Merge branch 'main' into new-schemas

Author: sidvasu

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/workflows/godoc_pr_preview.yaml

@@ -1,49 +1,49 @@
-name: godoc_pr_preview
-
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-
-jobs:
-  request_documentation:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.21
-
-      - name: Generate comment
-        id: generate_comment
-        run: |
-          set -x
-          version=$(go mod download --json $REPO@$REV | jq -r .Version)
-          echo "Module version: $version"
-          echo "version=$version" >> "$GITHUB_OUTPUT"
-
-          link="https://godocs.io/$REPO@$version"
-          comment="### godoc reference preview ready ✨<br>[![Go Documentation](https://godocs.io/github.com/acmcsufoss/api.acmcsuf.com?status.svg)]($link)"
-          echo "comment=$comment" >> "$GITHUB_OUTPUT"
-        env:
-          REPO: github.com/${{ github.event.pull_request.base.repo.full_name }}
-          REV: ${{ github.event.pull_request.head.sha }}
-
-      - name: Update existing issue comment
-        uses: peter-evans/find-comment@v1
-        id: fc
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          comment-author: "github-actions[bot]"
-          body-includes: "### godoc reference preview ready ✨"
-          edit-mode: replace
-
-      - name: Update comment
-        if: steps.fc.outputs.comment-id != ''
-        uses: peter-evans/create-or-update-comment@v1
-        with:
-          comment-id: ${{ steps.fc.outputs.comment-id }}
-          body: ${{ steps.generate_comment.outputs.comment }}
-          edit-mode: replace
+name: godoc_pr_preview
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+
+jobs:
+  request_documentation:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.21
+
+      - name: Generate comment
+        id: generate_comment
+        run: |
+          set -x
+          version=$(go mod download --json $REPO@$REV | jq -r .Version)
+          echo "Module version: $version"
+          echo "version=$version" >> "$GITHUB_OUTPUT"
+
+          link="https://godocs.io/$REPO@$version"
+          comment="### godoc reference preview ready ✨<br>[![Go Documentation](https://godocs.io/github.com/acmcsufoss/api.acmcsuf.com?status.svg)]($link)"
+          echo "comment=$comment" >> "$GITHUB_OUTPUT"
+        env:
+          REPO: github.com/${{ github.event.pull_request.base.repo.full_name }}
+          REV: ${{ github.event.pull_request.head.sha }}
+
+      - name: Update existing issue comment
+        uses: peter-evans/find-comment@v1
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: "github-actions[bot]"
+          body-includes: "### godoc reference preview ready ✨"
+          edit-mode: replace
+
+      - name: Update comment
+        if: steps.fc.outputs.comment-id != ''
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          body: ${{ steps.generate_comment.outputs.comment }}
+          edit-mode: replace

.gitignore

@@ -31,3 +31,5 @@ result/
 
 # Build artifact generated by Makefile
 .generate.marker
+
+tmp/

.vscode/settings.json

@@ -1,10 +1,10 @@
-{
-  "editor.formatOnSave": true,
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "[go]": {
-    "editor.defaultFormatter": "golang.go"
-  },
-  "[sql]": {
-    "editor.defaultFormatter": "inferrinizzard.prettier-sql-vscode"
-  }
-}
+{
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "[go]": {
+    "editor.defaultFormatter": "golang.go"
+  },
+  "[sql]": {
+    "editor.defaultFormatter": "inferrinizzard.prettier-sql-vscode"
+  }
+}

LICENSE

@@ -1,14 +1,14 @@
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
-
-Copyright (C) 2004 Sam Hocevar <[email protected]>
-
-Everyone is permitted to copy and distribute verbatim or modified
-copies of this license document, and changing it is allowed as long
-as the name is changed.
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. You just DO WHAT THE FUCK YOU WANT TO.
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+Copyright (C) 2004 Sam Hocevar <[email protected]>
+
+Everyone is permitted to copy and distribute verbatim or modified
+copies of this license document, and changing it is allowed as long
+as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. You just DO WHAT THE FUCK YOU WANT TO.

Makefile

@@ -20,8 +20,8 @@ generate: fmt $(GENERATE_MARKER)
 vet: fmt
 	go vet ./...
 
-run: generate
-	go run ./cmd/api
+run: build
+	./$(BIN_DIR)/$(APP_NAME)
 
 build: generate
 	mkdir -p $(BIN_DIR)

README.md

@@ -20,7 +20,7 @@ make # Compile program
 ```
 OR
 ```sh
-make run # This compiles & runs the program without creating a binary
+make run
 ```
 
 ### Other useful commands from the Makefile

cmd/api/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"database/sql"
 	"fmt"
 	"log"
 	"os"
@@ -11,6 +10,7 @@ import (
 
 	"github.com/acmcsufoss/api.acmcsuf.com/internal/api/routes"
 	"github.com/acmcsufoss/api.acmcsuf.com/internal/api/services"
+	"github.com/acmcsufoss/api.acmcsuf.com/internal/db"
 	"github.com/acmcsufoss/api.acmcsuf.com/internal/db/models"
 	"github.com/gin-gonic/gin"
 	_ "modernc.org/sqlite"
@@ -28,38 +28,22 @@ func main() {
 		cancel()
 	}()
 
-	// Setup SQLite database & make sure we can connect to it
-	uri := os.Getenv("DATABASE_URL")
-	if uri == "" {
-		log.Fatal("DATABASE_URL must be set")
-	}
-	db, err := sql.Open("sqlite", uri)
+	db, err := db.New(ctx)
 	if err != nil {
-		log.Fatalf("Error opening SQLite database: %vl", err)
+		log.Fatal(err)
 	}
 	defer db.Close()
-	if err := db.PingContext(ctx); err != nil {
-		log.Fatalf("Error connecting to database: %v", err)
-	}
-
-	schemaBytes, err := os.ReadFile("internal/db/sql/schemas/schema.sql")
-	if err != nil {
-		log.Fatalf("Error reading schema file: %v", err)
-	}
-
-	if _, err := db.ExecContext(ctx, string(schemaBytes)); err != nil {
-		log.Fatalf("Error initializing db schema: %v", err)
-	}
 
 	// Now we init services & gin router, and then start the server
 	// Should this be moved to the routes module??
 	queries := models.New(db)
 	eventsService := services.NewEventsService(queries)
+	announcementService := services.NewAnnouncementService(queries)
 	router := gin.Default()
 	router.SetTrustedProxies([]string{
 		"127.0.0.1/32",
 	})
-	routes.SetupRoutes(router, eventsService)
+	routes.SetupRoutes(router, eventsService, announcementService)
 	port := os.Getenv("PORT")
 	if port == "" {
 		port = "8080"

flake.lock

@@ -2,7 +2,7 @@
   description = "Go Dev Environment for api.acmcsuf.com";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     flake-utils.url = "github:numtide/flake-utils";
   };