Resolve "Move DTOs from service to ports"

ctrl/internal/core/ports/routing.go

@@ -4,13 +4,40 @@ import (
 	"context"
 
 	"code.fbi.h-da.de/danet/costaquanta/ctrl/internal/core/model"
-	"code.fbi.h-da.de/danet/costaquanta/ctrl/internal/service"
 )
 
 type RoutingService interface {
-	RequestRoute(context.Context, service.RequestRouteDTO) (model.Route, error)
-	AnnouncePayloadRelay(context.Context, service.AnnouncePayloadRelayRequestDTO) error
-	PayloadRelayFinished(context.Context, service.PayloadRelayFinishedRequestDTO) error
-	PayloadRelayError(context.Context, service.PayloadRelayErrorDTO) error
-	PushKeyStoreFillLevel(context.Context, service.PushKeyStoreFillLevelRequestDTO) error
+	RequestRoute(context.Context, RequestRouteDTO) (model.Route, error)
+	AnnouncePayloadRelay(context.Context, AnnouncePayloadRelayRequestDTO) error
+	PayloadRelayFinished(context.Context, PayloadRelayFinishedRequestDTO) error
+	PayloadRelayError(context.Context, PayloadRelayErrorDTO) error
+	PushKeyStoreFillLevel(context.Context, PushKeyStoreFillLevelRequestDTO) error
+}
+
+type RequestRouteDTO struct {
+	SourceKMSID     string
+	TargetKMSID     string
+	CryptoAlgorithm model.RoutingCryptoAlgorithm
+}
+
+type AnnouncePayloadRelayRequestDTO struct {
+	RequestID string
+	RouteID   string
+}
+
+type PayloadRelayFinishedRequestDTO struct {
+	RequestID string
+	RouteID   string
+}
+
+type PayloadRelayErrorDTO struct {
+	RequestID string
+	RouteID   string
+	ErrorType string
+}
+
+type PushKeyStoreFillLevelRequestDTO struct {
+	KMSID     string
+	PeerID    string
+	FillLevel int64
 }

ctrl/internal/infrastructure/interaction/routing.go

