Inventory service: split code to layers

Taskfile.yml

@@ -1,22 +1,22 @@
-version: '3'
+version: "3"
 
 # Глобальные переменные проекта
 vars:
-  GO_VERSION: '1.25.6'
-  GOLANGCI_LINT_VERSION: 'v2.8.0'
-  GCI_VERSION: 'v0.13.7'
-  GOFUMPT_VERSION: 'v0.9.2'
-  BUF_VERSION: '1.64.0'
-  PROTOC_GEN_GO_VERSION: 'v1.36.11'
-  PROTOC_GEN_GO_GRPC_VERSION: 'v1.6.0'
-
-  BIN_DIR: '{{.ROOT_DIR}}/bin'
-  GOLANGCI_LINT: '{{.BIN_DIR}}/golangci-lint'
-  GCI: '{{.BIN_DIR}}/gci'
-  GOFUMPT: '{{.BIN_DIR}}/gofumpt'
-  BUF: '{{.BIN_DIR}}/buf'
-  PROTOC_GEN_GO: '{{.BIN_DIR}}/protoc-gen-go'
-  PROTOC_GEN_GO_GRPC: '{{.BIN_DIR}}/protoc-gen-go-grpc'
+  GO_VERSION: "1.25.6"
+  GOLANGCI_LINT_VERSION: "v2.8.0"
+  GCI_VERSION: "v0.13.7"
+  GOFUMPT_VERSION: "v0.9.2"
+  BUF_VERSION: "1.64.0"
+  PROTOC_GEN_GO_VERSION: "v1.36.11"
+  PROTOC_GEN_GO_GRPC_VERSION: "v1.6.0"
+
+  BIN_DIR: "{{.ROOT_DIR}}/bin"
+  GOLANGCI_LINT: "{{.BIN_DIR}}/golangci-lint"
+  GCI: "{{.BIN_DIR}}/gci"
+  GOFUMPT: "{{.BIN_DIR}}/gofumpt"
+  BUF: "{{.BIN_DIR}}/buf"
+  PROTOC_GEN_GO: "{{.BIN_DIR}}/protoc-gen-go"
+  PROTOC_GEN_GO_GRPC: "{{.BIN_DIR}}/protoc-gen-go-grpc"
 
   MODULES: inventory payment order shared
 
@@ -39,20 +39,23 @@ tasks:
 
   format:
     desc: "Форматирует весь проект gofumpt + gci, исключая mocks"
-    deps: [ install-formatters ]
+    deps: [install-formatters]
     cmds:
       - |
         echo "🧼 Форматируем через gofumpt ..."
-        
+
         for module in {{.MODULES}}; do
           if [ -d "$module" ]; then
             echo "🧼 Форматируем $module"
-            find $module -type f -name '*.go' ! -path '*/mocks/*' -exec {{.GOFUMPT}} -extra -w {} +
+            find "$module" -type f -name '*.go' \
+              ! -path '*/mocks/*' \
+              ! -path '*/shared/pkg/*' \
+              -exec {{.GOFUMPT}} -extra -w {} +
           fi
         done
       - |
         echo "🎯 Сортируем импорты через gci ..."
-        
+
         for module in {{.MODULES}}; do
           if [ -d "$module" ]; then
             echo "🎯 Сортируем импорты в $module"
@@ -74,10 +77,10 @@ tasks:
 
   lint:
     desc: "Запускает golangci-lint для всех модулей"
-    deps: [ install-golangci-lint ]
+    deps: [install-golangci-lint, format]
     vars:
-      MODULES: '{{.MODULES}}'
-      GOLANGCI_LINT: '{{.GOLANGCI_LINT}}'
+      MODULES: "{{.MODULES}}"
+      GOLANGCI_LINT: "{{.GOLANGCI_LINT}}"
     cmds:
       - |
         set -e
@@ -93,10 +96,10 @@ tasks:
 
   lint:fix:
     desc: "Запускает golangci-lint для всех модулей"
-    deps: [ install-golangci-lint ]
+    deps: [install-golangci-lint]
     vars:
-      MODULES: '{{.MODULES}}'
-      GOLANGCI_LINT: '{{.GOLANGCI_LINT}}'
+      MODULES: "{{.MODULES}}"
+      GOLANGCI_LINT: "{{.GOLANGCI_LINT}}"
     cmds:
       - |
         set -e
@@ -150,7 +153,7 @@ tasks:
         }
 
   proto:update-deps:
-    deps: [ install-buf ]
+    deps: [install-buf]
     desc: Обновляет зависимости protobuf из удаленных репозиториев (googleapis и т.д.)
     dir: shared
     cmds:
@@ -159,7 +162,7 @@ tasks:
         {{.BUF}} dep update
 
   proto:lint:
-    deps: [ proto:install-plugins, proto:update-deps ]
+    deps: [proto:install-plugins, proto:update-deps]
     desc: Проверка .proto-файлов на соответствие стилю
     dir: shared
     cmds:
@@ -168,7 +171,7 @@ tasks:
         {{.BUF}} lint
 
   proto:gen:
