fix: Minor fixes about queue and cron

limanmys · Nov 10, 2023 · d4d0618 · d4d0618
1 parent 93ff7df
commit d4d0618
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/app/handlers/queue.go b/app/handlers/queue.go
@@ -116,11 +116,11 @@ func (h *QueueHandler) Index(c *fiber.Ctx) error {
 	}
 
 	var queues []*models.Queue
-	if err := h.db.Model(&models.Queue{}).
-		Where("type = ?", c.Params("queue_type")).
-		Where("data->>'extension_id' ?", extension_id).
-		Where("data->>'server_id' ?", server_id).
-		Where("data->>'user_id' ?", user_id).Find(&queues).Error; err != nil {
+	if err := h.db.Debug().Model(&models.Queue{}).
+		Where("type = ?", c.FormValue("queue_type")).
+		Where("data->>'extension_id' = ?", extension_id).
+		Where("data->>'server_id' = ?", server_id).
+		Where("data->>'user_id' = ?", user_id).Find(&queues).Error; err != nil {
 		return err
 	}
 
@@ -156,9 +156,9 @@ func (h *QueueHandler) Delete(c *fiber.Ctx) error {
 	if err := h.db.Model(&models.Queue{}).
 		Where("type = ?", c.FormValue("queue_type")).
 		Where("id = ?", uid_).
-		Where("data->>'extension_id' ?", extension_id).
-		Where("data->>'server_id' ?", server_id).
-		Where("data->>'user_id' ?", user_id).Delete(models.Queue{}).Error; err != nil {
+		Where("data->>'extension_id' = ?", extension_id).
+		Where("data->>'server_id' = ?", server_id).
+		Where("data->>'user_id' = ?", user_id).Delete(models.Queue{}).Error; err != nil {
 		return err
 	}
 

diff --git a/app/models/cron_job.go b/app/models/cron_job.go
@@ -58,6 +58,7 @@ func (cj *CronJob) UpdateAsFailed(message string) {
 
 func (cj *CronJob) UpdateAsDone(output string) {
 	cj.Status = StatusDone
+	cj.Output = output
 	cj.Message = "CronJob completed successfully. Waiting for next run."
 
 	database.Connection().Model(cj).Save(cj)

diff --git a/internal/process_queue/create_report.go b/internal/process_queue/create_report.go
@@ -106,7 +106,7 @@ func (c CreateReport) Process() error {
 
 	if err := json.Unmarshal([]byte(output), &response); err != nil {
 		// Update job as failed
-		c.Queue.UpdateError(err.Error())
+		c.Queue.UpdateError("error when unmarshalling json, output: " + output)
 		return err
 	}
 
@@ -115,7 +115,7 @@ func (c CreateReport) Process() error {
 		c.Queue.UpdateError(response.Message)
 	} else {
 		// Update job as done
-		c.Queue.UpdateAsDone(strings.TrimSpace(strings.ReplaceAll(output, "\"", "")))
+		c.Queue.UpdateAsDone(strings.TrimSpace(strings.ReplaceAll(response.Message, "\"", "")))
 	}
 
 	return nil