feat: полный patch External Channel архивирование creative в patch и

purchase, удалить у них доп ручки/usecase/dto

src/adapter/postgres.py

@@ -178,6 +178,11 @@ class Postgres(DatabaseBase):
         await self.session.execute(stmt)
         await self.session.flush()
 
+    async def update_external_channel(self, channel: domain.ExternalChannel) -> domain.ExternalChannel:
+        await self.session.flush()
+        await self.session.refresh(channel)
+        return channel
+
     async def get_creative(self, user_id: uuid.UUID, creative_id: uuid.UUID) -> domain.Creative | None:
         stmt = (
             select(domain.Creative)

src/controller/http/creatives.py

@@ -59,17 +59,6 @@ async def update_creative(
     )
 
 
-@creatives_router.post('/{creative_id}/archive')
-async def archive_creative(
-    creative_id: uuid.UUID,
-    current_user: Annotated[JWTPayload, Depends(dependencies.get_current_user)],
-) -> dto.CreativeOutput:
-    return await dependencies.get_usecase().archive_creative(
-        creative_id=creative_id,
-        user_id=current_user.user_id,
-    )
-
-
 @creatives_router.delete('/{creative_id}')
 async def delete_creative(
     creative_id: uuid.UUID,

src/controller/http/external_channels.py

@@ -36,6 +36,20 @@ async def create_external_channel(
     )
 
 
+@external_channels_router.patch('/{channel_id}')
+async def update_external_channel(
+    channel_id: uuid.UUID,
+    request: dto.UpdateExternalChannelInput,
+    current_user: Annotated[JWTPayload, Depends(dependencies.get_current_user)],
+) -> dto.ExternalChannelOutput:
+    """Update external channel fields (title, username, description, subscribers_count)."""
+    return await dependencies.get_usecase().update_external_channel(
+        channel_id=channel_id,
+        input=request,
+        user_id=current_user.user_id,
+    )
+
+
 @external_channels_router.patch('/{channel_id}/links')
 async def update_external_channel_links(
     channel_id: uuid.UUID,

src/controller/http/purchases.py

@@ -63,17 +63,6 @@ async def update_purchase(
     )
 
 
-@purchases_router.post('/{purchase_id}/archive')
-async def archive_purchase(
-    purchase_id: uuid.UUID,
-    current_user: Annotated[JWTPayload, Depends(dependencies.get_current_user)],
-) -> dto.PurchaseOutput:
-    return await dependencies.get_usecase().archive_purchase(
-        purchase_id=purchase_id,
-        user_id=current_user.user_id,
-    )
-
-
 @purchases_router.delete('/{purchase_id}')
 async def delete_purchase(
     purchase_id: uuid.UUID,

src/dto/__init__.py

@@ -15,6 +15,7 @@ __all__ = (
     'GetExternalChannelsOutput',
     'CreateExternalChannelInput',
     'DeleteExternalChannelInput',
+    'UpdateExternalChannelInput',
     'UpdateExternalChannelLinksInput',
     'ImportExternalChannelsInput',
     'ImportExternalChannelsOutput',
@@ -24,7 +25,6 @@ __all__ = (
     'GetCreativeInput',
     'CreateCreativeInput',
     'UpdateCreativeInput',
-    'ArchiveCreativeInput',
     'DeleteCreativeInput',
     'PurchaseOutput',
     'GetPurchasesInput',
@@ -32,7 +32,6 @@ __all__ = (
     'GetPurchaseInput',
     'CreatePurchaseInput',
     'UpdatePurchaseInput',
-    'ArchivePurchaseInput',
     'DeletePurchaseInput',
     'ViewsSnapshotOutput',
     'GetViewsHistoryInput',
@@ -43,7 +42,6 @@ __all__ = (
 )
 
 from .creative import (
-    ArchiveCreativeInput,
     CreateCreativeInput,
     CreativeOutput,
     DeleteCreativeInput,
@@ -60,10 +58,10 @@ from .external_channel import (
     GetExternalChannelsOutput,
     ImportExternalChannelsInput,
     ImportExternalChannelsOutput,
+    UpdateExternalChannelInput,
     UpdateExternalChannelLinksInput,
 )
 from .purchase import (
-    ArchivePurchaseInput,
     CreatePurchaseInput,
     DeletePurchaseInput,
     GetPurchaseInput,

src/dto/creative.py

@@ -41,11 +41,7 @@ class CreateCreativeInput(pydantic.BaseModel):
 class UpdateCreativeInput(pydantic.BaseModel):
     name: str | None = None
     text: str | None = None
-
+    status: domain.CreativeStatus | None = None
-
-class ArchiveCreativeInput(pydantic.BaseModel):
-    creative_id: uuid.UUID
-    user_id: uuid.UUID
 
 
 class DeleteCreativeInput(pydantic.BaseModel):

src/dto/external_channel.py

@@ -35,9 +35,14 @@ class DeleteExternalChannelInput(pydantic.BaseModel):
     user_id: uuid.UUID
 
 
-class UpdateExternalChannelLinksInput(pydantic.BaseModel):
+class UpdateExternalChannelInput(pydantic.BaseModel):
-    """Request body for PATCH endpoint - links to add or remove."""
+    title: str | None = None
+    username: str | None = None
+    description: str | None = None
+    subscribers_count: int | None = None
 
+
+class UpdateExternalChannelLinksInput(pydantic.BaseModel):
     add_target_channel_ids: list[uuid.UUID] = []
     remove_target_channel_ids: list[uuid.UUID] = []
 

src/dto/purchase.py

@@ -61,11 +61,7 @@ class UpdatePurchaseInput(pydantic.BaseModel):
     cost: float | None = None
     comment: str | None = None
     ad_post_url: str | None = None
-
+    status: domain.PurchaseStatus | None = None
-
-class ArchivePurchaseInput(pydantic.BaseModel):
-    purchase_id: uuid.UUID
-    user_id: uuid.UUID
 
 
 class DeletePurchaseInput(pydantic.BaseModel):

src/usecase/__init__.py

@@ -5,7 +5,6 @@ from uuid import UUID
 
 from src import domain
 
-from .creative.archive_creative import archive_creative
 from .creative.create_creative import create_creative
 from .creative.delete_creative import delete_creative
 from .creative.get_creative import get_creative
@@ -15,8 +14,8 @@ from .external_channel.create_external_channel import create_external_channel
 from .external_channel.delete_external_channel import delete_external_channel
 from .external_channel.get_external_channels import get_external_channels
 from .external_channel.import_external_channels_from_excel import import_external_channels_from_excel
+from .external_channel.update_external_channel import update_external_channel
 from .external_channel.update_external_channel_links import update_external_channel_links
-from .purchase.archive_purchase import archive_purchase
 from .purchase.create_purchase import create_purchase
 from .purchase.delete_purchase import delete_purchase
 from .purchase.get_purchase import get_purchase
@@ -78,6 +77,8 @@ class Database(typing.Protocol):
 
     async def delete_external_channel(self, channel_id: UUID) -> None: ...
 
+    async def update_external_channel(self, channel: domain.ExternalChannel) -> domain.ExternalChannel: ...
+
     async def get_creative(self, user_id: UUID, creative_id: UUID) -> domain.Creative | None: ...
 
     async def create_creative(self, creative: domain.Creative) -> domain.Creative: ...
@@ -165,19 +166,18 @@ class Usecase:
     get_external_channels = get_external_channels
     create_external_channel = create_external_channel
     delete_external_channel = delete_external_channel
+    update_external_channel = update_external_channel
     update_external_channel_links = update_external_channel_links
     import_external_channels_from_excel = import_external_channels_from_excel
     get_creatives = get_creatives
     get_creative = get_creative
     create_creative = create_creative
     update_creative = update_creative
-    archive_creative = archive_creative
     delete_creative = delete_creative
     get_purchases = get_purchases
     get_purchase = get_purchase
     create_purchase = create_purchase
     update_purchase = update_purchase
-    archive_purchase = archive_purchase
     delete_purchase = delete_purchase
     handle_subscription = handle_subscription
     fetch_views = fetch_views

src/usecase/creative/archive_creative.py

@@ -1,32 +0,0 @@
-import logging
-import uuid
-from typing import TYPE_CHECKING
-
-from src import domain, dto
-
-if TYPE_CHECKING:
-    from .. import Usecase
-
-log = logging.getLogger(__name__)
-
-
-async def archive_creative(self: 'Usecase', creative_id: uuid.UUID, user_id: uuid.UUID) -> dto.CreativeOutput:
-    async with self.database.transaction():
-        creative = await self.database.get_creative(user_id, creative_id)
-        if not creative:
-            log.warning('User %s attempted to change archive status for unavailable creative %s', user_id, creative_id)
-            raise domain.CreativeNotFound(creative_id)
-
-        creative.status = domain.CreativeStatus.ARCHIVED
-        updated = await self.database.update_creative(creative)
-
-        return dto.CreativeOutput(
-            id=updated.id,
-            name=updated.name,
-            text=updated.text,
-            target_channel_id=updated.target_channel_id,
-            target_channel_title=updated.target_channel.title,
-            created_at=updated.created_at,
-            status=updated.status,
-            purchases_count=updated.purchases_count,
-        )

src/usecase/creative/update_creative.py

@@ -23,6 +23,8 @@ async def update_creative(
             creative.name = input.name
         if input.text is not None:
             creative.text = input.text
+        if input.status is not None:
+            creative.status = input.status
 
         updated = await self.database.update_creative(creative)
 

src/usecase/external_channel/update_external_channel.py

@@ -0,0 +1,42 @@
+import logging
+import uuid
+from typing import TYPE_CHECKING
+
+from src import domain, dto
+
+if TYPE_CHECKING:
+    from .. import Usecase
+
+log = logging.getLogger(__name__)
+
+
+async def update_external_channel(
+    self: 'Usecase', channel_id: uuid.UUID, input: dto.UpdateExternalChannelInput, user_id: uuid.UUID
+) -> dto.ExternalChannelOutput:
+    async with self.database.transaction():
+        external_channel = await self.database.get_external_channel(user_id, channel_id=channel_id)
+        if not external_channel:
+            log.warning('External channel %s not found', channel_id)
+            raise domain.ExternalChannelNotFound(channel_id)
+
+        if input.title is not None:
+            external_channel.title = input.title
+        if input.username is not None:
+            external_channel.username = input.username
+        if input.description is not None:
+            external_channel.description = input.description
+        if input.subscribers_count is not None:
+            external_channel.subscribers_count = input.subscribers_count
+
+        updated = await self.database.update_external_channel(external_channel)
+
+        log.info('External channel %s updated', channel_id)
+
+        return dto.ExternalChannelOutput(
+            id=updated.id,
+            telegram_id=updated.telegram_id,
+            title=updated.title,
+            username=updated.username,
+            description=updated.description,
+            subscribers_count=updated.subscribers_count,
+        )

src/usecase/purchase/archive_purchase.py

@@ -1,43 +0,0 @@
-import logging
-import uuid
-from typing import TYPE_CHECKING
-
-from src import domain, dto
-
-if TYPE_CHECKING:
-    from .. import Usecase
-
-log = logging.getLogger(__name__)
-
-
-async def archive_purchase(self: 'Usecase', purchase_id: uuid.UUID, user_id: uuid.UUID) -> dto.PurchaseOutput:
-    async with self.database.transaction():
-        purchase = await self.database.get_purchase(user_id, purchase_id)
-        if not purchase:
-            log.warning('Purchase %s not found for user %s', purchase_id, user_id)
-            raise domain.PurchaseNotFound(purchase_id)
-
-        purchase.status = domain.PurchaseStatus.ARCHIVED
-        updated = await self.database.update_purchase(purchase)
-
-        return dto.PurchaseOutput(
-            id=updated.id,
-            target_channel_id=updated.target_channel_id,
-            target_channel_title=updated.target_channel.title,
-            external_channel_id=updated.external_channel_id,
-            external_channel_title=updated.external_channel.title,
-            creative_id=updated.creative_id,
-            creative_name=updated.creative.name,
-            placement_date=updated.placement_date,
-            cost=updated.cost,
-            comment=updated.comment,
-            ad_post_url=updated.ad_post_url,
-            invite_link_type=updated.invite_link_type,
-            invite_link=updated.invite_link,
-            status=updated.status,
-            subscriptions_count=updated.subscriptions_count,
-            views_count=updated.views_count,
-            views_availability=updated.views_availability,
-            last_views_fetch_at=updated.last_views_fetch_at,
-            created_at=updated.created_at,
-        )

src/usecase/purchase/update_purchase.py

@@ -28,6 +28,8 @@ async def update_purchase(
             purchase.comment = input.comment
         if input.ad_post_url is not None:
             purchase.ad_post_url = input.ad_post_url
+        if input.status is not None:
+            purchase.status = input.status
 
         updated = await self.database.update_purchase(purchase)