shop_system_models 1.0.0.dev26932__py3-none-any.whl → 1.0.0.dev27183__py3-none-any.whl

shop_system_models/consts/languages.py

@@ -0,0 +1,4 @@
+TG_LANGUAGES_MAPPING = {'ru': 'RU',
+                        'en': 'EN'}
+
+LANGUAGES = {value: key for key, value in TG_LANGUAGES_MAPPING.items()}  # reverse TG_LANGUAGES

shop_system_models/consts/languages.pyi

@@ -0,0 +1,4 @@
+from _typeshed import Incomplete
+
+TG_LANGUAGES_MAPPING: Incomplete
+LANGUAGES: Incomplete

shop_system_models/deployment_api/request/authorization.py

@@ -1 +1,6 @@
+from shop_system_models.deployment_api.request.users import User
+
+
+class Token(User):
+    initData: str
 

shop_system_models/deployment_api/request/processes.py

@@ -12,3 +12,4 @@ class DeployVariables(BaseModel):
     contact_phone: Optional[str]
     bot_token: Optional[str]
     invite_user: bool = True
+

shop_system_models/deployment_api/request/services.py

@@ -0,0 +1,36 @@
+from typing import Optional
+
+from shop_system_models.consts.enums import ServiceNames
+from pydantic import BaseModel, computed_field
+
+
+class ServiceConfig(BaseModel):
+    name: ServiceNames
+    version: Optional[str] = 'latest'
+
+    class Config:
+        use_enum_values = True
+
+
+class ProjectConfiguration(BaseModel):
+    shop_name: str
+
+    # Константы для URL — будут задаваться в рантайме
+    SHOP_BOT_URL: str = ''
+    SHOP_API_URL: str = ''
+    SHOP_APP_URL: str = ''
+
+    @computed_field  # type: ignore
+    @property
+    def shop_bot_url(self) -> str:
+        return f"{self.SHOP_BOT_URL}/{self.shop_name}"
+
+    @computed_field  # type: ignore
+    @property
+    def shop_api_url(self) -> str:
+        return f"{self.SHOP_API_URL}/{self.shop_name}"
+
+    @computed_field  # type: ignore
+    @property
+    def shop_url(self) -> str:
+        return f"{self.SHOP_APP_URL}/{self.shop_name}"

shop_system_models/deployment_api/request/shop_categories.py

@@ -0,0 +1,9 @@
+from typing import Optional
+
+from pydantic import BaseModel
+
+
+class ShopCategory(BaseModel):
+    name: str
+    description: Optional[str] = None
+    preview_url: Optional[str] = None

shop_system_models/deployment_api/request/shop_content/blocks.py

@@ -0,0 +1,21 @@
+from typing import Optional
+
+from fastapi import HTTPException
+from pydantic import BaseModel, field_validator
+
+
+def link_validation(link: str) -> str:
+    if not link.startswith('http://') and not link.startswith('https://'):
+        raise HTTPException(status_code=400, detail=f'Invalid link: {link}')
+    return link
+
+
+class LinkBlocks(BaseModel):
+    contacts: Optional[str] = None
+    info: Optional[str] = None
+
+    @field_validator('contacts', 'info')
+    def link_validation(cls, value: str) -> str:
+        if value:
+            return link_validation(link=value)
+        return value

shop_system_models/deployment_api/request/shop_content/delivery_types.py

@@ -0,0 +1,51 @@
+from typing import List, Optional
+
+from fastapi import HTTPException
+from pydantic import BaseModel, field_validator
+
+
+class Coordinates(BaseModel):
+    latitude: float
+    longitude: float
+
+
+class ExtraField(BaseModel):
+    name: str
+    description: str
+    is_required: bool
+
+
+# class ExtraFieldPayload(BaseModel):
+#     name: str
+#     value: str
+
+
+class DeliveryType(BaseModel):
+    name: str
+    amount: float = 0.0
+    is_address_required: bool = False
+    address_hint: Optional[str] = ''
+    extra_fields: List[ExtraField] = []
+    is_timepicker_required: bool = False
+    details: str = ''
+    country: Optional[str] = ''
+    country_code: Optional[str] = ''  # ISO format, ex.: RU, KZ, BY...
+    city: Optional[str] = None
+    delivery_location: Optional[Coordinates] = None
+    delivery_radius: Optional[int] = None
+    delivery_min_hour: Optional[int] = None
+    delivery_max_hour: Optional[int] = None
+    delivery_minutes_interval: Optional[int] = None
+    delivery_min_day: Optional[int] = None
+    delivery_max_day: Optional[int] = None
+
+    @field_validator('name')
+    def name_validation(cls, name):
+        name = name.strip()
+        if len(name) <= 2:
+            raise HTTPException(status_code=400, detail=f'Invalid delivery name: {name}')
+        return name
+
+
+class DeliveryTypeResponse(DeliveryType):
+    id: str

