refactor: flatten product catalog package

backend/cart/bounded_context.go

@@ -11,13 +11,12 @@ import (
 	"github.com/bkielbasa/go-ecommerce/backend/internal/application"
 	"github.com/bkielbasa/go-ecommerce/backend/internal/https"
 	"github.com/bkielbasa/go-ecommerce/backend/internal/observability"
-	pcApp "github.com/bkielbasa/go-ecommerce/backend/productcatalog/app"
-	pcDomain "github.com/bkielbasa/go-ecommerce/backend/productcatalog/domain"
+	"github.com/bkielbasa/go-ecommerce/backend/productcatalog"
 	"github.com/gorilla/mux"
 	"github.com/sirupsen/logrus"
 )
 
-func New(db *sql.DB, logger logrus.FieldLogger, pc pcApp.ProductService) application.BoundedContext {
+func New(db *sql.DB, logger logrus.FieldLogger, pc productcatalog.ProductService) application.BoundedContext {
 	storage := adapter.NewPostgres(db)
 
 	return &boundedContext{
@@ -29,13 +28,13 @@ func New(db *sql.DB, logger logrus.FieldLogger, pc pcApp.ProductService) applica
 // transformProductCatalog is part of Anti-Corruption Layer that prevents leaking
 // productcatalog's types into the cart
 type transformProductCatalog struct {
-	pc pcApp.ProductService
+	pc productcatalog.ProductService
 }
 
 func (tpc transformProductCatalog) Find(ctx context.Context, productID string) (domain.Product, error) {
 	p, err := tpc.pc.Find(ctx, productID)
 
-	if errors.Is(err, pcDomain.ErrProductNotFound) {
+	if errors.Is(err, productcatalog.ErrProductNotFound) {
 		return domain.Product{}, domain.ErrProductNotFound
 	}
 

backend/cmd/cli/rootcmd.go

@@ -5,8 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/bkielbasa/go-ecommerce/backend/productcatalog/adapter"
-	"github.com/bkielbasa/go-ecommerce/backend/productcatalog/app"
+	"github.com/bkielbasa/go-ecommerce/backend/productcatalog"
 	"github.com/spf13/cobra"
 )
 
@@ -19,8 +18,8 @@ var rootCmd = &cobra.Command{
 }
 
 func Execute(db *sql.DB) {
-	storage := adapter.NewPostgres(db)
-	appServ := app.NewProductService(storage)
+	storage := productcatalog.NewPostgres(db)
+	appServ := productcatalog.NewProductService(storage)
 	rootCmd.AddCommand(newProductCatalogCmd(appServ))
 	rootCmd.AddCommand(newSeedsCmd(appServ))
 

backend/docs/swagger.json

@@ -201,7 +201,7 @@
                         "schema": {
                             "type": "array",
                             "items": {
-                                "$ref": "#/definitions/port.product"
+                                "$ref": "#/definitions/productcatalog.httpProduct"
                             }
                         }
                     },
@@ -222,17 +222,6 @@
         }
     },
     "definitions": {
-        "cart_port.price": {
-            "type": "object",
-            "properties": {
-                "amount": {
-                    "type": "number"
-                },
-                "currency": {
-                    "type": "string"
-                }
-            }
-        },
         "https.ErrorResponse": {
             "type": "object",
             "properties": {
@@ -280,22 +269,13 @@
                 }
             }
         },
-        "port.product": {
+        "port.price": {
             "type": "object",
             "properties": {
-                "description": {
-                    "type": "string"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "name": {
-                    "type": "string"
-                },
-                "price": {
-                    "$ref": "#/definitions/productcatalog_port.price"
+                "amount": {
+                    "type": "number"
                 },
-                "thumbnail": {
+                "currency": {
                     "type": "string"
                 }
             }
@@ -310,7 +290,7 @@
                     "type": "string"
                 },
                 "price": {
-                    "$ref": "#/definitions/cart_port.price"
+                    "$ref": "#/definitions/port.price"
                 },
                 "quantity": {
                     "type": "integer"
@@ -328,7 +308,27 @@
                 }
             }
         },
-        "productcatalog_port.price": {
+        "productcatalog.httpProduct": {
+            "type": "object",
+            "properties": {
+                "description": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "price": {
+                    "$ref": "#/definitions/productcatalog.price"
+                },
+                "thumbnail": {
+                    "type": "string"
+                }
+            }
+        },
+        "productcatalog.price": {
             "type": "object",
             "properties": {
                 "amount": {

backend/docs/swagger.yaml

@@ -1,12 +1,5 @@
 basePath: /api/v1
 definitions:
-  cart_port.price:
-    properties:
-      amount:
-        type: number
-      currency:
-        type: string
-    type: object
   https.ErrorResponse:
     properties:
       detail:
@@ -37,17 +30,11 @@ definitions:
       username:
         type: string
     type: object
-  port.product:
+  port.price:
     properties:
-      description:
-        type: string
-      id:
-        type: string
-      name:
-        type: string
-      price:
-        $ref: '#/definitions/productcatalog_port.price'
-      thumbnail:
+      amount:
+        type: number
+      currency:
         type: string
     type: object
   port.showCartItemResponse:
@@ -57,7 +44,7 @@ definitions:
       name:
         type: string
       price:
-        $ref: '#/definitions/cart_port.price'
+        $ref: '#/definitions/port.price'
       quantity:
         type: integer
     type: object
@@ -68,7 +55,20 @@ definitions:
           $ref: '#/definitions/port.showCartItemResponse'
         type: array
     type: object
-  productcatalog_port.price:
+  productcatalog.httpProduct:
+    properties:
+      description:
+        type: string
+      id:
+        type: string
+      name:
+        type: string
+      price:
+        $ref: '#/definitions/productcatalog.price'
+      thumbnail:
+        type: string
+    type: object
+  productcatalog.price:
     properties:
       amount:
         type: number
@@ -204,7 +204,7 @@ paths:
           description: OK
           schema:
             items:
-              $ref: '#/definitions/port.product'
+              $ref: '#/definitions/productcatalog.httpProduct'
             type: array
         "404":
           description: Not Found

backend/productcatalog/adapter_inmemory.go

@@ -0,0 +1,36 @@
+package productcatalog
+
+import (
+	"context"
+)
+
+type inMemory struct {
+	products []Product
+}
+
+func NewInMemory() *inMemory {
+	return &inMemory{}
+}
+
+func (im *inMemory) Add(ctx context.Context, p Product) error {
+	im.products = append(im.products, p)
+
+	return nil
+}
+
+func (im *inMemory) All(ctx context.Context) ([]Product, error) {
+	return im.products, nil
+}
+
+func (im *inMemory) Find(ctx context.Context, id string) (Product, error) {
+	for _, p := range im.products {
+		if string(p.ID()) == id {
+			return p, nil
+		}
+	}
+	return Product{}, ErrProductNotFound
+}
+
+func (im *inMemory) Reserve(ctx context.Context, name string) error {
+	return nil
+}