Fixed Format Step in GitHub Workflow

.github/workflows/auto_assign_author.yml

@@ -4,6 +4,10 @@ on:
   pull_request:
     types: [opened, ready_for_review, reopened]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   auto-add-assignee:
     runs-on: ubuntu-latest

.github/workflows/auto_request_review.yml

@@ -4,6 +4,9 @@ on:
   pull_request:
     types: [opened, ready_for_review, reopened]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
   auto-request-review:
     runs-on: ubuntu-latest

.github/workflows/go.yml → .github/workflows/backend.yml

@@ -1,16 +1,16 @@
-name: Go
+name: Backend
 
 on:
   push:
     branches:
       - main
     paths:
       - "backend/**"
-      - ".github/workflows/go.yml"
+      - ".github/workflows/backend.yml"
   pull_request:
     paths:
       - "backend/**"
-      - ".github/workflows/go.yml"
+      - ".github/workflows/backend.yml"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -27,8 +27,23 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: "1.21"
-      - name: Enforce formatting
-        run: gofmt -l ./backend/ | grep ".go$" | xargs -r echo "Files not formatted:"
+      - name: Cache Go Modules
+        uses: actions/cache@v3
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+      - name: Install gofumpt
+        run: go install mvdan.cc/gofumpt@latest
+      - name: Check code formatting
+        run: |
+          unformatted_files=$(gofumpt -l ./backend/)
+          if [ -n "$unformatted_files" ]; then
+            echo "Files not formatted:"
+            echo "$unformatted_files"
+            exit 1
+          fi
 
   lint:
     name: Lint
@@ -68,6 +83,13 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: "1.21"
+      - name: Cache Go Modules
+        uses: actions/cache@v3
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
       - name: Install Dependencies
         run: cd ./backend/ && go get ./...
       - name: Increase max_connections in PostgreSQL

.github/workflows/codeql.yml

@@ -18,6 +18,10 @@ on:
   schedule:
     - cron: "0 0 * * 1"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   analyze-js-ts:
     name: Analyze JavaScript and TypeScript

README.md

@@ -4,9 +4,9 @@
 
 <div align="center">
   <!-- Github Actions -->
-  <a href="https://github.com/GenerateNU/sac/actions/workflows/go.yml">
-    <img src="https://github.com/GenerateNU/sac/actions/workflows/go.yml/badge.svg"
-      alt="Go Workflow Status" />
+  <a href="https://github.com/GenerateNU/sac/actions/workflows/backend.yml">
+    <img src="https://github.com/GenerateNU/sac/actions/workflows/backend.yml/badge.svg"
+      alt="Backend Workflow Status" />
   </a>
 </div>
 

backend/src/auth/password.go