shop_system_models/deployment_api/request/shop_content/payment_methods.py

@@ -0,0 +1,32 @@
+from enum import Enum
+from typing import List, Optional
+
+from pydantic import BaseModel
+
+
+class PaymentTypes(str, Enum):
+    manual_payment_request = 'ManualPaymentRequest'
+    external_card_payment_provider = 'ExternalCardPaymentProvider'
+    crypto_ton = 'CryptoTON'
+    xtr = 'XTR'
+    life_pay = 'LifePay'
+    yookassa = "yookassa"
+    tkassa = "tkassa"
+
+class Metadata(BaseModel):
+    key: str
+    value: List[str]
+
+
+class PaymentMethod(BaseModel):
+    name: str
+    type: PaymentTypes
+    payment_data: str  # payment_token, TON address etc....
+    meta: Optional[List[Metadata]] = []
+
+    class Config:
+        use_enum_values = True
+
+
+class PaymentMethodResponse(PaymentMethod):
+    id: str

shop_system_models/deployment_api/request/shop_templates.py

@@ -0,0 +1,18 @@
+from typing import Optional
+
+from fastapi import HTTPException
+from pydantic import BaseModel, field_validator
+
+
+class ShopTemplate(BaseModel):
+    template_id: str
+    name: str
+    description: Optional[str] = ''
+    bot_url: str
+    language: str
+
+    @field_validator('bot_url')
+    def url_validation(cls, bot_url):
+        if bot_url.startswith('http://') or bot_url.startswith('https://'):
+            return bot_url
+        raise HTTPException(status_code=400, detail=f'Invalid bot_url: {bot_url}')

shop_system_models/deployment_api/request/shops.py

@@ -0,0 +1,102 @@
+import re
+from datetime import datetime
+from typing import Any, List, Optional, Union
+
+from pydantic import BaseModel, ValidationError, computed_field, model_validator, Field
+from transliterate import translit  # type: ignore
+
+from shop_system_models.consts.enums import ShopStatuses
+from shop_system_models.deployment_api.request.nocodb import NocoDBConfig
+from shop_system_models.deployment_api.request.services import ProjectConfiguration
+from shop_system_models.deployment_api.request.tasks import Task
+from shop_system_models.deployment_api.response.shops import ShopCategoryResponse
+
+
+class Location(BaseModel):
+    latitude: float
+    longitude: float
+    address: str
+
+
+class CreateShop(BaseModel):
+    name: str
+    categories: List[ShopCategoryResponse] = []
+    locations: Optional[List[Location]] = []
+    contact_email: str
+    template_id: str
+    orders_chat_id: int = 0
+    friendly_name: str = ''
+    contact_phone: Optional[str] = ''
+    bot_token: Optional[str] = ''
+    zone: Optional[int] = None
+
+    @model_validator(mode='before')
+    def set_friendly_name_and_format_name(cls, values: dict):
+        name = values.get('name', '')
+        if len(name) > 35:
+            raise ValueError('Shop name too long; must be less than 35 symbols')
+
+        if not values.get('friendly_name'):
+            values['friendly_name'] = name.strip().strip("-")
+
+        transliterated_name = translit(name, 'ru', reversed=True) if name else ''
+        no_whitespaces_and_underscores = transliterated_name.replace(' ', '-').replace('_', '-')
+        no_double_dashes = re.sub(r'-{2,}', '-', no_whitespaces_and_underscores)
+        to_lowercase = no_double_dashes.lower()
+        no_special_characters = re.sub(r'[^a-z0-9_-]', '', to_lowercase)
+        formatted_name = re.sub(r'^[^a-z0-9]+|[^a-z0-9]+$', '', no_special_characters)
+
+        values['name'] = formatted_name
+        return values
+
+
+class Shop(CreateShop):
+    # КОНСТАНТЫ ИЗ CONFIG
+    WEB_APP_URL: str = ''
+    FRONTEND_HOST: str = ''
+
+    placeholder: Optional[Union[ShopStatuses, Any]] = ShopStatuses.deploying
+    tasks: List[Task] = []
+    language: str = 'RU'
+    nocodb_config: NocoDBConfig = NocoDBConfig()
+
+    search_enabled: Optional[bool] = False
+    warehouse_accounting: Optional[bool] = False
+    weekly_reports: Optional[bool] = True
+    orders_history_chat_id: Optional[int] = None
+    topic_chat_id: Optional[int] = None
+    premium_expiration_date: Optional[datetime] = None
+    broadcast_messages_count: Optional[int] = 0
+    web_app_url: str = Field(default_factory=lambda: Shop.WEB_APP_URL)
+
+    blocked: bool = False
+    block_reason: str = ""
+
+    @computed_field  # type: ignore
+    @property
+    def sheet_link(self) -> Optional[str]:
+        if self.nocodb_config and self.nocodb_config.nocodb_project_id:
+            return f"{self.FRONTEND_HOST}/dashboard/#/nc/{self.nocodb_config.nocodb_project_id}"
+        return None
+
+
+class ShopDB(Shop):
+    id: str
+    tg_admin_id: int = 0
+    is_changeable: Optional[bool] = True
+    order_process: str = "The-devs.Shop.CreateOrder"
+    nocodb_config: NocoDBConfig = NocoDBConfig()
+    preview_url: Optional[str] = None
+    views_id: List[str] = []
+
+    @computed_field  # type: ignore
+    @property
+    def configuration(self) -> ProjectConfiguration:
+        return ProjectConfiguration(
+            shop_name=self.name
+        )
+
+
+class UpdateFromProcess(BaseModel):
+    nocodb_config: NocoDBConfig
+    language: str

