Update Internal Imports (#20)

GenerateNU · Jan 19, 2024 · e8b23d6 · e8b23d6
1 parent e5ddb80
commit e8b23d6
Show file tree

Hide file tree

Showing 27 changed files with 58 additions and 46 deletions.
diff --git a/backend/go.mod b/backend/go.mod
@@ -1,4 +1,4 @@
-module backend
+module github.com/GenerateNU/sac/backend
 
 go 1.21.1
 

diff --git a/backend/src/controllers/category.go b/backend/src/controllers/category.go
@@ -1,8 +1,8 @@
 package controllers
 
 import (
-	"backend/src/models"
-	"backend/src/services"
+	"github.com/GenerateNU/sac/backend/src/models"
+	"github.com/GenerateNU/sac/backend/src/services"
 
 	"github.com/gofiber/fiber/v2"
 )

diff --git a/backend/src/controllers/user.go b/backend/src/controllers/user.go
@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"backend/src/services"
+	"github.com/GenerateNU/sac/backend/src/services"
 
 	"github.com/gofiber/fiber/v2"
 )

diff --git a/backend/src/database/db.go b/backend/src/database/db.go
@@ -1,8 +1,8 @@
 package database
 
 import (
-	"backend/src/config"
-	"backend/src/models"
+	"github.com/GenerateNU/sac/backend/src/config"
+	"github.com/GenerateNU/sac/backend/src/models"
 
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"

diff --git a/backend/src/main.go b/backend/src/main.go
@@ -1,11 +1,12 @@
 package main
 
 import (
-	"backend/src/config"
-	"backend/src/database"
-	"backend/src/server"
 	"flag"
 	"fmt"
+
+	"github.com/GenerateNU/sac/backend/src/config"
+	"github.com/GenerateNU/sac/backend/src/database"
+	"github.com/GenerateNU/sac/backend/src/server"
 )
 
 // @title SAC API

diff --git a/backend/src/models/category.go b/backend/src/models/category.go
@@ -1,6 +1,6 @@
 package models
 
-import "backend/src/types"
+import "github.com/GenerateNU/sac/backend/src/types"
 
 type Category struct {
 	types.Model

diff --git a/backend/src/models/club.go b/backend/src/models/club.go
@@ -1,8 +1,9 @@
 package models
 
 import (
-	"backend/src/types"
 	"time"
+
+	"github.com/GenerateNU/sac/backend/src/types"
 )
 
 type RecruitmentCycle string

diff --git a/backend/src/models/comment.go b/backend/src/models/comment.go
@@ -1,7 +1,7 @@
 package models
 
 import (
-	"backend/src/types"
+	"github.com/GenerateNU/sac/backend/src/types"
 )
 
 type Comment struct {

diff --git a/backend/src/models/contact.go b/backend/src/models/contact.go
@@ -1,7 +1,7 @@
 package models
 
 import (
-	"backend/src/types"
+	"github.com/GenerateNU/sac/backend/src/types"
 )
 
 type Media string

diff --git a/backend/src/models/event.go b/backend/src/models/event.go
@@ -1,8 +1,9 @@
 package models
 
 import (
-	"backend/src/types"
 	"time"
+
+	"github.com/GenerateNU/sac/backend/src/types"
 )
 
 type EventType string

diff --git a/backend/src/models/notification.go b/backend/src/models/notification.go
@@ -1,8 +1,9 @@
 package models
 
 import (
-	"backend/src/types"
 	"time"
+
+	"github.com/GenerateNU/sac/backend/src/types"
 )
 
 type NotificationType string

diff --git a/backend/src/models/point_of_contact.go b/backend/src/models/point_of_contact.go
@@ -1,7 +1,7 @@
 package models
 
 import (
-	"backend/src/types"
+	"github.com/GenerateNU/sac/backend/src/types"
 )
 
 type PointOfContact struct {

diff --git a/backend/src/models/tag.go b/backend/src/models/tag.go
@@ -1,7 +1,7 @@
 package models
 
 import (
-	"backend/src/types"
+	"github.com/GenerateNU/sac/backend/src/types"
 )
 
 type Tag struct {

diff --git a/backend/src/models/user.go b/backend/src/models/user.go
@@ -1,6 +1,6 @@
 package models
 
-import "backend/src/types"
+import "github.com/GenerateNU/sac/backend/src/types"
 
 type UserRole string
 

diff --git a/backend/src/server/server.go b/backend/src/server/server.go
@@ -1,8 +1,8 @@
 package server
 
 import (
-	"backend/src/controllers"
-	"backend/src/services"
+	"github.com/GenerateNU/sac/backend/src/controllers"
+	"github.com/GenerateNU/sac/backend/src/services"
 
 	"github.com/goccy/go-json"
 

diff --git a/backend/src/services/category.go b/backend/src/services/category.go
@@ -1,9 +1,9 @@
 package services
 
 import (
-	"backend/src/models"
-	"backend/src/transactions"
-	"backend/src/utilities"
+	"github.com/GenerateNU/sac/backend/src/models"
+	"github.com/GenerateNU/sac/backend/src/transactions"
+	"github.com/GenerateNU/sac/backend/src/utilities"
 
 	"github.com/gofiber/fiber/v2"
 	"golang.org/x/text/cases"

diff --git a/backend/src/services/user.go b/backend/src/services/user.go
@@ -1,8 +1,8 @@
 package services
 
 import (
-	"backend/src/models"
-	"backend/src/transactions"
+	"github.com/GenerateNU/sac/backend/src/models"
+	"github.com/GenerateNU/sac/backend/src/transactions"
 
 	"gorm.io/gorm"
 )

diff --git a/backend/src/transactions/category.go b/backend/src/transactions/category.go
@@ -1,9 +1,10 @@
 package transactions
 
 import (
-	"backend/src/models"
 	"errors"
 
+	"github.com/GenerateNU/sac/backend/src/models"
+
 	"github.com/gofiber/fiber/v2"
 	"gorm.io/gorm"
 )

diff --git a/backend/src/transactions/user.go b/backend/src/transactions/user.go
@@ -1,7 +1,7 @@
 package transactions
 
 import (
-	"backend/src/models"
+	"github.com/GenerateNU/sac/backend/src/models"
 
 	"github.com/gofiber/fiber/v2"
 	"gorm.io/gorm"

diff --git a/backend/tests/api/category_test.go b/backend/tests/api/category_test.go
@@ -1,11 +1,12 @@
 package tests
 
 import (
-	"backend/src/models"
-	"backend/src/transactions"
 	"io"
 	"testing"
 
+	"github.com/GenerateNU/sac/backend/src/models"
+	"github.com/GenerateNU/sac/backend/src/transactions"
+
 	"github.com/goccy/go-json"
 )
 

diff --git a/backend/tests/api/helpers.go b/backend/tests/api/helpers.go
@@ -1,9 +1,6 @@
 package tests
 
 import (
-	"backend/src/config"
-	"backend/src/database"
-	"backend/src/server"
 	"bytes"
 	crand "crypto/rand"
 	"fmt"
@@ -14,6 +11,10 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/GenerateNU/sac/backend/src/config"
+	"github.com/GenerateNU/sac/backend/src/database"
+	"github.com/GenerateNU/sac/backend/src/server"
+
 	"github.com/goccy/go-json"
 
 	"github.com/gofiber/fiber/v2"

diff --git a/backend/tests/api/helpers_test.go b/backend/tests/api/helpers_test.go
@@ -1,9 +1,10 @@
 package tests
 
 import (
-	"backend/src/utilities"
 	"testing"
 
+	"github.com/GenerateNU/sac/backend/src/utilities"
+
 	"github.com/huandu/go-assert"
 )
 

diff --git a/backend/tests/api/user_test.go b/backend/tests/api/user_test.go
@@ -1,10 +1,11 @@
 package tests
 
 import (
-	"backend/src/models"
-	"backend/src/transactions"
 	"testing"
 
+	"github.com/GenerateNU/sac/backend/src/models"
+	"github.com/GenerateNU/sac/backend/src/transactions"
+
 	"github.com/goccy/go-json"
 )
 

diff --git a/backend/tests/utilities_test.go b/backend/tests/utilities_test.go
@@ -1,9 +1,10 @@
 package tests
 
 import (
-	"backend/src/utilities"
 	"testing"
 
+	"github.com/GenerateNU/sac/backend/src/utilities"
+
 	"github.com/huandu/go-assert"
 )
 

diff --git a/cli/commands/format.go b/cli/commands/format.go
@@ -43,13 +43,13 @@ func Format(c *cli.Context) error {
 	}
 
 	frontendDir := filepath.Join(currentDir, "frontend/")
-	backendDir := filepath.Join(currentDir, "backend/")
+	backendDir := filepath.Join(currentDir, "github.com/GenerateNU/sac/backend/")
 	list, err := os.ReadDir(frontendDir)
 	if err != nil {
 		return cli.Exit("Error reading frontend directory", 1)
 	}
 
-	if !c.IsSet("frontend") && !c.IsSet("backend") {	
+	if !c.IsSet("frontend") && !c.IsSet("backend") {
 		formatBackend(backendDir)
 		for _, f := range list {
 			if f.IsDir() {
@@ -63,15 +63,19 @@ func Format(c *cli.Context) error {
 		formatBackend(backendDir)
 	}
 
-	if c.IsSet("frontend") { formatFrontend(frontendDir, c.String("frontend")) }
-	if c.IsSet("backend") { formatBackend(backendDir) }
+	if c.IsSet("frontend") {
+		formatFrontend(frontendDir, c.String("frontend"))
+	}
+	if c.IsSet("backend") {
+		formatBackend(backendDir)
+	}
 
 	return nil
 }
 
 func formatFrontend(frontendDir string, folder string) {
 	cmd := exec.Command("yarn", "format")
-	cmd.Dir = filepath.Join(frontendDir, folder) 
+	cmd.Dir = filepath.Join(frontendDir, folder)
 
 	err := cmd.Run()
 	if err != nil {
@@ -85,11 +89,10 @@ func formatBackend(backendDir string) {
 	cmd := exec.Command("go", "fmt", "./...")
 	cmd.Dir = filepath.Join(backendDir)
 
-
 	err := cmd.Run()
 	if err != nil {
 		fmt.Println("Error formatting backend, run go fmt ./... in backend folder")
 	}
 
 	fmt.Println("backend", cmd.Dir) // remove
-}
+}
diff --git a/cli/go.mod b/cli/go.mod
@@ -1,4 +1,4 @@
-module cli
+module github.com/GenerateNU/sac/cli
 
 go 1.21.1
 

diff --git a/cli/main.go b/cli/main.go
@@ -5,12 +5,11 @@ import (
 	"os"
 	"path/filepath"
 
-	"cli/commands"
+	"github.com/GenerateNU/sac/cli/commands"
 
 	"github.com/urfave/cli/v2"
 )
 
-
 func main() {
 	ROOT_DIR, err := os.Getwd()
 	if err != nil {