(PC-33125)[API] fix: public api: edit event's location #15152
Conversation
|
|
jbaudet-pass
force-pushed
the
PC-33125/fix_public_api_offer_edit_can_update_address
branch
from
144dcce
to
f770add
Compare
| ) -> models.Offer: | ||
| aliases = set(body.dict(by_alias=True)) | ||
| fields = body.dict(by_alias=True, exclude_unset=True) | ||
|
|
||
| # updated using the pro interface |
There was a problem hiding this comment.
Je pense qu'il y a peut-être une refacto à faire ici mais dans un deuxième temps. Le code de l'update est ici trop orienté portail pro (mais je sais bien que ce n'est pas de ton fait).
api/src/pcapi/core/offers/api.py
Outdated
| @@ -428,7 +439,7 @@ def update_offer( | |||
|
|
|||
| withdrawal_fields = {"bookingContact", "withdrawalDelay", "withdrawalDetails", "withdrawalType"} | |||
| withdrawal_updated = updates_set & withdrawal_fields | |||
| oa_updated = "offererAddress" in updates | |||
| oa_updated = "offererAddress" in updates or (offerer_address is not None) | |||
There was a problem hiding this comment.
Je ne suis pas sûr qu'il faille ajouter la condition or (offerer_address is not None) ici parce que si on a renseigné un offerer_addressmais qu'il est identique au précédent offerer_address alors normalement il n'y a pas d'update (si on se réfère à la ligne 376).
| with suppress(AttributeError): | ||
| if body.location.venue_id: # type: ignore[union-attr] | ||
| venue = utils.get_venue_with_offerer_address(body.location.venue_id) # type: ignore[union-attr] | ||
| offerer_address = venue.offererAddress # default offerer_address |
There was a problem hiding this comment.
Plutôt que d'utiliser suppress(AttributeError) et d'avoir à ajouter des # type: ignore[union-attr], le mieux ici c'est sans doute de procéder ainsi
| with suppress(AttributeError): | |
| if body.location.venue_id: # type: ignore[union-attr] | |
| venue = utils.get_venue_with_offerer_address(body.location.venue_id) # type: ignore[union-attr] | |
| offerer_address = venue.offererAddress # default offerer_address | |
| location = body.location | |
| if location: | |
| venue = utils.get_venue_with_offerer_address(location.venue_id) | |
| if location.type == "address": | |
| address = utils.get_address_or_raise_404(location.address_id) | |
| offerer_address = offerers_api.get_or_create_offerer_address( | |
| offerer_id=venue.managingOffererId, | |
| address_id=address.id, | |
| label=location.address_label, | |
| ) | |
| else: | |
| offerer_address = venue.offererAddress |
| with suppress(AttributeError): | ||
| if body.location.type == "address": # type: ignore[union-attr] | ||
| assert venue is not None | ||
|
|
||
| address = utils.get_address_or_raise_404(body.location.address_id) # type: ignore[union-attr] | ||
| offerer_address = offerers_api.get_or_create_offerer_address( | ||
| offerer_id=venue.managingOffererId, | ||
| address_id=address.id, | ||
| label=body.location.address_label, # type: ignore[union-attr] | ||
| ) | ||
|
|
There was a problem hiding this comment.
Avec ma proposition précédente tu peux enlever cette partie :)
| body: offers_schemas.UpdateOffer, | ||
| venue: offerers_models.Venue | None = None, | ||
| offerer_address: offerers_models.OffererAddress | None = None, | ||
| is_from_private_api: bool = False, |
There was a problem hiding this comment.
Ce qui pourrait être cool c'est que tu ajoutes des tests pour les changements que tu as apportés à update_offer
jbaudet-pass
force-pushed
the
PC-33125/fix_public_api_offer_edit_can_update_address
branch
from
f770add
to
61477a7
Compare
jbaudet-pass
force-pushed
the
PC-33125/fix_public_api_offer_edit_can_update_address
branch
from
61477a7
to
bea5d34
Compare
jbaudet-pass
deleted the
PC-33125/fix_public_api_offer_edit_can_update_address
branch
But de la pull request
Ticket Jira (ou description si BSR) : https://passculture.atlassian.net/browse/PC-33125
Permettre l'édition de l'emplacement d'un événement via l'API publique. Le portail pro le permet mais pas l'API, cette PR corrige cet écart.
J'ai essayé d'adopter une approche la plus proche possible de ce qui se fait pour la création (
venueetofferer_addresspassés à part).