Simplified Cinterface providers and inbound communication handlers un…

…der one single 'infra' layer

README.md

@@ -51,12 +51,10 @@ Go Climb follows the group-by-layer structure:
 │   │       ├── crag.go
 │   │       ├── mock_repository.go
 │   │       └── repository.go
-│   ├── inputports
+│   ├── infra
 │   │   ├── http
 │   │   │   ├── crag
 │   │   │   └── server.go
-│   │   └── sevices.go
-│   ├── outputadapters
 │   │   ├── notification
 │   │   │   └── console
 │   │   ├── services.go
@@ -72,8 +70,6 @@ Go Climb follows the group-by-layer structure:
 - `docs` contains documentation about the application
 - `internal` contains the main implementation of our application. It consists of the three layers of clean architecture + shared utility code under `pkg/`
     - infra
-        - outputadapters
-        - inputports
     - app
     - domain
     - pkg

cmd/main.go

@@ -3,17 +3,16 @@ package main
 
 import (
 	"github.com/pkritiotis/go-climb-clean-architecture-example/internal/app"
-	"github.com/pkritiotis/go-climb-clean-architecture-example/internal/inputports"
-	"github.com/pkritiotis/go-climb-clean-architecture-example/internal/interfaceadapters"
+	"github.com/pkritiotis/go-climb-clean-architecture-example/internal/infra"
 	"github.com/pkritiotis/go-climb-clean-architecture-example/internal/pkg/time"
 	"github.com/pkritiotis/go-climb-clean-architecture-example/internal/pkg/uuid"
 )
 
 func main() {
-	interfaceAdapterServices := interfaceadapters.NewServices()
+	infraProviders := infra.NewInfraProviders()
 	tp := time.NewTimeProvider()
 	up := uuid.NewUUIDProvider()
-	appServices := app.NewServices(interfaceAdapterServices.CragRepository, interfaceAdapterServices.NotificationService, up, tp)
-	inputPortsServices := inputports.NewServices(appServices)
-	inputPortsServices.Server.ListenAndServe(":8080")
+	appServices := app.NewServices(infraProviders.CragRepository, infraProviders.NotificationService, up, tp)
+	infraHTTPServer := infra.NewHTTPServer(appServices)
+	infraHTTPServer.ListenAndServe(":8080")
 }

internal/inputports/http/server.go → internal/infra/http/server.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/pkritiotis/go-climb-clean-architecture-example/internal/app"
-	"github.com/pkritiotis/go-climb-clean-architecture-example/internal/inputports/http/crag"
+	"github.com/pkritiotis/go-climb-clean-architecture-example/internal/infra/http/crag"
 )
 
 // Server Represents the http server running for this service

internal/interfaceadapters/services.go → internal/infra/services.go

@@ -1,23 +1,31 @@
-// Package interfaceadapters contains the services of the interface adapters
-package interfaceadapters
+// Package infra contains the services of the interface adapters
+package infra
 
 import (
+	"github.com/pkritiotis/go-climb-clean-architecture-example/internal/app"
 	"github.com/pkritiotis/go-climb-clean-architecture-example/internal/app/notification"
 	"github.com/pkritiotis/go-climb-clean-architecture-example/internal/domain/crag"
-	"github.com/pkritiotis/go-climb-clean-architecture-example/internal/interfaceadapters/notification/console"
-	"github.com/pkritiotis/go-climb-clean-architecture-example/internal/interfaceadapters/storage/memory"
+	"github.com/pkritiotis/go-climb-clean-architecture-example/internal/infra/http"
+	"github.com/pkritiotis/go-climb-clean-architecture-example/internal/infra/notification/console"
+	"github.com/pkritiotis/go-climb-clean-architecture-example/internal/infra/storage/memory"
 )
 
 // Services contains the exposed services of interface adapters
 type Services struct {
 	NotificationService notification.Service
 	CragRepository      crag.Repository
+	Server              *http.Server
 }
 
-// NewServices Instantiates the interface adapter services
-func NewServices() Services {
+// NewInfraProviders Instantiates the infra services
+func NewInfraProviders() Services {
 	return Services{
 		NotificationService: console.NewNotificationService(),
 		CragRepository:      memory.NewRepo(),
 	}
 }
+
+// NewHTTPServer creates a new server
+func NewHTTPServer(appServices app.Services) *http.Server {
+	return http.NewServer(appServices)
+}