Release v0.3.0

.github/workflows/dev-build-deploy-bat-worker.yml

@@ -0,0 +1,93 @@
+name: Deploy BAT Worker to Development
+
+on:
+  push:
+    branches:
+      - dev
+    paths:
+      - 'apps/api/**'
+      - 'infra/docker-compose.api.yml'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  build-and-push:
+    name: Build and Push Docker Image to GHCR
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        run: |
+          docker build \
+            --target prod \
+            -f ./apps/api/cmd/BAT_worker/Dockerfile \
+            -t ghcr.io/${{ github.repository_owner }}/core-bat-worker:dev \
+            ./apps/api
+          docker push ghcr.io/${{ github.repository_owner }}/core-bat-worker:dev
+
+  run-migrations:
+    name: Run Goose Migrations
+    runs-on: ubuntu-latest
+    needs: build-and-push
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install Goose
+        run: |
+          curl -fsSL https://raw.githubusercontent.com/pressly/goose/master/install.sh | sh
+
+      - name: Run migrations
+        run: |
+          goose -dir ./apps/api/internal/db/migrations postgres "${{ secrets.DEV_DB_URL }}" up
+
+  deploy:
+    name: Deploy to Development Server
+    runs-on: ubuntu-latest
+    needs: [build-and-push, run-migrations]
+
+    steps:
+      - name: SSH proxy command
+        uses: appleboy/ssh-action@v1
+        with:
+          host: ${{ secrets.API_HOST }}
+          username: root
+          password: ${{ secrets.API_PASSWORD }}
+          script: |
+            cd /root/core/infra
+            git fetch
+            git checkout dev
+            git reset --hard origin/dev
+            git pull
+
+            export INFISICAL_TOKEN=$(infisical login \
+              --method=universal-auth \
+              --client-id='${{ secrets.INFISICAL_CLIENT_ID }}' \
+              --client-secret='${{ secrets.INFISICAL_CLIENT_SECRET }}' \
+              --silent \
+              --plain)
+
+            infisical export \
+              --token=$INFISICAL_TOKEN \
+              --env=dev \
+              --format=dotenv \
+              --path="/api" \
+              --projectId='${{ secrets.INFISICAL_PROJECT_ID }}' \
+              > ./secrets/.env.dev.api
+
+            docker compose -f docker-compose.api.yml pull bat-worker-dev
+            docker compose -f docker-compose.api.yml up -d --no-deps --force-recreate bat-worker-dev

.github/workflows/prod-build-deploy-bat-worker.yml

@@ -0,0 +1,93 @@
+name: Deploy BAT Worker to Production
+
+on:
+  push:
+    branches:
+      - dev
+    paths:
+      - 'apps/api/**'
+      - 'infra/docker-compose.api.yml'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  build-and-push:
+    name: Build and Push Docker Image to GHCR
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        run: |
+          docker build \
+            --target prod \
+            -f ./apps/api/cmd/BAT_worker/Dockerfile \
+            -t ghcr.io/${{ github.repository_owner }}/core-bat-worker:latest \
+            ./apps/api
+          docker push ghcr.io/${{ github.repository_owner }}/core-bat-worker:latest
+
+  run-migrations:
+    name: Run Goose Migrations
+    runs-on: ubuntu-latest
+    needs: build-and-push
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install Goose
+        run: |
+          curl -fsSL https://raw.githubusercontent.com/pressly/goose/master/install.sh | sh
+
+      - name: Run migrations
+        run: |
+          goose -dir ./apps/api/internal/db/migrations postgres "${{ secrets.DEV_DB_URL }}" up
+
+  deploy:
+    name: Deploy to Development Server
+    runs-on: ubuntu-latest
+    needs: [build-and-push, run-migrations]
+
+    steps:
+      - name: SSH proxy command
+        uses: appleboy/ssh-action@v1
+        with:
+          host: ${{ secrets.API_HOST }}
+          username: root
+          password: ${{ secrets.API_PASSWORD }}
+          script: |
+            cd /root/core/infra
+            git fetch
+            git checkout dev
+            git reset --hard origin/dev
+            git pull
+
+            export INFISICAL_TOKEN=$(infisical login \
+              --method=universal-auth \
+              --client-id='${{ secrets.INFISICAL_CLIENT_ID }}' \
+              --client-secret='${{ secrets.INFISICAL_CLIENT_SECRET }}' \
+              --silent \
+              --plain)
+
+            infisical export \
+              --token=$INFISICAL_TOKEN \
+              --env=dev \
+              --format=dotenv \
+              --path="/api" \
+              --projectId='${{ secrets.INFISICAL_PROJECT_ID }}' \
+              > ./secrets/.env.dev.api
+
+            docker compose -f docker-compose.api.yml pull bat-worker
+            docker compose -f docker-compose.api.yml up -d --no-deps --force-recreate bat-worker

