chore(structure): done project structure refactoring

breadrock1 · May 30, 2024 · 03b643d · 03b643d
1 parent df04b05
commit 03b643d
Show file tree

Hide file tree

Showing 19 changed files with 30 additions and 28 deletions.
diff --git a/cmd/resizer/resizer.go b/cmd/resizer/resizer.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"image-resize-service/cmd"
-	"image-resize-service/internal/pkg/app"
+	"image-resize-service/internal/app"
 )
 
 func main() {

diff --git a/cmd/root.go b/cmd/root.go
@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"image-resize-service/internal/pkg/config"
+	"image-resize-service/internal/config"
 )
 
 var rootCmd = &cobra.Command{

diff --git a/internal/pkg/app/app.go → internal/app/app.go b/internal/pkg/app/app.go → internal/app/app.go
@@ -7,11 +7,11 @@ import (
 	"os/signal"
 	"syscall"
 
-	"image-resize-service/internal/app/cache"
-	"image-resize-service/internal/app/resizer"
-	"image-resize-service/internal/app/server"
-	"image-resize-service/internal/app/storage"
-	"image-resize-service/internal/pkg/config"
+	"image-resize-service/internal/cache"
+	"image-resize-service/internal/config"
+	"image-resize-service/internal/resizer"
+	"image-resize-service/internal/server"
+	"image-resize-service/internal/storage"
 )
 
 type App struct {

diff --git a/internal/app/cache/cache.go → internal/cache/cache.go b/internal/app/cache/cache.go → internal/cache/cache.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/golang-lru/v2/expirable"
-	"image-resize-service/internal/pkg/config"
+	"image-resize-service/internal/config"
 )
 
 type Memcache struct {

diff --git a/internal/app/cache/public.go → internal/cache/public.go b/internal/app/cache/public.go → internal/cache/public.go
@@ -1,7 +1,7 @@
 package cache
 
 import (
-	"image-resize-service/internal/pkg/config"
+	"image-resize-service/internal/config"
 )
 
 type Cache interface {

diff --git a/internal/pkg/config/config.go → internal/config/config.go b/internal/pkg/config/config.go → internal/config/config.go
diff --git a/internal/app/resizer/public.go → internal/resizer/public.go b/internal/app/resizer/public.go → internal/resizer/public.go
@@ -1,6 +1,8 @@
 package resizer
 
-import "image-resize-service/internal/pkg/config"
+import (
+	"image-resize-service/internal/config"
+)
 
 type Resizer interface {
 	ResizeService

diff --git a/internal/app/resizer/resizer.go → internal/resizer/resizer.go b/internal/app/resizer/resizer.go → internal/resizer/resizer.go
@@ -6,7 +6,7 @@ import (
 	"image"
 
 	"github.com/disintegration/imaging"
-	"image-resize-service/internal/pkg/config"
+	"image-resize-service/internal/config"
 )
 
 type Service struct {

diff --git a/internal/app/server/forms.go → internal/server/forms.go b/internal/app/server/forms.go → internal/server/forms.go
diff --git a/internal/app/server/mws.go → internal/server/mws.go b/internal/app/server/mws.go → internal/server/mws.go
diff --git a/internal/app/server/routers.go → internal/server/routers.go b/internal/app/server/routers.go → internal/server/routers.go
diff --git a/internal/app/server/server.go → internal/server/server.go b/internal/app/server/server.go → internal/server/server.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
-	"image-resize-service/internal/app/cache"
-	"image-resize-service/internal/app/resizer"
-	"image-resize-service/internal/app/storage"
-	"image-resize-service/internal/pkg/config"
+	"image-resize-service/internal/cache"
+	"image-resize-service/internal/config"
+	"image-resize-service/internal/resizer"
+	"image-resize-service/internal/storage"
 )
 
 // @title Swagger Example API

diff --git a/internal/app/storage/error.go → internal/storage/error.go b/internal/app/storage/error.go → internal/storage/error.go
diff --git a/internal/app/storage/public.go → internal/storage/public.go b/internal/app/storage/public.go → internal/storage/public.go
@@ -3,7 +3,7 @@ package storage
 import (
 	"net/http"
 
-	"image-resize-service/internal/pkg/config"
+	"image-resize-service/internal/config"
 )
 
 type Storage interface {

diff --git a/internal/app/storage/storage.go → internal/storage/storage.go b/internal/app/storage/storage.go → internal/storage/storage.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/google/uuid"
-	"image-resize-service/internal/pkg/config"
+	"image-resize-service/internal/config"
 )
 
 type Service struct {

diff --git a/tests/integration/server_test.go b/tests/integration/server_test.go
@@ -9,11 +9,11 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"image-resize-service/internal/app/cache"
-	"image-resize-service/internal/app/resizer"
-	"image-resize-service/internal/app/server"
-	"image-resize-service/internal/app/storage"
-	"image-resize-service/internal/pkg/config"
+	"image-resize-service/internal/cache"
+	"image-resize-service/internal/config"
+	"image-resize-service/internal/resizer"
+	"image-resize-service/internal/server"
+	"image-resize-service/internal/storage"
 	"image-resize-service/tests/integration/service"
 )
 

diff --git a/tests/unit/cacher/cacher_test.go b/tests/unit/cacher/cacher_test.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/magiconair/properties/assert"
-	"image-resize-service/internal/app/cache"
-	"image-resize-service/internal/pkg/config"
+	"image-resize-service/internal/cache"
+	"image-resize-service/internal/config"
 )
 
 const (

diff --git a/tests/unit/resizer/resizer_test.go b/tests/unit/resizer/resizer_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"image-resize-service/internal/app/resizer"
-	"image-resize-service/internal/pkg/config"
+	"image-resize-service/internal/config"
+	"image-resize-service/internal/resizer"
 )
 
 func TestResizer(t *testing.T) {

diff --git a/tests/unit/storage/storage_test.go b/tests/unit/storage/storage_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"image-resize-service/internal/app/storage"
-	"image-resize-service/internal/pkg/config"
+	"image-resize-service/internal/config"
+	"image-resize-service/internal/storage"
 )
 
 const (