Remove ProcessesQuery. We always preload.

apps.go

@@ -202,13 +202,8 @@ func (s *scaler) Scale(ctx context.Context, db *gorm.DB, opts ScaleOpts) (*Proce
 		return nil, &ValidationError{Err: fmt.Errorf("no releases for %s", app.Name)}
 	}
 
-	f, err := formation(db, ProcessesQuery{Release: release})
-	if err != nil {
-		return nil, err
-	}
-
-	p, ok := f[t]
-	if !ok {
+	p := release.Process(t)
+	if p == nil {
 		return nil, &ValidationError{Err: fmt.Errorf("no %s process type in release", t)}
 	}
 

processes.go

@@ -242,44 +242,6 @@ func (f Formation) Processes() []*Process {
 	return processes
 }
 
-// ProcessesQuery is a Scope implementation for common things to filter
-// processes by.
-type ProcessesQuery struct {
-	// If provided, finds only processes belonging to the given release.
-	Release *Release
-}
-
-// Scope implements the Scope interface.
-func (q ProcessesQuery) Scope(db *gorm.DB) *gorm.DB {
-	var scope ComposedScope
-
-	if q.Release != nil {
-		scope = append(scope, FieldEquals("release_id", q.Release.ID))
-	}
-
-	return scope.Scope(db)
-}
-
-// processes returns all processes matching the scope.
-func processes(db *gorm.DB, scope Scope) ([]*Process, error) {
-	var processes []*Process
-	return processes, find(db, scope, &processes)
-}
-
-// formation returns a Formation for the processes matching the scope.
-func formation(db *gorm.DB, scope Scope) (Formation, error) {
-	p, err := processes(db, scope)
-	if err != nil {
-		return nil, err
-	}
-	return newFormation(p), nil
-}
-
-// processesCreate inserts a process into the database.
-func processesCreate(db *gorm.DB, process *Process) (*Process, error) {
-	return process, db.Create(process).Error
-}
-
 // processesUpdate updates an existing process into the database.
 func processesUpdate(db *gorm.DB, process *Process) error {
 	return db.Save(process).Error

processes_test.go

@@ -10,17 +10,6 @@ import (
 	"github.com/remind101/empire/pkg/constraints"
 )
 
-func TestProcessesQuery(t *testing.T) {
-	release := &Release{ID: "1234"}
-
-	tests := scopeTests{
-		{ProcessesQuery{}, "", []interface{}{}},
-		{ProcessesQuery{Release: release}, "WHERE (release_id = $1)", []interface{}{release.ID}},
-	}
-
-	tests.Run(t)
-}
-
 func TestNewFormation(t *testing.T) {
 	tests := []struct {
 		f  Formation

releases.go

@@ -44,6 +44,17 @@ func (r *Release) Formation() Formation {
 	return f
 }
 
+// Process return the Process with the given type.
+func (r *Release) Process(t ProcessType) *Process {
+	for _, p := range r.Processes {
+		if p.Type == t {
+			return p
+		}
+	}
+
+	return nil
+}
+
 // BeforeCreate sets created_at before inserting.
 func (r *Release) BeforeCreate() error {
 	t := timex.Now()
@@ -78,9 +89,6 @@ func (q ReleasesQuery) Scope(db *gorm.DB) *gorm.DB {
 
 	scope = append(scope, Range(q.Range.WithDefaults(q.DefaultRange())))
 
-	// Preload all the things.
-	scope = append(scope, Preload("App", "Config", "Slug", "Processes"))
-
 	return scope.Scope(db)
 }
 
@@ -132,10 +140,14 @@ func (s *releasesService) Rollback(ctx context.Context, db *gorm.DB, opts Rollba
 	})
 }
 
+// These associations are always available on a Release.
+var releasesPreload = Preload("App", "Config", "Slug", "Processes")
+
 // releasesFind returns the first matching release.
 func releasesFind(db *gorm.DB, scope Scope) (*Release, error) {
 	var release Release
 
+	scope = ComposedScope{releasesPreload, scope}
 	if err := first(db, scope, &release); err != nil {
 		return &release, err
 	}
@@ -150,6 +162,7 @@ func releasesFind(db *gorm.DB, scope Scope) (*Release, error) {
 // releases returns all releases matching the scope.
 func releases(db *gorm.DB, scope Scope) ([]*Release, error) {
 	var releases []*Release
+	scope = ComposedScope{releasesPreload, scope}
 	return releases, find(db, scope, &releases)
 }