Fix SQL query to get children jobs (#29)

Also remove some Logger.info instances.
rhpds · Jul 20, 2023 · 5c1ec7e · 5c1ec7e
1 parent a38d28a
commit 5c1ec7e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/cmd/sandbox-api/middlewares.go b/cmd/sandbox-api/middlewares.go
@@ -286,7 +286,6 @@ func ShortRequestID(next http.Handler) http.Handler {
 
 			var err error
 			requestID, err = gonanoid.New()
-			log.Logger.Info("Generating new request ID", "requestID", requestID)
 
 			if err != nil {
 				log.Logger.Error("Error generating request ID", "error", err)

diff --git a/internal/models/lifecycle_jobs.go b/internal/models/lifecycle_jobs.go
@@ -93,12 +93,6 @@ func GetLifecyclePlacementJob(dbpool *pgxpool.Pool, id int) (*LifecyclePlacement
 func GetLifecyclePlacementJobByRequestID(dbpool *pgxpool.Pool, requestID string) (*LifecyclePlacementJob, error) {
 	var j LifecyclePlacementJob
 
-	log.Logger.Info("sql",
-		"sql",
-		"SELECT id, placement_id, status, request, lifecycle_action FROM lifecycle_placement_jobs WHERE request_id = $1",
-		"requestID",
-		requestID)
-
 	err := dbpool.QueryRow(
 		context.Background(),
 		"SELECT id, placement_id, status, request, lifecycle_action FROM lifecycle_placement_jobs WHERE request_id = $1",
@@ -241,8 +235,7 @@ func (j *LifecyclePlacementJob) GlobalStatus() (string, error) {
 	rows, err := j.DbPool.Query(
 		context.TODO(),
 		`SELECT id FROM lifecycle_resource_jobs
-         WHERE lifecycle_action = 'status'
-         AND parent_id = $1
+         WHERE parent_id = $1
          ORDER BY updated_at`,
 		j.ID,
 	)