Refactor data service: rename streaming files, update gRPC service methods, and enhance stream management

services/data_service/internal/server/gprc_control_server.go

@@ -0,0 +1,69 @@
+package server
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/google/uuid"
+	pb "gitlab.michelsen.id/phillmichelsen/tessera/pkg/pb/data_service"
+	"gitlab.michelsen.id/phillmichelsen/tessera/services/data_service/internal/domain"
+	"gitlab.michelsen.id/phillmichelsen/tessera/services/data_service/internal/manager"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+type GRPCControlServer struct {
+	pb.UnimplementedDataServiceControlServer
+	manager *manager.Manager
+}
+
+func NewGRPCControlServer(m *manager.Manager) *GRPCControlServer {
+	return &GRPCControlServer{
+		manager: m,
+	}
+}
+
+func (s *GRPCControlServer) StartStream(_ context.Context, _ *pb.StartStreamRequest) (*pb.StartStreamResponse, error) {
+	streamID, err := s.manager.StartStream()
+	if err != nil {
+		return nil, fmt.Errorf("failed to start stream: %w", err)
+	}
+
+	return &pb.StartStreamResponse{StreamUuid: streamID.String()}, nil
+}
+
+func (s *GRPCControlServer) ConfigureStream(_ context.Context, req *pb.ConfigureStreamRequest) (*pb.ConfigureStreamResponse, error) {
+	streamID, err := uuid.Parse(req.StreamUuid)
+	if err != nil {
+		return nil, status.Errorf(codes.InvalidArgument, "invalid stream_uuid %q: %v", req.StreamUuid, err)
+	}
+
+	// Transform identifiers from protobuf to domain format
+	var ids []domain.Identifier
+	for _, i := range req.Identifiers {
+		ids = append(ids, domain.Identifier{
+			Provider: i.Provider,
+			Subject:  i.Subject,
+		})
+	}
+
+	if err := s.manager.ConfigureStream(streamID, ids); err != nil {
+		return nil, status.Errorf(codes.InvalidArgument, "configure failed: %v", err)
+	}
+
+	return &pb.ConfigureStreamResponse{}, nil
+}
+
+func (s *GRPCControlServer) StopStream(_ context.Context, req *pb.StopStreamRequest) (*pb.StopStreamResponse, error) {
+	streamID, err := uuid.Parse(req.StreamUuid)
+	if err != nil {
+		return nil, status.Errorf(codes.InvalidArgument, "invalid stream_uuid %q: %v", req.StreamUuid, err)
+	}
+
+	err = s.manager.StopStream(streamID) // Should only error if the stream doesn't exist
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, "failed to stop stream: %v", err)
+	}
+
+	return &pb.StopStreamResponse{}, nil
+}

services/data_service/internal/server/grpc_streaming_server.go

@@ -1,11 +1,10 @@
 package server
 
 import (
-	"context"
 	"fmt"
+
 	"github.com/google/uuid"
 	pb "gitlab.michelsen.id/phillmichelsen/tessera/pkg/pb/data_service"
-	"gitlab.michelsen.id/phillmichelsen/tessera/services/data_service/internal/domain"
 	"gitlab.michelsen.id/phillmichelsen/tessera/services/data_service/internal/manager"
 )
 
@@ -20,23 +19,6 @@ func NewGRPCStreamingServer(m *manager.Manager) *GRPCStreamingServer {
 	}
 }
 
-func (s *GRPCStreamingServer) StartStream(ctx context.Context, req *pb.StartStreamRequest) (*pb.StartStreamResponse, error) {
-	var ids []domain.Identifier
-	for _, id := range req.Identifiers {
-		ids = append(ids, domain.Identifier{
-			Provider: id.Provider,
-			Subject:  id.Subject,
-		})
-	}
-
-	streamID, err := s.manager.StartStream(ids)
-	if err != nil {
-		return nil, fmt.Errorf("failed to start stream: %w", err)
-	}
-
-	return &pb.StartStreamResponse{StreamUuid: streamID.String()}, nil
-}
-
 func (s *GRPCStreamingServer) ConnectStream(req *pb.ConnectStreamRequest, stream pb.DataServiceStreaming_ConnectStreamServer) error {
 	streamUUID, err := uuid.Parse(req.StreamUuid)
 	if err != nil {
@@ -63,7 +45,7 @@ func (s *GRPCStreamingServer) ConnectStream(req *pb.ConnectStreamRequest, stream
 					Provider: msg.Identifier.Provider,
 					Subject:  msg.Identifier.Subject,
 				},
-				Payload: fmt.Sprintf("%s", msg.Payload),
+				Payload: fmt.Sprintf("%v", msg.Payload),
 			})
 
 			if err != nil {

services/data_service/internal/server/socket_streaming_server.go

@@ -4,11 +4,12 @@ import (
 	"bufio"
 	"encoding/json"
 	"fmt"
-	"github.com/google/uuid"
-	"gitlab.michelsen.id/phillmichelsen/tessera/services/data_service/internal/manager"
 	"io"
 	"net"
 	"strings"
+
+	"github.com/google/uuid"
+	"gitlab.michelsen.id/phillmichelsen/tessera/services/data_service/internal/manager"
 )
 
 type SocketStreamingServer struct {
@@ -34,7 +35,14 @@ func (s *SocketStreamingServer) Serve(lis net.Listener) error {
 }
 
 func (s *SocketStreamingServer) handleConnection(conn net.Conn) {
-	defer conn.Close()
+	defer func(conn net.Conn) {
+		err := conn.Close()
+		if err != nil {
+			fmt.Printf("Failed to close connection: %v\n", err)
+		} else {
+			fmt.Println("Connection closed")
+		}
+	}(conn)
 	reader := bufio.NewReader(conn)
 
 	raw, err := reader.ReadString('\n')