Merge pull request #3633 from betagouv/claim-update-redirect

Après avoir révendiquer une cantine sur la page SIRET, rediriger l'utilisateur vers la page modification de la cantine

Author: alemangui

api/serializers/__init__.py

@@ -11,6 +11,7 @@
     CanteenTeledeclarationSerializer,
     SatelliteTeledeclarationSerializer,
     ElectedCanteenSerializer,
+    MinimalCanteenSerializer,
 )
 from .diagnostic import (  # noqa: F401
     ManagerDiagnosticSerializer,

api/tests/test_published_canteens.py

@@ -579,11 +579,14 @@ def test_canteen_claim_value(self):
 
     @authenticate
     def test_canteen_claim_request(self):
-        canteen = CanteenFactory.create(publication_status=Canteen.PublicationStatus.PUBLISHED.value)
+        canteen = CanteenFactory.create(publication_status=Canteen.PublicationStatus.DRAFT)
         canteen.managers.clear()
 
         response = self.client.post(reverse("claim_canteen", kwargs={"canteen_pk": canteen.id}), None)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
+        body = response.json()
+        self.assertEqual(body["id"], canteen.id)
+        self.assertEqual(body["name"], canteen.name)
         user = authenticate.user
         self.assertEqual(canteen.managers.first().id, user.id)
         self.assertEqual(canteen.managers.count(), 1)

api/views/canteen.py

@@ -35,6 +35,7 @@
     CanteenActionsSerializer,
     CanteenStatusSerializer,
     ElectedCanteenSerializer,
+    MinimalCanteenSerializer,
 )
 from data.models import Canteen, ManagerInvitation, Sector, Diagnostic, Teledeclaration, Purchase
 from data.region_choices import Region
@@ -1047,7 +1048,7 @@ def post(self, request, canteen_pk):
         canteen.claimed_by = self.request.user
         canteen.has_been_claimed = True
         canteen.save()
-        return JsonResponse({}, status=status.HTTP_200_OK)
+        return JsonResponse(camelize(MinimalCanteenSerializer(canteen).data), status=status.HTTP_200_OK)
 
 
 class UndoClaimCanteenView(APIView):

frontend/src/views/CanteenEditor/SiretCheck.vue

@@ -180,7 +180,7 @@ export default {
           this.requestSent = true
           this.$store.dispatch("notify", {
             status: "success",
-            message: `Votre message a bien été envoyé.`,
+            message: "Votre message a bien été envoyé.",
           })
           window.scrollTo(0, 0)
         })
@@ -190,8 +190,18 @@ export default {
       const canteenId = this.duplicateSiretCanteen.id
       return this.$store
         .dispatch("claimCanteen", { canteenId })
-        .then(() => (this.requestSent = true))
         .catch((e) => this.$store.dispatch("notifyServerError", e))
+        .then((response) => {
+          this.$store.dispatch("notify", {
+            status: "success",
+            message: "Vous gérez maintenant cet établissement.",
+          })
+          this.$router.push({
+            name: "CanteenForm",
+            params: { canteenUrlComponent: this.$store.getters.getCanteenUrlComponent(response) },
+          })
+        })
+        .catch(() => this.$router.push({ name: "ManagementPage" }))
     },
     saveSiretIfNeeded() {
       if (!this.canteen?.id) return Promise.resolve()