-    deps: [ install-buf, proto:install-plugins, proto:update-deps, proto:lint ]
+    deps: [install-buf, proto:install-plugins, proto:update-deps, proto:lint]
     desc: Генерация Go-кода из .proto
     dir: shared
     cmds:
@@ -183,4 +186,3 @@ tasks:
       - |
         echo "🏗️ Генерируем Go код из openapi..."
         go generate ./...
-

inventory/cmd/main.go

@@ -1,77 +1,23 @@
 package main
 
 import (
-	"context"
 	"fmt"
 	"log"
 	"net"
 	"os"
 	"os/signal"
-	"slices"
-	"sync"
 	"syscall"
 
-	"github.com/brianvoe/gofakeit/v7"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/reflection"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/types/known/timestamppb"
 
-	inventoryv1 "github.com/qyrlabs/test-backend/shared/pkg/proto/inventory/v1"
+	apiinventoryv1 "github.com/qyrlabs/test-backend/inventory/internal/api/inventory/v1"
+	partRepository "github.com/qyrlabs/test-backend/inventory/internal/repository/part"
+	partService "github.com/qyrlabs/test-backend/inventory/internal/service/part"
+	protoinventoryv1 "github.com/qyrlabs/test-backend/shared/pkg/proto/inventory/v1"
 )
 
