Skip to content

Commit 0711e09

Browse files
authored
Fix cdr 2 (#798)
### Description Please explain the changes you made here. ### Checklist - [ ] Created tests which fail without the change (if possible) - [ ] All tests passing - [ ] Extended the documentation, if necessary
1 parent 82b1656 commit 0711e09

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

app/modules/cdr/endpoints_cdr.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,6 +1324,7 @@ async def get_purchases_by_user_id(
13241324
price=product_variant.price,
13251325
product=schemas_cdr.ProductComplete(
13261326
id=product.id,
1327+
year=product.year,
13271328
seller_id=product.seller_id,
13281329
name_fr=product.name_fr,
13291330
name_en=product.name_en,
@@ -1416,6 +1417,7 @@ async def get_purchases_by_user_id_by_seller_id(
14161417
price=product_variant.price,
14171418
product=schemas_cdr.ProductComplete(
14181419
id=product.id,
1420+
year=product.year,
14191421
seller_id=product.seller_id,
14201422
name_fr=product.name_fr,
14211423
name_en=product.name_en,

app/modules/cdr/schemas_cdr.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ class ProductVariantBase(BaseModel):
9595
unique: bool
9696
allowed_curriculum: list[UUID]
9797
related_membership_added_duration: timedelta | None = None
98-
year: int
9998

10099

101100
class ProductVariantComplete(BaseModel):
102101
id: UUID
102+
year: int
103103
product_id: UUID
104104
name_fr: str
105105
name_en: str | None = None
@@ -137,7 +137,6 @@ class ProductBase(BaseModel):
137137
tickets: list[GenerateTicketBase] = []
138138
product_constraints: list[UUID]
139139
document_constraints: list[UUID]
140-
year: int | None = None
141140

142141

143142
class ProductCompleteNoConstraint(BaseModel):
@@ -147,6 +146,7 @@ class ProductCompleteNoConstraint(BaseModel):
147146
description_en: str | None = None
148147
available_online: bool
149148
needs_validation: bool
149+
year: int
150150
id: UUID
151151
seller_id: UUID
152152
variants: list[ProductVariantComplete] = []
@@ -164,6 +164,7 @@ class ProductComplete(BaseModel):
164164
available_online: bool
165165
needs_validation: bool
166166
id: UUID
167+
year: int
167168
seller_id: UUID
168169
variants: list[ProductVariantComplete] = []
169170
related_membership: schemas_memberships.MembershipSimple | None = None
@@ -249,6 +250,7 @@ class PaymentBase(BaseModel):
249250
class PaymentComplete(PaymentBase):
250251
id: UUID
251252
user_id: str
253+
year: int
252254

253255
model_config = ConfigDict(from_attributes=True)
254256

0 commit comments

Comments
 (0)