evt · evt · Jun 14, 2023 · Jun 14, 2023 · Jun 14, 2023 · Jun 14, 2023
diff --git a/cmd/port-service/main.go b/cmd/port-service/main.go
@@ -9,9 +9,10 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/evt/port-api/config"
-	"github.com/evt/port-api/internal/app"
-	"github.com/evt/port-api/internal/app/ui"
+	"github.com/evt/port-api/internal/config"
+	"github.com/evt/port-api/internal/repository/inmem"
+	"github.com/evt/port-api/internal/services"
+	"github.com/evt/port-api/internal/transport"
 	"github.com/gorilla/mux"
 )
 
@@ -26,14 +27,14 @@ func run() error {
 	// read config from env
 	cfg := config.Read()
 
-	// default context
-	ctx := context.Background()
+	// create port repository
+	portStoreRepo := inmem.NewPortStore()
 
-	// create application
-	application := app.New(ctx)
+	// create port service
+	portService := services.NewPortService(portStoreRepo)
 
 	// create http server with application injected
-	httpServer := ui.NewHttpServer(application)
+	httpServer := transport.NewHttpServer(portService)
 
 	// create http router
 	router := mux.NewRouter()

diff --git a/internal/app/adapters/model.go b/internal/app/adapters/model.go
diff --git a/internal/app/adapters/port_store_inmem.go b/internal/app/adapters/port_store_inmem.go
diff --git a/internal/app/adapters/port_store_inmem_test.go b/internal/app/adapters/port_store_inmem_test.go
diff --git a/internal/app/app.go b/internal/app/app.go
diff --git a/internal/app/command/create_or_update_port.go b/internal/app/command/create_or_update_port.go
diff --git a/internal/app/command/create_or_update_port_integration_test.go b/internal/app/command/create_or_update_port_integration_test.go
diff --git a/internal/app/query/count_ports.go b/internal/app/query/count_ports.go