Skip to content

Commit 8f9bfd4

Browse files
committed
added amap delivery names to orders
1 parent c134fbb commit 8f9bfd4

File tree

3 files changed

+46
-0
lines changed

3 files changed

+46
-0
lines changed

app/modules/amap/models_amap.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ class Order(Base):
7676
ForeignKey("amap_delivery.id"),
7777
index=True,
7878
)
79+
delivery_name: Mapped[str]
7980
order_id: Mapped[str] = mapped_column(primary_key=True, index=True)
8081
amount: Mapped[float]
8182
collection_slot: Mapped[AmapSlotType]

app/modules/amap/schemas_amap.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ class DeliveryProductsUpdate(BaseModel):
7070
class OrderBase(BaseModel):
7171
user_id: str
7272
delivery_id: str
73+
delivery_name: str
7374
products_ids: list[str]
7475
collection_slot: AmapSlotType
7576
products_quantity: list[int]
@@ -86,6 +87,7 @@ class OrderComplete(OrderBase):
8687
class OrderReturn(BaseModel):
8788
user: CoreUserSimple
8889
delivery_id: str
90+
delivery_name: str
8991
productsdetail: Sequence[ProductQuantity]
9092
collection_slot: AmapSlotType
9193
order_id: str
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
"""empty message
2+
3+
Create Date: 2025-09-12 11:21:06.877799
4+
"""
5+
6+
from collections.abc import Sequence
7+
from typing import TYPE_CHECKING
8+
9+
if TYPE_CHECKING:
10+
from pytest_alembic import MigrationContext
11+
12+
import sqlalchemy as sa
13+
from alembic import op
14+
15+
# revision identifiers, used by Alembic.
16+
revision: str = "b72df3765853"
17+
down_revision: str | None = "70f18009ac69"
18+
branch_labels: str | Sequence[str] | None = None
19+
depends_on: str | Sequence[str] | None = None
20+
21+
22+
def upgrade() -> None:
23+
op.add_column("amap_order", sa.Column("delivery_name", sa.String(), nullable=True))
24+
op.execute("UPDATE amap_order SET delivery_name = ''")
25+
op.alter_column("amap_order", "delivery_name", nullable=False)
26+
27+
28+
def downgrade() -> None:
29+
op.drop_column("amap_order", "delivery_name")
30+
31+
32+
def pre_test_upgrade(
33+
alembic_runner: "MigrationContext",
34+
alembic_connection: sa.Connection,
35+
) -> None:
36+
pass
37+
38+
39+
def test_upgrade(
40+
alembic_runner: "MigrationContext",
41+
alembic_connection: sa.Connection,
42+
) -> None:
43+
pass

0 commit comments

Comments
 (0)