@@ -44,7 +44,7 @@ func (r *RoutingServer) RequestRoute(
 	_, span := r.tracer.Start(ctx, "request-route")
 	defer span.End()
 
-	dto := service.RequestRouteDTO{
+	dto := ports.RequestRouteDTO{
 		SourceKMSID: req.GetSourceKmsId(),
 		TargetKMSID: req.GetTargetKmsId(),
 		// TODO: I'm pretty sure this doesn't work yet.
@@ -70,7 +70,7 @@ func (r *RoutingServer) AnnouncePayloadRelay(
 	_, span := r.tracer.Start(ctx, "announce-payload-relay")
 	defer span.End()
 
-	dto := service.AnnouncePayloadRelayRequestDTO{
+	dto := ports.AnnouncePayloadRelayRequestDTO{
 		RequestID: req.GetRequestId(),
 		RouteID:   req.GetRouteId(),
 	}
@@ -90,7 +90,7 @@ func (r *RoutingServer) PayloadRelayFinished(
 	_, span := r.tracer.Start(ctx, "payload-relay-finished")
 	defer span.End()
 
-	dto := service.PayloadRelayFinishedRequestDTO{
+	dto := ports.PayloadRelayFinishedRequestDTO{
 		RequestID: req.GetRequestId(),
 		RouteID:   req.GetRouteId(),
 	}
@@ -110,7 +110,7 @@ func (r *RoutingServer) PayloadRelayError(
 	_, span := r.tracer.Start(ctx, "payload-relay-error")
 	defer span.End()
 
-	dto := service.PayloadRelayErrorDTO{
+	dto := ports.PayloadRelayErrorDTO{
 		RequestID: req.GetRequestId(),
 		RouteID:   req.GetRouteId(),
 		ErrorType: req.GetError().Enum().String(),
@@ -131,7 +131,7 @@ func (r *RoutingServer) PushKeyStoreFillLevel(
 	_, span := r.tracer.Start(ctx, "push-key-store-fill-level")
 	defer span.End()
 
-	dto := service.PushKeyStoreFillLevelRequestDTO{
+	dto := ports.PushKeyStoreFillLevelRequestDTO{
 		KMSID:     req.GetKmsId(),
 		PeerID:    req.GetPeerId(),
 		FillLevel: req.GetFillLevel(),

ctrl/internal/service/routing.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"code.fbi.h-da.de/danet/costaquanta/ctrl/internal/core/model"
+	"code.fbi.h-da.de/danet/costaquanta/ctrl/internal/core/ports"
 	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
 )
@@ -14,34 +15,6 @@ type Routing struct {
 	tracer trace.Tracer
 }
 
-type RequestRouteDTO struct {
-	SourceKMSID     string
-	TargetKMSID     string
-	CryptoAlgorithm model.RoutingCryptoAlgorithm
-}
-
-type AnnouncePayloadRelayRequestDTO struct {
-	RequestID string
-	RouteID   string
-}
-
-type PayloadRelayFinishedRequestDTO struct {
-	RequestID string
-	RouteID   string
-}
-
-type PayloadRelayErrorDTO struct {
-	RequestID string
-	RouteID   string
-	ErrorType string
-}
-
-type PushKeyStoreFillLevelRequestDTO struct {
-	KMSID     string
-	PeerID    string
-	FillLevel int64
-}
-
 func NewRoutingService(logger *zap.SugaredLogger, tracer trace.Tracer) *Routing {
 	return &Routing{
 		logger: logger,
@@ -49,7 +22,10 @@ func NewRoutingService(logger *zap.SugaredLogger, tracer trace.Tracer) *Routing
 	}
 }
 
-func (r *Routing) RequestRoute(ctx context.Context, req RequestRouteDTO) (model.Route, error) {
+func (r *Routing) RequestRoute(
+	ctx context.Context,
+	req ports.RequestRouteDTO,
+) (model.Route, error) {
 	_, span := r.tracer.Start(ctx, "request-route")
 	defer span.End()
 
@@ -63,7 +39,7 @@ func (r *Routing) RequestRoute(ctx context.Context, req RequestRouteDTO) (model.
 
 func (r *Routing) AnnouncePayloadRelay(
 	ctx context.Context,
-	req AnnouncePayloadRelayRequestDTO,
+	req ports.AnnouncePayloadRelayRequestDTO,
 ) error {
 	_, span := r.tracer.Start(ctx, "announce-payload-relay")
 	defer span.End()
@@ -75,7 +51,7 @@ func (r *Routing) AnnouncePayloadRelay(
 
 func (r *Routing) PayloadRelayFinished(
 	ctx context.Context,
-	req PayloadRelayFinishedRequestDTO,
+	req ports.PayloadRelayFinishedRequestDTO,
 ) error {
 	_, span := r.tracer.Start(ctx, "payload-relay-finished")
 	defer span.End()
@@ -83,7 +59,7 @@ func (r *Routing) PayloadRelayFinished(
 	return nil
 }
 
-func (r *Routing) PayloadRelayError(ctx context.Context, req PayloadRelayErrorDTO) error {
+func (r *Routing) PayloadRelayError(ctx context.Context, req ports.PayloadRelayErrorDTO) error {
 	_, span := r.tracer.Start(ctx, "payload-relay-error")
 	defer span.End()
 
@@ -92,7 +68,7 @@ func (r *Routing) PayloadRelayError(ctx context.Context, req PayloadRelayErrorDT
 
 func (r *Routing) PushKeyStoreFillLevel(
 	ctx context.Context,
-	req PushKeyStoreFillLevelRequestDTO,
+	req ports.PushKeyStoreFillLevelRequestDTO,
 ) error {
 	_, span := r.tracer.Start(ctx, "push-key-store-fill-level")
 	defer span.End()

ctrl/internal/service/routing_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"code.fbi.h-da.de/danet/costaquanta/ctrl/internal/core/model"
+	"code.fbi.h-da.de/danet/costaquanta/ctrl/internal/core/ports"
 	"go.opentelemetry.io/otel/trace"
 	"go.opentelemetry.io/otel/trace/noop"
 	"go.uber.org/zap"
@@ -57,7 +58,7 @@ func TestRouting_RequestRoute(t *testing.T) {
 	}
 	type args struct {
 		ctx context.Context
-		req RequestRouteDTO
+		req ports.RequestRouteDTO
 	}
 	tests := []struct {
 		name    string
@@ -97,7 +98,7 @@ func TestRouting_AnnouncePayloadRelay(t *testing.T) {
 	}
 	type args struct {
 		ctx context.Context
-		req AnnouncePayloadRelayRequestDTO
+		req ports.AnnouncePayloadRelayRequestDTO
 	}
 	tests := []struct {
 		name    string
@@ -130,7 +131,7 @@ func TestRouting_PayloadRelayFinished(t *testing.T) {
 	}
 	type args struct {
 		ctx context.Context
-		req PayloadRelayFinishedRequestDTO
+		req ports.PayloadRelayFinishedRequestDTO
 	}
 	tests := []struct {
 		name    string
@@ -163,7 +164,7 @@ func TestRouting_PayloadRelayError(t *testing.T) {
 	}
 	type args struct {
 		ctx context.Context
-		req PayloadRelayErrorDTO
+		req ports.PayloadRelayErrorDTO
 	}
 	tests := []struct {
 		name    string
@@ -196,7 +197,7 @@ func TestRouting_PushKeyStoreFillLevel(t *testing.T) {
 	}
 	type args struct {
 		ctx context.Context
-		req PushKeyStoreFillLevelRequestDTO
+		req ports.PushKeyStoreFillLevelRequestDTO
 	}
 	tests := []struct {
 		name    string