shop_system_models 1.0.0.dev27178__tar.gz → 1.0.0.dev27183__tar.gz

{shop_system_models-1.0.0.dev27178 → shop_system_models-1.0.0.dev27183}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: shop_system_models
-Version: 1.0.0.dev27178
+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.dev27178 → shop_system_models-1.0.0.dev27183}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "shop_system_models"
-version = "v1.0.0.dev27178"
+version = "v1.0.0.dev27183"
 description = "Shared model definitions for shop system services"
 authors = ["Pavel Mulin <pavel@tg-shops.com>"]
 readme = "README.md"

{shop_system_models-1.0.0.dev27178 → shop_system_models-1.0.0.dev27183}/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-1.0.0.dev27183/shop_system_models/shop_api/shop/request/orders.py

@@ -0,0 +1,171 @@
+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.shop.response.baskets import UserBasketResponseModelV2
+from pydantic_core.core_schema import ValidationInfo
+from shop_system_models.consts.country_codes import ISO3166
+
+
+
+class ExtraFieldPayload(BaseModel):
+    name: str
+    value: str
+
+
+class OrderDeliveryTypeModel(BaseModel):
+    name: str
+    address: str | None = ""
+    amount: float | None = 0.0
+    extra_fields_payload: list[ExtraFieldPayload] | None = []
+
+
+class Coordinates(BaseModel):
+    latitude: float | None = None
+    longitude: float | None = None
+
+
+class AddressModel(BaseModel):
+    coordinates: Coordinates | None = None
+    address: str | None = None
+
+
+class ExtraField(BaseModel):
+    name: str
+    description: str
+    is_required: bool | None
+
+
+class DeliveryTypeModel(BaseModel):
+    name: str
+    amount: float = 0.0
+    is_address_required: bool | None = False
+    address_hint: str | None = ""
+    extra_fields: list[ExtraField] = []
+    is_timepicker_required: bool = False
+    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(BaseModel):
+    delivery: OrderDeliveryTypeModel | None = None
+    delivery_date_from: datetime = Field(default_factory=datetime.now)
+    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 OrderPaymentDetails(BaseModel):
+    title: str
+    description: str
+    expires_at: datetime
+    link: str
+
+
+class OrderModel(CreateOrderModel):
+    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: int | None = None
+    coupon: str | None = None
+    admin_message_id: str | None = None
+
+    payment_data: OrderPaymentDetails | None = None
+
+
+class LabeledPrice(BaseModel):
+    label: str
+    amount: int
+
+
+class InvoiceBaseModel(BaseModel):
+    chat_id: int
+    order_id: str
+    order_number: str  # order_number
+    payload: str  # <basket_id>_<order_id>_<order_number> from OrderResponseModel --> its subscription key
+    amount: float
+    currency: str  # fiat
+    payment_address: str
+    payment_timeout: int | None = None
+
+
+class InvoiceTGMessageModel(InvoiceBaseModel):
+    description: str  # order_products
+    provider_data: str | None = None
+    prices: list[LabeledPrice]  # label and amount in coins!
+    need_name: bool | None = False
+    need_phone_number: bool | None = False
+    need_email: bool | None = False
+    send_phone_number_to_provider: bool | None = False
+    send_email_to_provider: bool | None = False
+    is_flexible: bool | None = False
+    reply_markup: bool | None = None
+
+
+class InvoiceWithPaymentLinkMessageModel(InvoiceBaseModel):
+    payment_link: str
+
+
+class InvoiceTONMessageModel(InvoiceBaseModel):
+    approved_addresses: list[str] = []
+    ton_amount: float
+
+
+class PaidContentMessage(BaseModel):
+    message: str

shop_system_models-1.0.0.dev27178/shop_system_models/shop_api/shop/request/orders.py

@@ -1,150 +0,0 @@
-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
-
-
-class ExtraFieldPayload(MetaBaseModel):
-    """Model for extra field data in orders."""
-    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: [])
-
-
-class Coordinates(MetaBaseModel):
-    """Geographic coordinates."""
-    latitude: Optional[float] = None
-    longitude: Optional[float] = None
-
-
-class AddressModel(MetaBaseModel):
-    """Address model with optional coordinates."""
-    coordinates: Optional[Coordinates] = None
-    address: Optional[str] = None
-
-
-class ExtraField(MetaBaseModel):
-    """Model for defining extra fields."""
-    name: str
-    description: str
-    is_required: Optional[bool] = None
-
-
-class DeliveryTypeModel(MetaBaseModel):
-    """Delivery type configuration model."""
-    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_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."""
-    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
-    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] = ""
-
-
-class ProductsInBasket(ProductResponseModel):
-    count_in_basket: int = 1
-
-class OrderPaymentDetails(BaseModel):
-    title: str
-    description: str
-    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)
-    order_number: str = "#0001"
-    process_key: Optional[int] = None
-    coupon: Optional[str] = None
-    admin_message_id: str | None = None
-    payment_data: OrderPaymentDetails | None = None
-
-
-class LabeledPrice(BaseModel):
-    label: str
-    amount: int
-
-
-class InvoiceBaseModel(BaseModel):
-    chat_id: int
-    order_id: str
-    order_number: str  # order_number
-    payload: str  # <basket_id>_<order_id>_<order_number> from OrderResponseModel --> its subscription key
-    amount: float
-    currency: str  # fiat
-    payment_address: str
-    payment_timeout: int | None = None
-
-
-class InvoiceTGMessageModel(InvoiceBaseModel):
-    description: str  # order_products
-    provider_data: str | None = None
-    prices: list[LabeledPrice]  # label and amount in coins!
-    need_name: bool | None = False
-    need_phone_number: bool | None = False
-    need_email: bool | None = False
-    send_phone_number_to_provider: bool | None = False
-    send_email_to_provider: bool | None = False
-    is_flexible: bool | None = False
-    reply_markup: bool | None = None
-
-
-class InvoiceWithPaymentLinkMessageModel(InvoiceBaseModel):
-    payment_link: str
-
-
-class InvoiceTONMessageModel(InvoiceBaseModel):
-    approved_addresses: list[str] = []
-    ton_amount: float
-
-
-class PaidContentMessage(BaseModel):
-    message: str