Merge branch 'main' into 423-calendar

.github/dependabot.yml

@@ -9,10 +9,14 @@ updates:
     schedule:
       interval: weekly
   - package-ecosystem: npm
-    directory: ./frontend/sac-mobile
+    directory: ./frontend/sac-mobile/
     schedule:
       interval: weekly
   - package-ecosystem: npm
-    directory: ./frontend/sac-web
+    directory: ./frontend/sac-web/
+    schedule:
+      interval: weekly
+  - package-ecosystem: cargo
+    directory: ./scraper/clubs/
     schedule:
       interval: weekly

.github/reviewers.yml

@@ -1,4 +1,3 @@
 reviewers:
   defaults:
     - team:sac-tls
-    - team:sac

.github/workflows/auto_request_review.yml

@@ -1,18 +1,14 @@
 name: Auto Request Review
 
 on:
-  pull_request:
+  pull_request_target:
     types: [opened, reopened]
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
 jobs:
   auto-request-review:
     runs-on: ubuntu-latest
-    if: github.actor != 'dependabot[bot]' && github.event.pull_request.user.login != 'dependabot[bot]'
     steps:
-      - name: Request review from the TLs and random team members
+      - name: Request review from the TLs
         uses: necojackarc/[email protected]
         with:
           token: ${{ secrets.PAT_FOR_AUTO_REQUEST_REVIEW }}

.github/workflows/backend.yml

