Merge pull request #282 from swamphacks/fix/waitlist-trans-prevent-post-event-start

Fix/waitlist trans prevent post event start

Author: h1divp

apps/api/cmd/BAT_worker/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"time"
 
 	"github.com/hibiken/asynq"
@@ -57,9 +56,6 @@ func main() {
 		},
 	)
 
-	logger.Info().Msg("Debug test")
-	fmt.Print("Debug test")
-
 	schedulerLocation, err := time.LoadLocation("America/New_York")
 	if err != nil {
 		panic(err)
@@ -71,10 +67,8 @@ func main() {
 		},
 	)
 
-	logger.Info().Msg("Debug test")
-	fmt.Print("Debug test")
-
 	taskQueueClient := asynq.NewClient(redisOpt)
+	defer taskQueueClient.Close()
 
 	database := db.NewDB(cfg.DatabaseURL)
 	defer database.Close()
@@ -92,7 +86,7 @@ func main() {
 	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, taskQueueClient, logger)
+	BATWorker := workers.NewBATWorker(batService, applicationService, eventService, scheduler, taskQueueClient, logger)
 
 	mux := asynq.NewServeMux()
 	mux.HandleFunc(tasks.TypeCalculateAdmissions, BATWorker.HandleCalculateAdmissionsTask)

apps/api/internal/services/application.go

@@ -3,6 +3,7 @@ package services
 import (
 	"context"
 	"errors"
+	"time"
 
 	"github.com/google/uuid"
 	"github.com/hibiken/asynq"
@@ -21,6 +22,7 @@ var (
 	ErrGetApplicationStatistics = errors.New("failed to aggregate application stats")
 	ErrMismatchedReviewerCounts = errors.New("the total number of applications does not match the total number of assigned reviews")
 	ErrWrongReviewerAssignment  = errors.New("an application has been assigned to a reviewer who is not authorized to review it")
+	ErrEventAlreadyStarted      = errors.New("the event has already started")
 )
 
 // TODO: figure out a way to create the submission fields dynamically using the json form files with proper validation.
@@ -94,7 +96,7 @@ func NewApplicationService(appRepo *repository.ApplicationRepository, userRepo *
 		buckets:       buckets,
 		txm:           txm,
 		scheduler:     scheduler,
-		logger:        logger,
+		logger:        logger.With().Str("component", "applicationService").Logger(),
 	}
 }
 
@@ -595,7 +597,19 @@ func (s *ApplicationService) AcceptApplicationAcceptance(ctx context.Context, us
 
 func (s *ApplicationService) TransitionWaitlistedApplications(ctx context.Context, eventId uuid.UUID, acceptanceCount uint32, acceptanceQuota uint32) error {
 	var acceptedUserIds []uuid.UUID
-	err := s.txm.WithTx(ctx, func(tx pgx.Tx) error {
+
+	event, err := s.eventsService.GetEventByID(ctx, eventId)
+	if err != nil {
+		s.logger.Err(err).Msg(err.Error())
+		return err
+	}
+	currentTime := time.Now()
+	if currentTime.After(event.StartTime) {
+		s.logger.Err(ErrEventAlreadyStarted).Msg("Could not transition waitlisted applications: the event has already started.")
+		return ErrEventAlreadyStarted
+	}
+
+	err = s.txm.WithTx(ctx, func(tx pgx.Tx) error {
 		txAppRepo := s.appRepo.NewTx(tx)
 
 		err := txAppRepo.TransitionAcceptedApplicationsToWaitlistByEventID(ctx, eventId)

apps/api/internal/workers/bat.go

@@ -3,6 +3,8 @@ package workers
 import (
 	"context"
 	"encoding/json"
+	"errors"
+	"time"
 
 	"github.com/hibiken/asynq"
 	"github.com/rs/zerolog"
@@ -12,6 +14,10 @@ import (
 	"github.com/swamphacks/core/apps/api/internal/tasks"
 )
 
+var (
+	ErrEventAlreadyStarted = errors.New("the event has already started")
+)
+
 // BAT Worker
 // The BAT worker runs the background execution pipeline for our
 // Balanced Admissions Thresher (BAT). This worker processes
@@ -22,15 +28,17 @@ import (
 type BATWorker struct {
 	batService         *services.BatService
 	applicationService *services.ApplicationService
+	eventService       *services.EventService
 	scheduler          *asynq.Scheduler
 	taskQueue          *asynq.Client
 	logger             zerolog.Logger
 }
 
-func NewBATWorker(batService *services.BatService, applicationService *services.ApplicationService, scheduler *asynq.Scheduler, taskQueue *asynq.Client, logger zerolog.Logger) *BATWorker {
+func NewBATWorker(batService *services.BatService, applicationService *services.ApplicationService, eventService *services.EventService, scheduler *asynq.Scheduler, taskQueue *asynq.Client, logger zerolog.Logger) *BATWorker {
 	return &BATWorker{
 		batService:         batService,
 		applicationService: applicationService,
+		eventService:       eventService,
 		logger:             logger.With().Str("worker", "BATWorker").Str("component", "BAT").Logger(),
 		scheduler:          scheduler,
 		taskQueue:          taskQueue,
@@ -72,6 +80,18 @@ func (w *BATWorker) HandleScheduleTransitionWaitlistTask(ctx context.Context, t
 		return err
 	}
 
+	// Get event start date, error if past the start of the event.
+	event, err := w.eventService.GetEventByID(ctx, payload.EventID)
+	if err != nil {
+		w.logger.Err(err).Msg(err.Error())
+		return err
+	}
+	currentTime := time.Now()
+	if currentTime.After(event.StartTime) {
+		w.logger.Err(ErrEventAlreadyStarted).Msg("Could not transition waitlisted applications: the event has already started.")
+		return ErrEventAlreadyStarted
+	}
+
 	cfg := config.Load()
 	task, err := tasks.NewTaskTransitionWaitlist(tasks.TransitionWaitlistPayload{
 		EventID:                 payload.EventID,