Makefile

@@ -4,6 +4,9 @@ local:
 api:
 	docker compose up api
 
+bat:
+	docker compose up api bat_worker asynqmon
+
 storage:
 	docker compose up postgres redis
 

apps/api/.air.bat.toml

@@ -0,0 +1,31 @@
+root = "."
+tmp_dir = "tmp"
+
+[build]
+  cmd = "go build -o ./tmp/main ./cmd/BAT_worker"
+  bin = "./tmp/main"
+  exclude_dir = ["tmp", "vendor"]
+  include_dir = ["cmd", "internal", "docs"]  # same as API if you want
+  exclude_regex = ["_test.go"]
+  include_ext = ["go", "tpl", "tmpl", "html"]
+  log = "tmp/build-errors.log"
+  poll = true
+
+[color]
+  app = ""
+  build = "yellow"
+  main = "magenta"
+  runner = "green"
+  watcher = "cyan"
+
+[log]
+  main_only = false
+  silent = false
+  time = true
+
+[misc]
+  clean_on_exit = false
+
+[screen]
+  clear_on_rebuild = false
+  keep_scroll = true

apps/api/.air.toml

@@ -6,6 +6,7 @@ testdata_dir = "testdata"
   cmd = "go build -o ./tmp/main ./cmd/api"
   bin = "./tmp/main"
   exclude_dir = ["assets", "tmp", "vendor", "testdata"]
+  include_dir = ["cmd", "internal", "docs", "pkgs"]
   exclude_regex = ["_test.go"]
   include_ext = ["go", "tpl", "tmpl", "html"]
   log = "build-errors.log"

apps/api/cmd/BAT_worker/Dockerfile

@@ -13,7 +13,9 @@ FROM base AS dev
 
 RUN go install github.com/air-verse/air@latest
 
-CMD ["air"]
+COPY .air.bat.toml .
+
+CMD ["air", "-c", ".air.bat.toml"]
 
 # Production
 FROM base AS prod

apps/api/cmd/BAT_worker/main.go

@@ -5,7 +5,12 @@ import (
 
 	"github.com/hibiken/asynq"
 	"github.com/swamphacks/core/apps/api/internal/config"
+	"github.com/swamphacks/core/apps/api/internal/db"
+	"github.com/swamphacks/core/apps/api/internal/db/repository"
+	"github.com/swamphacks/core/apps/api/internal/email"
 	"github.com/swamphacks/core/apps/api/internal/logger"
+	"github.com/swamphacks/core/apps/api/internal/services"
+	"github.com/swamphacks/core/apps/api/internal/tasks"
 	"github.com/swamphacks/core/apps/api/internal/workers"
 )
 
@@ -51,9 +56,24 @@ func main() {
 		},
 	)
 
-	_ = workers.NewBATWorker(logger)
+	database := db.NewDB(cfg.DatabaseURL)
+	defer database.Close()
+
+	txm := db.NewTransactionManager(database)
+
+	applicationRepo := repository.NewApplicationRepository(database)
+	eventRepo := repository.NewEventRespository(database)
+	userRepo := repository.NewUserRepository(database)
+	batRunsRepo := repository.NewBatRunsRepository(database)
+
+	sesClient := email.NewSESClient(cfg.AWS.AccessKey, cfg.AWS.AccessKeySecret, cfg.AWS.Region, logger)
+	emailService := services.NewEmailService(nil, sesClient, logger)
+	batService := services.NewBatService(applicationRepo, eventRepo, userRepo, batRunsRepo, emailService, txm, nil, logger)
+
+	BATWorker := workers.NewBATWorker(batService, logger)
 
 	mux := asynq.NewServeMux()
