Deployment web

.github/pull_request_template.md

@@ -1,14 +1,17 @@
 ## Description
+
 <!--
 Summarize changes, try to be specific.
 -->
 
 ## Linked Jira Ticket
+
 <!--
 Link Jira ticket here. [TECH-000](https://swamphacks.atlassian.net/browse/TECH-000)
 -->
 
 ## Type of Change
+
 <!--
 Delete irrelevant options:
 - Bug fix (non-breaking change)
@@ -19,13 +22,15 @@ Delete irrelevant options:
 -->
 
 ## Checklist
+
 - [ ] My code follows the project's style guidelines
 - [ ] I have commented on complex parts of the code
 - [ ] I have updated documentation if necessary
 - [ ] I have updated or added tests to cover my changes
 - [ ] I have updated the OpenAPI YAML or other API schema files if applicable
 
 ## Additional Notes
+
 <!--
 Screenshots and notes would be appreciated!
 -->

.github/workflows/dev-build-deploy-web.yml

@@ -0,0 +1,65 @@
+name: Deploy Web to Development
+
+on:
+  push:
+    branches:
+      - dev
+    paths:
+      - 'apps/web/**'
+      - 'infra/docker-compose.web.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 Docker image
+        run: |
+          docker build \
+            --platform linux/amd64 \
+            -t ghcr.io/${{ github.repository_owner }}/core-web:dev \
+            --file ./apps/web/Dockerfile \
+            --target prod \
+            ./apps/web
+
+      - name: Push Docker image
+        run: |
+          docker push ghcr.io/${{ github.repository_owner }}/core-web:dev
+  deploy:
+    name: Deploy to Development Server
+    runs-on: ubuntu-latest
+    needs: [build-and-push]
+
+    steps:
+      - name: SSH proxy commmand
+        uses: appleboy/ssh-action@v1
+        with:
+          host: ${{ secrets.WEB_HOST }}
+          username: root
+          password: ${{ secrets.WEB_PASSWORD }}
+          script: |
+            cd /root/core/infra
+            git fetch
+            git checkout dev
+            git reset --hard origin/dev
+            git pull
+            infisical export --env=dev --format=dotenv --path="/web" --projectId=${{ secrets.INFISICAL_PROJECT_ID }} > ./secrets/.env.dev.web
+            docker compose -f docker-compose.web.yml pull web-dev
+            docker compose -f docker-compose.web.yml up -d --no-deps --force-recreate web-dev
+

.github/workflows/prod-build-deploy-web.yml

@@ -0,0 +1,66 @@
+name: Deploy Web to Production
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'apps/web/**'
+      - 'infra/docker-compose.web.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 Docker image
+        run: |
+          docker build \
+            --platform linux/amd64 \
+            -t ghcr.io/${{ github.repository_owner }}/core-web:latest \
+            --file ./apps/web/Dockerfile \
+            --target prod \
+            ./apps/web
+
+      - name: Push Docker image
+        run: |
+          docker push ghcr.io/${{ github.repository_owner }}/core-web:latest
+
+  deploy:
+    name: Deploy to Production server
+    runs-on: ubuntu-latest
+    needs: [build-and-push]
+
+    steps:
+      - name: SSH proxy commmand
+        uses: appleboy/ssh-action@v1
+        with:
+          host: ${{ secrets.WEB_HOST }}
+          username: root
+          password: ${{ secrets.WEB_PASSWORD }}
+          script: |
+            cd /root/core/infra
+            git fetch
+            git checkout main
+            git reset --hard origin/main
+            git pull
+            infisical export --env=prod --format=dotenv --path="/web" --projectId=${{ secrets.INFISICAL_PROJECT_ID }} > ./secrets/.env.web
+            docker compose -f docker-compose.web.yml pull web
+            docker compose -f docker-compose.web.yml up -d --no-deps --force-recreate web
+

apps/api/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.24-alpine AS builder
+FROM golang:1.25-alpine AS builder
 
 RUN apk add --no-cache build-base ca-certificates
 

apps/api/Makefile

@@ -9,3 +9,8 @@ migrate-down:
 generate:
 	@sqlc generate
 
+openapi-generate:
+	swag init --dir cmd/api,internal/api/handlers --parseDependency --requiredByDefault -v3.1
+
+openapi-format:
+	swag f --dir cmd/api,internal/api/handlers

apps/api/cmd/api/main.go

@@ -17,6 +17,17 @@ import (
 	"github.com/swamphacks/core/apps/api/internal/storage"
 )
 
+//	@title			SwampHacks Test API
+//	@version		1.0
+//	@description	This is SwampHacks' OpenAPI documentation.
+//	@termsOfService	TODO
+
+//	@contact.name	API Support
+//	@contact.url	http://www.swagger.io/support
+//	@contact.email	support@swagger.io
+
+// @license.name	Apache 2.0
+// @license.url	http://www.apache.org/licenses/LICENSE-2.0.html
 func main() {
 	logger := logger.New()
 	cfg := config.Load()
@@ -66,13 +77,14 @@ func main() {
 
 	// Injections into services
 	authService := services.NewAuthService(userRepo, accountRepo, sessionRepo, txm, client, logger, &cfg.Auth)
+	userService := services.NewUserService(userRepo, logger)
 	eventInterestService := services.NewEventInterestService(eventInterestRepo, logger)
-	eventService := services.NewEventService(eventRepo, userRepo, logger)
+	eventService := services.NewEventService(eventRepo, userRepo, r2Client, &cfg.CoreBuckets, logger)
 	emailService := services.NewEmailService(taskQueueClient, logger)
 	applicationService := services.NewApplicationService(applicationRepo, eventService, txm, r2Client, &cfg.CoreBuckets, logger)
 
 	// Injections into handlers
-	apiHandlers := handlers.NewHandlers(authService, eventInterestService, eventService, emailService, applicationService, cfg, logger)
+	apiHandlers := handlers.NewHandlers(authService, userService, eventInterestService, eventService, emailService, applicationService, cfg, logger)
 
 	api := api.NewAPI(&logger, apiHandlers, mw)
 

apps/api/cmd/email_worker/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.24-alpine AS base
+FROM golang:1.25-alpine AS base
 
 WORKDIR /app
 
@@ -16,7 +16,7 @@ RUN go install github.com/air-verse/air@latest
 CMD ["air"]
 
 # Production
-FROM base as prod
+FROM base AS prod
 
 RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -o email_worker ./cmd/email_worker