shop_system_models/deployment_api/request/tasks.py

@@ -0,0 +1,24 @@
+from typing import List
+
+from shop_system_models.consts.enums import TaskStatuses
+from pydantic import BaseModel
+
+
+class Task(BaseModel):
+    title: str
+    assignee_role: List = []
+    shop_id: str
+    shop_name: str
+    submit_url: str = ''
+    variables: dict
+    element_id: str
+    form_json: dict
+    job_key: int
+    process_id: str
+    process_instance_key: int
+    process_monitoring_url: str
+    deadline: int
+    status: TaskStatuses = TaskStatuses.pending
+
+    class Config:
+        use_enum_values = True

shop_system_models/deployment_api/request/users.py

@@ -0,0 +1,53 @@
+from typing import List, Optional
+
+from shop_system_models.consts.enums import UserRoles
+from shop_system_models.consts.languages import TG_LANGUAGES_MAPPING
+from pydantic import BaseModel, field_validator, model_validator, computed_field
+
+
+class ReferralUser(BaseModel):
+    first_name: str
+    last_name: Optional[str] = ''
+    username: Optional[str] = ''
+    tg_id: int
+
+
+class User(BaseModel):
+    first_name: str
+    last_name: Optional[str] = ''
+    username: Optional[str] = ''
+    tg_id: int
+    tg_language: str = ''  # language_code from TG
+
+    @computed_field  # type: ignore
+    @property
+    def language(self) -> str:
+        return TG_LANGUAGES_MAPPING.get(self.tg_language, 'EN')
+
+
+class UserDB(User):
+    invited_by_id: Optional[str] = None
+    invited_by_user: Optional[ReferralUser] = None
+    cache_key: Optional[str] = None
+
+
+class UserExtended(UserDB):
+    SHOPS_LIMIT: int = 0  # сюда потом в рантайме подставишь значение из конфига
+
+    roles: List[str] = []  # 'shop_admin:<shop_id>' or 'admin'
+    shops_available: int = SHOPS_LIMIT
+
+    @field_validator('roles')
+    def if_admin(cls, roles: list):
+        for role in roles:
+            if role == UserRoles.admin.value:
+                return [UserRoles.admin.value]
+        return roles
+
+    @field_validator('shops_available')
+    def admin_limit(cls, shops_available, model):
+        roles = model.data['roles']
+        for role in roles:
+            if role == UserRoles.admin.value:
+                return 10
+        return shops_available

shop_system_models/deployment_api/request/web_app_url.py

@@ -0,0 +1,14 @@
+import re
+
+from pydantic import BaseModel, Field, field_validator
+
+
+class WebAppUrlUpdateRequest(BaseModel):
+    web_app_url: str = Field(..., description="The URL of the telegram web app")
+
+    @field_validator("web_app_url")
+    def validate_web_app_url(cls, value):
+        pattern = r"^https://t\.me/[A-Za-z0-9_]+/[A-Za-z0-9_]+$"
+        if not re.match(pattern, value):
+            raise ValueError("web_app_url must follow the pattern: 'https://t.me/{bot_name}/{webapp_name}', where bot_name and webapp_name can vary.")
+        return value

shop_system_models/deployment_api/response/general.py

@@ -0,0 +1,23 @@
+import enum
+from pydantic import BaseModel
+
+
+class PageInfo(BaseModel):
+    total_rows: int
+    page: int
+    page_size: int
+    is_first_page: bool
+    is_last_page: bool
+
+
+class ListResponseModel(BaseModel):
+    page_info: PageInfo
+
+
+class ExtraOptionsModel(str, enum.Enum):
+    enabled = 'enabled'
+    disabled = 'disabled'
+
+
+class ExtraOptionsStatusResponse(BaseModel):
+    status: ExtraOptionsModel

shop_system_models/deployment_api/response/permissions.py

@@ -0,0 +1,6 @@
+from pydantic import BaseModel
+
+
+class InviteLinkResponse(BaseModel):
+    valid_until: int
+    link: str

shop_system_models/deployment_api/response/premium.py

