Skip to content

Include all fields in cdr user edition and fix variant edition #1069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rotheem wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Include all fields in cdr user edition and fix variant edition #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50a8c3f
fix: include all fields in cdr user edition and fix variant edition
Rotheem Sep 2, 2026
a3a7622
fix: exlude email from update
Rotheem Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/core/users/cruds_users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ async def update_user(
await db.execute(
update(models_users.CoreUser)
.where(models_users.CoreUser.id == user_id)
.values(**user_update.model_dump(exclude_none=True)),
.values(**user_update.model_dump(exclude_unset=True)),
)


Expand Down
40 changes: 26 additions & 14 deletions app/modules/cdr/endpoints_cdr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,13 +311,18 @@ async def update_cdr_user(
settings=settings,
)

if user_update.floor or user_update.nickname:
if (
user_update.floor
or user_update.nickname
or user_update.promo
or user_update.birthday
or user_update.phone
):
await cruds_users.update_user(
db=db,
user_id=user_id,
user_update=schemas_users.CoreUserUpdate(
nickname=user_update.nickname,
floor=user_update.floor,
user_update=schemas_users.CoreUserUpdateAdmin(
**user_update.model_dump(exclude_unset=True, exclude={"email"}),
),
)
await db.flush()
Expand Down Expand Up @@ -1147,7 +1152,7 @@ async def update_product_variant(
seller_id: UUID,
product_id: UUID,
variant_id: UUID,
product_variant: schemas_cdr.ProductVariantEdit,
product_variant_edit: schemas_cdr.ProductVariantEdit,
db: AsyncSession = Depends(get_db),
user: models_users.CoreUser = Depends(
is_user_allowed_to([CdrPermissions.access_cdr]),
Expand All @@ -1159,7 +1164,7 @@ async def update_product_variant(
**User must be part of the seller's group to use this endpoint**
"""

if not bool(product_variant.model_fields_set):
if not bool(product_variant_edit.model_fields_set):
raise HTTPException(
status_code=400,
detail="You must specify at least one field to update",
Expand All @@ -1177,18 +1182,25 @@ async def update_product_variant(
product_id=product_id,
variant_id=variant_id,
)
db_variant = await cruds_cdr.get_product_variant_by_id(
db=db,
variant_id=variant_id,
)
purchases = await cruds_cdr.get_purchases_by_variant_id(
db=db,
product_variant_id=variant_id,
)
if purchases and "price" in product_variant.model_fields_set:
if purchases and "price" in product_variant_edit.model_fields_set:
raise HTTPException(
status_code=403,
detail="You can't edit the price of this variant because it has already been purchased.",
)
if (
purchases
and "related_membership_added_duration" in product_variant.model_fields_set
and db_variant
and "related_membership_added_duration" in product_variant_edit.model_fields_set
and db_variant.related_membership_added_duration
!= product_variant_edit.related_membership_added_duration
):
raise HTTPException(
status_code=403,
Expand All @@ -1198,16 +1210,16 @@ async def update_product_variant(
if (
db_product
and not db_product.related_membership
and product_variant.related_membership_added_duration
and product_variant_edit.related_membership_added_duration
):
raise HTTPException(
status_code=403,
detail="This product has no related membership. You can't specify a membership duration.",
)
if (
product_variant.price is not None
product_variant_edit.price is not None
and db_product
and (not db_product.needs_validation and product_variant.price != 0)
and (not db_product.needs_validation and product_variant_edit.price != 0)
):
raise HTTPException(
status_code=403,
Expand All @@ -1216,12 +1228,12 @@ async def update_product_variant(

await cruds_cdr.update_product_variant(
variant_id=variant_id,
product_variant=product_variant,
product_variant=product_variant_edit,
db=db,
)
if product_variant.allowed_curriculum is not None:
if product_variant_edit.allowed_curriculum is not None:
await cruds_cdr.delete_allowed_curriculums(db=db, variant_id=variant_id)
for c in product_variant.allowed_curriculum:
for c in product_variant_edit.allowed_curriculum:
cruds_cdr.create_allowed_curriculum(
db,
models_cdr.AllowedCurriculum(
Expand Down
Loading