From 6479bacebf35f06b3dbc3d1da08b7bc061b14de9 Mon Sep 17 00:00:00 2001 From: garrettladley Date: Sun, 21 Apr 2024 20:38:28 -0400 Subject: [PATCH] refactor --- backend/.dockerignore | 1 + backend/Dockerfile | 15 +++++++++++++++ backend/{src => }/auth/hash.go | 0 backend/{src => }/auth/jwt.go | 6 +++--- backend/{src => }/auth/jwt_mock.go | 2 +- backend/{src => }/auth/password.go | 4 ++-- backend/{src => }/auth/permissions.go | 2 +- backend/{src => }/config/application.go | 0 backend/{src => }/config/auth.go | 0 backend/{src => }/config/aws.go | 0 backend/{src => }/config/config.go | 0 backend/{src => }/config/database.go | 0 backend/{src => }/config/local.go | 0 backend/{src => }/config/openai.go | 0 backend/{src => }/config/pinecone.go | 0 backend/{src => }/config/production.go | 0 backend/{src => }/config/resend.go | 0 backend/{src => }/config/super_user.go | 0 backend/{src => }/constants/auth.go | 0 backend/{src => }/constants/email.go | 0 backend/{src => }/constants/file.go | 0 backend/{src => }/constants/pagination.go | 0 backend/{src => }/constants/search.go | 0 backend/{src => }/controllers/auth.go | 10 +++++----- backend/{src => }/controllers/category.go | 8 ++++---- backend/{src => }/controllers/category_tag.go | 4 ++-- backend/{src => }/controllers/club.go | 8 ++++---- backend/{src => }/controllers/club_contact.go | 6 +++--- backend/{src => }/controllers/club_event.go | 4 ++-- backend/{src => }/controllers/club_follower.go | 4 ++-- backend/{src => }/controllers/club_member.go | 4 ++-- backend/{src => }/controllers/club_poc.go | 6 +++--- backend/{src => }/controllers/club_tag.go | 6 +++--- backend/{src => }/controllers/contact.go | 4 ++-- backend/{src => }/controllers/event.go | 8 ++++---- backend/{src => }/controllers/file.go | 8 ++++---- backend/{src => }/controllers/poc.go | 4 ++-- backend/{src => }/controllers/tag.go | 6 +++--- backend/{src => }/controllers/user.go | 12 ++++++------ backend/{src => }/controllers/user_follower.go | 4 ++-- backend/{src => }/controllers/user_member.go | 4 ++-- backend/{src => }/controllers/user_tag.go | 6 +++--- backend/{src => }/database/db.go | 4 ++-- backend/{src => }/database/super.go | 8 ++++---- backend/{src => }/docs/docs.go | 0 backend/{src => }/docs/swagger.json | 0 backend/{src => }/docs/swagger.yaml | 0 backend/{src => }/email/email.go | 6 +++--- backend/{src => }/email/resend_mock.go | 2 +- backend/{src => }/errors/auth.go | 0 backend/{src => }/errors/category.go | 0 backend/{src => }/errors/club.go | 0 backend/{src => }/errors/common.go | 0 backend/{src => }/errors/contact.go | 0 backend/{src => }/errors/error.go | 0 backend/{src => }/errors/event.go | 0 backend/{src => }/errors/file.go | 0 backend/{src => }/errors/point_of_contact.go | 0 backend/{src => }/errors/search.go | 0 backend/{src => }/errors/tag.go | 0 backend/{src => }/errors/user.go | 0 backend/{src => }/errors/verification.go | 0 backend/{src => }/file/aws_mock.go | 4 ++-- backend/{src => }/file/file.go | 8 ++++---- backend/go.mod | 3 ++- backend/go.sum | 2 ++ backend/{src => }/main.go | 16 ++++++++-------- backend/{src => }/middleware/auth.go | 6 +++--- backend/{src => }/middleware/club.go | 8 ++++---- backend/{src => }/middleware/middleware.go | 4 ++-- backend/{src => }/middleware/user.go | 6 +++--- backend/{src => }/migrations/data.sql | 0 backend/{src => }/models/category.go | 0 backend/{src => }/models/club.go | 0 backend/{src => }/models/comment.go | 0 backend/{src => }/models/contact.go | 0 backend/{src => }/models/event.go | 0 backend/{src => }/models/file.go | 0 backend/{src => }/models/follower.go | 0 backend/{src => }/models/membership.go | 0 backend/{src => }/models/notification.go | 0 backend/{src => }/models/poc.go | 0 backend/{src => }/models/root.go | 0 backend/{src => }/models/tag.go | 0 backend/{src => }/models/user.go | 0 backend/{src => }/models/verification.go | 0 backend/{src => }/search/README.md | 0 backend/{src => }/search/ai.go | 6 +++--- backend/{src => }/search/openai_mock.go | 2 +- backend/{src => }/search/pinecone_mock.go | 2 +- backend/{src => }/search/search.go | 10 +++++----- backend/{src => }/search/searchable.go | 0 backend/{src => }/server/routes/auth.go | 6 +++--- backend/{src => }/server/routes/category.go | 8 ++++---- backend/{src => }/server/routes/category_tag.go | 6 +++--- backend/{src => }/server/routes/club.go | 8 ++++---- backend/{src => }/server/routes/club_contact.go | 6 +++--- backend/{src => }/server/routes/club_event.go | 6 +++--- backend/{src => }/server/routes/club_follower.go | 6 +++--- backend/{src => }/server/routes/club_member.go | 6 +++--- backend/{src => }/server/routes/club_poc.go | 6 +++--- backend/{src => }/server/routes/club_tag.go | 6 +++--- backend/{src => }/server/routes/contact.go | 8 ++++---- backend/{src => }/server/routes/event.go | 6 +++--- backend/{src => }/server/routes/file.go | 6 +++--- backend/{src => }/server/routes/poc.go | 6 +++--- backend/{src => }/server/routes/tag.go | 8 ++++---- backend/{src => }/server/routes/user.go | 8 ++++---- backend/{src => }/server/routes/user_follower.go | 6 +++--- backend/{src => }/server/routes/user_member.go | 6 +++--- backend/{src => }/server/routes/user_tag.go | 6 +++--- backend/{src => }/server/routes/utility.go | 0 backend/{src => }/server/server.go | 12 ++++++------ backend/{src => }/services/auth.go | 12 ++++++------ backend/{src => }/services/category.go | 10 +++++----- backend/{src => }/services/category_tag.go | 10 +++++----- backend/{src => }/services/club.go | 10 +++++----- backend/{src => }/services/club_contact.go | 10 +++++----- backend/{src => }/services/club_event.go | 10 +++++----- backend/{src => }/services/club_follower.go | 10 +++++----- backend/{src => }/services/club_member.go | 10 +++++----- backend/{src => }/services/club_poc.go | 12 ++++++------ backend/{src => }/services/club_tag.go | 10 +++++----- backend/{src => }/services/contact.go | 10 +++++----- backend/{src => }/services/event.go | 10 +++++----- backend/{src => }/services/file.go | 12 ++++++------ backend/{src => }/services/poc.go | 10 +++++----- backend/{src => }/services/tag.go | 10 +++++----- backend/{src => }/services/user.go | 12 ++++++------ backend/{src => }/services/user_follower.go | 10 +++++----- backend/{src => }/services/user_member.go | 10 +++++----- backend/{src => }/services/user_tag.go | 10 +++++----- .../templates/emails/email_verification.html | 0 .../emails/password_change_complete.html | 0 .../templates/emails/password_reset.html | 0 backend/{src => }/templates/emails/welcome.html | 0 backend/tests/api/category_tag_test.go | 4 ++-- backend/tests/api/category_test.go | 4 ++-- backend/tests/api/club_contact_test.go | 4 ++-- backend/tests/api/club_follower_test.go | 2 +- backend/tests/api/club_member_test.go | 2 +- backend/tests/api/club_tag_test.go | 4 ++-- backend/tests/api/club_test.go | 4 ++-- backend/tests/api/contact_test.go | 4 ++-- backend/tests/api/event_test.go | 4 ++-- backend/tests/api/helpers/app.go | 4 ++-- backend/tests/api/helpers/auth.go | 6 +++--- backend/tests/api/helpers/database.go | 4 ++-- backend/tests/api/helpers/dependencies.go | 8 ++++---- backend/tests/api/helpers/requests.go | 4 ++-- backend/tests/api/tag_test.go | 4 ++-- backend/tests/api/user_follower_test.go | 4 ++-- backend/tests/api/user_member_test.go | 4 ++-- backend/tests/api/user_tag_test.go | 6 +++--- backend/tests/api/user_test.go | 8 ++++---- backend/tests/search_test.go | 6 +++--- backend/{src => }/transactions/auth.go | 4 ++-- backend/{src => }/transactions/category.go | 4 ++-- backend/{src => }/transactions/category_tag.go | 4 ++-- backend/{src => }/transactions/club.go | 6 +++--- backend/{src => }/transactions/club_contact.go | 4 ++-- backend/{src => }/transactions/club_event.go | 4 ++-- backend/{src => }/transactions/club_follower.go | 4 ++-- backend/{src => }/transactions/club_member.go | 4 ++-- backend/{src => }/transactions/club_poc.go | 4 ++-- backend/{src => }/transactions/club_tag.go | 4 ++-- backend/{src => }/transactions/contacts.go | 4 ++-- backend/{src => }/transactions/event.go | 4 ++-- backend/{src => }/transactions/file.go | 4 ++-- backend/{src => }/transactions/poc.go | 4 ++-- backend/{src => }/transactions/preloaders.go | 0 backend/{src => }/transactions/tag.go | 4 ++-- backend/{src => }/transactions/user.go | 4 ++-- backend/{src => }/transactions/user_follower.go | 4 ++-- backend/{src => }/transactions/user_member.go | 4 ++-- backend/{src => }/transactions/user_tag.go | 4 ++-- backend/{src => }/types/params.go | 12 ++++++------ backend/{src => }/utilities/http.go | 0 backend/{src => }/utilities/manipulator.go | 0 backend/{src => }/utilities/response.go | 0 backend/{src => }/utilities/validator.go | 4 ++-- cli/commands/clean_tests.go | 2 +- cli/commands/drop.go | 2 +- cli/commands/insert.go | 2 +- 184 files changed, 393 insertions(+), 374 deletions(-) create mode 100644 backend/.dockerignore create mode 100644 backend/Dockerfile rename backend/{src => }/auth/hash.go (100%) rename backend/{src => }/auth/jwt.go (98%) rename backend/{src => }/auth/jwt_mock.go (95%) rename backend/{src => }/auth/password.go (85%) rename backend/{src => }/auth/permissions.go (98%) rename backend/{src => }/config/application.go (100%) rename backend/{src => }/config/auth.go (100%) rename backend/{src => }/config/aws.go (100%) rename backend/{src => }/config/config.go (100%) rename backend/{src => }/config/database.go (100%) rename backend/{src => }/config/local.go (100%) rename backend/{src => }/config/openai.go (100%) rename backend/{src => }/config/pinecone.go (100%) rename backend/{src => }/config/production.go (100%) rename backend/{src => }/config/resend.go (100%) rename backend/{src => }/config/super_user.go (100%) rename backend/{src => }/constants/auth.go (100%) rename backend/{src => }/constants/email.go (100%) rename backend/{src => }/constants/file.go (100%) rename backend/{src => }/constants/pagination.go (100%) rename backend/{src => }/constants/search.go (100%) rename backend/{src => }/controllers/auth.go (96%) rename backend/{src => }/controllers/category.go (95%) rename backend/{src => }/controllers/category_tag.go (95%) rename backend/{src => }/controllers/club.go (95%) rename backend/{src => }/controllers/club_contact.go (93%) rename backend/{src => }/controllers/club_event.go (92%) rename backend/{src => }/controllers/club_follower.go (92%) rename backend/{src => }/controllers/club_member.go (92%) rename backend/{src => }/controllers/club_poc.go (97%) rename backend/{src => }/controllers/club_tag.go (95%) rename backend/{src => }/controllers/contact.go (96%) rename backend/{src => }/controllers/event.go (98%) rename backend/{src => }/controllers/file.go (94%) rename backend/{src => }/controllers/poc.go (95%) rename backend/{src => }/controllers/tag.go (96%) rename backend/{src => }/controllers/user.go (95%) rename backend/{src => }/controllers/user_follower.go (96%) rename backend/{src => }/controllers/user_member.go (96%) rename backend/{src => }/controllers/user_tag.go (94%) rename backend/{src => }/database/db.go (97%) rename backend/{src => }/database/super.go (84%) rename backend/{src => }/docs/docs.go (100%) rename backend/{src => }/docs/swagger.json (100%) rename backend/{src => }/docs/swagger.yaml (100%) rename backend/{src => }/email/email.go (94%) rename backend/{src => }/email/resend_mock.go (90%) rename backend/{src => }/errors/auth.go (100%) rename backend/{src => }/errors/category.go (100%) rename backend/{src => }/errors/club.go (100%) rename backend/{src => }/errors/common.go (100%) rename backend/{src => }/errors/contact.go (100%) rename backend/{src => }/errors/error.go (100%) rename backend/{src => }/errors/event.go (100%) rename backend/{src => }/errors/file.go (100%) rename backend/{src => }/errors/point_of_contact.go (100%) rename backend/{src => }/errors/search.go (100%) rename backend/{src => }/errors/tag.go (100%) rename backend/{src => }/errors/user.go (100%) rename backend/{src => }/errors/verification.go (100%) rename backend/{src => }/file/aws_mock.go (83%) rename backend/{src => }/file/file.go (95%) rename backend/{src => }/main.go (87%) rename backend/{src => }/middleware/auth.go (95%) rename backend/{src => }/middleware/club.go (80%) rename backend/{src => }/middleware/middleware.go (90%) rename backend/{src => }/middleware/user.go (81%) rename backend/{src => }/migrations/data.sql (100%) rename backend/{src => }/models/category.go (100%) rename backend/{src => }/models/club.go (100%) rename backend/{src => }/models/comment.go (100%) rename backend/{src => }/models/contact.go (100%) rename backend/{src => }/models/event.go (100%) rename backend/{src => }/models/file.go (100%) rename backend/{src => }/models/follower.go (100%) rename backend/{src => }/models/membership.go (100%) rename backend/{src => }/models/notification.go (100%) rename backend/{src => }/models/poc.go (100%) rename backend/{src => }/models/root.go (100%) rename backend/{src => }/models/tag.go (100%) rename backend/{src => }/models/user.go (100%) rename backend/{src => }/models/verification.go (100%) rename backend/{src => }/search/README.md (100%) rename backend/{src => }/search/ai.go (95%) rename backend/{src => }/search/openai_mock.go (87%) rename backend/{src => }/search/pinecone_mock.go (92%) rename backend/{src => }/search/search.go (96%) rename backend/{src => }/search/searchable.go (100%) rename backend/{src => }/server/routes/auth.go (80%) rename backend/{src => }/server/routes/category.go (84%) rename backend/{src => }/server/routes/category_tag.go (74%) rename backend/{src => }/server/routes/club.go (83%) rename backend/{src => }/server/routes/club_contact.go (75%) rename backend/{src => }/server/routes/club_event.go (68%) rename backend/{src => }/server/routes/club_follower.go (70%) rename backend/{src => }/server/routes/club_member.go (69%) rename backend/{src => }/server/routes/club_poc.go (87%) rename backend/{src => }/server/routes/club_tag.go (76%) rename backend/{src => }/server/routes/contact.go (71%) rename backend/{src => }/server/routes/event.go (89%) rename backend/{src => }/server/routes/file.go (72%) rename backend/{src => }/server/routes/poc.go (78%) rename backend/{src => }/server/routes/tag.go (74%) rename backend/{src => }/server/routes/user.go (84%) rename backend/{src => }/server/routes/user_follower.go (79%) rename backend/{src => }/server/routes/user_member.go (79%) rename backend/{src => }/server/routes/user_tag.go (78%) rename backend/{src => }/server/routes/utility.go (100%) rename backend/{src => }/server/server.go (88%) rename backend/{src => }/services/auth.go (96%) rename backend/{src => }/services/category.go (91%) rename backend/{src => }/services/category_tag.go (84%) rename backend/{src => }/services/club.go (90%) rename backend/{src => }/services/club_contact.go (83%) rename backend/{src => }/services/club_event.go (78%) rename backend/{src => }/services/club_follower.go (78%) rename backend/{src => }/services/club_member.go (78%) rename backend/{src => }/services/club_poc.go (95%) rename backend/{src => }/services/club_tag.go (86%) rename backend/{src => }/services/contact.go (84%) rename backend/{src => }/services/event.go (96%) rename backend/{src => }/services/file.go (86%) rename backend/{src => }/services/poc.go (82%) rename backend/{src => }/services/tag.go (89%) rename backend/{src => }/services/user.go (94%) rename backend/{src => }/services/user_follower.go (84%) rename backend/{src => }/services/user_member.go (84%) rename backend/{src => }/services/user_tag.go (86%) rename backend/{src => }/templates/emails/email_verification.html (100%) rename backend/{src => }/templates/emails/password_change_complete.html (100%) rename backend/{src => }/templates/emails/password_reset.html (100%) rename backend/{src => }/templates/emails/welcome.html (100%) rename backend/{src => }/transactions/auth.go (94%) rename backend/{src => }/transactions/category.go (94%) rename backend/{src => }/transactions/category_tag.go (91%) rename backend/{src => }/transactions/club.go (97%) rename backend/{src => }/transactions/club_contact.go (91%) rename backend/{src => }/transactions/club_event.go (81%) rename backend/{src => }/transactions/club_follower.go (83%) rename backend/{src => }/transactions/club_member.go (83%) rename backend/{src => }/transactions/club_poc.go (96%) rename backend/{src => }/transactions/club_tag.go (91%) rename backend/{src => }/transactions/contacts.go (91%) rename backend/{src => }/transactions/event.go (98%) rename backend/{src => }/transactions/file.go (95%) rename backend/{src => }/transactions/poc.go (91%) rename backend/{src => }/transactions/preloaders.go (100%) rename backend/{src => }/transactions/tag.go (96%) rename backend/{src => }/transactions/user.go (97%) rename backend/{src => }/transactions/user_follower.go (92%) rename backend/{src => }/transactions/user_member.go (95%) rename backend/{src => }/transactions/user_tag.go (91%) rename backend/{src => }/types/params.go (67%) rename backend/{src => }/utilities/http.go (100%) rename backend/{src => }/utilities/manipulator.go (100%) rename backend/{src => }/utilities/response.go (100%) rename backend/{src => }/utilities/validator.go (96%) diff --git a/backend/.dockerignore b/backend/.dockerignore new file mode 100644 index 000000000..3d0dbe446 --- /dev/null +++ b/backend/.dockerignore @@ -0,0 +1 @@ +tests/ \ No newline at end of file diff --git a/backend/Dockerfile b/backend/Dockerfile new file mode 100644 index 000000000..8fa18c7b8 --- /dev/null +++ b/backend/Dockerfile @@ -0,0 +1,15 @@ +# syntax=docker/dockerfile:1 + +FROM golang:1.22.2 + +WORKDIR /app + +COPY go.mod go.sum ./ + +COPY *.go ./ + +RUN CGO_ENABLED=0 GOOS=linux go build -v -o ./sac + +EXPOSE 8080 + +CMD ["/sac"] \ No newline at end of file diff --git a/backend/src/auth/hash.go b/backend/auth/hash.go similarity index 100% rename from backend/src/auth/hash.go rename to backend/auth/hash.go diff --git a/backend/src/auth/jwt.go b/backend/auth/jwt.go similarity index 98% rename from backend/src/auth/jwt.go rename to backend/auth/jwt.go index b75f396ac..2fbe80c0c 100644 --- a/backend/src/auth/jwt.go +++ b/backend/auth/jwt.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/GenerateNU/sac/backend/src/config" - "github.com/GenerateNU/sac/backend/src/constants" - "github.com/GenerateNU/sac/backend/src/errors" + "github.com/GenerateNU/sac/backend/config" + "github.com/GenerateNU/sac/backend/constants" + "github.com/GenerateNU/sac/backend/errors" m "github.com/garrettladley/mattress" "github.com/gofiber/fiber/v2" "github.com/golang-jwt/jwt" diff --git a/backend/src/auth/jwt_mock.go b/backend/auth/jwt_mock.go similarity index 95% rename from backend/src/auth/jwt_mock.go rename to backend/auth/jwt_mock.go index 6a8a7aebe..4232a1e57 100644 --- a/backend/src/auth/jwt_mock.go +++ b/backend/auth/jwt_mock.go @@ -1,7 +1,7 @@ package auth import ( - "github.com/GenerateNU/sac/backend/src/errors" + "github.com/GenerateNU/sac/backend/errors" "github.com/golang-jwt/jwt" ) diff --git a/backend/src/auth/password.go b/backend/auth/password.go similarity index 85% rename from backend/src/auth/password.go rename to backend/auth/password.go index f1e6a9412..d2c90ca04 100644 --- a/backend/src/auth/password.go +++ b/backend/auth/password.go @@ -4,8 +4,8 @@ import ( "regexp" "strings" - "github.com/GenerateNU/sac/backend/src/constants" - "github.com/GenerateNU/sac/backend/src/errors" + "github.com/GenerateNU/sac/backend/constants" + "github.com/GenerateNU/sac/backend/errors" ) func ValidatePassword(password string) *errors.Error { diff --git a/backend/src/auth/permissions.go b/backend/auth/permissions.go similarity index 98% rename from backend/src/auth/permissions.go rename to backend/auth/permissions.go index 88071381e..12b12d84e 100644 --- a/backend/src/auth/permissions.go +++ b/backend/auth/permissions.go @@ -1,6 +1,6 @@ package auth -import "github.com/GenerateNU/sac/backend/src/models" +import "github.com/GenerateNU/sac/backend/models" type Permission string diff --git a/backend/src/config/application.go b/backend/config/application.go similarity index 100% rename from backend/src/config/application.go rename to backend/config/application.go diff --git a/backend/src/config/auth.go b/backend/config/auth.go similarity index 100% rename from backend/src/config/auth.go rename to backend/config/auth.go diff --git a/backend/src/config/aws.go b/backend/config/aws.go similarity index 100% rename from backend/src/config/aws.go rename to backend/config/aws.go diff --git a/backend/src/config/config.go b/backend/config/config.go similarity index 100% rename from backend/src/config/config.go rename to backend/config/config.go diff --git a/backend/src/config/database.go b/backend/config/database.go similarity index 100% rename from backend/src/config/database.go rename to backend/config/database.go diff --git a/backend/src/config/local.go b/backend/config/local.go similarity index 100% rename from backend/src/config/local.go rename to backend/config/local.go diff --git a/backend/src/config/openai.go b/backend/config/openai.go similarity index 100% rename from backend/src/config/openai.go rename to backend/config/openai.go diff --git a/backend/src/config/pinecone.go b/backend/config/pinecone.go similarity index 100% rename from backend/src/config/pinecone.go rename to backend/config/pinecone.go diff --git a/backend/src/config/production.go b/backend/config/production.go similarity index 100% rename from backend/src/config/production.go rename to backend/config/production.go diff --git a/backend/src/config/resend.go b/backend/config/resend.go similarity index 100% rename from backend/src/config/resend.go rename to backend/config/resend.go diff --git a/backend/src/config/super_user.go b/backend/config/super_user.go similarity index 100% rename from backend/src/config/super_user.go rename to backend/config/super_user.go diff --git a/backend/src/constants/auth.go b/backend/constants/auth.go similarity index 100% rename from backend/src/constants/auth.go rename to backend/constants/auth.go diff --git a/backend/src/constants/email.go b/backend/constants/email.go similarity index 100% rename from backend/src/constants/email.go rename to backend/constants/email.go diff --git a/backend/src/constants/file.go b/backend/constants/file.go similarity index 100% rename from backend/src/constants/file.go rename to backend/constants/file.go diff --git a/backend/src/constants/pagination.go b/backend/constants/pagination.go similarity index 100% rename from backend/src/constants/pagination.go rename to backend/constants/pagination.go diff --git a/backend/src/constants/search.go b/backend/constants/search.go similarity index 100% rename from backend/src/constants/search.go rename to backend/constants/search.go diff --git a/backend/src/controllers/auth.go b/backend/controllers/auth.go similarity index 96% rename from backend/src/controllers/auth.go rename to backend/controllers/auth.go index 524f31e49..dbe4b765d 100644 --- a/backend/src/controllers/auth.go +++ b/backend/controllers/auth.go @@ -1,11 +1,11 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/auth" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/auth" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/utilities" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/controllers/category.go b/backend/controllers/category.go similarity index 95% rename from backend/src/controllers/category.go rename to backend/controllers/category.go index 526a06724..b9f270b29 100644 --- a/backend/src/controllers/category.go +++ b/backend/controllers/category.go @@ -1,10 +1,10 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/constants" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/services" + "github.com/GenerateNU/sac/backend/constants" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/services" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/controllers/category_tag.go b/backend/controllers/category_tag.go similarity index 95% rename from backend/src/controllers/category_tag.go rename to backend/controllers/category_tag.go index 216e6e47d..ae8608b29 100644 --- a/backend/src/controllers/category_tag.go +++ b/backend/controllers/category_tag.go @@ -1,8 +1,8 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/constants" - "github.com/GenerateNU/sac/backend/src/services" + "github.com/GenerateNU/sac/backend/constants" + "github.com/GenerateNU/sac/backend/services" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/controllers/club.go b/backend/controllers/club.go similarity index 95% rename from backend/src/controllers/club.go rename to backend/controllers/club.go index 3c9f70b5c..3647c7633 100644 --- a/backend/src/controllers/club.go +++ b/backend/controllers/club.go @@ -1,10 +1,10 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/constants" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/services" + "github.com/GenerateNU/sac/backend/constants" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/services" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/controllers/club_contact.go b/backend/controllers/club_contact.go similarity index 93% rename from backend/src/controllers/club_contact.go rename to backend/controllers/club_contact.go index 3e3ad8d22..2df495121 100644 --- a/backend/src/controllers/club_contact.go +++ b/backend/controllers/club_contact.go @@ -1,9 +1,9 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/services" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/services" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/controllers/club_event.go b/backend/controllers/club_event.go similarity index 92% rename from backend/src/controllers/club_event.go rename to backend/controllers/club_event.go index ec7e74ab4..f2c54573f 100644 --- a/backend/src/controllers/club_event.go +++ b/backend/controllers/club_event.go @@ -1,8 +1,8 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/constants" - "github.com/GenerateNU/sac/backend/src/services" + "github.com/GenerateNU/sac/backend/constants" + "github.com/GenerateNU/sac/backend/services" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/controllers/club_follower.go b/backend/controllers/club_follower.go similarity index 92% rename from backend/src/controllers/club_follower.go rename to backend/controllers/club_follower.go index 3d9203164..4139da135 100644 --- a/backend/src/controllers/club_follower.go +++ b/backend/controllers/club_follower.go @@ -1,8 +1,8 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/constants" - "github.com/GenerateNU/sac/backend/src/services" + "github.com/GenerateNU/sac/backend/constants" + "github.com/GenerateNU/sac/backend/services" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/controllers/club_member.go b/backend/controllers/club_member.go similarity index 92% rename from backend/src/controllers/club_member.go rename to backend/controllers/club_member.go index d6c91fc1f..40b4006e1 100644 --- a/backend/src/controllers/club_member.go +++ b/backend/controllers/club_member.go @@ -1,8 +1,8 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/constants" - "github.com/GenerateNU/sac/backend/src/services" + "github.com/GenerateNU/sac/backend/constants" + "github.com/GenerateNU/sac/backend/services" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/controllers/club_poc.go b/backend/controllers/club_poc.go similarity index 97% rename from backend/src/controllers/club_poc.go rename to backend/controllers/club_poc.go index 1068aa030..a66e39c9d 100644 --- a/backend/src/controllers/club_poc.go +++ b/backend/controllers/club_poc.go @@ -1,9 +1,9 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/services" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/services" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/controllers/club_tag.go b/backend/controllers/club_tag.go similarity index 95% rename from backend/src/controllers/club_tag.go rename to backend/controllers/club_tag.go index 0438f7ee3..129b8ef8b 100644 --- a/backend/src/controllers/club_tag.go +++ b/backend/controllers/club_tag.go @@ -1,9 +1,9 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/services" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/services" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/controllers/contact.go b/backend/controllers/contact.go similarity index 96% rename from backend/src/controllers/contact.go rename to backend/controllers/contact.go index 23d30e0b5..57c7c6b40 100644 --- a/backend/src/controllers/contact.go +++ b/backend/controllers/contact.go @@ -1,8 +1,8 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/constants" - "github.com/GenerateNU/sac/backend/src/services" + "github.com/GenerateNU/sac/backend/constants" + "github.com/GenerateNU/sac/backend/services" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/controllers/event.go b/backend/controllers/event.go similarity index 98% rename from backend/src/controllers/event.go rename to backend/controllers/event.go index 8cf85fa96..9be9d95e9 100644 --- a/backend/src/controllers/event.go +++ b/backend/controllers/event.go @@ -1,10 +1,10 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/constants" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/services" + "github.com/GenerateNU/sac/backend/constants" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/services" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/controllers/file.go b/backend/controllers/file.go similarity index 94% rename from backend/src/controllers/file.go rename to backend/controllers/file.go index 9461035d3..77d95e226 100644 --- a/backend/src/controllers/file.go +++ b/backend/controllers/file.go @@ -1,10 +1,10 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/constants" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/services" + "github.com/GenerateNU/sac/backend/constants" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/services" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/controllers/poc.go b/backend/controllers/poc.go similarity index 95% rename from backend/src/controllers/poc.go rename to backend/controllers/poc.go index 7717ecfe1..eb2938a39 100644 --- a/backend/src/controllers/poc.go +++ b/backend/controllers/poc.go @@ -1,8 +1,8 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/constants" - "github.com/GenerateNU/sac/backend/src/services" + "github.com/GenerateNU/sac/backend/constants" + "github.com/GenerateNU/sac/backend/services" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/controllers/tag.go b/backend/controllers/tag.go similarity index 96% rename from backend/src/controllers/tag.go rename to backend/controllers/tag.go index 39c6cd843..74874e999 100644 --- a/backend/src/controllers/tag.go +++ b/backend/controllers/tag.go @@ -1,9 +1,9 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/services" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/services" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/controllers/user.go b/backend/controllers/user.go similarity index 95% rename from backend/src/controllers/user.go rename to backend/controllers/user.go index 53a242530..78a076ef0 100644 --- a/backend/src/controllers/user.go +++ b/backend/controllers/user.go @@ -1,12 +1,12 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/auth" - "github.com/GenerateNU/sac/backend/src/constants" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/auth" + "github.com/GenerateNU/sac/backend/constants" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/utilities" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/controllers/user_follower.go b/backend/controllers/user_follower.go similarity index 96% rename from backend/src/controllers/user_follower.go rename to backend/controllers/user_follower.go index 0a7862382..556cdb062 100644 --- a/backend/src/controllers/user_follower.go +++ b/backend/controllers/user_follower.go @@ -1,8 +1,8 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/utilities" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/controllers/user_member.go b/backend/controllers/user_member.go similarity index 96% rename from backend/src/controllers/user_member.go rename to backend/controllers/user_member.go index bf8610a38..2f57cd9d1 100644 --- a/backend/src/controllers/user_member.go +++ b/backend/controllers/user_member.go @@ -1,8 +1,8 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/utilities" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/controllers/user_tag.go b/backend/controllers/user_tag.go similarity index 94% rename from backend/src/controllers/user_tag.go rename to backend/controllers/user_tag.go index 8cd42ca37..007ce6448 100644 --- a/backend/src/controllers/user_tag.go +++ b/backend/controllers/user_tag.go @@ -1,9 +1,9 @@ package controllers import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/services" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/services" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/database/db.go b/backend/database/db.go similarity index 97% rename from backend/src/database/db.go rename to backend/database/db.go index 10359b8b3..845e8ef5f 100644 --- a/backend/src/database/db.go +++ b/backend/database/db.go @@ -1,8 +1,8 @@ package database import ( - "github.com/GenerateNU/sac/backend/src/config" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/config" + "github.com/GenerateNU/sac/backend/models" "gorm.io/driver/postgres" "gorm.io/gorm" "gorm.io/gorm/logger" diff --git a/backend/src/database/super.go b/backend/database/super.go similarity index 84% rename from backend/src/database/super.go rename to backend/database/super.go index 7cc9c2b8d..9f3161274 100644 --- a/backend/src/database/super.go +++ b/backend/database/super.go @@ -1,10 +1,10 @@ package database import ( - "github.com/GenerateNU/sac/backend/src/auth" - "github.com/GenerateNU/sac/backend/src/config" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/auth" + "github.com/GenerateNU/sac/backend/config" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/google/uuid" ) diff --git a/backend/src/docs/docs.go b/backend/docs/docs.go similarity index 100% rename from backend/src/docs/docs.go rename to backend/docs/docs.go diff --git a/backend/src/docs/swagger.json b/backend/docs/swagger.json similarity index 100% rename from backend/src/docs/swagger.json rename to backend/docs/swagger.json diff --git a/backend/src/docs/swagger.yaml b/backend/docs/swagger.yaml similarity index 100% rename from backend/src/docs/swagger.yaml rename to backend/docs/swagger.yaml diff --git a/backend/src/email/email.go b/backend/email/email.go similarity index 94% rename from backend/src/email/email.go rename to backend/email/email.go index c30f83c93..5ea9ea4b1 100644 --- a/backend/src/email/email.go +++ b/backend/email/email.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/GenerateNU/sac/backend/src/config" - "github.com/GenerateNU/sac/backend/src/constants" - "github.com/GenerateNU/sac/backend/src/errors" + "github.com/GenerateNU/sac/backend/config" + "github.com/GenerateNU/sac/backend/constants" + "github.com/GenerateNU/sac/backend/errors" "github.com/afex/hystrix-go/hystrix" "github.com/resend/resend-go/v2" ) diff --git a/backend/src/email/resend_mock.go b/backend/email/resend_mock.go similarity index 90% rename from backend/src/email/resend_mock.go rename to backend/email/resend_mock.go index 482635d32..689af7e64 100644 --- a/backend/src/email/resend_mock.go +++ b/backend/email/resend_mock.go @@ -1,6 +1,6 @@ package email -import "github.com/GenerateNU/sac/backend/src/errors" +import "github.com/GenerateNU/sac/backend/errors" type ResendMockClient struct{} diff --git a/backend/src/errors/auth.go b/backend/errors/auth.go similarity index 100% rename from backend/src/errors/auth.go rename to backend/errors/auth.go diff --git a/backend/src/errors/category.go b/backend/errors/category.go similarity index 100% rename from backend/src/errors/category.go rename to backend/errors/category.go diff --git a/backend/src/errors/club.go b/backend/errors/club.go similarity index 100% rename from backend/src/errors/club.go rename to backend/errors/club.go diff --git a/backend/src/errors/common.go b/backend/errors/common.go similarity index 100% rename from backend/src/errors/common.go rename to backend/errors/common.go diff --git a/backend/src/errors/contact.go b/backend/errors/contact.go similarity index 100% rename from backend/src/errors/contact.go rename to backend/errors/contact.go diff --git a/backend/src/errors/error.go b/backend/errors/error.go similarity index 100% rename from backend/src/errors/error.go rename to backend/errors/error.go diff --git a/backend/src/errors/event.go b/backend/errors/event.go similarity index 100% rename from backend/src/errors/event.go rename to backend/errors/event.go diff --git a/backend/src/errors/file.go b/backend/errors/file.go similarity index 100% rename from backend/src/errors/file.go rename to backend/errors/file.go diff --git a/backend/src/errors/point_of_contact.go b/backend/errors/point_of_contact.go similarity index 100% rename from backend/src/errors/point_of_contact.go rename to backend/errors/point_of_contact.go diff --git a/backend/src/errors/search.go b/backend/errors/search.go similarity index 100% rename from backend/src/errors/search.go rename to backend/errors/search.go diff --git a/backend/src/errors/tag.go b/backend/errors/tag.go similarity index 100% rename from backend/src/errors/tag.go rename to backend/errors/tag.go diff --git a/backend/src/errors/user.go b/backend/errors/user.go similarity index 100% rename from backend/src/errors/user.go rename to backend/errors/user.go diff --git a/backend/src/errors/verification.go b/backend/errors/verification.go similarity index 100% rename from backend/src/errors/verification.go rename to backend/errors/verification.go diff --git a/backend/src/file/aws_mock.go b/backend/file/aws_mock.go similarity index 83% rename from backend/src/file/aws_mock.go rename to backend/file/aws_mock.go index eff2b6443..82e0108d5 100644 --- a/backend/src/file/aws_mock.go +++ b/backend/file/aws_mock.go @@ -3,8 +3,8 @@ package file import ( "mime/multipart" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" ) type AWSMockClient struct{} diff --git a/backend/src/file/file.go b/backend/file/file.go similarity index 95% rename from backend/src/file/file.go rename to backend/file/file.go index 9e292dbe1..47300247d 100644 --- a/backend/src/file/file.go +++ b/backend/file/file.go @@ -7,10 +7,10 @@ import ( "mime/multipart" "strings" - "github.com/GenerateNU/sac/backend/src/config" - "github.com/GenerateNU/sac/backend/src/constants" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/config" + "github.com/GenerateNU/sac/backend/constants" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/session" diff --git a/backend/go.mod b/backend/go.mod index 6f7a7d366..22fe96b92 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -18,6 +18,7 @@ require ( 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/sahilm/fuzzy v0.1.1 github.com/spf13/viper v1.18.2 github.com/swaggo/swag v1.16.3 golang.org/x/crypto v0.22.0 @@ -59,6 +60,7 @@ require ( github.com/jinzhu/now v1.1.5 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/klauspost/compress v1.17.7 // indirect + github.com/kylelemons/godebug v1.1.0 // 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 @@ -70,7 +72,6 @@ require ( 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 - github.com/sahilm/fuzzy v0.1.1 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.6.0 // indirect diff --git a/backend/go.sum b/backend/go.sum index e16335582..51d0304ef 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -88,6 +88,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= diff --git a/backend/src/main.go b/backend/main.go similarity index 87% rename from backend/src/main.go rename to backend/main.go index 3a06ad1c3..1bc61eef7 100644 --- a/backend/src/main.go +++ b/backend/main.go @@ -7,14 +7,14 @@ import ( "os" "path/filepath" - "github.com/GenerateNU/sac/backend/src/config" - "github.com/GenerateNU/sac/backend/src/database" - _ "github.com/GenerateNU/sac/backend/src/docs" - "github.com/GenerateNU/sac/backend/src/email" - "github.com/GenerateNU/sac/backend/src/file" - "github.com/GenerateNU/sac/backend/src/search" - "github.com/GenerateNU/sac/backend/src/server" - t "github.com/GenerateNU/sac/backend/src/types" + "github.com/GenerateNU/sac/backend/config" + "github.com/GenerateNU/sac/backend/database" + _ "github.com/GenerateNU/sac/backend/docs" + "github.com/GenerateNU/sac/backend/email" + "github.com/GenerateNU/sac/backend/file" + "github.com/GenerateNU/sac/backend/search" + "github.com/GenerateNU/sac/backend/server" + t "github.com/GenerateNU/sac/backend/types" ) func CheckServerRunning(host string, port uint16) error { diff --git a/backend/src/middleware/auth.go b/backend/middleware/auth.go similarity index 95% rename from backend/src/middleware/auth.go rename to backend/middleware/auth.go index 8b763d5f1..5e0a05e35 100644 --- a/backend/src/middleware/auth.go +++ b/backend/middleware/auth.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/GenerateNU/sac/backend/src/auth" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/auth" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/golang-jwt/jwt" "github.com/gofiber/fiber/v2" diff --git a/backend/src/middleware/club.go b/backend/middleware/club.go similarity index 80% rename from backend/src/middleware/club.go rename to backend/middleware/club.go index b110a6912..797d64d64 100644 --- a/backend/src/middleware/club.go +++ b/backend/middleware/club.go @@ -3,10 +3,10 @@ package middleware import ( "slices" - "github.com/GenerateNU/sac/backend/src/auth" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/auth" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/utilities" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/middleware/middleware.go b/backend/middleware/middleware.go similarity index 90% rename from backend/src/middleware/middleware.go rename to backend/middleware/middleware.go index b7afb1523..2f9689e1d 100644 --- a/backend/src/middleware/middleware.go +++ b/backend/middleware/middleware.go @@ -3,8 +3,8 @@ package middleware import ( "time" - "github.com/GenerateNU/sac/backend/src/auth" - "github.com/GenerateNU/sac/backend/src/config" + "github.com/GenerateNU/sac/backend/auth" + "github.com/GenerateNU/sac/backend/config" "github.com/go-playground/validator/v10" "github.com/gofiber/fiber/v2" "gorm.io/gorm" diff --git a/backend/src/middleware/user.go b/backend/middleware/user.go similarity index 81% rename from backend/src/middleware/user.go rename to backend/middleware/user.go index fd8656f39..fe5dd3611 100644 --- a/backend/src/middleware/user.go +++ b/backend/middleware/user.go @@ -1,9 +1,9 @@ package middleware import ( - "github.com/GenerateNU/sac/backend/src/auth" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/auth" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/utilities" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/migrations/data.sql b/backend/migrations/data.sql similarity index 100% rename from backend/src/migrations/data.sql rename to backend/migrations/data.sql diff --git a/backend/src/models/category.go b/backend/models/category.go similarity index 100% rename from backend/src/models/category.go rename to backend/models/category.go diff --git a/backend/src/models/club.go b/backend/models/club.go similarity index 100% rename from backend/src/models/club.go rename to backend/models/club.go diff --git a/backend/src/models/comment.go b/backend/models/comment.go similarity index 100% rename from backend/src/models/comment.go rename to backend/models/comment.go diff --git a/backend/src/models/contact.go b/backend/models/contact.go similarity index 100% rename from backend/src/models/contact.go rename to backend/models/contact.go diff --git a/backend/src/models/event.go b/backend/models/event.go similarity index 100% rename from backend/src/models/event.go rename to backend/models/event.go diff --git a/backend/src/models/file.go b/backend/models/file.go similarity index 100% rename from backend/src/models/file.go rename to backend/models/file.go diff --git a/backend/src/models/follower.go b/backend/models/follower.go similarity index 100% rename from backend/src/models/follower.go rename to backend/models/follower.go diff --git a/backend/src/models/membership.go b/backend/models/membership.go similarity index 100% rename from backend/src/models/membership.go rename to backend/models/membership.go diff --git a/backend/src/models/notification.go b/backend/models/notification.go similarity index 100% rename from backend/src/models/notification.go rename to backend/models/notification.go diff --git a/backend/src/models/poc.go b/backend/models/poc.go similarity index 100% rename from backend/src/models/poc.go rename to backend/models/poc.go diff --git a/backend/src/models/root.go b/backend/models/root.go similarity index 100% rename from backend/src/models/root.go rename to backend/models/root.go diff --git a/backend/src/models/tag.go b/backend/models/tag.go similarity index 100% rename from backend/src/models/tag.go rename to backend/models/tag.go diff --git a/backend/src/models/user.go b/backend/models/user.go similarity index 100% rename from backend/src/models/user.go rename to backend/models/user.go diff --git a/backend/src/models/verification.go b/backend/models/verification.go similarity index 100% rename from backend/src/models/verification.go rename to backend/models/verification.go diff --git a/backend/src/search/README.md b/backend/search/README.md similarity index 100% rename from backend/src/search/README.md rename to backend/search/README.md diff --git a/backend/src/search/ai.go b/backend/search/ai.go similarity index 95% rename from backend/src/search/ai.go rename to backend/search/ai.go index 6eee260ee..10d802efe 100644 --- a/backend/src/search/ai.go +++ b/backend/search/ai.go @@ -6,9 +6,9 @@ import ( "github.com/goccy/go-json" - "github.com/GenerateNU/sac/backend/src/config" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/config" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/utilities" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/search/openai_mock.go b/backend/search/openai_mock.go similarity index 87% rename from backend/src/search/openai_mock.go rename to backend/search/openai_mock.go index ba81def43..044f73f02 100644 --- a/backend/src/search/openai_mock.go +++ b/backend/search/openai_mock.go @@ -1,6 +1,6 @@ package search -import "github.com/GenerateNU/sac/backend/src/errors" +import "github.com/GenerateNU/sac/backend/errors" type OpenAIMockClient struct{} diff --git a/backend/src/search/pinecone_mock.go b/backend/search/pinecone_mock.go similarity index 92% rename from backend/src/search/pinecone_mock.go rename to backend/search/pinecone_mock.go index 4e0725702..7ea5ebd4f 100644 --- a/backend/src/search/pinecone_mock.go +++ b/backend/search/pinecone_mock.go @@ -1,7 +1,7 @@ package search import ( - "github.com/GenerateNU/sac/backend/src/errors" + "github.com/GenerateNU/sac/backend/errors" "gorm.io/gorm" ) diff --git a/backend/src/search/search.go b/backend/search/search.go similarity index 96% rename from backend/src/search/search.go rename to backend/search/search.go index c959bd5cb..b2a7d8113 100644 --- a/backend/src/search/search.go +++ b/backend/search/search.go @@ -12,11 +12,11 @@ import ( "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/log" - "github.com/GenerateNU/sac/backend/src/config" - "github.com/GenerateNU/sac/backend/src/constants" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/config" + "github.com/GenerateNU/sac/backend/constants" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/utilities" ) type SearchClientInterface interface { diff --git a/backend/src/search/searchable.go b/backend/search/searchable.go similarity index 100% rename from backend/src/search/searchable.go rename to backend/search/searchable.go diff --git a/backend/src/server/routes/auth.go b/backend/server/routes/auth.go similarity index 80% rename from backend/src/server/routes/auth.go rename to backend/server/routes/auth.go index 65745357c..9f138c93c 100644 --- a/backend/src/server/routes/auth.go +++ b/backend/server/routes/auth.go @@ -1,9 +1,9 @@ package routes import ( - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" ) func Auth(params types.RouteParams) { diff --git a/backend/src/server/routes/category.go b/backend/server/routes/category.go similarity index 84% rename from backend/src/server/routes/category.go rename to backend/server/routes/category.go index 6e988f331..2e2107baf 100644 --- a/backend/src/server/routes/category.go +++ b/backend/server/routes/category.go @@ -1,10 +1,10 @@ package routes import ( - "github.com/GenerateNU/sac/backend/src/auth" - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + "github.com/GenerateNU/sac/backend/auth" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/server/routes/category_tag.go b/backend/server/routes/category_tag.go similarity index 74% rename from backend/src/server/routes/category_tag.go rename to backend/server/routes/category_tag.go index 30f557a6a..a51cb2fb9 100644 --- a/backend/src/server/routes/category_tag.go +++ b/backend/server/routes/category_tag.go @@ -1,9 +1,9 @@ package routes import ( - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" ) func CategoryTag(categoryParams types.RouteParams) { diff --git a/backend/src/server/routes/club.go b/backend/server/routes/club.go similarity index 83% rename from backend/src/server/routes/club.go rename to backend/server/routes/club.go index 25b95e6e3..dec9ba05f 100644 --- a/backend/src/server/routes/club.go +++ b/backend/server/routes/club.go @@ -1,10 +1,10 @@ package routes import ( - p "github.com/GenerateNU/sac/backend/src/auth" - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + p "github.com/GenerateNU/sac/backend/auth" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/server/routes/club_contact.go b/backend/server/routes/club_contact.go similarity index 75% rename from backend/src/server/routes/club_contact.go rename to backend/server/routes/club_contact.go index f4494d9e2..882ada881 100644 --- a/backend/src/server/routes/club_contact.go +++ b/backend/server/routes/club_contact.go @@ -1,9 +1,9 @@ package routes import ( - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" ) func ClubContact(clubParams types.RouteParams) { diff --git a/backend/src/server/routes/club_event.go b/backend/server/routes/club_event.go similarity index 68% rename from backend/src/server/routes/club_event.go rename to backend/server/routes/club_event.go index b1e47e0d9..176f8dee0 100644 --- a/backend/src/server/routes/club_event.go +++ b/backend/server/routes/club_event.go @@ -1,9 +1,9 @@ package routes import ( - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" ) func ClubEvent(clubParams types.RouteParams) { diff --git a/backend/src/server/routes/club_follower.go b/backend/server/routes/club_follower.go similarity index 70% rename from backend/src/server/routes/club_follower.go rename to backend/server/routes/club_follower.go index b45a97ec3..f8293ede6 100644 --- a/backend/src/server/routes/club_follower.go +++ b/backend/server/routes/club_follower.go @@ -1,9 +1,9 @@ package routes import ( - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" ) func ClubFollower(clubParams types.RouteParams) { diff --git a/backend/src/server/routes/club_member.go b/backend/server/routes/club_member.go similarity index 69% rename from backend/src/server/routes/club_member.go rename to backend/server/routes/club_member.go index e95b052f0..1cacdc38e 100644 --- a/backend/src/server/routes/club_member.go +++ b/backend/server/routes/club_member.go @@ -1,9 +1,9 @@ package routes import ( - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" ) func ClubMember(clubParams types.RouteParams) { diff --git a/backend/src/server/routes/club_poc.go b/backend/server/routes/club_poc.go similarity index 87% rename from backend/src/server/routes/club_poc.go rename to backend/server/routes/club_poc.go index 26f8c26a9..4030300b0 100644 --- a/backend/src/server/routes/club_poc.go +++ b/backend/server/routes/club_poc.go @@ -1,9 +1,9 @@ package routes import ( - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" ) func ClubPointOfContact(clubParams types.RouteParams) { diff --git a/backend/src/server/routes/club_tag.go b/backend/server/routes/club_tag.go similarity index 76% rename from backend/src/server/routes/club_tag.go rename to backend/server/routes/club_tag.go index 7c4122b53..9f7799781 100644 --- a/backend/src/server/routes/club_tag.go +++ b/backend/server/routes/club_tag.go @@ -1,9 +1,9 @@ package routes import ( - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" ) func ClubTag(clubParams types.RouteParams) { diff --git a/backend/src/server/routes/contact.go b/backend/server/routes/contact.go similarity index 71% rename from backend/src/server/routes/contact.go rename to backend/server/routes/contact.go index a79334d5e..b490841ab 100644 --- a/backend/src/server/routes/contact.go +++ b/backend/server/routes/contact.go @@ -1,10 +1,10 @@ package routes import ( - "github.com/GenerateNU/sac/backend/src/auth" - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + "github.com/GenerateNU/sac/backend/auth" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" ) func Contact(contactParams types.RouteParams) { diff --git a/backend/src/server/routes/event.go b/backend/server/routes/event.go similarity index 89% rename from backend/src/server/routes/event.go rename to backend/server/routes/event.go index 5b09fc7ef..1b5b7a156 100644 --- a/backend/src/server/routes/event.go +++ b/backend/server/routes/event.go @@ -1,9 +1,9 @@ package routes import ( - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" ) func Event(eventParams types.RouteParams) { diff --git a/backend/src/server/routes/file.go b/backend/server/routes/file.go similarity index 72% rename from backend/src/server/routes/file.go rename to backend/server/routes/file.go index 93377bed4..d0396df23 100644 --- a/backend/src/server/routes/file.go +++ b/backend/server/routes/file.go @@ -1,9 +1,9 @@ package routes import ( - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" ) func File(fileParams types.RouteParams) { diff --git a/backend/src/server/routes/poc.go b/backend/server/routes/poc.go similarity index 78% rename from backend/src/server/routes/poc.go rename to backend/server/routes/poc.go index 7f77ec9f3..724e31edc 100644 --- a/backend/src/server/routes/poc.go +++ b/backend/server/routes/poc.go @@ -1,9 +1,9 @@ package routes import ( - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" ) func PointOfContact(pointOfContactParams types.RouteParams) { diff --git a/backend/src/server/routes/tag.go b/backend/server/routes/tag.go similarity index 74% rename from backend/src/server/routes/tag.go rename to backend/server/routes/tag.go index d38d30315..a626e1986 100644 --- a/backend/src/server/routes/tag.go +++ b/backend/server/routes/tag.go @@ -1,10 +1,10 @@ package routes import ( - p "github.com/GenerateNU/sac/backend/src/auth" - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + p "github.com/GenerateNU/sac/backend/auth" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" ) func Tag(tagParams types.RouteParams) { diff --git a/backend/src/server/routes/user.go b/backend/server/routes/user.go similarity index 84% rename from backend/src/server/routes/user.go rename to backend/server/routes/user.go index 9e283aa65..4b53ceb2d 100644 --- a/backend/src/server/routes/user.go +++ b/backend/server/routes/user.go @@ -1,10 +1,10 @@ package routes import ( - p "github.com/GenerateNU/sac/backend/src/auth" - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + p "github.com/GenerateNU/sac/backend/auth" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" "github.com/gofiber/fiber/v2" ) diff --git a/backend/src/server/routes/user_follower.go b/backend/server/routes/user_follower.go similarity index 79% rename from backend/src/server/routes/user_follower.go rename to backend/server/routes/user_follower.go index 4fcff5ad3..391aaaaae 100644 --- a/backend/src/server/routes/user_follower.go +++ b/backend/server/routes/user_follower.go @@ -1,9 +1,9 @@ package routes import ( - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" ) func UserFollower(userParams types.RouteParams) { diff --git a/backend/src/server/routes/user_member.go b/backend/server/routes/user_member.go similarity index 79% rename from backend/src/server/routes/user_member.go rename to backend/server/routes/user_member.go index 36573dd79..f1984294a 100644 --- a/backend/src/server/routes/user_member.go +++ b/backend/server/routes/user_member.go @@ -1,9 +1,9 @@ package routes import ( - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" ) func UserMember(userParams types.RouteParams) { diff --git a/backend/src/server/routes/user_tag.go b/backend/server/routes/user_tag.go similarity index 78% rename from backend/src/server/routes/user_tag.go rename to backend/server/routes/user_tag.go index 8f65852d4..cb7029b3a 100644 --- a/backend/src/server/routes/user_tag.go +++ b/backend/server/routes/user_tag.go @@ -1,9 +1,9 @@ package routes import ( - "github.com/GenerateNU/sac/backend/src/controllers" - "github.com/GenerateNU/sac/backend/src/services" - "github.com/GenerateNU/sac/backend/src/types" + "github.com/GenerateNU/sac/backend/controllers" + "github.com/GenerateNU/sac/backend/services" + "github.com/GenerateNU/sac/backend/types" ) func UserTag(userParams types.RouteParams) { diff --git a/backend/src/server/routes/utility.go b/backend/server/routes/utility.go similarity index 100% rename from backend/src/server/routes/utility.go rename to backend/server/routes/utility.go diff --git a/backend/src/server/server.go b/backend/server/server.go similarity index 88% rename from backend/src/server/server.go rename to backend/server/server.go index c91a43497..47f9d0731 100644 --- a/backend/src/server/server.go +++ b/backend/server/server.go @@ -4,12 +4,12 @@ import ( "encoding/json" "fmt" - "github.com/GenerateNU/sac/backend/src/auth" - "github.com/GenerateNU/sac/backend/src/config" - "github.com/GenerateNU/sac/backend/src/middleware" - "github.com/GenerateNU/sac/backend/src/server/routes" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/auth" + "github.com/GenerateNU/sac/backend/config" + "github.com/GenerateNU/sac/backend/middleware" + "github.com/GenerateNU/sac/backend/server/routes" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/middleware/cors" "github.com/gofiber/fiber/v2/middleware/logger" diff --git a/backend/src/services/auth.go b/backend/services/auth.go similarity index 96% rename from backend/src/services/auth.go rename to backend/services/auth.go index 30079cd8f..37f3c22b9 100644 --- a/backend/src/services/auth.go +++ b/backend/services/auth.go @@ -3,12 +3,12 @@ package services import ( "time" - "github.com/GenerateNU/sac/backend/src/auth" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/auth" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" "github.com/gofiber/fiber/v2" "github.com/golang-jwt/jwt" "gorm.io/gorm" diff --git a/backend/src/services/category.go b/backend/services/category.go similarity index 91% rename from backend/src/services/category.go rename to backend/services/category.go index df6565242..98c62ec2e 100644 --- a/backend/src/services/category.go +++ b/backend/services/category.go @@ -1,11 +1,11 @@ package services import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" "golang.org/x/text/cases" "golang.org/x/text/language" diff --git a/backend/src/services/category_tag.go b/backend/services/category_tag.go similarity index 84% rename from backend/src/services/category_tag.go rename to backend/services/category_tag.go index 46df111b7..30acf3e9e 100644 --- a/backend/src/services/category_tag.go +++ b/backend/services/category_tag.go @@ -1,11 +1,11 @@ package services import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" ) type CategoryTagServiceInterface interface { diff --git a/backend/src/services/club.go b/backend/services/club.go similarity index 90% rename from backend/src/services/club.go rename to backend/services/club.go index 10549822a..3e171ffab 100644 --- a/backend/src/services/club.go +++ b/backend/services/club.go @@ -1,11 +1,11 @@ package services import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" ) type ClubServiceInterface interface { diff --git a/backend/src/services/club_contact.go b/backend/services/club_contact.go similarity index 83% rename from backend/src/services/club_contact.go rename to backend/services/club_contact.go index 2c0658be6..a6618ff27 100644 --- a/backend/src/services/club_contact.go +++ b/backend/services/club_contact.go @@ -1,11 +1,11 @@ package services import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" ) type ClubContactServiceInterface interface { diff --git a/backend/src/services/club_event.go b/backend/services/club_event.go similarity index 78% rename from backend/src/services/club_event.go rename to backend/services/club_event.go index d2e64f9d1..92e932ffb 100644 --- a/backend/src/services/club_event.go +++ b/backend/services/club_event.go @@ -1,11 +1,11 @@ package services import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" ) type ClubEventServiceInterface interface { diff --git a/backend/src/services/club_follower.go b/backend/services/club_follower.go similarity index 78% rename from backend/src/services/club_follower.go rename to backend/services/club_follower.go index e16965490..bf1c3049a 100644 --- a/backend/src/services/club_follower.go +++ b/backend/services/club_follower.go @@ -1,11 +1,11 @@ package services import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" ) type ClubFollowerServiceInterface interface { diff --git a/backend/src/services/club_member.go b/backend/services/club_member.go similarity index 78% rename from backend/src/services/club_member.go rename to backend/services/club_member.go index 5cc766e90..bdeca6801 100644 --- a/backend/src/services/club_member.go +++ b/backend/services/club_member.go @@ -1,11 +1,11 @@ package services import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" ) type ClubMemberServiceInterface interface { diff --git a/backend/src/services/club_poc.go b/backend/services/club_poc.go similarity index 95% rename from backend/src/services/club_poc.go rename to backend/services/club_poc.go index 50077eaa4..7e9acac7d 100644 --- a/backend/src/services/club_poc.go +++ b/backend/services/club_poc.go @@ -3,12 +3,12 @@ package services import ( "mime/multipart" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/file" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/file" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" ) type ClubPointOfContactServiceInterface interface { diff --git a/backend/src/services/club_tag.go b/backend/services/club_tag.go similarity index 86% rename from backend/src/services/club_tag.go rename to backend/services/club_tag.go index 36a6410ab..37bed5db7 100644 --- a/backend/src/services/club_tag.go +++ b/backend/services/club_tag.go @@ -1,11 +1,11 @@ package services import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" ) type ClubTagServiceInterface interface { diff --git a/backend/src/services/contact.go b/backend/services/contact.go similarity index 84% rename from backend/src/services/contact.go rename to backend/services/contact.go index 5de3e9a60..5cc141112 100644 --- a/backend/src/services/contact.go +++ b/backend/services/contact.go @@ -1,11 +1,11 @@ package services import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" ) type ContactServiceInterface interface { diff --git a/backend/src/services/event.go b/backend/services/event.go similarity index 96% rename from backend/src/services/event.go rename to backend/services/event.go index 23e96c9a9..bf695d207 100644 --- a/backend/src/services/event.go +++ b/backend/services/event.go @@ -1,11 +1,11 @@ package services import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" ) type EventServiceInterface interface { diff --git a/backend/src/services/file.go b/backend/services/file.go similarity index 86% rename from backend/src/services/file.go rename to backend/services/file.go index 488160b4c..bbf468209 100644 --- a/backend/src/services/file.go +++ b/backend/services/file.go @@ -3,12 +3,12 @@ package services import ( "mime/multipart" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/file" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/file" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" ) type FileServiceInterface interface { diff --git a/backend/src/services/poc.go b/backend/services/poc.go similarity index 82% rename from backend/src/services/poc.go rename to backend/services/poc.go index 81c7d1809..8a0cbfa54 100644 --- a/backend/src/services/poc.go +++ b/backend/services/poc.go @@ -1,11 +1,11 @@ package services import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" ) type PointOfContactServiceInterface interface { diff --git a/backend/src/services/tag.go b/backend/services/tag.go similarity index 89% rename from backend/src/services/tag.go rename to backend/services/tag.go index 38eb8b192..e300638b7 100644 --- a/backend/src/services/tag.go +++ b/backend/services/tag.go @@ -1,11 +1,11 @@ package services import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" ) type TagServiceInterface interface { diff --git a/backend/src/services/user.go b/backend/services/user.go similarity index 94% rename from backend/src/services/user.go rename to backend/services/user.go index e10b6fee4..1a60964e3 100644 --- a/backend/src/services/user.go +++ b/backend/services/user.go @@ -4,12 +4,12 @@ import ( "fmt" "strings" - "github.com/GenerateNU/sac/backend/src/auth" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/auth" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" ) type UserServiceInterface interface { diff --git a/backend/src/services/user_follower.go b/backend/services/user_follower.go similarity index 84% rename from backend/src/services/user_follower.go rename to backend/services/user_follower.go index 93b84c914..ab4c34bf2 100644 --- a/backend/src/services/user_follower.go +++ b/backend/services/user_follower.go @@ -1,11 +1,11 @@ package services import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" ) type UserFollowerServiceInterface interface { diff --git a/backend/src/services/user_member.go b/backend/services/user_member.go similarity index 84% rename from backend/src/services/user_member.go rename to backend/services/user_member.go index 2d523748e..143b45d2b 100644 --- a/backend/src/services/user_member.go +++ b/backend/services/user_member.go @@ -1,11 +1,11 @@ package services import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" ) type UserMemberServiceInterface interface { diff --git a/backend/src/services/user_tag.go b/backend/services/user_tag.go similarity index 86% rename from backend/src/services/user_tag.go rename to backend/services/user_tag.go index 4f877ef97..bc2cfa405 100644 --- a/backend/src/services/user_tag.go +++ b/backend/services/user_tag.go @@ -1,11 +1,11 @@ package services import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" - "github.com/GenerateNU/sac/backend/src/types" - "github.com/GenerateNU/sac/backend/src/utilities" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" + "github.com/GenerateNU/sac/backend/transactions" + "github.com/GenerateNU/sac/backend/types" + "github.com/GenerateNU/sac/backend/utilities" ) type UserTagServiceInterface interface { diff --git a/backend/src/templates/emails/email_verification.html b/backend/templates/emails/email_verification.html similarity index 100% rename from backend/src/templates/emails/email_verification.html rename to backend/templates/emails/email_verification.html diff --git a/backend/src/templates/emails/password_change_complete.html b/backend/templates/emails/password_change_complete.html similarity index 100% rename from backend/src/templates/emails/password_change_complete.html rename to backend/templates/emails/password_change_complete.html diff --git a/backend/src/templates/emails/password_reset.html b/backend/templates/emails/password_reset.html similarity index 100% rename from backend/src/templates/emails/password_reset.html rename to backend/templates/emails/password_reset.html diff --git a/backend/src/templates/emails/welcome.html b/backend/templates/emails/welcome.html similarity index 100% rename from backend/src/templates/emails/welcome.html rename to backend/templates/emails/welcome.html diff --git a/backend/tests/api/category_tag_test.go b/backend/tests/api/category_tag_test.go index d7165c885..afc3e0d3f 100644 --- a/backend/tests/api/category_tag_test.go +++ b/backend/tests/api/category_tag_test.go @@ -5,8 +5,8 @@ import ( "net/http" "testing" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" h "github.com/GenerateNU/sac/backend/tests/api/helpers" "github.com/goccy/go-json" diff --git a/backend/tests/api/category_test.go b/backend/tests/api/category_test.go index 6bf679046..5abd15c47 100644 --- a/backend/tests/api/category_test.go +++ b/backend/tests/api/category_test.go @@ -5,8 +5,8 @@ import ( "net/http" "testing" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" h "github.com/GenerateNU/sac/backend/tests/api/helpers" "github.com/gofiber/fiber/v2" "github.com/google/uuid" diff --git a/backend/tests/api/club_contact_test.go b/backend/tests/api/club_contact_test.go index ead3052bb..d23d63ec4 100644 --- a/backend/tests/api/club_contact_test.go +++ b/backend/tests/api/club_contact_test.go @@ -6,8 +6,8 @@ import ( "net/http" "testing" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" h "github.com/GenerateNU/sac/backend/tests/api/helpers" "github.com/goccy/go-json" "github.com/gofiber/fiber/v2" diff --git a/backend/tests/api/club_follower_test.go b/backend/tests/api/club_follower_test.go index a7af140db..f3d15ef88 100644 --- a/backend/tests/api/club_follower_test.go +++ b/backend/tests/api/club_follower_test.go @@ -5,7 +5,7 @@ import ( "net/http" "testing" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/models" h "github.com/GenerateNU/sac/backend/tests/api/helpers" "github.com/goccy/go-json" "github.com/gofiber/fiber/v2" diff --git a/backend/tests/api/club_member_test.go b/backend/tests/api/club_member_test.go index acc426e18..91e8ac05d 100644 --- a/backend/tests/api/club_member_test.go +++ b/backend/tests/api/club_member_test.go @@ -5,7 +5,7 @@ import ( "net/http" "testing" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/models" h "github.com/GenerateNU/sac/backend/tests/api/helpers" "github.com/goccy/go-json" "github.com/gofiber/fiber/v2" diff --git a/backend/tests/api/club_tag_test.go b/backend/tests/api/club_tag_test.go index 250d335ed..381095f1c 100644 --- a/backend/tests/api/club_tag_test.go +++ b/backend/tests/api/club_tag_test.go @@ -5,8 +5,8 @@ import ( "net/http" "testing" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" h "github.com/GenerateNU/sac/backend/tests/api/helpers" "github.com/goccy/go-json" "github.com/gofiber/fiber/v2" diff --git a/backend/tests/api/club_test.go b/backend/tests/api/club_test.go index 5f4fd259d..6586448c2 100644 --- a/backend/tests/api/club_test.go +++ b/backend/tests/api/club_test.go @@ -6,8 +6,8 @@ import ( "net/http" "testing" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" h "github.com/GenerateNU/sac/backend/tests/api/helpers" "github.com/goccy/go-json" "github.com/gofiber/fiber/v2" diff --git a/backend/tests/api/contact_test.go b/backend/tests/api/contact_test.go index e609392e2..f0ac22f1f 100644 --- a/backend/tests/api/contact_test.go +++ b/backend/tests/api/contact_test.go @@ -6,8 +6,8 @@ import ( "net/http" "testing" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" h "github.com/GenerateNU/sac/backend/tests/api/helpers" "github.com/goccy/go-json" "github.com/gofiber/fiber/v2" diff --git a/backend/tests/api/event_test.go b/backend/tests/api/event_test.go index 643140e5d..ef0fc7cea 100644 --- a/backend/tests/api/event_test.go +++ b/backend/tests/api/event_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" h "github.com/GenerateNU/sac/backend/tests/api/helpers" "github.com/goccy/go-json" "github.com/gofiber/fiber/v2" diff --git a/backend/tests/api/helpers/app.go b/backend/tests/api/helpers/app.go index 72699c024..755c1be79 100644 --- a/backend/tests/api/helpers/app.go +++ b/backend/tests/api/helpers/app.go @@ -5,8 +5,8 @@ import ( "net" "path/filepath" - "github.com/GenerateNU/sac/backend/src/config" - "github.com/GenerateNU/sac/backend/src/server" + "github.com/GenerateNU/sac/backend/config" + "github.com/GenerateNU/sac/backend/server" "github.com/gofiber/fiber/v2" "github.com/huandu/go-assert" "gorm.io/gorm" diff --git a/backend/tests/api/helpers/auth.go b/backend/tests/api/helpers/auth.go index c36778cb9..8f6669125 100644 --- a/backend/tests/api/helpers/auth.go +++ b/backend/tests/api/helpers/auth.go @@ -3,9 +3,9 @@ package helpers import ( "fmt" - "github.com/GenerateNU/sac/backend/src/auth" - "github.com/GenerateNU/sac/backend/src/database" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/auth" + "github.com/GenerateNU/sac/backend/database" + "github.com/GenerateNU/sac/backend/models" "github.com/goccy/go-json" "github.com/gofiber/fiber/v2" "github.com/google/uuid" diff --git a/backend/tests/api/helpers/database.go b/backend/tests/api/helpers/database.go index dd51598e0..1a9ff7f86 100644 --- a/backend/tests/api/helpers/database.go +++ b/backend/tests/api/helpers/database.go @@ -4,8 +4,8 @@ import ( "fmt" "sync" - "github.com/GenerateNU/sac/backend/src/config" - "github.com/GenerateNU/sac/backend/src/database" + "github.com/GenerateNU/sac/backend/config" + "github.com/GenerateNU/sac/backend/database" "gorm.io/gorm" ) diff --git a/backend/tests/api/helpers/dependencies.go b/backend/tests/api/helpers/dependencies.go index f9554120d..5c66de9ac 100644 --- a/backend/tests/api/helpers/dependencies.go +++ b/backend/tests/api/helpers/dependencies.go @@ -1,10 +1,10 @@ package helpers import ( - "github.com/GenerateNU/sac/backend/src/email" - "github.com/GenerateNU/sac/backend/src/file" - "github.com/GenerateNU/sac/backend/src/search" - "github.com/GenerateNU/sac/backend/src/types" + "github.com/GenerateNU/sac/backend/email" + "github.com/GenerateNU/sac/backend/file" + "github.com/GenerateNU/sac/backend/search" + "github.com/GenerateNU/sac/backend/types" ) func NewMockDependencies() *types.Dependencies { diff --git a/backend/tests/api/helpers/requests.go b/backend/tests/api/helpers/requests.go index 4a25b5a17..6b37c5043 100644 --- a/backend/tests/api/helpers/requests.go +++ b/backend/tests/api/helpers/requests.go @@ -7,8 +7,8 @@ import ( "net/http/httptest" "strings" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/gofiber/fiber/v2" "github.com/goccy/go-json" diff --git a/backend/tests/api/tag_test.go b/backend/tests/api/tag_test.go index 6bb186fb4..a96f9a4dc 100644 --- a/backend/tests/api/tag_test.go +++ b/backend/tests/api/tag_test.go @@ -5,8 +5,8 @@ import ( "net/http" "testing" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" h "github.com/GenerateNU/sac/backend/tests/api/helpers" "github.com/gofiber/fiber/v2" "github.com/google/uuid" diff --git a/backend/tests/api/user_follower_test.go b/backend/tests/api/user_follower_test.go index 637be82fc..62db371f3 100644 --- a/backend/tests/api/user_follower_test.go +++ b/backend/tests/api/user_follower_test.go @@ -7,8 +7,8 @@ import ( "github.com/goccy/go-json" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" h "github.com/GenerateNU/sac/backend/tests/api/helpers" "github.com/gofiber/fiber/v2" "github.com/google/uuid" diff --git a/backend/tests/api/user_member_test.go b/backend/tests/api/user_member_test.go index 9ef2f828f..812212505 100644 --- a/backend/tests/api/user_member_test.go +++ b/backend/tests/api/user_member_test.go @@ -7,8 +7,8 @@ import ( "github.com/goccy/go-json" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" h "github.com/GenerateNU/sac/backend/tests/api/helpers" "github.com/gofiber/fiber/v2" "github.com/google/uuid" diff --git a/backend/tests/api/user_tag_test.go b/backend/tests/api/user_tag_test.go index 08da819ba..f9e9033f6 100644 --- a/backend/tests/api/user_tag_test.go +++ b/backend/tests/api/user_tag_test.go @@ -5,10 +5,10 @@ import ( "net/http" "testing" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" h "github.com/GenerateNU/sac/backend/tests/api/helpers" + "github.com/GenerateNU/sac/backend/transactions" "github.com/goccy/go-json" "github.com/gofiber/fiber/v2" "github.com/google/uuid" diff --git a/backend/tests/api/user_test.go b/backend/tests/api/user_test.go index 2db88c551..3bf2cfb60 100644 --- a/backend/tests/api/user_test.go +++ b/backend/tests/api/user_test.go @@ -7,11 +7,11 @@ import ( stdliberrors "errors" - "github.com/GenerateNU/sac/backend/src/auth" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" - "github.com/GenerateNU/sac/backend/src/transactions" + "github.com/GenerateNU/sac/backend/auth" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" h "github.com/GenerateNU/sac/backend/tests/api/helpers" + "github.com/GenerateNU/sac/backend/transactions" "github.com/gofiber/fiber/v2" "github.com/google/uuid" "gorm.io/gorm" diff --git a/backend/tests/search_test.go b/backend/tests/search_test.go index db0261fb8..217de8410 100644 --- a/backend/tests/search_test.go +++ b/backend/tests/search_test.go @@ -3,9 +3,9 @@ package tests import ( "testing" - "github.com/GenerateNU/sac/backend/src/config" - "github.com/GenerateNU/sac/backend/src/constants" - "github.com/GenerateNU/sac/backend/src/search" + "github.com/GenerateNU/sac/backend/config" + "github.com/GenerateNU/sac/backend/constants" + "github.com/GenerateNU/sac/backend/search" m "github.com/garrettladley/mattress" "github.com/h2non/gock" "github.com/huandu/go-assert" diff --git a/backend/src/transactions/auth.go b/backend/transactions/auth.go similarity index 94% rename from backend/src/transactions/auth.go rename to backend/transactions/auth.go index 56abd3ea2..828b2da9e 100644 --- a/backend/src/transactions/auth.go +++ b/backend/transactions/auth.go @@ -3,8 +3,8 @@ package transactions import ( "time" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/google/uuid" "gorm.io/gorm" ) diff --git a/backend/src/transactions/category.go b/backend/transactions/category.go similarity index 94% rename from backend/src/transactions/category.go rename to backend/transactions/category.go index c38f06b00..f9d166f5d 100644 --- a/backend/src/transactions/category.go +++ b/backend/transactions/category.go @@ -3,10 +3,10 @@ package transactions import ( stdliberrors "errors" - "github.com/GenerateNU/sac/backend/src/errors" + "github.com/GenerateNU/sac/backend/errors" "github.com/google/uuid" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/models" "gorm.io/gorm" ) diff --git a/backend/src/transactions/category_tag.go b/backend/transactions/category_tag.go similarity index 91% rename from backend/src/transactions/category_tag.go rename to backend/transactions/category_tag.go index 591f99895..58c20eb39 100644 --- a/backend/src/transactions/category_tag.go +++ b/backend/transactions/category_tag.go @@ -3,10 +3,10 @@ package transactions import ( stdliberrors "errors" - "github.com/GenerateNU/sac/backend/src/errors" + "github.com/GenerateNU/sac/backend/errors" "github.com/google/uuid" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/models" "gorm.io/gorm" ) diff --git a/backend/src/transactions/club.go b/backend/transactions/club.go similarity index 97% rename from backend/src/transactions/club.go rename to backend/transactions/club.go index 78f054b25..8c08cd79e 100644 --- a/backend/src/transactions/club.go +++ b/backend/transactions/club.go @@ -3,11 +3,11 @@ package transactions import ( stdliberrors "errors" - "github.com/GenerateNU/sac/backend/src/search" + "github.com/GenerateNU/sac/backend/search" "github.com/sahilm/fuzzy" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/google/uuid" "gorm.io/gorm" ) diff --git a/backend/src/transactions/club_contact.go b/backend/transactions/club_contact.go similarity index 91% rename from backend/src/transactions/club_contact.go rename to backend/transactions/club_contact.go index 0cca00a46..2ac591ea1 100644 --- a/backend/src/transactions/club_contact.go +++ b/backend/transactions/club_contact.go @@ -3,8 +3,8 @@ package transactions import ( stdliberrors "errors" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/google/uuid" "gorm.io/gorm" "gorm.io/gorm/clause" diff --git a/backend/src/transactions/club_event.go b/backend/transactions/club_event.go similarity index 81% rename from backend/src/transactions/club_event.go rename to backend/transactions/club_event.go index 5638f2c36..f0c5ce0b1 100644 --- a/backend/src/transactions/club_event.go +++ b/backend/transactions/club_event.go @@ -1,8 +1,8 @@ package transactions import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/google/uuid" "gorm.io/gorm" ) diff --git a/backend/src/transactions/club_follower.go b/backend/transactions/club_follower.go similarity index 83% rename from backend/src/transactions/club_follower.go rename to backend/transactions/club_follower.go index 63a5cc366..7c1170589 100644 --- a/backend/src/transactions/club_follower.go +++ b/backend/transactions/club_follower.go @@ -1,8 +1,8 @@ package transactions import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/google/uuid" "gorm.io/gorm" ) diff --git a/backend/src/transactions/club_member.go b/backend/transactions/club_member.go similarity index 83% rename from backend/src/transactions/club_member.go rename to backend/transactions/club_member.go index 46538e7c3..3b5eafaa3 100644 --- a/backend/src/transactions/club_member.go +++ b/backend/transactions/club_member.go @@ -1,8 +1,8 @@ package transactions import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/google/uuid" "gorm.io/gorm" diff --git a/backend/src/transactions/club_poc.go b/backend/transactions/club_poc.go similarity index 96% rename from backend/src/transactions/club_poc.go rename to backend/transactions/club_poc.go index 1b36cd3d4..116542093 100644 --- a/backend/src/transactions/club_poc.go +++ b/backend/transactions/club_poc.go @@ -3,8 +3,8 @@ package transactions import ( stdliberrors "errors" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/google/uuid" "gorm.io/gorm" ) diff --git a/backend/src/transactions/club_tag.go b/backend/transactions/club_tag.go similarity index 91% rename from backend/src/transactions/club_tag.go rename to backend/transactions/club_tag.go index 82423bc11..0c30e8a1b 100644 --- a/backend/src/transactions/club_tag.go +++ b/backend/transactions/club_tag.go @@ -1,8 +1,8 @@ package transactions import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/google/uuid" "gorm.io/gorm" diff --git a/backend/src/transactions/contacts.go b/backend/transactions/contacts.go similarity index 91% rename from backend/src/transactions/contacts.go rename to backend/transactions/contacts.go index f068dfa77..721f89112 100644 --- a/backend/src/transactions/contacts.go +++ b/backend/transactions/contacts.go @@ -3,8 +3,8 @@ package transactions import ( stdliberrors "errors" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/google/uuid" "gorm.io/gorm" ) diff --git a/backend/src/transactions/event.go b/backend/transactions/event.go similarity index 98% rename from backend/src/transactions/event.go rename to backend/transactions/event.go index 7fde49651..d9dd334e1 100644 --- a/backend/src/transactions/event.go +++ b/backend/transactions/event.go @@ -3,8 +3,8 @@ package transactions import ( stdliberrors "errors" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/google/uuid" "gorm.io/gorm" diff --git a/backend/src/transactions/file.go b/backend/transactions/file.go similarity index 95% rename from backend/src/transactions/file.go rename to backend/transactions/file.go index 103c3ce2f..4a3cf0a0f 100644 --- a/backend/src/transactions/file.go +++ b/backend/transactions/file.go @@ -3,8 +3,8 @@ package transactions import ( stdliberrors "errors" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/google/uuid" "gorm.io/gorm" ) diff --git a/backend/src/transactions/poc.go b/backend/transactions/poc.go similarity index 91% rename from backend/src/transactions/poc.go rename to backend/transactions/poc.go index 5f949202a..f3a961a41 100644 --- a/backend/src/transactions/poc.go +++ b/backend/transactions/poc.go @@ -3,8 +3,8 @@ package transactions import ( stdliberrors "errors" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/google/uuid" "gorm.io/gorm" ) diff --git a/backend/src/transactions/preloaders.go b/backend/transactions/preloaders.go similarity index 100% rename from backend/src/transactions/preloaders.go rename to backend/transactions/preloaders.go diff --git a/backend/src/transactions/tag.go b/backend/transactions/tag.go similarity index 96% rename from backend/src/transactions/tag.go rename to backend/transactions/tag.go index caf6576ea..f41ff7e04 100644 --- a/backend/src/transactions/tag.go +++ b/backend/transactions/tag.go @@ -3,10 +3,10 @@ package transactions import ( stdliberrors "errors" - "github.com/GenerateNU/sac/backend/src/errors" + "github.com/GenerateNU/sac/backend/errors" "github.com/google/uuid" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/models" "gorm.io/gorm" ) diff --git a/backend/src/transactions/user.go b/backend/transactions/user.go similarity index 97% rename from backend/src/transactions/user.go rename to backend/transactions/user.go index 80885fb3c..744fb8ce9 100644 --- a/backend/src/transactions/user.go +++ b/backend/transactions/user.go @@ -3,8 +3,8 @@ package transactions import ( stdliberrors "errors" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/google/uuid" "gorm.io/gorm" diff --git a/backend/src/transactions/user_follower.go b/backend/transactions/user_follower.go similarity index 92% rename from backend/src/transactions/user_follower.go rename to backend/transactions/user_follower.go index a67ff2fd8..d44304d32 100644 --- a/backend/src/transactions/user_follower.go +++ b/backend/transactions/user_follower.go @@ -1,8 +1,8 @@ package transactions import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/google/uuid" "gorm.io/gorm" ) diff --git a/backend/src/transactions/user_member.go b/backend/transactions/user_member.go similarity index 95% rename from backend/src/transactions/user_member.go rename to backend/transactions/user_member.go index a9da7b63d..670a09fe5 100644 --- a/backend/src/transactions/user_member.go +++ b/backend/transactions/user_member.go @@ -1,8 +1,8 @@ package transactions import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/google/uuid" "gorm.io/gorm" ) diff --git a/backend/src/transactions/user_tag.go b/backend/transactions/user_tag.go similarity index 91% rename from backend/src/transactions/user_tag.go rename to backend/transactions/user_tag.go index 49a193098..fa4b9128c 100644 --- a/backend/src/transactions/user_tag.go +++ b/backend/transactions/user_tag.go @@ -1,8 +1,8 @@ package transactions import ( - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/google/uuid" "gorm.io/gorm" ) diff --git a/backend/src/types/params.go b/backend/types/params.go similarity index 67% rename from backend/src/types/params.go rename to backend/types/params.go index 74ba8fb3a..9e468eeb9 100644 --- a/backend/src/types/params.go +++ b/backend/types/params.go @@ -1,12 +1,12 @@ package types import ( - "github.com/GenerateNU/sac/backend/src/auth" - "github.com/GenerateNU/sac/backend/src/config" - "github.com/GenerateNU/sac/backend/src/email" - "github.com/GenerateNU/sac/backend/src/file" - "github.com/GenerateNU/sac/backend/src/middleware" - "github.com/GenerateNU/sac/backend/src/search" + "github.com/GenerateNU/sac/backend/auth" + "github.com/GenerateNU/sac/backend/config" + "github.com/GenerateNU/sac/backend/email" + "github.com/GenerateNU/sac/backend/file" + "github.com/GenerateNU/sac/backend/middleware" + "github.com/GenerateNU/sac/backend/search" "github.com/go-playground/validator/v10" "github.com/gofiber/fiber/v2" "gorm.io/gorm" diff --git a/backend/src/utilities/http.go b/backend/utilities/http.go similarity index 100% rename from backend/src/utilities/http.go rename to backend/utilities/http.go diff --git a/backend/src/utilities/manipulator.go b/backend/utilities/manipulator.go similarity index 100% rename from backend/src/utilities/manipulator.go rename to backend/utilities/manipulator.go diff --git a/backend/src/utilities/response.go b/backend/utilities/response.go similarity index 100% rename from backend/src/utilities/response.go rename to backend/utilities/response.go diff --git a/backend/src/utilities/validator.go b/backend/utilities/validator.go similarity index 96% rename from backend/src/utilities/validator.go rename to backend/utilities/validator.go index 092165f60..e80c175ab 100644 --- a/backend/src/utilities/validator.go +++ b/backend/utilities/validator.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/GenerateNU/sac/backend/src/errors" - "github.com/GenerateNU/sac/backend/src/models" + "github.com/GenerateNU/sac/backend/errors" + "github.com/GenerateNU/sac/backend/models" "github.com/google/uuid" "github.com/mcnijman/go-emailaddress" diff --git a/cli/commands/clean_tests.go b/cli/commands/clean_tests.go index edc7955bd..ca3555e0f 100644 --- a/cli/commands/clean_tests.go +++ b/cli/commands/clean_tests.go @@ -7,7 +7,7 @@ import ( "os/user" "sync" - "github.com/GenerateNU/sac/backend/src/config" + "github.com/GenerateNU/sac/backend/config" _ "github.com/lib/pq" "github.com/urfave/cli/v2" ) diff --git a/cli/commands/drop.go b/cli/commands/drop.go index 37d90980e..4b9c58de4 100644 --- a/cli/commands/drop.go +++ b/cli/commands/drop.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "github.com/GenerateNU/sac/backend/src/config" + "github.com/GenerateNU/sac/backend/config" "github.com/urfave/cli/v2" ) diff --git a/cli/commands/insert.go b/cli/commands/insert.go index b3d40eb1c..fc7677c66 100644 --- a/cli/commands/insert.go +++ b/cli/commands/insert.go @@ -6,7 +6,7 @@ import ( "os" "os/exec" - "github.com/GenerateNU/sac/backend/src/config" + "github.com/GenerateNU/sac/backend/config" "github.com/lib/pq" "github.com/urfave/cli/v2" )