Improve package structure

cmd/bwizard/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"bwizard/internal/pkg/ssh"
 	"bwizard/internal/pkg/wizard/application"
-	"bwizard/internal/pkg/wizard/infrastructure/mysql"
+	"bwizard/internal/pkg/wizard/infrastructure/postgres"
 	"bwizard/internal/pkg/wizardapi"
 	"github.com/rs/zerolog"
 	"os"
@@ -35,7 +35,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	db, err := mysql.Connect(&logger)
+	db, err := postgres.Connect(&logger)
 	if err != nil {
 		logger.Error().Msg(err.Error())
 		os.Exit(1)

internal/pkg/wizard/application/application.go

@@ -1,12 +1,9 @@
 package application
 
 import (
-	deviceSvcImpl "bwizard/internal/pkg/wizard/application/svc/device"
-	"bwizard/internal/pkg/wizard/domain/entity/device"
-	deviceRepo "bwizard/internal/pkg/wizard/domain/repo/device"
-	deviceSvc "bwizard/internal/pkg/wizard/domain/svc/device"
-	deviceValue "bwizard/internal/pkg/wizard/domain/valueobject/device"
-	deviceRepoImpl "bwizard/internal/pkg/wizard/infrastructure/mysql/repo/device"
+	deviceSvc "bwizard/internal/pkg/wizard/application/device"
+	"bwizard/internal/pkg/wizard/domain/device"
+	deviceRepo "bwizard/internal/pkg/wizard/infrastructure/postgres/device"
 	"context"
 	"errors"
 	_ "github.com/doug-martin/goqu/v9/dialect/mysql"
@@ -16,21 +13,21 @@ import (
 
 type Application interface {
 	// SetupDevice setups a new device
-	SetupDevice(ctx context.Context, ips []string, kind deviceValue.Kind, name *string) (*device.Device, error)
+	SetupDevice(ctx context.Context, ips []string, kind device.Kind, name *string) (*device.Device, error)
 }
 
 type Impl struct {
 	logger              *zerolog.Logger
-	DeviceRepo          deviceRepo.Repository
-	DeviceInspectionSvc deviceSvc.InspectionService
+	DeviceRepo          device.Repository
+	DeviceInspectionSvc device.InspectionService
 }
 
 var _ Application = &Impl{}
 
 // NewApplication returns a new application
 func NewApplication(logger *zerolog.Logger, db *sqlx.DB) *Impl {
-	deviceRepository := deviceRepoImpl.NewRepository(logger, db)
-	deviceInspectionSvc := deviceSvcImpl.NewInspectionSvc(logger)
+	deviceRepository := deviceRepo.NewRepository(logger, db)
+	deviceInspectionSvc := deviceSvc.NewInspectionSvc(logger)
 
 	return &Impl{
 		logger:              logger,
@@ -40,7 +37,7 @@ func NewApplication(logger *zerolog.Logger, db *sqlx.DB) *Impl {
 }
 
 // SetupDevice setups a new device
-func (i *Impl) SetupDevice(ctx context.Context, ips []string, kind deviceValue.Kind, name *string) (*device.Device, error) {
+func (i *Impl) SetupDevice(ctx context.Context, ips []string, kind device.Kind, name *string) (*device.Device, error) {
 	inspection, err := i.DeviceInspectionSvc.Inspect(ips)
 	if err != nil {
 		return nil, err
@@ -61,7 +58,7 @@ func (i *Impl) SetupDevice(ctx context.Context, ips []string, kind deviceValue.K
 		Name(*name).
 		Hostname(inspection.Hostname).
 		Kind(kind).
-		Protection(deviceValue.ProtectionStatusOk).
+		Protection(device.ProtectionStatusOk).
 		CPU(inspection.CPU).
 		Ram(inspection.Ram).
 		Disks(inspection.Disks).

internal/pkg/wizard/application/svc/device/device.go → internal/pkg/wizard/application/device/svc.go

@@ -3,8 +3,7 @@ package device
 import (
 	"bwizard/internal/pkg/inspect"
 	"bwizard/internal/pkg/ssh"
-	deviceSvc "bwizard/internal/pkg/wizard/domain/svc/device"
-	deviceValue "bwizard/internal/pkg/wizard/domain/valueobject/device"
+	"bwizard/internal/pkg/wizard/domain/device"
 	"github.com/rs/zerolog"
 )
 
@@ -16,7 +15,7 @@ type InspectionSvcImpl struct {
 	logger *zerolog.Logger
 }
 
-var _ deviceSvc.InspectionService = &InspectionSvcImpl{}
+var _ device.InspectionService = &InspectionSvcImpl{}
 
 func NewInspectionSvc(logger *zerolog.Logger) *InspectionSvcImpl {
 	return &InspectionSvcImpl{
@@ -25,7 +24,7 @@ func NewInspectionSvc(logger *zerolog.Logger) *InspectionSvcImpl {
 }
 
 // Inspect gains information from a backup device such like the operating system or the agent
-func (i *InspectionSvcImpl) Inspect(ips []string) (*deviceValue.Inspection, error) {
+func (i *InspectionSvcImpl) Inspect(ips []string) (*device.Inspection, error) {
 	credentials := ssh.Credentials{
 		Username:       "root",
 		PrivateKeyPath: privateKeyPath,
@@ -57,7 +56,7 @@ func (i *InspectionSvcImpl) Inspect(ips []string) (*deviceValue.Inspection, erro
 			return nil, err
 		}
 
-		return deviceValue.NewInspectionFromDeviceInspection(inspection), nil
+		return device.NewInspectionFromDeviceInspection(inspection), nil
 	}
 
 	defer func(clients []*ssh.Client) {

internal/pkg/wizard/domain/entity/device/builder.go → internal/pkg/wizard/domain/device/builder.go

@@ -1,7 +1,6 @@
 package device
 
 import (
-	"bwizard/internal/pkg/wizard/domain/valueobject/device"
 	"github.com/gofrs/uuid/v5"
 	"time"
 )
@@ -34,13 +33,13 @@ func (b *Builder) Hostname(v string) *Builder {
 	return b
 }
 
-func (b *Builder) Kind(v device.Kind) *Builder {
+func (b *Builder) Kind(v Kind) *Builder {
 	b.Device.Kind = v
 
 	return b
 }
 
-func (b *Builder) Protection(v device.ProtectionStatus) *Builder {
+func (b *Builder) Protection(v ProtectionStatus) *Builder {
 	b.Device.Protection = v
 
 	return b

internal/pkg/wizard/domain/entity/device/device.go → internal/pkg/wizard/domain/device/entity.go

@@ -1,7 +1,6 @@
 package device
 
 import (
-	"bwizard/internal/pkg/wizard/domain/valueobject/device"
 	"github.com/gofrs/uuid/v5"
 	"time"
 )
@@ -10,8 +9,8 @@ type Device struct {
 	ID              uuid.UUID
 	Name            string
 	Hostname        string
-	Kind            device.Kind
-	Protection      device.ProtectionStatus
+	Kind            Kind
+	Protection      ProtectionStatus
 	LastBackup      *time.Time
 	CPU             string
 	Ram             string

internal/pkg/wizard/domain/device/repo.go

@@ -0,0 +1,12 @@
+package device
+
+import (
+	"context"
+	"github.com/google/uuid"
+)
+
+type Repository interface {
+	GetDeviceByID(ctx context.Context, id uuid.UUID) (*Device, error)
+	GetDevices(ctx context.Context) ([]*Device, error)
+	SaveDevice(ctx context.Context, device *Device) error
+}

internal/pkg/wizard/domain/device/svc.go

@@ -0,0 +1,5 @@
+package device
+
+type InspectionService interface {
+	Inspect(ips []string) (*Inspection, error)
+}

internal/pkg/wizard/infrastructure/mysql/database.go → internal/pkg/wizard/infrastructure/postgres/database.go

@@ -1,4 +1,4 @@
-package mysql
+package postgres
 
 import (
 	"fmt"

internal/pkg/wizard/infrastructure/mysql/model/device/device.go → internal/pkg/wizard/infrastructure/postgres/device/device.go

@@ -1,28 +1,27 @@
 package device
 
 import (
-	"bwizard/internal/pkg/wizard/domain/entity/device"
-	deviceValue "bwizard/internal/pkg/wizard/domain/valueobject/device"
+	"bwizard/internal/pkg/wizard/domain/device"
 	"github.com/gofrs/uuid/v5"
 	"github.com/lib/pq"
 	"time"
 )
 
 type Device struct {
-	ID              uuid.UUID                    `db:"id"`
-	Name            string                       `db:"name"`
-	Hostname        string                       `db:"hostname"`
-	Kind            deviceValue.Kind             `db:"kind"`
-	Protection      deviceValue.ProtectionStatus `db:"protection"`
-	LastBackup      *time.Time                   `db:"last_backup" goqu:"omitempty"`
-	CPU             string                       `db:"cpu"`
-	Ram             string                       `db:"ram"`
-	Disks           pq.StringArray               `db:"disks"`
-	IPs             pq.StringArray               `db:"ips"`
-	OperatingSystem string                       `db:"operating_system"`
-	Agent           string                       `db:"agent"`
-	CreatedAt       time.Time                    `db:"created_at" goqu:"skipinsert,skipupdate"`
-	UpdatedAt       time.Time                    `db:"updated_at" goqu:"skipinsert"`
+	ID              uuid.UUID               `db:"id"`
+	Name            string                  `db:"name"`
+	Hostname        string                  `db:"hostname"`
+	Kind            device.Kind             `db:"kind"`
+	Protection      device.ProtectionStatus `db:"protection"`
+	LastBackup      *time.Time              `db:"last_backup" goqu:"omitempty"`
+	CPU             string                  `db:"cpu"`
+	Ram             string                  `db:"ram"`
+	Disks           pq.StringArray          `db:"disks"`
+	IPs             pq.StringArray          `db:"ips"`
+	OperatingSystem string                  `db:"operating_system"`
+	Agent           string                  `db:"agent"`
+	CreatedAt       time.Time               `db:"created_at" goqu:"skipinsert,skipupdate"`
+	UpdatedAt       time.Time               `db:"updated_at" goqu:"skipinsert"`
 }
 
 func MapModel(deviceEntity *Device) *device.Device {

internal/pkg/wizard/infrastructure/mysql/repo/device/device.go → internal/pkg/wizard/infrastructure/postgres/device/repo.go

@@ -1,9 +1,7 @@
 package device
 
 import (
-	"bwizard/internal/pkg/wizard/domain/entity/device"
-	device2 "bwizard/internal/pkg/wizard/domain/repo/device"
-	deviceModel "bwizard/internal/pkg/wizard/infrastructure/mysql/model/device"
+	"bwizard/internal/pkg/wizard/domain/device"
 	"context"
 	"database/sql"
 	"errors"
@@ -24,7 +22,7 @@ type Impl struct {
 	db     *sqlx.DB
 }
 
-var _ device2.Repository = &Impl{}
+var _ device.Repository = &Impl{}
 
 // NewRepository returns a new mysql device repository
 func NewRepository(logger *zerolog.Logger, db *sqlx.DB) *Impl {
@@ -65,7 +63,7 @@ func (i *Impl) GetDevices(ctx context.Context) ([]*device.Device, error) {
 	query, _, err := goqu.
 		Dialect(Dialect).
 		From(TableName).
-		Select(&deviceModel.Device{}).
+		Select(&Device{}).
 		ToSQL()
 
 	if err != nil {
@@ -84,12 +82,12 @@ func (i *Impl) GetDevices(ctx context.Context) ([]*device.Device, error) {
 	devices := make([]*device.Device, 0)
 
 	for rows.Next() {
-		var model deviceModel.Device
+		var model Device
 		if scanErr := rows.StructScan(&model); scanErr != nil {
 			return nil, scanErr
 		}
 
-		deviceEntity := deviceModel.MapModel(&model)
+		deviceEntity := MapModel(&model)
 		devices = append(devices, deviceEntity)
 	}
 
@@ -100,7 +98,7 @@ func (i *Impl) GetDevices(ctx context.Context) ([]*device.Device, error) {
 func (i *Impl) SaveDevice(ctx context.Context, device *device.Device) error {
 	i.logger.Debug().Msgf("try to save device %s", device.ID.String())
 
-	model := deviceModel.MapDevice(device)
+	model := MapDevice(device)
 
 	insertSQL, _, _ := goqu.
 		Dialect(Dialect).

internal/pkg/wizardapi/api.go

@@ -3,7 +3,7 @@ package wizardapi
 import (
 	api "bwizard/api/openapi/wizard"
 	"bwizard/internal/pkg/wizard/application"
-	deviceRepo "bwizard/internal/pkg/wizard/domain/repo/device"
+	deviceRepo "bwizard/internal/pkg/wizard/domain/device"
 	"flag"
 	"github.com/labstack/echo/v4"
 	echoMiddleware "github.com/labstack/echo/v4/middleware"

internal/pkg/wizardapi/handler.go

@@ -3,8 +3,7 @@ package wizardapi
 import (
 	"bwizard/api/openapi/wizard"
 	"bwizard/internal/pkg/wizard/application"
-	deviceRepo "bwizard/internal/pkg/wizard/domain/repo/device"
-	deviceValue "bwizard/internal/pkg/wizard/domain/valueobject/device"
+	deviceRepo "bwizard/internal/pkg/wizard/domain/device"
 	"bwizard/internal/pkg/wizardapi/mappings"
 	"context"
 	"github.com/rs/zerolog"
@@ -71,7 +70,7 @@ func (h *Handler) FindDevices(ctx context.Context, request wizard.FindDevicesReq
 }
 
 func (h *Handler) RegisterDevice(ctx context.Context, request wizard.RegisterDeviceRequestObject) (wizard.RegisterDeviceResponseObject, error) {
-	device, err := h.app.SetupDevice(ctx, request.Body.Ips, deviceValue.Kind(request.Body.Kind), request.Body.Name)
+	device, err := h.app.SetupDevice(ctx, request.Body.Ips, deviceRepo.Kind(request.Body.Kind), request.Body.Name)
 	if err != nil {
 		h.logger.Error().Msgf("%s", err.Error())
 

internal/pkg/wizardapi/mappings/device.go

@@ -2,7 +2,7 @@ package mappings
 
 import (
 	"bwizard/api/openapi/wizard"
-	"bwizard/internal/pkg/wizard/domain/entity/device"
+	"bwizard/internal/pkg/wizard/domain/device"
 	"github.com/google/uuid"
 )