@@ -0,0 +1,15 @@
+from pydantic import BaseModel
+
+from shop_system_models.deployment_api.request.premium import PremiumPlanTypes
+
+
+class PremiumLinkResponseModel(BaseModel):
+    shop_name: str
+    premium_type: str
+    link: str
+
+
+class PremiumPlanType(BaseModel):
+    price: int
+    final_price: int
+    type: PremiumPlanTypes

shop_system_models/deployment_api/response/shops.py

@@ -0,0 +1,51 @@
+from datetime import datetime
+from typing import List, Optional
+
+
+from shop_system_models.deployment_api.request.nocodb import NocoDBConfig
+from shop_system_models.deployment_api.request.shop_categories import ShopCategory
+from shop_system_models.deployment_api.request.shop_content.blocks import LinkBlocks
+from shop_system_models.deployment_api.request.shop_content.delivery_types import DeliveryTypeResponse
+from shop_system_models.deployment_api.request.shop_content.payment_methods import PaymentMethodResponse
+from pydantic import BaseModel, Field
+
+
+class ContentDataResponseModel(BaseModel):
+    blocks: Optional[LinkBlocks]
+    delivery_types: Optional[List[DeliveryTypeResponse]]
+    payment_methods: Optional[List[PaymentMethodResponse]]
+
+
+class ShopDetails(BaseModel):
+    shop_id: str
+    shop_name: str
+    friendly_name: str
+    shop_language: Optional[str] = 'RU'
+    shop_api_url: str
+    contact_phone: str
+    contact_email: str
+    orders_chat_id: int # orders_management_chat_id
+    orders_history_chat_id: Optional[int] = None
+    topic_chat_id: Optional[int] = None
+    bot_url: str
+    bot_token: str
+    placeholder: str
+    order_process: str
+    search_enabled: bool = False
+    warehouse_accounting: bool = False
+    nocodb_config: Optional[NocoDBConfig] = None
+    nocodb_project_id: Optional[str] = None
+    nocodb_categories_table: Optional[str] = None
+    nocodb_products_table: Optional[str] = None
+    nocodb_orders_table: Optional[str] = None
+    nocodb_status_table: Optional[str] = None
+    nocodb_bot_commands_table: Optional[str] = None
+    nocodb_options_table: Optional[str] = ""
+    nocodb_options_category_table: Optional[str] = ""
+    premium_expiration_date: Optional[datetime] = None
+    broadcast_messages_count: Optional[int] = 0
+    web_app_url: str
+
+
+class ShopCategoryResponse(ShopCategory):
+    id: str

shop_system_models/deployment_api/response/simple_responses.py

@@ -0,0 +1,61 @@
+from typing import List, Optional
+
+
+from shop_system_models.deployment_api.request.services import ServiceConfig
+from shop_system_models.deployment_api.request.shop_templates import ShopTemplate
+from shop_system_models.deployment_api.request.shops import CreateShop, Shop, ShopDB
+from shop_system_models.deployment_api.request.tasks import Task
+from shop_system_models.deployment_api.request.users import User, UserExtended
+from pydantic import BaseModel
+
+from shop_system_models.deployment_api.response.general import ListResponseModel
+
+
+class BasicResponse(BaseModel):
+    message: str
+
+
+
+
+
+class ServiceConfigResponse(ServiceConfig):
+    id: str
+
+
+class CreateShopResponse(CreateShop):
+    id: str
+
+
+class ShopResponse(Shop):
+    id: str
+    preview_url: Optional[str] = None
+
+
+class ShopResponseId(ShopDB):
+    id: str
+
+
+class ShopsListResponseModel(ListResponseModel):
+    shops: List[ShopResponseId]
+
+
+class ShopDBResponse(ShopDB):
+    id: str
+
+
+class TaskResponse(Task):
+    id: str
+
+
+class UserResponse(UserExtended):
+    id: str
+    invited_users: Optional[List[User]] = None
+    cache_key: Optional[str] = None
+
+
+class TokenResponse(BaseModel):
+    access_token: str
+
+
+class ShopTemplateResponse(ShopTemplate):
+    id: str

shop_system_models/deployment_api/response/web_app_url.py

@@ -0,0 +1,5 @@
+from pydantic import BaseModel
+
+
+class WebAppUrlResponse(BaseModel):
+    web_app_url: str

shop_system_models/deployment_api/shared.pyi

@@ -0,0 +1,34 @@
+from datetime import datetime
+from pydantic import BaseModel
+
+class NocoDBConfig(BaseModel):
+    nocodb_project_id: str
+    nocodb_categories_table: str
+    nocodb_products_table: str
+    nocodb_orders_table: str
+    nocodb_status_table: str
+    nocodb_bot_commands_table: str
+    nocodb_options_table: str | None
+    nocodb_options_category_table: str | None
+
+class ShopDetailsModel(BaseModel):
+    shop_id: str
+    shop_name: str
+    friendly_name: str
+    shop_language: str
+    shop_api_url: str
+    contact_phone: str | None
+    contact_email: str
+    orders_chat_id: int
+    orders_history_chat_id: int | None
+    search_enabled: bool | None
+    warehouse_accounting: bool
+    bot_url: str | None
+    bot_token: str
+    payment_token: str | None
+    placeholder: str
+    order_process: str
+    nocodb_config: NocoDBConfig | None
+    topic_chat_id: int | None
+    premium_expiration_date: datetime | None
+    web_app_url: str

