Merge pull request #16 from oleksandrkhmil/feature/refactor-structure

Feature/refactor structure
nix-united · Dec 6, 2024 · 8b4e641 · 8b4e641
2 parents 1095ffe + 0275b04
commit 8b4e641
Show file tree

Hide file tree

Showing 38 changed files with 79 additions and 75 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Swagger
         run: |
           go install github.com/swaggo/swag/cmd/swag@0b9e347c196710ea155a147782bf51707a600c2c # https://github.com/swaggo/swag/releases/tag/v1.16.4
-          swag init -g cmd/main.go
+          swag init -g cmd/service/main.go
       - uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # https://github.com/golangci/golangci-lint-action/releases/tag/v6.1.1
         with:
           version: v1.61
@@ -41,7 +41,7 @@ jobs:
       - name: Setup Swagger
         run: |
           go install github.com/swaggo/swag/cmd/swag@0b9e347c196710ea155a147782bf51707a600c2c # https://github.com/swaggo/swag/releases/tag/v1.16.4
-          swag init -g cmd/main.go
+          swag init -g cmd/service/main.go
       - name: Run tests
         run: go test -race ./...
 
@@ -70,7 +70,7 @@ jobs:
       - name: Setup Swagger
         run: |
           go install github.com/swaggo/swag/cmd/swag@0b9e347c196710ea155a147782bf51707a600c2c # https://github.com/swaggo/swag/releases/tag/v1.16.4
-          swag init -g cmd/main.go
+          swag init -g cmd/service/main.go
       - name: Run govulncheck
         run: |
           go install golang.org/x/vuln/cmd/govulncheck@4ea4418106cea3bb2c9aa098527c924e9e1fbbb4 # https://go.googlesource.com/vuln/+/refs/tags/v1.1.3

diff --git a/app.go b/app.go
@@ -1,9 +1,9 @@
 package application
 
 import (
-	"echo-demo-project/config"
-	"echo-demo-project/server"
-	"echo-demo-project/server/routes"
+	"echo-demo-project/internal/config"
+	"echo-demo-project/internal/server"
+	"echo-demo-project/internal/server/routes"
 	"log"
 )
 

diff --git a/cmd/main.go → cmd/service/main.go b/cmd/main.go → cmd/service/main.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	application "echo-demo-project"
-	"echo-demo-project/config"
+	"echo-demo-project/internal/config"
 	"echo-demo-project/docs"
 	"fmt"
 )

