(PC-31953)[API] feat: Handle manual edition on pro side

api/src/pcapi/core/offerers/api.py

@@ -2727,9 +2727,9 @@ def create_offerer_address_from_address_api(
     city: str,
     latitude: float,
     longitude: float,
+    is_manual_edition: bool,
 ) -> geography_models.Address:
-    is_manual_edition: bool = False
-    try:
+    if not is_manual_edition:
         address_info = api_adresse.get_address(street, postal_code, city)
         location_data = LocationData(
             city=address_info.city,
@@ -2740,23 +2740,16 @@ def create_offerer_address_from_address_api(
             insee_code=address_info.citycode,
             ban_id=address_info.id,
         )
-    except api_adresse.NoResultException:
-        insee_code = None
-        if city and postal_code:
-            try:
-                insee_code = api_adresse.get_municipality_centroid(city, postal_code).citycode
-            except api_adresse.AdresseException:
-                pass
+    else:
         location_data = LocationData(
             city=city,
             postal_code=postal_code,
             latitude=latitude,
             longitude=longitude,
             street=street,
-            insee_code=insee_code,
             ban_id=None,
+            insee_code=None,
         )
-        is_manual_edition = True
     return get_or_create_address(location_data, is_manual_edition=is_manual_edition)
 
 

api/src/pcapi/core/offerers/schemas.py

@@ -117,3 +117,4 @@ class AddressBodyModel(BaseModel):
     longitude: float | str
     postalCode: VenuePostalCode
     street: VenueAddress
+    isManualEdition: bool = False

api/src/pcapi/core/offers/api.py

@@ -331,6 +331,7 @@ def get_offerer_address_from_address(
         city=address.city,
         latitude=float(address.latitude),
         longitude=float(address.longitude),
+        is_manual_edition=address.isManualEdition,
     )
     return offerers_api.get_or_create_offerer_address(
         venue.managingOffererId,

api/tests/routes/pro/patch_offer_test.py

@@ -132,6 +132,48 @@ def test_patch_offer_with_address(self, get_address_mock, label, offer_has_oa, a
         assert address.postalCode == "75102"
         assert address.latitude == Decimal("48.85660")
         assert address.longitude == Decimal("2.3522")
+        assert address.isManualEdition is False
+
+    def test_patch_offer_with_manual_address_edition(self, client):
+        # Given
+        user_offerer = offerers_factories.UserOffererFactory(user__email="[email protected]")
+        venue = offerers_factories.VenueFactory(managingOfferer=user_offerer.offerer)
+        offer = offers_factories.OfferFactory(
+            subcategoryId=subcategories.ABO_MEDIATHEQUE.id,
+            venue=venue,
+            name="New name",
+            description="description",
+        )
+
+        # When
+        data = {
+            "name": "New name",
+            "externalTicketOfficeUrl": "http://example.net",
+            "mentalDisabilityCompliant": True,
+            "address": {
+                "street": "42, Rue qui n’existe pas",
+                "city": "Ville inconnue",
+                "postalCode": "00000",
+                "latitude": 1,
+                "longitude": 1,
+                "label": "label",
+                "isManualEdition": True,
+            },
+        }
+
+        response = client.with_session_auth("[email protected]").patch(f"/offers/{offer.id}", json=data)
+
+        assert response.status_code == 200
+        assert response.json["id"] == offer.id
+        updated_offer = Offer.query.get(offer.id)
+        address = updated_offer.offererAddress.address
+        assert updated_offer.offererAddress.label == "label"
+        assert address.street == "42, Rue qui n’existe pas"
+        assert address.city == "Ville inconnue"
+        assert address.postalCode == "00000"
+        assert address.latitude == Decimal("1")
+        assert address.longitude == Decimal("1")
+        assert address.isManualEdition is True
 
     @pytest.mark.parametrize("label", ["", None, True])
     @patch("pcapi.connectors.api_adresse.get_address")
@@ -193,6 +235,7 @@ def test_patch_offer_with_address_twice(self, get_address_mock, label, client):
         assert address.postalCode == "75102"
         assert address.latitude == Decimal("48.85660")
         assert address.longitude == Decimal("2.3522")
+        assert address.isManualEdition is False
 
     def test_withdrawal_can_be_updated(self, client):
         offer = offers_factories.OfferFactory(

api/tests/routes/pro/post_offer_test.py

@@ -1,9 +1,7 @@
 from decimal import Decimal
-from unittest.mock import patch
 
 import pytest
 
-from pcapi.connectors import api_adresse
 from pcapi.core.categories import subcategories_v2 as subcategories
 import pcapi.core.offerers.factories as offerers_factories
 from pcapi.core.offers.models import Offer
@@ -210,20 +208,19 @@ def test_create_event_offer_with_manual_offerer_address(self, oa_label, client):
                 "longitude": "2.308289",
                 "postalCode": "75001",
                 "street": "3 Rue de Valois",
+                "isManualEdition": True,
             },
         }
-        with patch("pcapi.connectors.api_adresse.get_address") as mocked_get_address:
-            mocked_get_address.side_effect = api_adresse.NoResultException
-            response = client.with_session_auth("[email protected]").post("/offers", json=data)
+        response = client.with_session_auth("[email protected]").post("/offers", json=data)
 
         # Then
         assert response.status_code == 201
         offer_id = response.json["id"]
         offer = Offer.query.get(offer_id)
         assert offer.offererAddress.address.isManualEdition
         assert offer.offererAddress.label == oa_label
-        assert offer.offererAddress.address.inseeCode == "06029"
         assert not offer.offererAddress.address.banId
+        assert offer.offererAddress.address.isManualEdition is True
 
     def when_creating_new_thing_offer(self, client):
         # Given

pro/src/apiClient/v1/models/AddressBodyModel.ts

@@ -4,6 +4,7 @@
 /* eslint-disable */
 export type AddressBodyModel = {
   city: string;
+  isManualEdition?: boolean;
   label?: string | null;
   latitude: (number | string);
   longitude: (number | string);

pro/src/screens/IndividualOffer/InformationsScreen/__specs__/serializers.spec.ts

@@ -146,6 +146,7 @@ describe('test updateIndividualOffer::serializers', () => {
         postalCode: '75001',
         street: '3 Rue de Valois',
         locationLabel: 'Bureau',
+        manuallySetAddress: true,
       }
       patchBody = {
         ...patchBody,
@@ -156,6 +157,7 @@ describe('test updateIndividualOffer::serializers', () => {
           postalCode: '75001',
           street: '3 Rue de Valois',
           label: 'Bureau',
+          isManualEdition: true,
         },
       }
       expect(
@@ -164,6 +166,37 @@ describe('test updateIndividualOffer::serializers', () => {
           formValues,
         })
       ).toEqual(patchBody)
+
+      // Test with empty label and manual edition false
+      formValues = {
+        ...formValues,
+        city: 'Paris',
+        latitude: '48.853320',
+        longitude: '2.348979',
+        postalCode: '75001',
+        street: '3 Rue de Valois',
+        locationLabel: '',
+        manuallySetAddress: false,
+      }
+      patchBody = {
+        ...patchBody,
+        address: {
+          city: 'Paris',
+          latitude: '48.853320',
+          longitude: '2.348979',
+          postalCode: '75001',
+          street: '3 Rue de Valois',
+          label: '',
+          isManualEdition: false,
+        },
+      }
+
+      expect(
+        serializePatchOffer({
+          offer: getIndividualOfferFactory(),
+          formValues,
+        })
+      ).toEqual(patchBody)
     })
   })
 })

pro/src/screens/IndividualOffer/InformationsScreen/serializePatchOffer.ts

@@ -83,8 +83,7 @@ export const serializePatchOffer = ({
     sentValues.latitude &&
     sentValues.longitude &&
     sentValues.postalCode &&
-    sentValues.street &&
-    sentValues.locationLabel
+    sentValues.street
   ) {
     addressValues = {
       address: {
@@ -94,6 +93,7 @@ export const serializePatchOffer = ({
         postalCode: sentValues.postalCode,
         street: sentValues.street,
         label: sentValues.locationLabel,
+        isManualEdition: sentValues.manuallySetAddress,
       },
     }
   }