shop_system_models/deployment_api/users.pyi

@@ -0,0 +1,37 @@
+from pydantic import BaseModel
+
+class UserHeadersUpdatingModel(BaseModel):
+    tg_id: int
+    first_name: str | None
+    last_name: str | None
+    tg_language: str | None
+    username: str | None
+
+class UserModel(UserHeadersUpdatingModel):
+    password: str | None
+    preview_url: str | None
+    rights: str
+    delivery_addresses: list[str] | None
+
+class ReferralUser(BaseModel):
+    tg_id: int
+    first_name: str
+    last_name: str | None
+    username: str | None
+
+class InvitedUser(ReferralUser):
+    tg_language: str | None
+    language: str | None
+
+class UserDeploymentModel(BaseModel):
+    id: str
+    first_name: str
+    last_name: str | None
+    username: str | None
+    tg_id: int
+    tg_language: str
+    invited_by_id: str | None
+    invited_by_user: ReferralUser | None
+    roles: list[str] | None
+    shops_available: int
+    invited_users: list[InvitedUser] | None

shop_system_models/shop_api/shop/request/details.py

@@ -5,6 +5,16 @@ from pydantic import BaseModel, Field
 
 
 
+class NocoDBConfig(BaseModel):
+    nocodb_project_id: Optional[str] = None
+    nocodb_categories_table: Optional[str] = None
+    nocodb_products_table: Optional[str] = None
+    nocodb_orders_table: Optional[str] = None
+    nocodb_status_table: Optional[str] = None
+    nocodb_bot_commands_table: Optional[str] = None
+    nocodb_options_table: Optional[str] = ""
+    nocodb_options_category_table: Optional[str] = ""
+
 
 class ShopDetailsModel(BaseModel):
     shop_id: str

shop_system_models/shop_api/shop/request/orders.py

@@ -2,86 +2,109 @@ from datetime import datetime
 from typing import Optional, List, Dict, Any, Union
 from pydantic import Field, field_validator, BaseModel
 
-from shop_system_models.shop_api import MetaBaseModel
 from shop_system_models.shop_api.shop.response.baskets import UserBasketResponseModelV2
-from shop_system_models.shop_api.shop.response.products import ProductResponseModel
+from pydantic_core.core_schema import ValidationInfo
+from shop_system_models.consts.country_codes import ISO3166
 
 
-class ExtraFieldPayload(MetaBaseModel):
-    """Model for extra field data in orders."""
+
+class ExtraFieldPayload(BaseModel):
     name: str
     value: str
 
 
 class OrderDeliveryTypeModel(BaseModel):
-    """Model for order delivery details."""
     name: str
-    address: Optional[str] = ""
-    amount: Optional[float] = 0.0
-    extra_fields_payload: Optional[List[ExtraFieldPayload]] = Field(default_factory=lambda: [])
+    address: str | None = ""
+    amount: float | None = 0.0
+    extra_fields_payload: list[ExtraFieldPayload] | None = []
 
 
-class Coordinates(MetaBaseModel):
-    """Geographic coordinates."""
-    latitude: Optional[float] = None
-    longitude: Optional[float] = None
+class Coordinates(BaseModel):
+    latitude: float | None = None
+    longitude: float | None = None
 
 
-class AddressModel(MetaBaseModel):
-    """Address model with optional coordinates."""
-    coordinates: Optional[Coordinates] = None
-    address: Optional[str] = None
+class AddressModel(BaseModel):
+    coordinates: Coordinates | None = None
+    address: str | None = None
 
 
-class ExtraField(MetaBaseModel):
-    """Model for defining extra fields."""
+class ExtraField(BaseModel):
     name: str
     description: str
-    is_required: Optional[bool] = None
+    is_required: bool | None
 
 
-class DeliveryTypeModel(MetaBaseModel):
-    """Delivery type configuration model."""
+class DeliveryTypeModel(BaseModel):
     name: str
     amount: float = 0.0
-    is_address_required: Optional[bool] = False
-    address_hint: Optional[str] = ""
-    extra_fields: List[ExtraField] = Field(default_factory=list)
+    is_address_required: bool | None = False
+    address_hint: str | None = ""
+    extra_fields: list[ExtraField] = []
     is_timepicker_required: bool = False
