fix:scheduler is shutdown on bat worker side not api side

Author: h1divp

apps/api/cmd/BAT_worker/main.go

@@ -91,6 +91,7 @@ func main() {
 	mux.HandleFunc(tasks.TypeCalculateAdmissions, BATWorker.HandleCalculateAdmissionsTask)
 	mux.HandleFunc(tasks.TypeTransitionWaitlist, BATWorker.HandleTransitionWaitlistTask)
 	mux.HandleFunc(tasks.TypeScheduleTransitionWaitlist, BATWorker.HandleScheduleTransitionWaitlistTask)
+	mux.HandleFunc(tasks.TypeShutdownScheduler, BATWorker.HandleShutdownScheduler)
 
 	if err := srv.Run(mux); err != nil {
 		logger.Fatal().Msg("Failed to run BAT worker")

apps/api/internal/api/api.go

@@ -144,7 +144,7 @@ func (api *API) setupRoutes(mw *mw.Middleware) {
 			r.With(ensureEventAdmin).Post("/calc-admissions", api.Handlers.Admission.HandleCalculateAdmissionsRequest)
 			r.With(ensureEventAdmin).Patch("/transition-waitlisted-applications", api.Handlers.Application.TransitionWaitlistedApplications)
 			r.With(ensureEventAdmin).Post("/begin-waitlist-transition", api.Handlers.Bat.QueueScheduleWaitlistTransitionTask)
-			r.With(ensureEventAdmin).Post("/shutdown-waitlist-scheduler", api.Handlers.Bat.ShutdownWaitlistScheduler)
+			r.With(ensureEventAdmin).Post("/shutdown-waitlist-scheduler", api.Handlers.Bat.QueueShutdownWaitlistSchedulerTask)
 			r.With(ensureEventAdmin).Post("/reviews/bat-runs/{runId}/release", api.Handlers.Admission.ReleaseDecisions)
 			r.With(ensureEventAdmin).Patch("/", api.Handlers.Event.UpdateEventById)
 			r.With(ensureEventAdmin).Post("/banner", api.Handlers.Event.UploadEventBanner)

apps/api/internal/api/handlers/bat.go

@@ -179,7 +179,7 @@ func (h *BatHandler) QueueScheduleWaitlistTransitionTask(w http.ResponseWriter,
 	res.Send(w, http.StatusCreated, nil)
 }
 
-//	 Shutdown scheduler
+//	 Queue Shutdown scheduler task
 //
 //		@Summary		Shutsdown an asynq scheduler
 //		@Description	Shutsdown the scheduler used for the waitlist transition task. Error returned through logs if a scheduler is not active.
@@ -188,8 +188,8 @@ func (h *BatHandler) QueueScheduleWaitlistTransitionTask(w http.ResponseWriter,
 //		@Success		200		"Scheduler shutdown successfully"
 //		@Failure		500		{object}	res.ErrorResponse	"Server error: failed to shutdown scheduler"
 //		@Router			/events/{eventId}/queue-transition-waitlist-task [post]
-func (h *BatHandler) ShutdownWaitlistScheduler(w http.ResponseWriter, r *http.Request) {
-	err := h.BatService.ShutdownWaitlistScheduler()
+func (h *BatHandler) QueueShutdownWaitlistSchedulerTask(w http.ResponseWriter, r *http.Request) {
+	err := h.BatService.QueueShutdownWaitlistScheduler()
 	if err != nil {
 		res.SendError(w, http.StatusInternalServerError, res.NewError("internal_err", "Failed to shutdown scheduler."))
 	}

apps/api/internal/services/bat.go

@@ -384,9 +384,19 @@ func (s *BatService) QueueScheduleWaitlistTransitionTask(ctx context.Context, ev
 	return nil
 }
 
-func (s *BatService) ShutdownWaitlistScheduler() error {
-	s.scheduler.Shutdown()
-	// Error is output by logging.
+func (s *BatService) QueueShutdownWaitlistScheduler() error {
+	task, err := tasks.NewTaskShutdownScheduler()
+	if err != nil {
+		s.logger.Err(err).Msg("Failed to create ShutdownWaitlistScheduler task")
+		return err
+	}
+
+	_, err = s.taskQueue.Enqueue(task, asynq.Queue("bat"))
+	if err != nil {
+		s.logger.Err(err).Msg("Failed to queue ShutdownWaitlistScheduler task")
+		return err
+	}
+	s.logger.Info().Msg("Queued ShutdownWaitlistScheduler task")
 
 	return nil
 }

apps/api/internal/tasks/bat.go

@@ -11,6 +11,7 @@ const (
 	TypeCalculateAdmissions        = "admissions:calculate"
 	TypeScheduleTransitionWaitlist = "waitlist:scheduletransition"
 	TypeTransitionWaitlist         = "waitlist:transition"
+	TypeShutdownScheduler          = "waitlist:shutdownscheduler"
 )
 
 type CalculateAdmissionsPayload struct {
@@ -55,3 +56,7 @@ func NewTaskTransitionWaitlist(payload TransitionWaitlistPayload) (*asynq.Task,
 
 	return asynq.NewTask(TypeTransitionWaitlist, data), nil
 }
+
+func NewTaskShutdownScheduler() (*asynq.Task, error) {
+	return asynq.NewTask(TypeShutdownScheduler, nil), nil
+}

apps/api/internal/workers/bat.go

@@ -106,3 +106,10 @@ func (w *BATWorker) HandleTransitionWaitlistTask(ctx context.Context, t *asynq.T
 
 	return nil
 }
+
+func (w *BATWorker) HandleShutdownScheduler(ctx context.Context, t *asynq.Task) error {
+	w.scheduler.Shutdown()
+	// Error returned by logging.
+
+	return nil
+}