From f2a441b6357bdee17c4d2299b77c5817898b0ecb Mon Sep 17 00:00:00 2001 From: ITQ Date: Thu, 20 Feb 2025 11:33:55 +0300 Subject: [PATCH] chore: small improvements --- .../services/backend/api/v1/advertisers/schemas.py | 6 +++--- .../services/backend/api/v1/campaigns/schemas.py | 14 +++++++------- .../services/backend/api/v1/campaigns/views.py | 4 ++-- .../services/backend/api/v1/clients/schemas.py | 4 ++-- solution/services/backend/api/v1/report/schemas.py | 10 +++++----- solution/services/backend/api/v1/report/views.py | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/solution/services/backend/api/v1/advertisers/schemas.py b/solution/services/backend/api/v1/advertisers/schemas.py index 9ce7bc5..751830f 100644 --- a/solution/services/backend/api/v1/advertisers/schemas.py +++ b/solution/services/backend/api/v1/advertisers/schemas.py @@ -1,4 +1,4 @@ -import typing +from typing import ClassVar from uuid import UUID from ninja import ModelSchema @@ -12,10 +12,10 @@ class Advertiser(ModelSchema): class Meta: model = AdvertiserModel - exclude: typing.ClassVar[tuple[str]] = (AdvertiserModel.id.field.name,) + exclude: ClassVar[tuple[str]] = (AdvertiserModel.id.field.name,) class Mlscore(ModelSchema): class Meta: model = MlscoreModel - exclude: typing.ClassVar[tuple[str]] = (MlscoreModel.id.field.name,) + exclude: ClassVar[tuple[str]] = (MlscoreModel.id.field.name,) diff --git a/solution/services/backend/api/v1/campaigns/schemas.py b/solution/services/backend/api/v1/campaigns/schemas.py index 4325bf7..375f2da 100644 --- a/solution/services/backend/api/v1/campaigns/schemas.py +++ b/solution/services/backend/api/v1/campaigns/schemas.py @@ -1,4 +1,4 @@ -import typing +from typing import ClassVar from typing import Any from uuid import UUID @@ -12,7 +12,7 @@ from apps.campaign.models import Campaign class CampaignTargeting(ModelSchema): class Meta: model = Campaign - fields: typing.ClassVar[tuple[str]] = ( + fields: ClassVar[tuple[str]] = ( Campaign.gender.field.name, Campaign.age_from.field.name, Campaign.age_to.field.name, @@ -28,7 +28,7 @@ class CampaignOut(ModelSchema): class Meta: model = Campaign - fields: typing.ClassVar[tuple[str]] = ( + fields: ClassVar[tuple[str]] = ( Campaign.ad_title.field.name, Campaign.ad_text.field.name, Campaign.ad_image.field.name, @@ -46,7 +46,7 @@ class CampaignCreateIn(ModelSchema): class Meta: model = Campaign - fields: typing.ClassVar[tuple[str]] = ( + fields: ClassVar[tuple[str]] = ( Campaign.ad_title.field.name, Campaign.ad_text.field.name, Campaign.impressions_limit.field.name, @@ -59,7 +59,7 @@ class CampaignCreateIn(ModelSchema): @field_validator("targeting", mode="before") @classmethod - def validate_target(cls, value: Any) -> Any: + def validate_targeting(cls, value: Any) -> Any: if ( not isinstance(value, dict) and not isinstance( @@ -78,7 +78,7 @@ class CampaignUpdateIn(ModelSchema): class Meta: model = Campaign - fields: typing.ClassVar[tuple[str]] = ( + fields: ClassVar[tuple[str]] = ( Campaign.impressions_limit.field.name, Campaign.clicks_limit.field.name, Campaign.ad_title.field.name, @@ -91,7 +91,7 @@ class CampaignUpdateIn(ModelSchema): @field_validator("targeting", mode="before") @classmethod - def validate_target(cls, value: Any) -> Any: + def validate_targeting(cls, value: Any) -> Any: if ( not isinstance(value, dict) and not isinstance( diff --git a/solution/services/backend/api/v1/campaigns/views.py b/solution/services/backend/api/v1/campaigns/views.py index 1317d82..dee0116 100644 --- a/solution/services/backend/api/v1/campaigns/views.py +++ b/solution/services/backend/api/v1/campaigns/views.py @@ -150,7 +150,7 @@ def delete_campaign( @router.post( - "/{advertiser_id}/campaigns/{campaign_id}/ad_image/upload", + "/{advertiser_id}/campaigns/{campaign_id}/ad_image", response={ status.OK: schemas.CampaignOut, status.BAD_REQUEST: global_schemas.BadRequestError, @@ -187,7 +187,7 @@ def upload_ad_image( @router.delete( - "/{advertiser_id}/campaigns/{campaign_id}/ad_image/delete", + "/{advertiser_id}/campaigns/{campaign_id}/ad_image", response={ status.NO_CONTENT: None, status.BAD_REQUEST: global_schemas.BadRequestError, diff --git a/solution/services/backend/api/v1/clients/schemas.py b/solution/services/backend/api/v1/clients/schemas.py index 34f760a..be935cf 100644 --- a/solution/services/backend/api/v1/clients/schemas.py +++ b/solution/services/backend/api/v1/clients/schemas.py @@ -1,4 +1,4 @@ -import typing +from typing import ClassVar from uuid import UUID from ninja import ModelSchema @@ -11,4 +11,4 @@ class Client(ModelSchema): class Meta: model = ClientModel - exclude: typing.ClassVar[tuple[str]] = (ClientModel.id.field.name,) + exclude: ClassVar[tuple[str]] = (ClientModel.id.field.name,) diff --git a/solution/services/backend/api/v1/report/schemas.py b/solution/services/backend/api/v1/report/schemas.py index fe251d4..0a5dff0 100644 --- a/solution/services/backend/api/v1/report/schemas.py +++ b/solution/services/backend/api/v1/report/schemas.py @@ -1,4 +1,5 @@ -import typing +from typing import ClassVar +from uuid import UUID from ninja import ModelSchema, Schema @@ -6,12 +7,11 @@ from apps.campaign.models import CampaignReport class SubmitReportIn(ModelSchema): + client_id: UUID + class Meta: model = CampaignReport - fields: typing.ClassVar[tuple[str]] = ( - CampaignReport.client.field.name, - CampaignReport.message.field.name, - ) + fields: ClassVar[tuple[str]] = (CampaignReport.message.field.name,) class SubmitReportOut(Schema): diff --git a/solution/services/backend/api/v1/report/views.py b/solution/services/backend/api/v1/report/views.py index 33db7fb..b89f12a 100644 --- a/solution/services/backend/api/v1/report/views.py +++ b/solution/services/backend/api/v1/report/views.py @@ -29,7 +29,7 @@ def submit_report( request: HttpRequest, campaign_id: UUID, report: schemas.SubmitReportIn ) -> tuple[status, schemas.SubmitReportOut]: campaign = get_object_or_404(Campaign, id=campaign_id) - client = get_object_or_404(Client, id=report.client) + client = get_object_or_404(Client, id=report.client_id) try: CampaignImpression.objects.get(campaign=campaign, client=client)