diff --git a/config/auth.go → internal/config/auth.go b/config/auth.go → internal/config/auth.go
diff --git a/config/config.go → internal/config/config.go b/config/config.go → internal/config/config.go
diff --git a/config/db.go → internal/config/db.go b/config/db.go → internal/config/db.go
diff --git a/config/http.go → internal/config/http.go b/config/http.go → internal/config/http.go
diff --git a/db/connection.go → internal/db/connection.go b/db/connection.go → internal/db/connection.go
@@ -1,8 +1,8 @@
 package db
 
 import (
-	"echo-demo-project/config"
-	"echo-demo-project/db/seeders"
+	"echo-demo-project/internal/config"
+	"echo-demo-project/internal/db/seeders"
 	"fmt"
 
 	"gorm.io/driver/mysql"

diff --git a/db/seeders/user_seeder.go → internal/db/seeders/user_seeder.go b/db/seeders/user_seeder.go → internal/db/seeders/user_seeder.go
@@ -1,7 +1,7 @@
 package seeders
 
 import (
-	"echo-demo-project/models"
+	"echo-demo-project/internal/models"
 
 	"gorm.io/gorm"
 )

diff --git a/models/post.go → internal/models/post.go b/models/post.go → internal/models/post.go
diff --git a/models/user.go → internal/models/user.go b/models/user.go → internal/models/user.go
diff --git a/repositories/post_reposititory.go → internal/repositories/post_reposititory.go b/repositories/post_reposititory.go → internal/repositories/post_reposititory.go
@@ -1,7 +1,7 @@
 package repositories
 
 import (
-	"echo-demo-project/models"
+	"echo-demo-project/internal/models"
 
 	"gorm.io/gorm"
 )

diff --git a/repositories/user_repository.go → internal/repositories/user_repository.go b/repositories/user_repository.go → internal/repositories/user_repository.go
@@ -1,7 +1,7 @@
 package repositories
 
 import (
-	"echo-demo-project/models"
+	"echo-demo-project/internal/models"
 
 	"gorm.io/gorm"
 )

diff --git a/requests/post_requests.go → internal/requests/post_requests.go b/requests/post_requests.go → internal/requests/post_requests.go
diff --git a/requests/user_requests.go → internal/requests/user_requests.go b/requests/user_requests.go → internal/requests/user_requests.go
diff --git a/responses/login_response.go → internal/responses/login_response.go b/responses/login_response.go → internal/responses/login_response.go
diff --git a/responses/posts_response.go → internal/responses/posts_response.go b/responses/posts_response.go → internal/responses/posts_response.go
@@ -1,7 +1,7 @@
 package responses
 
 import (
-	"echo-demo-project/models"
+	"echo-demo-project/internal/models"
 )
 
 type PostResponse struct {

diff --git a/responses/response_wrapper.go → internal/responses/response_wrapper.go b/responses/response_wrapper.go → internal/responses/response_wrapper.go
diff --git a/server/builders/user_builder.go → internal/server/builders/user_builder.go b/server/builders/user_builder.go → internal/server/builders/user_builder.go
@@ -1,6 +1,6 @@
 package builders
 
-import "echo-demo-project/models"
+import "echo-demo-project/internal/models"
 
 type UserBuilder struct {
 	email    string

diff --git a/server/handlers/auth_handler.go → internal/server/handlers/auth_handler.go b/server/handlers/auth_handler.go → internal/server/handlers/auth_handler.go
@@ -1,12 +1,12 @@
 package handlers
 
 import (
-	"echo-demo-project/models"
-	"echo-demo-project/repositories"
-	"echo-demo-project/requests"
-	"echo-demo-project/responses"
-	s "echo-demo-project/server"
-	tokenservice "echo-demo-project/services/token"
+	"echo-demo-project/internal/models"
+	"echo-demo-project/internal/repositories"
+	"echo-demo-project/internal/requests"
+	"echo-demo-project/internal/responses"
+	s "echo-demo-project/internal/server"
+	tokenservice "echo-demo-project/internal/services/token"
 	"fmt"
 	"net/http"
 

diff --git a/server/handlers/post_handler.go → internal/server/handlers/post_handler.go b/server/handlers/post_handler.go → internal/server/handlers/post_handler.go
@@ -1,13 +1,13 @@
 package handlers
 
 import (
-	"echo-demo-project/models"
-	"echo-demo-project/repositories"
-	"echo-demo-project/requests"
-	"echo-demo-project/responses"
-	s "echo-demo-project/server"
-	postservice "echo-demo-project/services/post"
-	"echo-demo-project/services/token"
+	"echo-demo-project/internal/models"
+	"echo-demo-project/internal/repositories"
+	"echo-demo-project/internal/requests"
+	"echo-demo-project/internal/responses"
+	s "echo-demo-project/internal/server"
+	postservice "echo-demo-project/internal/services/post"
+	"echo-demo-project/internal/services/token"
 	"net/http"
 	"strconv"
 

diff --git a/server/handlers/register_handler.go → internal/server/handlers/register_handler.go b/server/handlers/register_handler.go → internal/server/handlers/register_handler.go
@@ -1,12 +1,12 @@
 package handlers
 
 import (
-	"echo-demo-project/models"
-	"echo-demo-project/repositories"
-	"echo-demo-project/requests"
-	"echo-demo-project/responses"
-	s "echo-demo-project/server"
-	"echo-demo-project/services/user"
+	"echo-demo-project/internal/models"
+	"echo-demo-project/internal/repositories"
+	"echo-demo-project/internal/requests"
+	"echo-demo-project/internal/responses"
+	s "echo-demo-project/internal/server"
+	"echo-demo-project/internal/services/user"
 	"net/http"
 
 	"github.com/labstack/echo/v4"

diff --git a/server/routes/routes.go → internal/server/routes/routes.go b/server/routes/routes.go → internal/server/routes/routes.go
@@ -1,9 +1,9 @@
 package routes
 
 import (
-	s "echo-demo-project/server"
-	"echo-demo-project/server/handlers"
-	"echo-demo-project/services/token"
+	s "echo-demo-project/internal/server"
+	"echo-demo-project/internal/server/handlers"
+	"echo-demo-project/internal/services/token"
 	"fmt"
 
 	"github.com/golang-jwt/jwt/v5"

diff --git a/server/server.go → internal/server/server.go b/server/server.go → internal/server/server.go
@@ -1,8 +1,8 @@
 package server
 
 import (
-	"echo-demo-project/config"
-	"echo-demo-project/db"
+	"echo-demo-project/internal/config"
+	"echo-demo-project/internal/db"
 
 	"github.com/labstack/echo/v4"
 	"gorm.io/gorm"

diff --git a/services/post/create.go → internal/services/post/create.go b/services/post/create.go → internal/services/post/create.go
@@ -1,6 +1,6 @@
 package post
 
-import "echo-demo-project/models"
+import "echo-demo-project/internal/models"
 
 func (postService *Service) Create(post *models.Post) {
 	postService.DB.Create(post)

diff --git a/services/post/delete.go → internal/services/post/delete.go b/services/post/delete.go → internal/services/post/delete.go
@@ -1,6 +1,6 @@
 package post
 
-import "echo-demo-project/models"
+import "echo-demo-project/internal/models"
 
 func (postService *Service) Delete(post *models.Post) {
 	postService.DB.Delete(post)

diff --git a/services/post/service.go → internal/services/post/service.go b/services/post/service.go → internal/services/post/service.go
@@ -1,8 +1,8 @@
 package post
 
 import (
-	"echo-demo-project/models"
-	"echo-demo-project/requests"
+	"echo-demo-project/internal/models"
+	"echo-demo-project/internal/requests"
 
 	"gorm.io/gorm"
 )

diff --git a/services/post/update.go → internal/services/post/update.go b/services/post/update.go → internal/services/post/update.go
@@ -1,8 +1,8 @@
 package post
 
 import (
-	"echo-demo-project/models"
-	"echo-demo-project/requests"
+	"echo-demo-project/internal/models"
+	"echo-demo-project/internal/requests"
 )
 
 func (postService *Service) Update(post *models.Post, updatePostRequest *requests.UpdatePostRequest) {

diff --git a/services/token/create_access_token.go → ...nal/services/token/create_access_token.go b/services/token/create_access_token.go → ...nal/services/token/create_access_token.go
@@ -1,7 +1,7 @@
 package token
 
 import (
-	"echo-demo-project/models"
+	"echo-demo-project/internal/models"
 	"time"
 
 	"github.com/golang-jwt/jwt/v5"

diff --git a/services/token/create_refresh_token.go → ...al/services/token/create_refresh_token.go b/services/token/create_refresh_token.go → ...al/services/token/create_refresh_token.go
@@ -1,7 +1,7 @@
 package token
 
 import (
-	"echo-demo-project/models"
+	"echo-demo-project/internal/models"
 	"time"
 
 	"github.com/golang-jwt/jwt/v5"

diff --git a/services/token/service.go → internal/services/token/service.go b/services/token/service.go → internal/services/token/service.go
@@ -1,8 +1,8 @@
 package token
 
 import (
-	"echo-demo-project/config"
-	"echo-demo-project/models"
+	"echo-demo-project/internal/config"
+	"echo-demo-project/internal/models"
 
 	"github.com/golang-jwt/jwt/v5"
 )

diff --git a/services/user/register.go → internal/services/user/register.go b/services/user/register.go → internal/services/user/register.go
@@ -1,8 +1,8 @@
 package user
 
 import (
-	"echo-demo-project/requests"
-	"echo-demo-project/server/builders"
+	"echo-demo-project/internal/requests"
+	"echo-demo-project/internal/server/builders"
 
 	"golang.org/x/crypto/bcrypt"
 )

diff --git a/services/user/service.go → internal/services/user/service.go b/services/user/service.go → internal/services/user/service.go
@@ -1,7 +1,7 @@
 package user
 
 import (
-	"echo-demo-project/requests"
+	"echo-demo-project/internal/requests"
 
 	"gorm.io/gorm"
 )

diff --git a/tests/auth_test.go b/tests/auth_test.go
@@ -2,25 +2,26 @@ package tests
 
 import (
 	"database/sql/driver"
-	"echo-demo-project/config"
-	"echo-demo-project/models"
-	"echo-demo-project/requests"
-	"echo-demo-project/responses"
-	"echo-demo-project/server"
-	"echo-demo-project/server/handlers"
-	"echo-demo-project/services/token"
+	"echo-demo-project/internal/config"
+	"echo-demo-project/internal/models"
+	"echo-demo-project/internal/requests"
+	"echo-demo-project/internal/responses"
+	"echo-demo-project/internal/server"
+	"echo-demo-project/internal/server/handlers"
+	"echo-demo-project/internal/services/token"
 	"echo-demo-project/tests/helpers"
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
 	"github.com/DATA-DOG/go-sqlmock"
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/crypto/bcrypt"
-	"net/http"
-	"net/http/httptest"
-	"testing"
 )
 
 func TestWalkAuth(t *testing.T) {

diff --git a/tests/helpers/server.go b/tests/helpers/server.go
@@ -1,8 +1,9 @@
 package helpers
 
 import (
-	"echo-demo-project/config"
-	"echo-demo-project/server"
+	"echo-demo-project/internal/config"
+	"echo-demo-project/internal/server"
+
 	"github.com/labstack/echo/v4"
 	"gorm.io/gorm"
 )

diff --git a/tests/helpers/test_case.go b/tests/helpers/test_case.go
@@ -2,7 +2,7 @@ package helpers
 
 import (
 	"database/sql/driver"
-	"echo-demo-project/server"
+	"echo-demo-project/internal/server"
 	"encoding/json"
 	"github.com/DATA-DOG/go-sqlmock"
 	"github.com/labstack/echo/v4"

diff --git a/tests/post_test.go b/tests/post_test.go
@@ -2,17 +2,18 @@ package tests
 
 import (
 	"database/sql/driver"
-	"echo-demo-project/requests"
-	"echo-demo-project/server"
-	"echo-demo-project/server/handlers"
-	"echo-demo-project/services/token"
+	"echo-demo-project/internal/requests"
+	"echo-demo-project/internal/server"
+	"echo-demo-project/internal/server/handlers"
+	"echo-demo-project/internal/services/token"
 	"echo-demo-project/tests/helpers"
+	"net/http"
+	"testing"
+
 	"github.com/DATA-DOG/go-sqlmock"
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"
-	"net/http"
-	"testing"
 )
 
 const postId = "1"

diff --git a/tests/register_test.go b/tests/register_test.go
@@ -2,15 +2,16 @@ package tests
 
 import (
 	"database/sql/driver"
-	"echo-demo-project/requests"
-	"echo-demo-project/server"
-	"echo-demo-project/server/handlers"
+	"echo-demo-project/internal/requests"
+	"echo-demo-project/internal/server"
+	"echo-demo-project/internal/server/handlers"
 	"echo-demo-project/tests/helpers"
+	"net/http"
+	"testing"
+
 	"github.com/DATA-DOG/go-sqlmock"
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"
-	"net/http"
-	"testing"
 )
 
 func TestWalkRegister(t *testing.T) {