Refactor project structure

weesvc · May 19, 2024 · 0232e6b · 0232e6b
1 parent e9d6e8f
commit 0232e6b
Show file tree

Hide file tree

Showing 20 changed files with 17 additions and 14 deletions.
diff --git a/cmd/migrate.go b/cmd/migrate.go
@@ -8,8 +8,8 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	"github.com/weesvc/weesvc-gorilla/app"
-	"github.com/weesvc/weesvc-gorilla/migrations"
+	"github.com/weesvc/weesvc-gorilla/internal/app"
+	"github.com/weesvc/weesvc-gorilla/internal/migrations"
 )
 
 var migrateCmd = &cobra.Command{

diff --git a/cmd/serve.go b/cmd/serve.go
@@ -14,8 +14,8 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	"github.com/weesvc/weesvc-gorilla/api"
-	"github.com/weesvc/weesvc-gorilla/app"
+	"github.com/weesvc/weesvc-gorilla/internal/api"
+	"github.com/weesvc/weesvc-gorilla/internal/app"
 )
 
 func serveAPI(ctx context.Context, api *api.API) {

diff --git a/cmd/version.go b/cmd/version.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/weesvc/weesvc-gorilla/env"
+	"github.com/weesvc/weesvc-gorilla/internal/env"
 )
 
 var versionCmd = &cobra.Command{

diff --git a/api/api.go → internal/api/api.go b/api/api.go → internal/api/api.go
@@ -15,7 +15,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/sirupsen/logrus"
 
-	"github.com/weesvc/weesvc-gorilla/app"
+	"github.com/weesvc/weesvc-gorilla/internal/app"
 )
 
 type statusCodeRecorder struct {

diff --git a/api/api_contract_test.go → internal/api/api_contract_test.go b/api/api_contract_test.go → internal/api/api_contract_test.go
diff --git a/api/api_test.go → internal/api/api_test.go b/api/api_test.go → internal/api/api_test.go
diff --git a/api/config.go → internal/api/config.go b/api/config.go → internal/api/config.go
diff --git a/api/place.go → internal/api/place.go b/api/place.go → internal/api/place.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/weesvc/weesvc-gorilla/app"
-	"github.com/weesvc/weesvc-gorilla/model"
+	"github.com/weesvc/weesvc-gorilla/internal/app"
+	"github.com/weesvc/weesvc-gorilla/internal/model"
 )
 
 func (a *API) getPlaces(ctx *app.Context, w http.ResponseWriter, _ *http.Request) error {

diff --git a/app/app.go → internal/app/app.go b/app/app.go → internal/app/app.go
@@ -4,7 +4,7 @@ package app
 import (
 	"github.com/sirupsen/logrus"
 
-	"github.com/weesvc/weesvc-gorilla/db"
+	"github.com/weesvc/weesvc-gorilla/internal/db"
 )
 
 // App defines the main application state and behaviors.

diff --git a/app/context.go → internal/app/context.go b/app/context.go → internal/app/context.go
@@ -4,7 +4,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/sirupsen/logrus"
 
-	"github.com/weesvc/weesvc-gorilla/db"
+	"github.com/weesvc/weesvc-gorilla/internal/db"
 )
 
 // Context provides for a request-scoped context.

diff --git a/app/place.go → internal/app/place.go b/app/place.go → internal/app/place.go
@@ -1,6 +1,8 @@
 package app
 
-import "github.com/weesvc/weesvc-gorilla/model"
+import (
+	"github.com/weesvc/weesvc-gorilla/internal/model"
+)
 
 // GetPlaces returns available places.
 func (ctx *Context) GetPlaces() ([]*model.Place, error) {

diff --git a/db/config.go → internal/db/config.go b/db/config.go → internal/db/config.go
diff --git a/db/db.go → internal/db/db.go b/db/db.go → internal/db/db.go
diff --git a/db/place.go → internal/db/place.go b/db/place.go → internal/db/place.go
@@ -3,7 +3,7 @@ package db
 import (
 	"github.com/pkg/errors"
 
-	"github.com/weesvc/weesvc-gorilla/model"
+	"github.com/weesvc/weesvc-gorilla/internal/model"
 )
 
 // GetPlaces retrieves all available places from the database.

diff --git a/db/place_test.go → internal/db/place_test.go b/db/place_test.go → internal/db/place_test.go
@@ -5,7 +5,8 @@ import (
 	"log"
 	"testing"
 
-	"github.com/weesvc/weesvc-gorilla/model"
+	"github.com/weesvc/weesvc-gorilla/internal/model"
+
 	"github.com/weesvc/weesvc-gorilla/testhelpers"
 
 	"github.com/stretchr/testify/assert"

diff --git a/env/version.go → internal/env/version.go b/env/version.go → internal/env/version.go
diff --git a/migrations/0001_create_places.go → internal/migrations/0001_create_places.go b/migrations/0001_create_places.go → internal/migrations/0001_create_places.go
diff --git a/migrations/migrate.go → internal/migrations/migrate.go b/migrations/migrate.go → internal/migrations/migrate.go
diff --git a/model/place.go → internal/model/place.go b/model/place.go → internal/model/place.go
diff --git a/testhelpers/containers.go b/testhelpers/containers.go
@@ -23,7 +23,7 @@ type PostgresContainer struct {
 func CreatePostgresContainer(ctx context.Context) (*PostgresContainer, error) {
 	pgContainer, err := postgres.RunContainer(ctx,
 		testcontainers.WithImage("postgres:15.3-alpine"),
-		postgres.WithInitScripts(filepath.Join("..", "testdata", "init-db.sql")),
+		postgres.WithInitScripts(filepath.Join("..", "..", "testdata", "init-db.sql")),
 		postgres.WithDatabase("test-db"),
 		postgres.WithUsername("postgres"),
 		postgres.WithPassword("postgres"),