fix: Mixed payload issue on cronjobs

Author: zekiahmetbayar

app/handlers/cron_jobs.go

@@ -50,7 +50,7 @@ func CreateCronJob(c *fiber.Ctx) error {
 	}
 
 	// Register and run cronjob
-	if err := cron_jobs.RegisterAndRun(&payload); err != nil {
+	if err := cron_jobs.RegisterAndRun(payload); err != nil {
 		return err
 	}
 

app/models/cron_job.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/limanmys/render-engine/internal/database"
+	"github.com/limanmys/render-engine/pkg/logger"
 )
 
 type CronJob struct {
@@ -42,24 +43,31 @@ func NewCronJob() *CronJob {
 }
 
 func (cj *CronJob) UpdateAsProcessing() {
-	cj.Status = StatusProcessing
-	cj.Message = "Cronjob processing."
-	cj.Output = "-"
-
-	database.Connection().Model(cj).Save(cj)
+	if err := database.Connection().Model(&CronJob{}).Where("id = ?", cj.ID).Updates(&CronJob{
+		Status:  StatusProcessing,
+		Message: "Cronjob processing",
+		Output:  "-",
+	}).Error; err != nil {
+		logger.Sugar().Errorw("error when saving job, %s", err.Error())
+	}
 }
 
-func (cj *CronJob) UpdateAsFailed(message string) {
-	cj.Status = StatusFailed
-	cj.Message = message
-
-	database.Connection().Model(cj).Save(cj)
+func (cj *CronJob) UpdateAsFailed(output string) {
+	if err := database.Connection().Model(&CronJob{}).Where("id = ?", cj.ID).Updates(&CronJob{
+		Status:  StatusFailed,
+		Message: "Cronjob failed.",
+		Output:  output,
+	}).Error; err != nil {
+		logger.Sugar().Errorw("error when saving job, %s", err.Error())
+	}
 }
 
 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)
+	if err := database.Connection().Model(&CronJob{}).Where("id = ?", cj.ID).Updates(&CronJob{
+		Status:  StatusDone,
+		Message: "Cronjob completed successfully. Waiting for next run.",
+		Output:  output,
+	}).Error; err != nil {
+		logger.Sugar().Errorw("error when saving job, %s", err.Error())
+	}
 }

pkg/cron_jobs/cron_jobs.go

@@ -2,6 +2,7 @@ package cron_jobs
 
 import (
 	b64 "encoding/base64"
+	"encoding/json"
 	"time"
 
 	"github.com/google/uuid"
@@ -16,10 +17,11 @@ import (
 )
 
 // RegisterAndRun registers and runs new cron job
-func RegisterAndRun(cj *models.CronJob) error {
-	_, err := constants.GLOBAL_SCHEDULER.Tag(cj.ID.String()).Every(1).Week().Weekday(time.Weekday(cj.Day)).At(cj.Time).Do(func() {
+func RegisterAndRun(cj models.CronJob) error {
+	if _, err := constants.GLOBAL_SCHEDULER.Tag(cj.ID.String()).Every(1).Week().Weekday(time.Weekday(cj.Day)).At(cj.Time).Do(func() {
 		// Update cronjob as processing
 		cj.UpdateAsProcessing()
+
 		// Get extension
 		extension, err := liman.GetExtension(&models.Extension{
 			ID: cj.ExtensionID.String(),
@@ -92,15 +94,33 @@ func RegisterAndRun(cj *models.CronJob) error {
 			return
 		}
 
+		// Run command
 		output := linux.Execute(command)
-		cj.UpdateAsDone(output)
-	})
-	if err != nil {
+		// If returns liman json
+		if helpers.LimanJSON(output) {
+			// Unmarshal response
+			var response = make(map[string]interface{})
+			if err := json.Unmarshal([]byte(output), &response); err != nil {
+				// Update job as failed
+				cj.UpdateAsFailed(err.Error())
+			}
+			// Check is liman returns unsuccess
+			if response["status"].(int) != 200 {
+				// Set as failed
+				cj.UpdateAsFailed(response["message"].(string))
+			} else {
+				// Set as done
+				cj.UpdateAsDone(response["message"].(string))
+			}
+		} else {
+			// Set as done
+			cj.UpdateAsDone(output)
+		}
+	}); err != nil {
 		return err
 	}
 
 	constants.GLOBAL_SCHEDULER.StartAsync()
-
 	return nil
 }
 
@@ -122,7 +142,7 @@ func InitCronJobs() error {
 	}
 
 	for _, cronjob := range cronjobs {
-		if err := RegisterAndRun(cronjob); err != nil {
+		if err := RegisterAndRun(*cronjob); err != nil {
 			cronjob.UpdateAsFailed(err.Error())
 		}
 	}