add listing repository

Author: pgorecki

README.md

@@ -72,3 +72,16 @@ Event storming technique was used to discover the business domain and the most i
 ![](docs/images/auctions_ContextMap.png)
 
 Since `Payment` context will be provided by a 3rd party payments provider (via REST API), the downstream context (`Bidding`) must conform to whatever the upstream provides.
+
+
+## How to run this project
+
+`poetry shell`
+
+`poetry install`
+
+`poe compose_up` - run in a separate shell to start the database
+
+`poe start`
+
+`poe test`

poetry.lock

@@ -22,6 +22,7 @@ typed-ast = "^1.4.3"
 python-multipart = "^0.0.5"
 psycopg2-binary = "^2.9.2"
 freezegun = "^1.1.0"
+SQLAlchemy-Utils = "^0.38.3"
 
 [tool.poetry.dev-dependencies]
 poethepoet = "^0.10.0"
@@ -37,6 +38,7 @@ build-backend = "poetry.core.masonry.api"
 test = { shell = "DATABASE_URL=postgresql://postgres:password@localhost:5433/postgres pytest src" }
 test_coverage = "pytest --cov=src --cov-report=html"
 start = "uvicorn src.api.main:app --reload"
+start_cli = { shell = "cd src && python -v" }
 compose_up = "docker-compose -f docker-compose.dev.yml up"
 
 [tool.black]

pyproject.toml

@@ -13,45 +13,120 @@
 # run with "cd src && python -m cli"
 
 # configure logger prior to first usage
+import uuid
+from sqlalchemy.orm import Session
+
+from modules.catalog.infrastructure.listing_repository import (
+    PostgresJsonListingRepository,
+    Base,
+)
+
+
+from modules.catalog.domain.entities import Listing, Money
+
 LoggerFactory.configure(logger_name="cli")
 
-# configure catalog module
+
 container = Container()
 container.config.from_dict(
     dict(
-        DATABASE_URL="postgresql://postgres:password@localhost/postgres",
+        DATABASE_URL="sqlite+pysqlite:///:memory:",
         DEBUG=True,
     )
 )
 
-# instantiate catalog module
-catalog_module = container.catalog_module()
+engine = container.engine()
+Base.metadata.create_all(engine)
 
-logger.info("Application configured")
+listing_id = uuid.uuid4()
 