-    details: Optional[str] = None
-    country: Optional[str] = None
-    country_code: Optional[str] = None  # ISO format, ex.: RU, KZ, BY...
-    city: Optional[str] = None
-    delivery_location: Optional[Coordinates] = None
-    delivery_radius: Optional[int] = None
-    delivery_min_hour: Optional[int] = None
-    delivery_max_hour: Optional[int] = None
-    delivery_minutes_interval: Optional[int] = None
-    delivery_min_day: Optional[int] = None
-    delivery_max_day: Optional[int] = None
-
-
-class BookingOrderModel(MetaBaseModel):
-    """Details for a booking order."""
+    details: str | None = ""
+    country: str | None = ""
+    country_code: str | None = ""  # ISO format, ex.: RU, KZ, BY...
+    city: str | None = ""
+    delivery_location: Coordinates | None = None
+    delivery_radius: int | None = None
+    delivery_min_hour: int | None = None
+    delivery_max_hour: int | None = None
+    delivery_minutes_interval: int | None = None
+    delivery_min_day: int | None = None
+    delivery_max_day: int | None = None
+
+    @field_validator("country_code", mode="before")
+    def set_country_code(cls, value, values: ValidationInfo):
+        country_code_upper = value.upper()
+        if ISO3166.get(country_code_upper):
+            return country_code_upper
+        return "RU"
+
+
+def format_order_number(order_count: int) -> str:
+    return f"#{order_count:04}"
+
+
+"""
+{
+    "user_id": 123,
+    "basket_id": None,
+    "basket": None,
+    "status": "booking_request",
+    "delivery": None,
+    "delivery_date_from": None,
+    "user_contact_number": None,
+    "client_coordinates": None,
+    "comment": "",# НАДО
+    "payment_type_id": # НАДО
+    "preview_url": ''
+    "booking_details": {
+        "booking_id": "123123",
+        "from_date": datetime.now(),
+        "till_date": datetime.now(),
+        "item_id": "123123",
+    }
+}"""
+
+
+class BookingOrderModel(BaseModel):
     booking_id: str
     from_date: datetime
     till_date: datetime
     item_id: str
 
 
-class CreateOrderModel(MetaBaseModel):
-    """Model for creating a new order."""
-    delivery: Optional[OrderDeliveryTypeModel] = None
+class CreateOrderModel(BaseModel):
+    delivery: OrderDeliveryTypeModel | None = None
     delivery_date_from: datetime = Field(default_factory=datetime.now)
-    comment: Optional[str] = None
-    user_contact_number: Optional[str] = None
-    payment_type_id: Optional[str] = None
-    booking_details: Optional[BookingOrderModel] = None
-    preview_url: Optional[str] = ""
-
+    comment: str | None = None
+    user_contact_number: str | None = None
+    payment_type_id: str | None = None
+    booking_details: BookingOrderModel | None = None
+    preview_url: str | None = ""
 
-class ProductsInBasket(ProductResponseModel):
-    count_in_basket: int = 1
 
 class OrderPaymentDetails(BaseModel):
     title: str
@@ -89,21 +112,20 @@ class OrderPaymentDetails(BaseModel):
     expires_at: datetime
     link: str
 
-# This depends on UserBasketResponseModelV2 which we'll define in a separate file
-# For now, we'll create a placeholder class that can be updated later
+
 class OrderModel(CreateOrderModel):
-    """Complete order model."""
-    basket: UserBasketResponseModelV2  # This will be implemented in basket models
-    user_id: Optional[str] = None
-    basket_id: Optional[str] = None
-    status: Optional[str] = None
-    client_coordinates: Optional[AddressModel] = None
-    created: datetime = Field(default_factory=datetime.now)
-    updated: datetime = Field(default_factory=datetime.now)
+    basket: UserBasketResponseModelV2
+    user_id: str | None = None
+    basket_id: str | None = None
+    status: str | None = None
+    client_coordinates: AddressModel | None = None
+    created: datetime = datetime.now()
+    updated: datetime = datetime.now()
     order_number: str = "#0001"
-    process_key: Optional[int] = None
-    coupon: Optional[str] = None
+    process_key: int | None = None
+    coupon: str | None = None
     admin_message_id: str | None = None
+
     payment_data: OrderPaymentDetails | None = None
 
 