-const grpcPort = 50061
-
-type inventoryService struct {
-	inventoryv1.UnimplementedInventoryServiceServer
-
-	mu    sync.RWMutex
-	parts map[string]*inventoryv1.Part
-}
-
-// Get part info by its UUID.
-func (s *inventoryService) GetPart(ctx context.Context, req *inventoryv1.GetPartRequest) (*inventoryv1.GetPartResponse, error) {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	part, ok := s.parts[req.GetUuid()]
-	if !ok {
-		return nil, status.Errorf(codes.NotFound, "part with uuid %s is not found", req.GetUuid())
-	}
-
-	return &inventoryv1.GetPartResponse{
-		Part: part,
-	}, nil
-}
-
-// Returns List of Parts by filter.
-func (s *inventoryService) ListParts(ctx context.Context, req *inventoryv1.ListPartsRequest) (*inventoryv1.ListPartsResponse, error) {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-
-	filter := req.GetFilter()
-	uuids := filter.GetUuids()
-	names := filter.GetNames()
-	categories := filter.GetCategories()
-	countries := filter.GetManufacturerCountries()
-	tags := filter.GetTags()
-
-	filteredParts := make([]*inventoryv1.Part, 0)
-	for uuid, part := range s.parts {
-		if (uuids == nil || slices.Contains(uuids, uuid)) &&
-			(names == nil || slices.Contains(names, part.GetName())) &&
-			(categories == nil || slices.Contains(categories, part.GetCategory())) &&
-			(countries == nil || slices.Contains(countries, part.GetManufacturer().GetCountry())) &&
-			(tags == nil || slices.Equal(tags, part.GetTags())) {
-
-			filteredParts = append(filteredParts, part)
-		}
-	}
-
-	return &inventoryv1.ListPartsResponse{
-		Parts: filteredParts,
-	}, nil
-}
+const grpcPort = 50052
 
 func main() {
 	lis, err := net.Listen("tcp", fmt.Sprintf("localhost:%d", grpcPort))
@@ -83,11 +29,11 @@ func main() {
 	grpcServer := grpc.NewServer()
 	reflection.Register(grpcServer)
 
-	service := &inventoryService{
-		parts: initParts(100),
-	}
+	repo := partRepository.NewRepository()
+	service := partService.NewService(repo)
+	api := apiinventoryv1.NewAPI(service)
 
-	inventoryv1.RegisterInventoryServiceServer(grpcServer, service)
+	protoinventoryv1.RegisterInventoryServiceServer(grpcServer, api)
 
 	go func() {
 		log.Printf("gRPC server listening on %s\n", lis.Addr().String())
@@ -106,68 +52,3 @@ func main() {
 	grpcServer.GracefulStop()
 	log.Println("gRPC server stopped")
 }
-
-func initParts(count int) map[string]*inventoryv1.Part {
-	parts := createParts(count)
-	partsMap := make(map[string]*inventoryv1.Part, count)
-	for _, part := range parts {
-		partsMap[part.GetUuid()] = part
-	}
-	return partsMap
-}
-
-func fakeDimensions() *inventoryv1.Dimensions {
-	return &inventoryv1.Dimensions{
-		Length: gofakeit.Float64Range(1.0, 300.0),
-		Width:  gofakeit.Float64Range(1.0, 300.0),
-		Height: gofakeit.Float64Range(0.5, 150.0),
-		Weight: gofakeit.Float64Range(0.1, 500.0),
-	}
-}
-
-func fakeManufacturer() *inventoryv1.Manufacturer {
-	return &inventoryv1.Manufacturer{
-		Name:    gofakeit.Company(),
-		Country: gofakeit.Country(),
-		Website: gofakeit.URL(),
-	}
-}
-
-func fakeTags() []string {
-	tags := make([]string, 0, 5)
-	for range gofakeit.IntRange(1, 5) {
-		tags = append(tags, gofakeit.Word())
-	}
-	return tags
-}
-
-func randomCategory() inventoryv1.Category {
-	// Ignore any, but not UNSPECIFIED
-	vals := []inventoryv1.Category{
-		inventoryv1.Category_CATEGORY_ENGINE,
-		inventoryv1.Category_CATEGORY_FUEL,
-		inventoryv1.Category_CATEGORY_PORTHOLE,
-		inventoryv1.Category_CATEGORY_WING,
-	}
-	return vals[gofakeit.IntRange(0, len(vals)-1)]
-}
-
-func createParts(count int) []*inventoryv1.Part {
-	parts := make([]*inventoryv1.Part, 0, count)
-	for range count {
-		parts = append(parts, &inventoryv1.Part{
-			Uuid:          gofakeit.UUID(),
-			Name:          gofakeit.Name(),
-			Description:   gofakeit.Sentence(10),
-			PriceMinor:    int64(gofakeit.IntRange(1, 100000)),
-			StockQuantity: int64(gofakeit.IntRange(1, 100)),
-			Category:      randomCategory(),
-			Dimensions:    fakeDimensions(),
-			Manufacturer:  fakeManufacturer(),
-			Tags:          fakeTags(),
-			CreatedAt:     timestamppb.New(gofakeit.Date()),
-			UpdatedAt:     timestamppb.New(gofakeit.Date()),
-		})
-	}
-	return parts
-}

inventory/go.mod

@@ -6,7 +6,9 @@ replace github.com/qyrlabs/test-backend/shared => ../shared
 
 require (
 	github.com/brianvoe/gofakeit/v7 v7.14.0
+	github.com/google/uuid v1.6.0
 	github.com/qyrlabs/test-backend/shared v0.0.0-00010101000000-000000000000
+	github.com/samber/lo v1.52.0
 	google.golang.org/grpc v1.78.0
 	google.golang.org/protobuf v1.36.11
 )

inventory/go.sum

@@ -10,6 +10,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/samber/lo v1.52.0 h1:Rvi+3BFHES3A8meP33VPAxiBZX/Aws5RxrschYGjomw=
+github.com/samber/lo v1.52.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0=
 go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
 go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=

inventory/internal/api/inventory/v1/api.go

@@ -0,0 +1,18 @@
+package v1
+
+import (
+	"github.com/qyrlabs/test-backend/inventory/internal/service"
+	inventoryv1 "github.com/qyrlabs/test-backend/shared/pkg/proto/inventory/v1"
+)
+
+type api struct {
+	inventoryv1.UnimplementedInventoryServiceServer
+
+	inventoryService service.PartService
+}
+
+func NewAPI(inventoryService service.PartService) *api {
+	return &api{
+		inventoryService: inventoryService,
+	}
+}

inventory/internal/api/inventory/v1/get.go

@@ -0,0 +1,37 @@
+package v1
+
+import (
+	"context"
+	"errors"
+	"log"
+
+	"github.com/google/uuid"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+
+	"github.com/qyrlabs/test-backend/inventory/internal/converter"
+	"github.com/qyrlabs/test-backend/inventory/internal/model"
+	inventoryv1 "github.com/qyrlabs/test-backend/shared/pkg/proto/inventory/v1"
+)
+
+// Get part info by its UUID.
+func (a *api) GetPart(ctx context.Context, req *inventoryv1.GetPartRequest) (*inventoryv1.GetPartResponse, error) {
+	partUUID := req.GetUuid()
+
+	if _, err := uuid.Parse(partUUID); err != nil {
+		return nil, status.Errorf(codes.InvalidArgument, "invalid uuid format: %v", err)
+	}
+
+	part, err := a.inventoryService.Get(ctx, req.GetUuid())
+	if err != nil {
+		if errors.Is(err, model.ErrPartNotFound) {
+			return nil, status.Errorf(codes.NotFound, "part with uuid %s is not found", req.GetUuid())
+		}
+		log.Printf("failed to get part with uuid %s: %v", req.GetUuid(), err)
+		return nil, status.Error(codes.Internal, "internal error")
+	}
+
+	return &inventoryv1.GetPartResponse{
+		Part: converter.ToProtoPart(part),
+	}, nil
+}

inventory/internal/api/inventory/v1/list.go

@@ -0,0 +1,27 @@
+package v1
+
+import (
+	"context"
+	"log"
+
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+
+	"github.com/qyrlabs/test-backend/inventory/internal/converter"
+	inventoryv1 "github.com/qyrlabs/test-backend/shared/pkg/proto/inventory/v1"
+)
+
+// Returns List of Parts by filter.
+func (a *api) ListParts(ctx context.Context, req *inventoryv1.ListPartsRequest) (*inventoryv1.ListPartsResponse, error) {
+	filteredParts, err := a.inventoryService.List(ctx, converter.ToProtoFilter(req.GetFilter()))
+	if err != nil {
+		log.Printf("failed to list parts: %v", err)
+		return nil, status.Error(codes.Internal, "internal error")
+	}
+
+	protoParts := converter.ToProtoParts(filteredParts)
+
+	return &inventoryv1.ListPartsResponse{
+		Parts: protoParts,
+	}, nil
+}