-# let's generate a fake seller id for now
-seller_id = SellerRepository.next_id()
-
-# interact with a catalog module by issuing queries and commands
-# use request context if you want to logically separate queries/commands
-# from each other in the logs
-with request_context:
-    command = CreateListingDraftCommand(
-        title="Foo", description="Bar", price=1, seller_id=seller_id
-    )
-    result = catalog_module.execute_command(command)
-    print(result)
-    if result.is_ok():
-        logger.info("Draft added")
-    else:
-        logger.error(result.get_errors())
-
-with request_context:
-    query_result = catalog_module.execute_query(GetAllListings())
-    logger.info(f"All listings: {query_result.result}")
-
-with request_context:
-    query_result = catalog_module.execute_query(
-        GetListingsOfSeller(seller_id=seller_id)
+with Session(engine) as session:
+    request_context.correlation_id.set(uuid.uuid4())
+    logger.info("Session 1")
+    print(engine, session)
+    repo = PostgresJsonListingRepository(session)
+    listing = Listing(
+        id=listing_id,
+        seller_id=uuid.uuid4(),
+        title="Foo",
+        description="",
+        ask_price=Money(1),
     )
-    logger.info(f"Listings of seller {seller_id}: {query_result.result}")
+    repo.add(listing)
+
+
+with Session(engine) as session:
+    request_context.correlation_id.set(uuid.uuid4())
+    logger.info("Session 2")
+    repo = PostgresJsonListingRepository(session)
+    repo.get_by_id(listing_id)
+
+
+# # configure catalog module
+#
+#
+# # instantiate catalog module
+# catalog_module = container.catalog_module()
+#
+# logger.info("Application configured")
+#
+# # let's generate a fake seller id for now
+# seller_id = SellerRepository.next_id()
+#
+#
+# ###############################
+# from modules.catalog.infrastructure.listing_repository import PostgresJsonListingRepository
+#
+#
+# session = ...
+# repository = PostgresJsonListingRepository(sqla_session=session)
+
+
+# from contextlib import contextmanager
+# from modules.catalog.module import CatalogModule
+#
+# @contextmanager
+# def business_tansaction():
+#     try:
+#         unit_of_work = ...
+#
+#         yield CatalogModule(unit_of_work, listing_repository=container.listing_repository())
+#     finally:
+#         ...
+#
+#
+#
+#
+# with BusinessTransactionOn(CatalogModule) as catalog_module:
+#     catalog_module.foo_repo()
+#
+#
+#
+# with catalog_module as transaction:
+#     print(transaction)
+
+
+#
+# # interact with a catalog module by issuing queries and commands
+# # use request context if you want to logically separate queries/commands
+# # from each other in the logs
+# with request_context:
+#     command = CreateListingDraftCommand(
+#         title="Foo", description="Bar", ask_price=1, seller_id=seller_id
+#     )
+#     result = catalog_module.execute_command(command)
+#     print(result)
+#     if result.is_ok():
+#         logger.info("Draft added")
+#     else:
+#         logger.error(result.get_errors())
+#
+# with request_context:
+#     query_result = catalog_module.execute_query(GetAllListings())
+#     logger.info(f"All listings: {query_result.result}")
+#
+# with request_context:
+#     query_result = catalog_module.execute_query(
+#         GetListingsOfSeller(seller_id=seller_id)
+#     )
+#     logger.info(f"Listings of seller {seller_id}: {query_result.result}")

src/cli/__main__.py

@@ -7,12 +7,19 @@
 
 
 @pytest.fixture
-def db_session():
+def engine():
     config = ApiConfig()
     engine = create_engine(config.DATABASE_URL, echo=config.DEBUG)
+
     with engine.begin() as connection:
         Base.metadata.drop_all(connection)
         Base.metadata.create_all(connection)
 
+        return engine
+
+
+@pytest.fixture
+def db_session(engine):
+
     with Session(engine) as session:
         yield session

src/conftest.py

@@ -1,3 +1,5 @@
+from dataclasses import dataclass
+
 from seedwork.application.commands import Command
 from seedwork.domain.value_objects import UUID, Money
 from seedwork.application.command_handlers import CommandResult
@@ -7,19 +9,28 @@
 from modules.catalog.domain.repositories import ListingRepository
 
 
+@dataclass
 class CreateListingDraftCommand(Command):
     """A command for creating new listing in draft state"""
 
     title: str
     description: str
-    price: Money
+    ask_price: Money
     seller_id: UUID
 
 
 @command_handler
 def create_listing_draft(
     command: CreateListingDraftCommand, repository: ListingRepository
 ) -> CommandResult:
-    listing = Listing(id=Listing.next_id(), **command.dict())
-    repository.insert(listing)
-    return CommandResult.ok(result=listing.id, events=[ListingDraftCreatedEvent(listing_id=listing.id)])
+    listing = Listing(
+        id=Listing.next_id(),
+        title=command.title,
+        description=command.description,
+        ask_price=command.ask_price,
+        seller_id=command.seller_id,
+    )
+    repository.add(listing)
+    return CommandResult.ok(
+        result=listing.id, events=[ListingDraftCreatedEvent(listing_id=listing.id)]
+    )

src/modules/catalog/application/command/create_listing_draft.py

@@ -1,16 +1,18 @@
+from dataclasses import dataclass
+
 from seedwork.application.commands import Command
-from seedwork.domain.value_objects import UUID
 from seedwork.application.command_handlers import CommandResult
 from seedwork.application.decorators import command_handler
 from modules.catalog.domain.entities import Listing, Seller
+from modules.catalog.domain.value_objects import ListingId, SellerId
 from modules.catalog.domain.repositories import ListingRepository, SellerRepository
 
-
+@dataclass
 class PublishListingCommand(Command):
-    """A command for publishing a listing in draft state"""
+    """A command for publishing a draft of a listing"""
 
-    listing_id: UUID
-    seller_id: UUID
+    listing_id: ListingId
+    seller_id: SellerId
 
 
 @command_handler
@@ -19,12 +21,9 @@ def publish_listing(
     listing_repository: ListingRepository,
     seller_repository: SellerRepository,
 ):
-    listing: Listing = listing_repository.get_by_id(command.listing_id)
     seller: Seller = seller_repository.get_by_id(command.seller_id)
+    listing: Listing = listing_repository.get_by_id(command.listing_id)
 
     events = seller.publish_listing(listing)
 
-    # TODO: for now we need to manually persist the changes, but it should be handled automatically using "Unit of Work"
-    listing_repository.update(listing)
-
     return CommandResult.ok(events=events)

src/modules/catalog/application/command/publish_listing.py

@@ -1,18 +1,19 @@
+from dataclasses import dataclass
 from seedwork.application.commands import Command
 from seedwork.application.command_handlers import CommandResult
 from seedwork.application.decorators import command_handler
 from seedwork.domain.value_objects import Money, UUID
 from modules.catalog.domain.entities import Listing
 from modules.catalog.domain.repositories import ListingRepository
 
-
+@dataclass
 class UpdateListingDraftCommand(Command):
     """A command for updating a listing"""
 
     listing_id: UUID
     title: str
     description: str
-    price: Money
+    ask_price: Money
     modify_user_id: UUID
 
 
@@ -22,7 +23,6 @@ def update_listing_draft(
 ) -> CommandResult:
     listing: Listing = repository.get_by_id(command.listing_id)
     events = listing.change_main_attributes(
-        title=command.title, description=command.description, price=command.price
+        title=command.title, description=command.description, ask_price=command.ask_price
     )
-    repository.update(listing)
     return CommandResult.ok(events=events)