+	mux.HandleFunc(tasks.TypeCalculateAdmissions, BATWorker.HandleCalculateAdmissionsTask)
 
 	if err := srv.Run(mux); err != nil {
 		logger.Fatal().Msg("Failed to run BAT worker")

apps/api/cmd/api/main.go

@@ -81,6 +81,7 @@ func main() {
 	teamRepo := repository.NewTeamRespository(database)
 	teamMemberRepo := repository.NewTeamMemberRespository(database)
 	teamJoinRequestRepo := repository.NewTeamJoinRequestRepository(database)
+	batRunsRepo := repository.NewBatRunsRepository(database)
 
 	// Injections into services
 	authService := services.NewAuthService(userRepo, accountRepo, sessionRepo, txm, client, logger, &cfg.Auth)
@@ -90,9 +91,10 @@ func main() {
 	emailService := services.NewEmailService(taskQueueClient, sesClient, logger)
 	applicationService := services.NewApplicationService(applicationRepo, eventService, emailService, txm, r2Client, &cfg.CoreBuckets, logger)
 	teamService := services.NewTeamService(teamRepo, teamMemberRepo, teamJoinRequestRepo, eventRepo, txm, logger)
+	batService := services.NewBatService(applicationRepo, eventRepo, userRepo, batRunsRepo, emailService, txm, taskQueueClient, logger)
 
 	// Injections into handlers
-	apiHandlers := handlers.NewHandlers(authService, userService, eventInterestService, eventService, emailService, applicationService, teamService, cfg, logger)
+	apiHandlers := handlers.NewHandlers(authService, userService, eventInterestService, eventService, emailService, applicationService, teamService, batService, cfg, logger)
 
 	api := api.NewAPI(&logger, apiHandlers, mw)
 

apps/api/cmd/email_worker/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"log"
+	"os"
 	"time"
 
 	"github.com/hibiken/asynq"
@@ -46,8 +47,14 @@ func main() {
 	mux := asynq.NewServeMux()
 
 	mux.HandleFunc(tasks.TypeSendConfirmationEmail, emailWorker.HandleSendConfirmationEmailTask)
+	mux.HandleFunc(tasks.TypeSendHtmlEmail, emailWorker.HandleSendHtmlEmailTask)
 
-	logger.Info().Msg("Starting email worker")
+	wd, err := os.Getwd()
+	if err != nil {
+		log.Fatalf("Failed to run email worker (could not get working directory)")
+	}
+
+	logger.Info().Str("Working dir", wd).Msg("Starting email worker")
 
 	if err := srv.Run(mux); err != nil {
 		log.Fatalf("Failed to run email worker")

apps/api/internal/api/api.go

@@ -74,7 +74,7 @@
 			fmt.Printf("%v", err)
 		}
 
 		fmt.Fprintln(w, htmlContent)
 	})
 
 	// Health check
@@ -122,8 +122,8 @@
 
 	// --- Event routes ---
 	api.Router.Route("/events", func(r chi.Router) {
-		// r.Post("/{eventId}/application/reset-reviews", api.Handlers.Application.ResetApplicationReviews)
-		// r.Post("/{eventId}/application/assign-reviewers", api.Handlers.Application.AssignApplicationReviewers)
+		r.Post("/{eventId}/calc-admissions", api.Handlers.Admission.HandleCalculateAdmissionsRequest)
+		r.Post("/{eventId}/reviews/bat-runs/{runId}/release", api.Handlers.Admission.ReleaseDecisions)
 
 		// Superuser-only
 		r.With(mw.Auth.RequireAuth, ensureSuperuser).Post("/", api.Handlers.Event.CreateEvent)
@@ -151,6 +151,11 @@
 			r.With(ensureEventAdmin).Post("/roles", api.Handlers.Event.AssignEventRole)
 			r.With(ensureEventAdmin).Delete("/roles/{userId}", api.Handlers.Event.RevokeEventRole)
 			r.With(ensureEventAdmin).Post("/roles/batch", api.Handlers.Event.BatchAssignEventRoles)
+			r.With(ensureEventAdmin).Get("/bat-runs", api.Handlers.Bat.GetRunsByEventId)
+			r.With(ensureEventAdmin).Delete("/bat-runs", api.Handlers.Bat.GetRunsByEventId)
+			r.With(ensureEventAdmin).Get("/review-status", api.Handlers.Bat.CheckApplicationReviewsComplete)
+			r.With(ensureEventAdmin).Post("/reviews/bat-runs", api.Handlers.Admission.HandleCalculateAdmissionsRequest)
+			r.With(ensureEventAdmin).Post("/reviews/bat-runs/{runId}/release", api.Handlers.Admission.ReleaseDecisions)
 
 			// Superuser-only
 			r.With(ensureSuperuser).Delete("/", api.Handlers.Event.DeleteEventById)
@@ -177,6 +182,15 @@
 				// Review admin routes (For Event Admins only)
 				r.With(ensureEventAdmin).Post("/reset-reviews", api.Handlers.Application.ResetApplicationReviews)
 				r.With(ensureEventAdmin).Post("/assign-reviewers", api.Handlers.Application.AssignApplicationReviewers)
+
+				//withdraw Acceptance
+				r.Patch("/withdraw-acceptance", api.Handlers.Application.WithdrawAcceptance)
+
+				//Accept acceptance
+				r.Patch("/accept-acceptance", api.Handlers.Application.AcceptApplicationAcceptance)
+
+				//Waitlist application
+				r.Patch("/join-waitlist", api.Handlers.Application.JoinWaitlist)
 			})
 
 			// Team routes