@@ -58,7 +58,6 @@ var (
 
 func ComparePasswordAndHash(password, encodedHash string) (bool, error) {
 	p, salt, hash, err := decodeHash(encodedHash)
-
 	if err != nil {
 		return false, err
 	}
@@ -82,7 +81,6 @@ func decodeHash(encodedHash string) (p *params, salt []byte, hash []byte, err er
 	var version int
 
 	_, err = fmt.Sscanf(vals[2], "v=%d", &version)
-
 	if err != nil {
 		return nil, nil, nil, err
 	}
@@ -94,21 +92,18 @@ func decodeHash(encodedHash string) (p *params, salt []byte, hash []byte, err er
 	p = &params{}
 
 	_, err = fmt.Sscanf(vals[3], "m=%d,t=%d,p=%d", &p.memory, &p.iterations, &p.parallelism)
-
 	if err != nil {
 		return nil, nil, nil, err
 	}
 
 	salt, err = base64.RawStdEncoding.Strict().DecodeString(vals[4])
-
 	if err != nil {
 		return nil, nil, nil, err
 	}
 
 	p.saltLength = uint32(len(salt))
 
 	hash, err = base64.RawStdEncoding.Strict().DecodeString(vals[5])
-
 	if err != nil {
 		return nil, nil, nil, err
 	}

backend/src/config/config.go

@@ -71,7 +71,6 @@ const (
 )
 
 func GetConfiguration(path string) (Settings, error) {
-
 	var environment Environment
 	if env := os.Getenv("APP_ENVIRONMENT"); env != "" {
 		environment = Environment(env)
@@ -117,7 +116,6 @@ func GetConfiguration(path string) (Settings, error) {
 
 		portStr := os.Getenv(fmt.Sprintf("%sPORT", appPrefix))
 		portInt, err := strconv.ParseUint(portStr, 10, 16)
-
 		if err != nil {
 			return Settings{}, fmt.Errorf("failed to parse port: %w", err)
 		}

backend/src/controllers/category.go

@@ -39,7 +39,6 @@ func (t *CategoryController) CreateCategory(c *fiber.Ctx) error {
 	}
 
 	newCategory, err := t.categoryService.CreateCategory(categoryBody)
-
 	if err != nil {
 		return err.FiberError(c)
 	}
@@ -130,7 +129,6 @@ func (t *CategoryController) UpdateCategory(c *fiber.Ctx) error {
 	}
 
 	updatedCategory, err := t.categoryService.UpdateCategory(c.Params("id"), category)
-
 	if err != nil {
 		return err.FiberError(c)
 	}

backend/src/controllers/tag.go

@@ -59,7 +59,6 @@ func (t *TagController) CreateTag(c *fiber.Ctx) error {
 // @Router		/api/v1/tags/{id}  [get]
 func (t *TagController) GetTag(c *fiber.Ctx) error {
 	tag, err := t.tagService.GetTag(c.Params("categoryID"), c.Params("tagID"))
-
 	if err != nil {
 		return err.FiberError(c)
 	}

backend/src/controllers/user.go

@@ -146,7 +146,7 @@ func (u *UserController) GetUserTags(c *fiber.Ctx) error {
 	return c.Status(fiber.StatusOK).JSON(&tags)
 }
 
-func (u *UserController) CreateUserTags(c *fiber.Ctx) error {	
+func (u *UserController) CreateUserTags(c *fiber.Ctx) error {
 	var requestBody models.CreateUserTagsBody
 	if err := c.BodyParser(&requestBody); err != nil {
 		return errors.FailedToParseRequestBody.FiberError(c)
@@ -156,6 +156,6 @@ func (u *UserController) CreateUserTags(c *fiber.Ctx) error {
 	if err != nil {
 		return err.FiberError(c)
 	}
-	
+
 	return c.Status(fiber.StatusCreated).JSON(&tags)
 }

backend/src/database/db.go

@@ -16,13 +16,11 @@ func ConfigureDB(settings config.Settings) (*gorm.DB, error) {
 		SkipDefaultTransaction: true,
 		TranslateError:         true,
 	})
-
 	if err != nil {
 		return nil, err
 	}
 
 	err = db.Exec("CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\"").Error
-
 	if err != nil {
 		return nil, err
 	}
@@ -36,7 +34,6 @@ func ConfigureDB(settings config.Settings) (*gorm.DB, error) {
 
 func ConnPooling(db *gorm.DB) error {
 	sqlDB, err := db.DB()
-
 	if err != nil {
 		return err
 	}
@@ -58,7 +55,6 @@ func MigrateDB(settings config.Settings, db *gorm.DB) error {
 		&models.Tag{},
 		&models.User{},
 	)
-
 	if err != nil {
 		return err
 	}
@@ -82,7 +78,6 @@ func createSuperUser(settings config.Settings, db *gorm.DB) error {
 	}
 
 	passwordHash, err := auth.ComputePasswordHash(settings.SuperUser.Password)
-
 	if err != nil {
 		return err
 	}

backend/src/errors/user.go

@@ -7,9 +7,9 @@ var (
 		StatusCode: fiber.StatusBadRequest,
 		Message:    "failed to validate user",
 	}
-	FailedToValidateUserTags = Error {
+	FailedToValidateUserTags = Error{
 		StatusCode: fiber.StatusBadRequest,
-		Message: "failed to validate user tags",
+		Message:    "failed to validate user tags",
 	}
 	FailedToCreateUser = Error{
 		StatusCode: fiber.StatusInternalServerError,

backend/src/models/user.go

@@ -78,5 +78,5 @@ type UpdateUserRequestBody struct {
 }
 
 type CreateUserTagsBody struct {
-	Tags      []uuid.UUID  `json:"tags" validate:"required"`
+	Tags []uuid.UUID `json:"tags" validate:"required"`
 }

backend/src/services/category.go

@@ -44,13 +44,11 @@ func (c *CategoryService) CreateCategory(categoryBody models.CategoryRequestBody
 
 func (c *CategoryService) GetCategories(limit string, page string) ([]models.Category, *errors.Error) {
 	limitAsInt, err := utilities.ValidateNonNegative(limit)
-
 	if err != nil {
 		return nil, &errors.FailedToValidateLimit
 	}
 
 	pageAsInt, err := utilities.ValidateNonNegative(page)
-
 	if err != nil {
 		return nil, &errors.FailedToValidatePage
 	}
@@ -62,7 +60,6 @@ func (c *CategoryService) GetCategories(limit string, page string) ([]models.Cat
 
 func (c *CategoryService) GetCategory(id string) (*models.Category, *errors.Error) {
 	idAsUUID, err := utilities.ValidateID(id)
-
 	if err != nil {
 		return nil, err
 	}

backend/src/services/club.go

@@ -25,13 +25,11 @@ type ClubService struct {
 
 func (c *ClubService) GetClubs(limit string, page string) ([]models.Club, *errors.Error) {
 	limitAsInt, err := utilities.ValidateNonNegative(limit)
-
 	if err != nil {
 		return nil, &errors.FailedToValidateLimit
 	}
 
 	pageAsInt, err := utilities.ValidateNonNegative(page)
-
 	if err != nil {
 		return nil, &errors.FailedToValidatePage
 	}

backend/src/services/user.go

@@ -51,13 +51,11 @@ func (u *UserService) CreateUser(userBody models.CreateUserRequestBody) (*models
 
 func (u *UserService) GetUsers(limit string, page string) ([]models.User, *errors.Error) {
 	limitAsInt, err := utilities.ValidateNonNegative(limit)
-
 	if err != nil {
 		return nil, &errors.FailedToValidateLimit
 	}
 
 	pageAsInt, err := utilities.ValidateNonNegative(page)
-
 	if err != nil {
 		return nil, &errors.FailedToValidatePage
 	}
@@ -132,7 +130,6 @@ func (u *UserService) CreateUserTags(id string, tagIDs models.CreateUserTagsBody
 
 	// Retrieve a list of valid tags from the ids:
 	tags, err := transactions.GetTagsByIDs(u.DB, tagIDs.Tags)
-
 	if err != nil {
 		return nil, err
 	}

backend/src/transactions/user.go

@@ -84,7 +84,7 @@ func GetUserTags(db *gorm.DB, id uuid.UUID) ([]models.Tag, *errors.Error) {
 		return nil, &errors.UserNotFound
 	}
 
-	if err := db.Model(&user).Association("Tag").Find(&tags) ; err != nil {
+	if err := db.Model(&user).Association("Tag").Find(&tags); err != nil {
 		return nil, &errors.FailedToGetTag
 	}
 	return tags, nil

backend/src/utilities/manipulator.go

@@ -4,7 +4,6 @@ import (
 	"github.com/mitchellh/mapstructure"
 )
 
-
 // MapRequestToModel maps request data to a target model using mapstructure
 func MapRequestToModel[T any, U any](responseData T, targetModel *U) (*U, error) {
 	config := &mapstructure.DecoderConfig{

backend/src/utilities/validator.go

@@ -70,7 +70,6 @@ func validateContactPointer(validate *validator.Validate, fl validator.FieldLeve
 
 func ValidateID(id string) (*uuid.UUID, *errors.Error) {
 	idAsUUID, err := uuid.Parse(id)
-
 	if err != nil {
 		return nil, &errors.FailedToValidateID
 	}

backend/tests/api/category_test.go

@@ -165,7 +165,7 @@ func TestCreateCategoryFailsIfNameIsMissing(t *testing.T) {
 func TestCreateCategoryFailsIfCategoryWithThatNameAlreadyExists(t *testing.T) {
 	existingAppAssert, _ := CreateSampleCategory(t, nil)
 
-	var TestNumCategoriesRemainsAt1 = func(app TestApp, assert *assert.A, resp *http.Response) {
+	TestNumCategoriesRemainsAt1 := func(app TestApp, assert *assert.A, resp *http.Response) {
 		AssertNumCategoriesRemainsAtN(app, assert, resp, 1)
 	}
 
@@ -295,7 +295,7 @@ func TestUpdateCategoryWorks(t *testing.T) {
 		"name": "Arts & Crafts",
 	}
 
-	var AssertUpdatedCategoryBodyRespDB = func(app TestApp, assert *assert.A, resp *http.Response) {
+	AssertUpdatedCategoryBodyRespDB := func(app TestApp, assert *assert.A, resp *http.Response) {
 		AssertUpdatedCategoryBodyRespDB(app, assert, resp, &category)
 	}
 
@@ -317,7 +317,7 @@ func TestUpdateCategoryWorksWithSameDetails(t *testing.T) {
 	category := *SampleCategoryFactory()
 	category["id"] = uuid
 
-	var AssertSampleCategoryBodyRespDB = func(app TestApp, assert *assert.A, resp *http.Response) {
+	AssertSampleCategoryBodyRespDB := func(app TestApp, assert *assert.A, resp *http.Response) {
 		AssertUpdatedCategoryBodyRespDB(app, assert, resp, &category)
 	}
 

backend/tests/api/club_test.go

@@ -283,7 +283,6 @@ func TestCreateClubFailsOnInvalidRecruitmentType(t *testing.T) {
 			"https://google.com",
 		},
 	)
-
 }
 
 func TestCreateClubFailsOnInvalidApplicationLink(t *testing.T) {
@@ -294,7 +293,6 @@ func TestCreateClubFailsOnInvalidApplicationLink(t *testing.T) {
 			"@#139081#$Ad_Axf",
 		},
 	)
-
 }
 
 func TestCreateClubFailsOnInvalidLogo(t *testing.T) {