{shop_system_models-1.0.0.dev26932.dist-info → shop_system_models-1.0.0.dev27183.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: shop_system_models
-Version: 1.0.0.dev26932
+Version: 1.0.0.dev27183
 Summary: Shared model definitions for shop system services
 Author: Pavel Mulin
 Author-email: pavel@tg-shops.com

{shop_system_models-1.0.0.dev26932.dist-info → shop_system_models-1.0.0.dev27183.dist-info}/RECORD

@@ -6,20 +6,39 @@ shop_system_models/consts/country_codes.py,sha256=YklfJ4AtRe1jpmLiG2c7PEkzC8LIaH
 shop_system_models/consts/country_codes.pyi,sha256=zp1m5IkrZLYcQDyCNub7PSBw6ieVVCEQXYW1uibeZTk,54
 shop_system_models/consts/enums.py,sha256=gangFPp3nEZB7kBN5b4hrw-bje8OFjZt01_laJBRg5I,1545
 shop_system_models/consts/enums.pyi,sha256=vF6MchkJh4q970es7BFaCj2Jj2jI3VdHWXQPJ17snQM,737
+shop_system_models/consts/languages.py,sha256=wgj2Q0IqXXFDcsL6KM2vP0x-XDA-i-FROUBAdfHyvu0,169
+shop_system_models/consts/languages.pyi,sha256=kUQ3W__UjF3bfox3BlKEkoLq-9Ug7ksR3SYwNscKMho,89
 shop_system_models/consts/messages/admin.py,sha256=OmHXEeZkg3vysdbNuTBb3MOwynXAHsXEPfHkwLyTelY,7439
 shop_system_models/consts/messages/locales/en.json,sha256=kKA3Q1raL4aojC-m484H22esCSmjAP_eyBIPn7LapIU,5233
 shop_system_models/consts/messages/locales/ru.json,sha256=2WUpor_Rui6xPXTspYXNDijoVltCgl0re2mUiWtz-o8,7049
 shop_system_models/consts/messages/mapping.py,sha256=ud_qJCfWYGUNyztSWj7jjR1ZVqn4AFdO_pQzjeskv_k,952
 shop_system_models/deployment_api/__init__.py,sha256=hkfYuImAeOVE7d3y9VbuMY9AY9GCaz4a5GhAig-sqBc,22
-shop_system_models/deployment_api/request/authorization.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+shop_system_models/deployment_api/__init__.pyi,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+shop_system_models/deployment_api/request/authorization.py,sha256=wxwZYs_IhOHMkFST9t-fFPfgcKMnnY0sMwP-KO9sMbA,105
 shop_system_models/deployment_api/request/bot.py,sha256=URJzYawioh0zxEw2lpF0XprpPi2hLFoIoA3MXMadlAo,232
 shop_system_models/deployment_api/request/nocodb.py,sha256=_2ri01vBKcNlSqhYZXdchmPclhNZXp1czEMuXauIQ3w,478
 shop_system_models/deployment_api/request/premium.py,sha256=PrK_WBDgeBKyG-E3c71YD_OZuxBVvI0Z5l9qMglKsqQ,277
-shop_system_models/deployment_api/request/processes.py,sha256=gaY1PL7kFbE6E_iDOJgEqIUXAFY01wuNBV3mbe6hVrA,316
-shop_system_models/deployment_api/request/servers.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shop_system_models/deployment_api/request/services.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+shop_system_models/deployment_api/request/processes.py,sha256=6SvMgFyMSO0JdVtIi5BFr6iBHLx8d2BdLJ1KncuWtck,317
+shop_system_models/deployment_api/request/services.py,sha256=XFs9drMz9JZC_GOiVyJwcoIgT01Cg3SAT_SLO6gXEB0,931
+shop_system_models/deployment_api/request/shop_categories.py,sha256=rRvUZoFZTyEINQmutACS2PuAcjRnsYZQKIBwjrsaLZk,183
+shop_system_models/deployment_api/request/shop_content/blocks.py,sha256=ea2WVU7nLBggYv4u2xAQGRmTPRJC19bcmlEAcy7SqCo,594
+shop_system_models/deployment_api/request/shop_content/delivery_types.py,sha256=UAzqBE9fY_L-5hjthJ5zx2YKvskA_59D6wsmSmIguXg,1341
+shop_system_models/deployment_api/request/shop_content/payment_methods.py,sha256=dkBOULMOLG7qjHrhfLKySvGegTDg2JVojTSid73jV4g,699
+shop_system_models/deployment_api/request/shop_templates.py,sha256=orbn4uRLGYrSmpExbWnlebKEaNlnb6uz3RkUguUTneQ,507
+shop_system_models/deployment_api/request/shops.py,sha256=SHUBXs5-H3Gh8Sjm9EV0CSBqK3NllJv9VkvqHh0Zgk4,3472
+shop_system_models/deployment_api/request/tasks.py,sha256=ixjn3I93uE_2d8pb--VMs6g5K2QbHqWqRMDLMfT8d4s,518
+shop_system_models/deployment_api/request/users.py,sha256=5oi4i2T1wOGTxrkCKyUz_Lf8aQjEqWtkeV5QgenXYGo,1571
+shop_system_models/deployment_api/request/web_app_url.py,sha256=UTLmaaidlldkX9bT94ifXVnLJhrkJJZ7WCOaIJ59SKI,546
+shop_system_models/deployment_api/response/general.py,sha256=YLdVdMr-RrVdRYweyOs7No3Td2ApydFKZf-TVGgNoUA,403
+shop_system_models/deployment_api/response/permissions.py,sha256=aKSoUkwUwMizVQ2XARwt3iGnuXV-txVmUs3crtkr5Oo,104
+shop_system_models/deployment_api/response/premium.py,sha256=-Pu6ZB1F8KH1_x19J5hvdy8dRsORsg_tZQLu9BwoLGk,310
+shop_system_models/deployment_api/response/shops.py,sha256=5jBuw0_BUFTw8Mjj3U6MlIwJQXr_CgbV0Ih87WkWm8g,1854
+shop_system_models/deployment_api/response/simple_responses.py,sha256=DoSRLUSsmmgxFgF7gNCjn6t12akxDHAz8mN5Ssz-DD4,1233
+shop_system_models/deployment_api/response/web_app_url.py,sha256=G2KbdkivhZfKQV8gsryQKDGhwiO2RWsNP1-crsJZt0A,89
 shop_system_models/deployment_api/shared.py,sha256=8xweJ8Wqe72oZTEVdClZkfXdlGRbKhCOBKXuQOqM-dk,1070
+shop_system_models/deployment_api/shared.pyi,sha256=PWxbMaUwi6-rB2vLT9M-scLTGfAKvnOnibxXSDoniuM,931
 shop_system_models/deployment_api/users.py,sha256=R35Xi201PWwKUovqOC-D0GiXmB7xF6Q8eF4I41H97pM,1022
+shop_system_models/deployment_api/users.pyi,sha256=Vv15K7-ICPzf-hT-k0hltG3nu6Wr7oIymk85ETv9tiM,881
 shop_system_models/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shop_system_models/shop_api/__init__.py,sha256=jzSxNJuK5ODw451Jx1BhDt_Dyh1fC1jnstICZ5dOrLo,206
 shop_system_models/shop_api/__init__.pyi,sha256=iKEzD4j101gPfFRfbkx1s9Yi46pNMbWzgfJE32BuW0g,83
@@ -39,8 +58,8 @@ shop_system_models/shop_api/shop/request/__init__.py,sha256=kFEy1H52PuduvkyKZtFe
 shop_system_models/shop_api/shop/request/baskets.py,sha256=pQsnXoekis2_5aZYmktUa5YAp3vCAv5MNpD1wBTtDsM,1123
 shop_system_models/shop_api/shop/request/categories.py,sha256=Z5BTycKC3rQfBP5GI2s3VpxaGxJ3DstfwmJpgF8EVXw,626
 shop_system_models/shop_api/shop/request/coupons.py,sha256=9TigEAUKie8Rdg38llkQ6oSRl3aWzppJd1FvWEllolI,1537
-shop_system_models/shop_api/shop/request/details.py,sha256=6cWi5jKpLP9gKQkNryCOkuuB_MU6dZTwXnKgTQ6QOkw,1047
-shop_system_models/shop_api/shop/request/orders.py,sha256=o4_G1OtolUVGK1svHISHE8yxJaGslxFA4S9ga-xwOPI,4691
+shop_system_models/shop_api/shop/request/details.py,sha256=yMz07icr4rbhwLEm8zvoFU38nou3QdrUoX0JfEpzgXE,1464
+shop_system_models/shop_api/shop/request/orders.py,sha256=Q3DRwCYA-qE3TEdns4l320xBRCgnyFyDVYfaP1wNIV4,4601
 shop_system_models/shop_api/shop/request/payment_methods.py,sha256=KnHM0nz9lp3J8vQ36QIra_jEiaF2uEipNnKKYKsFD6g,388
 shop_system_models/shop_api/shop/request/products.py,sha256=LKIxg0OcmD-uGK9DkuCVJzOgqOv3LWmCa2W5c-uX0os,1076
 shop_system_models/shop_api/shop/request/review.py,sha256=jZOaKx2cPymXnd2RjWKnKZZvSHljYDG3VdyPSWAi54o,270
@@ -57,6 +76,6 @@ shop_system_models/shop_api/shop/response/payment_methods.py,sha256=gSb5zU_8LX4x
 shop_system_models/shop_api/shop/response/products.py,sha256=_r5ZZwJJe4iYht4yIu266xsm1U_zQeSFkj5P3P6Y9Oo,1275
 shop_system_models/shop_api/shop/response/review.py,sha256=k5jzgS1HinyjbGfR6gnJENB5WufAedsMS77-vZm6fdw,486
 shop_system_models/shop_api/shop/response/users.py,sha256=DdZOTxGxQdxEg1yZi4v4mm8V8O0pV6K7zc6DWylLrMY,141
-shop_system_models-1.0.0.dev26932.dist-info/METADATA,sha256=tD5doaU3SR_k2zscbvI9FnmICDY06YMHlxLmE1dNMIg,978
-shop_system_models-1.0.0.dev26932.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-shop_system_models-1.0.0.dev26932.dist-info/RECORD,,
+shop_system_models-1.0.0.dev27183.dist-info/METADATA,sha256=yqgCI5ReGJYugodAeA2lo4dAsADcqjVtkKIKd0cKX5o,978
+shop_system_models-1.0.0.dev27183.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+shop_system_models-1.0.0.dev27183.dist-info/RECORD,,