CoPilot

Author: jakub-id

broker/scheduler/api/api_handler.go

@@ -198,8 +198,8 @@ func (h SchedulerApiHandler) getScheduledTask(w http.ResponseWriter, r *http.Req
 		brokerapi.AddInternalError(ctx, w, err)
 		return sched_db.ScheduledTask{}, ctx, true
 	}
-	if task.ActionData.BatchActionData == nil {
-		brokerapi.AddInternalError(ctx, w, errors.New("missing batchActionData"))
+	if err := validateBatchActionTask(task); err != nil {
+		brokerapi.AddInternalError(ctx, w, err)
 		return sched_db.ScheduledTask{}, ctx, true
 	}
 	return task, ctx, false
@@ -220,6 +220,9 @@ func (h SchedulerApiHandler) DeleteBatchActionsId(w http.ResponseWriter, r *http
 		if inErr != nil {
 			return inErr
 		}
+		if inErr = validateBatchActionTask(task); inErr != nil {
+			return inErr
+		}
 		active, inErr := schedRepo.HasActiveBatchActionEvents(ctx, task.ID)
 		if inErr != nil {
 			return inErr
@@ -345,8 +348,8 @@ func (h SchedulerApiHandler) mutateScheduledTask(
 		if inErr != nil {
 			return inErr
 		}
-		if task.ActionData.BatchActionData == nil {
-			return errors.New("missing batchActionData")
+		if inErr = validateBatchActionTask(task); inErr != nil {
+			return inErr
 		}
 		mutate(&task)
 		task, inErr = repo.SaveScheduledTask(ctx, sched_db.SaveScheduledTaskParams(task))
@@ -355,6 +358,13 @@ func (h SchedulerApiHandler) mutateScheduledTask(
 	return task, err
 }
 
+func validateBatchActionTask(task sched_db.ScheduledTask) error {
+	if task.ActionData.BatchActionData == nil {
+		return errors.New("missing batchActionData")
+	}
+	return nil
+}
+
 func (h SchedulerApiHandler) writeScheduledTaskMutationError(ctx common.ExtendedContext, w http.ResponseWriter, err error) {
 	if errors.Is(err, pgx.ErrNoRows) {
 		brokerapi.AddNotFoundError(w)

broker/scheduler/api/api_handler_test.go

@@ -726,6 +726,24 @@ func TestDeleteBatchActionsId_GetScheduledTaskError(t *testing.T) {
 	repo.AssertExpectations(t)
 }
 
+func TestDeleteBatchActionsId_NotBatchAction(t *testing.T) {
+	repo := new(MockSchedRepo)
+	task := scheduledTaskFixture("task-1")
+	task.ActionData.BatchActionData = nil
+	repo.On("GetScheduledTaskByIdForUpdate", "task-1", testOwnerScope).Return(task, nil)
+
+	h := newHandler(repo)
+	req := newReq(http.MethodDelete, "")
+	rr := httptest.NewRecorder()
+	h.DeleteBatchActionsId(rr, req, "task-1", schedoapi.DeleteBatchActionsIdParams{Symbol: symPtr(testSymbol)})
+
+	assertErrorStatus(t, rr, http.StatusInternalServerError)
+	repo.AssertNotCalled(t, "HasActiveBatchActionEvents", mock.Anything)
+	repo.AssertNotCalled(t, "DeleteBatchActionEvents", mock.Anything)
+	repo.AssertNotCalled(t, "DeleteScheduledTask", mock.Anything, mock.Anything)
+	repo.AssertExpectations(t)
+}
+
 func TestDeleteBatchActionsId_DeleteError(t *testing.T) {
 	repo := new(MockSchedRepo)
 	task := scheduledTaskFixture("task-1")

broker/scheduler/db/repo.go

@@ -28,7 +28,8 @@ type SchedRepo interface {
 
 type PgSchedRepo struct {
 	repo.PgBaseRepo[SchedRepo]
-	queries Queries
+	queries      Queries
+	eventQueries events.Queries
 }
 
 // WithTxFunc delegates transaction handling to PgBaseRepo.
@@ -116,11 +117,11 @@ func (r *PgSchedRepo) DeleteScheduledTask(ctx common.ExtendedContext, id string,
 }
 
 func (r *PgSchedRepo) HasActiveBatchActionEvents(ctx common.ExtendedContext, taskID string) (bool, error) {
-	return events.New().HasActiveBatchActionEvents(ctx, r.GetConnOrTx(), taskID)
+	return r.eventQueries.HasActiveBatchActionEvents(ctx, r.GetConnOrTx(), taskID)
 }
 
 func (r *PgSchedRepo) DeleteBatchActionEvents(ctx common.ExtendedContext, taskID string) error {
-	return events.New().DeleteBatchActionEvents(ctx, r.GetConnOrTx(), taskID)
+	return r.eventQueries.DeleteBatchActionEvents(ctx, r.GetConnOrTx(), taskID)
 }
 
 func (r *PgSchedRepo) GetScheduledTasks(ctx common.ExtendedContext, params GetScheduledTasksParams) ([]ScheduledTask, int64, error) {