@@ -6,11 +6,13 @@ on:
   push:
     paths:
       - backend/**
+      - config/**
       - .github/workflows/backend.yml
   pull_request:
     types: [opened]
     paths:
       - backend/**
+      - config/**
       - .github/workflows/backend.yml
 
 concurrency:
@@ -88,7 +90,7 @@ jobs:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
-            ${{ runner.os }}-go-
+            ${{ runner.os }}-go
       - name: Install Dependencies
         run: cd ./backend/ && go get ./...
       - name: Increase max_connections in PostgreSQL
@@ -99,6 +101,6 @@ jobs:
       - name: Restart PostgreSQL Container
         run: docker restart $(docker ps --filter "publish=5432" --format "{{.ID}}")
       - name: Run Tests with Coverage
-        run: cd ./backend/ && go test -bench=. -benchmem -race -coverprofile=coverage.txt ./...
+        run: cd ./backend/ && go test -v -race -coverprofile=coverage.txt ./...
       - name: Print Coverage
         run: cd ./backend/ && go tool cover -func=coverage.txt

.github/workflows/cli.yml

@@ -6,11 +6,13 @@ on:
   push:
     paths:
       - cli/**
+      - config/**
       - .github/workflows/cli.yml
   pull_request:
     types: [opened]
     paths:
       - cli/**
+      - config/**
       - .github/workflows/cli.yml
 
 concurrency:
@@ -34,7 +36,7 @@ jobs:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
-            ${{ runner.os }}-go-
+            ${{ runner.os }}-go
       - name: Install gofumpt
         run: go install mvdan.cc/gofumpt@latest
       - name: Check code formatting

.github/workflows/club_scraper.yml → .github/workflows/mock_data.yml

@@ -1,25 +1,25 @@
-name: Club Scraper
+name: Mock Data
 
 permissions: read-all
 
 on:
   push:
     paths:
-      - scraper/club/**
-      - .github/workflows/club_scraper.yml
+      - mock_data/**
+      - .github/workflows/mock_data.yml
   pull_request:
     types: [opened]
     paths:
-      - scraper/club/**
-      - .github/workflows/club_scraper.yml
+      - mock_data/**
+      - .github/workflows/mock_data.yml
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 env:
   CARGO_TERM_COLOR: always
-  MANIFEST_PATH: ./scraper/clubs/Cargo.toml
+  MANIFEST_PATH: ./mock_data/Cargo.toml
 
 jobs:
   test:

.gitignore

@@ -1,8 +1,26 @@
+# MacOS
 .DS_Store
-.env
-sac-cli
-node_modules
+
+# Cli
+sac
+
+# VSCode
 .vscode
 .trunk
+
+# Node modules
+node_modules
+
+# Environment files
+.env
 .env.dev
-tmp/
+
+# Debug files
+backend/tests/api/__debug_*
+.env.prod
+
+frontend/sac-mobile/ios/
+frontend/sac-mobile/android/
+tmp/
+ios
+android

CONTRIBUTING.md

@@ -131,7 +131,7 @@
 
 ### SAC CLI
 
-   To install use `./install.sh` and then run `sac-cli` to see all commands.
+   To install use `./install.sh` and then run `sac` to see all commands.
 
 # Git Flow
 

backend/.golangci.yml

@@ -1,6 +1,5 @@
 linters:
   enable:
-    - cyclop
     - exportloopref
     - gocritic
     - gosec
@@ -15,12 +14,3 @@ linters:
 linters-settings:
   whitespace:
     multi-func: true
-
-issues:
-  exclude-rules:
-    - path: tests/api/helpers/
-      linters:
-        - cyclop
-    - path: src/config/production.go
-      linters:
-        - cyclop

backend/go.mod

@@ -1,66 +1,72 @@
 module github.com/GenerateNU/sac/backend
 
-go 1.22.1
+go 1.22.2
 
 require (
+	github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5
+	github.com/aws/aws-sdk-go v1.51.21
 	github.com/garrettladley/mattress v0.4.0
 	github.com/go-playground/validator/v10 v10.19.0
 	github.com/goccy/go-json v0.10.2
-	github.com/gofiber/fiber/v2 v2.52.2
+	github.com/gofiber/fiber/v2 v2.52.4
 	github.com/gofiber/swagger v1.0.0
 	github.com/golang-jwt/jwt v3.2.2+incompatible
 	github.com/google/uuid v1.6.0
 	github.com/h2non/gock v1.2.0
 	github.com/huandu/go-assert v1.1.6
+	github.com/joho/godotenv v1.5.1
 	github.com/mcnijman/go-emailaddress v1.1.1
 	github.com/mitchellh/mapstructure v1.5.0
+	github.com/resend/resend-go/v2 v2.6.0
 	github.com/spf13/viper v1.18.2
 	github.com/swaggo/swag v1.16.3
-	golang.org/x/crypto v0.21.0
+	golang.org/x/crypto v0.22.0
 	golang.org/x/text v0.14.0
 	gorm.io/driver/postgres v1.5.7
-	gorm.io/gorm v1.25.8
+	gorm.io/gorm v1.25.9
 )
 
 require (
 	github.com/awnumar/memcall v0.2.0 // indirect
-	github.com/awnumar/memguard v0.22.4 // indirect
+	github.com/awnumar/memguard v0.22.5 // indirect
 	github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 // indirect
 	github.com/jackc/puddle/v2 v2.2.1 // indirect
 	github.com/philhofer/fwd v1.1.2 // indirect
-	github.com/tinylib/msgp v1.1.8 // indirect
-	golang.org/x/sync v0.6.0 // indirect
+	github.com/smartystreets/goconvey v1.8.1 // indirect
+	github.com/tinylib/msgp v1.1.9 // indirect
+	golang.org/x/sync v0.7.0 // indirect
 )
 
+require github.com/jmespath/go-jmespath v0.4.0 // indirect
+
 require (
 	github.com/KyleBanks/depth v1.2.1 // indirect
-	github.com/andybalholm/brotli v1.0.5 // indirect
+	github.com/andybalholm/brotli v1.1.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
-	github.com/go-openapi/jsonpointer v0.20.2 // indirect
-	github.com/go-openapi/jsonreference v0.20.4 // indirect
-	github.com/go-openapi/spec v0.20.14 // indirect
-	github.com/go-openapi/swag v0.22.9 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/spec v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
-	github.com/jackc/pgx/v5 v5.5.4 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
+	github.com/jackc/pgx/v5 v5.5.5 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/joho/godotenv v1.5.1
 	github.com/josharian/intern v1.0.0 // indirect
-	github.com/klauspost/compress v1.17.0 // indirect
+	github.com/klauspost/compress v1.17.7 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
-	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
-	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.0 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
@@ -71,14 +77,13 @@ require (
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/swaggo/files/v2 v2.0.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasthttp v1.51.0 // indirect
+	github.com/valyala/fasthttp v1.52.0 // indirect
 	github.com/valyala/tcplisten v1.0.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.9.0 // indirect
-	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-	golang.org/x/net v0.21.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/tools v0.18.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 // indirect
+	golang.org/x/net v0.24.0 // indirect
+	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/tools v0.20.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )