Merge pull request #267 from swamphacks/feat/waitlist-transition

Major waitlist transition fixes

Author: h1divp

apps/api/.env.dev.example

@@ -3,6 +3,11 @@ DATABASE_URL_MIGRATION="postgres://postgres:postgres@localhost:5432/coredb"
 REDIS_URL="redis://redis:6379"
 ALLOWED_ORIGINS="" # URLs in comma seperated list
 
+# Application waitlist
+MAX_ACCEPTED_APPLICATIONS=500
+ACCEPT_FROM_WAITLIST_COUNT=50
+ACCEPT_FROM_WAITLIST_PERIOD="@every 72h"
+
 # For OAuth
 AUTH_DISCORD_CLIENT_ID=
 AUTH_DISCORD_CLIENT_SECRET=

apps/api/cmd/BAT_worker/main.go

@@ -82,15 +82,16 @@ func main() {
 
 	sesClient := email.NewSESClient(cfg.AWS.AccessKey, cfg.AWS.AccessKeySecret, cfg.AWS.Region, logger)
 	emailService := services.NewEmailService(taskQueueClient, sesClient, logger)
-	batService := services.NewBatService(applicationRepo, eventRepo, userRepo, batRunsRepo, emailService, txm, nil, logger)
+	batService := services.NewBatService(applicationRepo, eventRepo, userRepo, batRunsRepo, emailService, txm, nil, scheduler, logger)
 	applicationService := services.NewApplicationService(applicationRepo, userRepo, eventService, emailService, txm, nil, nil, scheduler, logger)
 
-	BATWorker := workers.NewBATWorker(batService, applicationService, scheduler, logger)
+	BATWorker := workers.NewBATWorker(batService, applicationService, scheduler, taskQueueClient, logger)
 
 	mux := asynq.NewServeMux()
 	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/cmd/api/main.go

@@ -91,7 +91,7 @@ func main() {
 	emailService := services.NewEmailService(taskQueueClient, sesClient, logger)
 	applicationService := services.NewApplicationService(applicationRepo, userRepo, eventService, emailService, txm, r2Client, &cfg.CoreBuckets, nil, logger)
 	teamService := services.NewTeamService(teamRepo, teamMemberRepo, teamJoinRequestRepo, eventRepo, txm, logger)
-	batService := services.NewBatService(applicationRepo, eventRepo, userRepo, batRunsRepo, emailService, txm, taskQueueClient, logger)
+	batService := services.NewBatService(applicationRepo, eventRepo, userRepo, batRunsRepo, emailService, txm, taskQueueClient, nil, logger)
 
 	// Injections into handlers
 	apiHandlers := handlers.NewHandlers(authService, userService, eventInterestService, eventService, emailService, applicationService, teamService, batService, cfg, logger)

apps/api/internal/api/api.go

@@ -143,7 +143,8 @@ func (api *API) setupRoutes(mw *mw.Middleware) {
 			r.With(ensureEventAdmin).Post("/queue-confirmation-email", api.Handlers.Email.QueueConfirmationEmail)
 			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("/queue-transition-waitlist-task", api.Handlers.Bat.QueueScheduleWaitlistTransitionTask)
+			r.With(ensureEventAdmin).Post("/begin-waitlist-transition", api.Handlers.Bat.QueueScheduleWaitlistTransitionTask)
+			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

@@ -178,3 +178,21 @@ func (h *BatHandler) QueueScheduleWaitlistTransitionTask(w http.ResponseWriter,
 
 	res.Send(w, http.StatusCreated, nil)
 }
+
+//	 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.
+//		@Tags
+//
+//		@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) 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."))
+	}
+
+	res.Send(w, http.StatusOK, nil)
+}

apps/api/internal/config/config.go

@@ -55,14 +55,15 @@ type CoreBuckets struct {
 }
 
 type Config struct {
-	DatabaseURL                   string   `env:"DATABASE_URL"`
-	RedisURL                      string   `env:"REDIS_URL"`
-	Port                          string   `env:"PORT" envDefault:"8080"`
-	AllowedOriginsString          string   `env:"ALLOWED_ORIGINS"`
-	EmailTemplateDirectory        string   `env:"EMAIL_TEMPLATE_DIRECTORY"`
-	AllowedOrigins                []string ``
-	ApiOrigin                     string   `env:"API_ORIGIN"`
-	WaitlistWorkerSessionIdCookie string   `env:WAITLIST_WORKER_SESSION_ID_COOKIE`
+	DatabaseURL              string   `env:"DATABASE_URL"`
+	RedisURL                 string   `env:"REDIS_URL"`
+	Port                     string   `env:"PORT" envDefault:"8080"`
+	AllowedOriginsString     string   `env:"ALLOWED_ORIGINS"`
+	EmailTemplateDirectory   string   `env:"EMAIL_TEMPLATE_DIRECTORY"`
+	AllowedOrigins           []string ``
+	MaxAcceptedApplications  uint32   `env:"MAX_ACCEPTED_APPLICATIONS"`
+	AcceptFromWaitlistCount  uint32   `env:"ACCEPT_FROM_WAITLIST_COUNT"`
+	AcceptFromWaitlistPeriod string   `env:"ACCEPT_FROM_WAITLIST_PERIOD"`
 
 	Auth      AuthConfig   `envPrefix:"AUTH_"`
 	Cookie    CookieConfig `envPrefix:"COOKIE_"`

apps/api/internal/db/queries/applications.sql

@@ -104,7 +104,12 @@ UPDATE applications
 SET waitlist_join_time = COALESCE(waitlist_join_time, NOW()),
     status = 'waitlisted'
 WHERE event_id = @event_id::uuid
-  AND status = 'accepted';
+  AND status = 'accepted'
+  AND user_id IN (
+    SELECT user_id from event_roles AS er
+    WHERE er.role = 'applicant'
+)
+;
 
 -- name: TransitionWaitlistedApplicationsToAcceptedByEventID :many
 UPDATE applications
@@ -119,7 +124,3 @@ WHERE user_id IN (
 )
 RETURNING user_id;
 
--- name: GetTotalAcceptedApplicationsByEventId :one
-SELECT COUNT(*) FROM applications
-WHERE event_id = @event_id::uuid
-  AND status = 'accepted';

apps/api/internal/db/queries/event_roles.sql

@@ -24,4 +24,9 @@ WHERE er.event_id = $1;
 -- name: UpdateRole :exec
 UPDATE event_roles
 SET role = $3
-WHERE event_id = $1 AND user_id = $2;
+WHERE event_id = $1 AND user_id = $2;
+
+-- name: GetAttendeeCountByEventId :one
+SELECT COUNT(*) FROM event_roles AS er
+WHERE er.event_id = @event_id::uuid
+  AND er.role = 'attendee';

apps/api/internal/db/repository/application.go

@@ -211,7 +211,7 @@ func (r *ApplicationRepository) TransitionWaitlistedApplicationsToAcceptedByEven
 	})
 }
 
-func (r *ApplicationRepository) GetTotalAcceptedApplicationsByEventId(ctx context.Context, eventId uuid.UUID) (uint32, error) {
-	amount, err := r.db.Query.GetTotalAcceptedApplicationsByEventId(ctx, eventId)
+func (r *ApplicationRepository) GetAttendeeCountByEventId(ctx context.Context, eventId uuid.UUID) (uint32, error) {
+	amount, err := r.db.Query.GetAttendeeCountByEventId(ctx, eventId)
 	return uint32(amount), err
 }