refactor job to proc

model/build.go

@@ -2,37 +2,37 @@ package model
 
 // swagger:model build
 type Build struct {
-	ID        int64   `json:"id"            meddler:"build_id,pk"`
-	RepoID    int64   `json:"-"             meddler:"build_repo_id"`
-	Number    int     `json:"number"        meddler:"build_number"`
-	Parent    int     `json:"parent"        meddler:"build_parent"`
-	Event     string  `json:"event"         meddler:"build_event"`
-	Status    string  `json:"status"        meddler:"build_status"`
-	Error     string  `json:"error"         meddler:"build_error"`
-	Enqueued  int64   `json:"enqueued_at"   meddler:"build_enqueued"`
-	Created   int64   `json:"created_at"    meddler:"build_created"`
-	Started   int64   `json:"started_at"    meddler:"build_started"`
-	Finished  int64   `json:"finished_at"   meddler:"build_finished"`
-	Deploy    string  `json:"deploy_to"     meddler:"build_deploy"`
-	Commit    string  `json:"commit"        meddler:"build_commit"`
-	Branch    string  `json:"branch"        meddler:"build_branch"`
-	Ref       string  `json:"ref"           meddler:"build_ref"`
-	Refspec   string  `json:"refspec"       meddler:"build_refspec"`
-	Remote    string  `json:"remote"        meddler:"build_remote"`
-	Title     string  `json:"title"         meddler:"build_title"`
-	Message   string  `json:"message"       meddler:"build_message"`
-	Timestamp int64   `json:"timestamp"     meddler:"build_timestamp"`
-	Sender    string  `json:"sender"        meddler:"build_sender"`
-	Author    string  `json:"author"        meddler:"build_author"`
-	Avatar    string  `json:"author_avatar" meddler:"build_avatar"`
-	Email     string  `json:"author_email"  meddler:"build_email"`
-	Link      string  `json:"link_url"      meddler:"build_link"`
-	Signed    bool    `json:"signed"        meddler:"build_signed"`   // deprecate
-	Verified  bool    `json:"verified"      meddler:"build_verified"` // deprecate
-	Reviewer  string  `json:"reviewed_by"   meddler:"build_reviewer"`
-	Reviewed  int64   `json:"reviewed_at"   meddler:"build_reviewed"`
-	Jobs      []*Job  `json:"jobs,omitempty"  meddler:"-"`
-	Procs     []*Proc `json:"procs,omitempty" meddler:"-"`
+	ID        int64  `json:"id"            meddler:"build_id,pk"`
+	RepoID    int64  `json:"-"             meddler:"build_repo_id"`
+	Number    int    `json:"number"        meddler:"build_number"`
+	Parent    int    `json:"parent"        meddler:"build_parent"`
+	Event     string `json:"event"         meddler:"build_event"`
+	Status    string `json:"status"        meddler:"build_status"`
+	Error     string `json:"error"         meddler:"build_error"`
+	Enqueued  int64  `json:"enqueued_at"   meddler:"build_enqueued"`
+	Created   int64  `json:"created_at"    meddler:"build_created"`
+	Started   int64  `json:"started_at"    meddler:"build_started"`
+	Finished  int64  `json:"finished_at"   meddler:"build_finished"`
+	Deploy    string `json:"deploy_to"     meddler:"build_deploy"`
+	Commit    string `json:"commit"        meddler:"build_commit"`
+	Branch    string `json:"branch"        meddler:"build_branch"`
+	Ref       string `json:"ref"           meddler:"build_ref"`
+	Refspec   string `json:"refspec"       meddler:"build_refspec"`
+	Remote    string `json:"remote"        meddler:"build_remote"`
+	Title     string `json:"title"         meddler:"build_title"`
+	Message   string `json:"message"       meddler:"build_message"`
+	Timestamp int64  `json:"timestamp"     meddler:"build_timestamp"`
+	Sender    string `json:"sender"        meddler:"build_sender"`
+	Author    string `json:"author"        meddler:"build_author"`
+	Avatar    string `json:"author_avatar" meddler:"build_avatar"`
+	Email     string `json:"author_email"  meddler:"build_email"`
+	Link      string `json:"link_url"      meddler:"build_link"`
+	Signed    bool   `json:"signed"        meddler:"build_signed"`   // deprecate
+	Verified  bool   `json:"verified"      meddler:"build_verified"` // deprecate
+	Reviewer  string `json:"reviewed_by"   meddler:"build_reviewer"`
+	Reviewed  int64  `json:"reviewed_at"   meddler:"build_reviewed"`
+	// Jobs      []*Job  `json:"jobs,omitempty"  meddler:"-"`
+	Procs []*Proc `json:"procs,omitempty" meddler:"-"`
 }
 
 type BuildGroup struct {

model/event.go

@@ -15,24 +15,5 @@ type Event struct {
 	Type  EventType `json:"type"`
 	Repo  Repo      `json:"repo"`
 	Build Build     `json:"build"`
-	Job   Job       `json:"job"`
-}
-
-// NewEvent creates a new Event for the build, using copies of
-// the build data to avoid possible mutation or race conditions.
-func NewEvent(t EventType, r *Repo, b *Build, j *Job) *Event {
-	return &Event{
-		Type:  t,
-		Repo:  *r,
-		Build: *b,
-		Job:   *j,
-	}
-}
-
-func NewBuildEvent(t EventType, r *Repo, b *Build) *Event {
-	return &Event{
-		Type:  t,
-		Repo:  *r,
-		Build: *b,
-	}
+	Proc  Proc      `json:"proc"`
 }

model/job.go

@@ -1,17 +1,17 @@
 package model
 
-// swagger:model job
-type Job struct {
-	ID       int64  `json:"id"           meddler:"job_id,pk"`
-	BuildID  int64  `json:"-"            meddler:"job_build_id"`
-	NodeID   int64  `json:"-"            meddler:"job_node_id"`
-	Number   int    `json:"number"       meddler:"job_number"`
-	Error    string `json:"error"        meddler:"job_error"`
-	Status   string `json:"status"       meddler:"job_status"`
-	ExitCode int    `json:"exit_code"    meddler:"job_exit_code"`
-	Enqueued int64  `json:"enqueued_at"  meddler:"job_enqueued"`
-	Started  int64  `json:"started_at"   meddler:"job_started"`
-	Finished int64  `json:"finished_at"  meddler:"job_finished"`
-
-	Environment map[string]string `json:"environment" meddler:"job_environment,json"`
-}
+// // swagger:model job
+// type Job struct {
+// 	ID       int64  `json:"id"           meddler:"job_id,pk"`
+// 	BuildID  int64  `json:"-"            meddler:"job_build_id"`
+// 	NodeID   int64  `json:"-"            meddler:"job_node_id"`
+// 	Number   int    `json:"number"       meddler:"job_number"`
+// 	Error    string `json:"error"        meddler:"job_error"`
+// 	Status   string `json:"status"       meddler:"job_status"`
+// 	ExitCode int    `json:"exit_code"    meddler:"job_exit_code"`
+// 	Enqueued int64  `json:"enqueued_at"  meddler:"job_enqueued"`
+// 	Started  int64  `json:"started_at"   meddler:"job_started"`
+// 	Finished int64  `json:"finished_at"  meddler:"job_finished"`
+//
+// 	Environment map[string]string `json:"environment" meddler:"job_environment,json"`
+// }

model/log.go

@@ -1,7 +1,7 @@
 package model
 
-type Log struct {
-	ID    int64  `meddler:"log_id,pk"`
-	JobID int64  `meddler:"log_job_id"`
-	Data  []byte `meddler:"log_data"`
-}
+// type Log struct {
+// 	ID    int64  `meddler:"log_id,pk"`
+// 	JobID int64  `meddler:"log_job_id"`
+// 	Data  []byte `meddler:"log_data"`
+// }