From 1d21499eab651edd33e2566c9724444f5059cf6c Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 29 Nov 2023 14:04:19 +0100
Subject: [PATCH 1/7] add version property to accompanyingperiodwork for
 optimistic locking

---
 .../AccompanyingPeriodWork.php                | 19 ++++++++++++++
 .../migrations/Version20231129113816.php      | 26 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20231129113816.php

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index 77906b1ba..8531d7157 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -244,6 +244,13 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
      */
     private ?User $updatedBy = null;
 
+    /**
+    * @ORM\Column(type="integer", nullable=false, options={"default": 1})
+    *
+    * @Serializer\Groups({"read", "read:accompanyingPeriodWork:light", "read:evaluation:include-work"})
+    */
+    private int $version = 1;
+
     public function __construct()
     {
         $this->goals = new ArrayCollection();
@@ -452,6 +459,18 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->updatedBy;
     }
 
+    public function getVersion(): int
+    {
+        return $this->version;
+    }
+
+    public function setVersion(int $version): self
+    {
+        $this->version = $version;
+
+        return $this;
+    }
+
     public function removeAccompanyingPeriodWorkEvaluation(AccompanyingPeriodWorkEvaluation $evaluation): self
     {
         $this->accompanyingPeriodWorkEvaluations
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20231129113816.php b/src/Bundle/ChillPersonBundle/migrations/Version20231129113816.php
new file mode 100644
index 000000000..51731db8a
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20231129113816.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20231129113816 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add versioning to accompanying period work';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD version INT DEFAULT 1 NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP version');
+    }
+}

From 09882bb4be80320401a1a1554102cf475f12a7bd Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 29 Nov 2023 14:25:04 +0100
Subject: [PATCH 2/7] Add translations that were missing according to console
 error

---
 .../Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index ad386992e..f99ee53c5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -348,6 +348,9 @@ import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
 const i18n = {
    messages: {
       fr: {
+         action: {
+           save: "Enregistrer"
+         },
          action_title: "Action d'accompagnement",
          comments: "Commentaire",
          startDate: "Date de début",
@@ -378,6 +381,7 @@ const i18n = {
          no_evaluations_available: "Aucune évaluation disponible",
          no_goals_available: "Aucun objectif disponible",
          referrers: "Agents traitants",
+         add_referrers: "Ajouter des agents traitants",
          no_referrers: "Aucun agent traitant",
          choose_referrers: "Choisir des agents traitants",
          remove_referrer: "Enlever l'agent",

From f00b39980c5bd53640fb9f791a18ec5bba4d8380 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 29 Nov 2023 14:25:36 +0100
Subject: [PATCH 3/7] Add version of the social action to the state

put correct serialization groups
---
 .../Entity/AccompanyingPeriod/AccompanyingPeriodWork.php     | 2 +-
 .../public/vuejs/AccompanyingCourseWorkEdit/App.vue          | 5 +++--
 .../public/vuejs/AccompanyingCourseWorkEdit/store.js         | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index 8531d7157..be385c664 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -247,7 +247,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
     /**
     * @ORM\Column(type="integer", nullable=false, options={"default": 1})
     *
-    * @Serializer\Groups({"read", "read:accompanyingPeriodWork:light", "read:evaluation:include-work"})
+    * @Serializer\Groups({"read", "accompanying_period_work:edit"})
     */
     private int $version = 1;
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index f99ee53c5..dd4ddb664 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -297,7 +297,7 @@
             @go-to-generate-workflow="goToGenerateWorkflow"
          ></list-workflow-modal>
       </li>
-      
+
       <li>
          <button v-if="AmIRefferer"
              class="btn btn-notify"
@@ -311,7 +311,7 @@
             </ul>
          </template>
       </li>
-      
+
       <li v-if="!isPosting">
          <button class="btn btn-save" @click="submit">
             {{ $t('action.save') }}
@@ -472,6 +472,7 @@ export default {
          'errors',
          'templatesAvailablesForAction',
          'me',
+         'version'
       ]),
       ...mapGetters([
          'hasResultsForAction',
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index 9a46b741a..5175ba70c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -35,7 +35,8 @@ const store = createStore({
     referrers: window.accompanyingCourseWork.referrers,
     isPosting: false,
     errors: [],
-    me: null
+    me: null,
+    version: window.accompanyingCourseWork.version
   },
   getters: {
     socialAction(state) {

From 3bb911b4d0f10a452785dd455574bda244c38134 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 29 Nov 2023 16:14:19 +0100
Subject: [PATCH 4/7] Update version within PUT request

Try to add api logic

check for version being the same instead of smaller

implementing optimistic locking and displaying correct message in frontend

rector fixes

adjust violation message and add translation in translation.yaml

add translator in apiController
---
 .../Resources/public/lib/api/apiMethods.ts    | 25 ++++++++++++++++-
 .../AccompanyingCourseWorkApiController.php   | 28 +++++++++++++++++--
 .../AccompanyingPeriodWork.php                | 10 ++++---
 .../vuejs/AccompanyingCourseWorkEdit/App.vue  |  2 +-
 .../vuejs/AccompanyingCourseWorkEdit/store.js |  8 ++++--
 .../migrations/Version20231129113816.php      |  7 +++++
 .../translations/validators.fr.yml            |  1 +
 7 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
index 17ac8879e..24f518ca3 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
@@ -55,11 +55,20 @@ export interface ServerExceptionInterface extends TransportExceptionInterface {
   body: string;
 }
 
+export interface ConflictHttpExceptionInterface extends TransportExceptionInterface {
+    name: 'ConflictHttpException';
+    violations: string[];
+}
 
 /**
  * Generic api method that can be adapted to any fetch request
  */
-export const makeFetch = <Input, Output>(method: 'POST'|'GET'|'PUT'|'PATCH'|'DELETE', url: string, body?: body | Input | null, options?: FetchParams): Promise<Output> => {
+export const makeFetch = <Input, Output>(
+    method: 'POST'|'GET'|'PUT'|'PATCH'|'DELETE',
+    url: string, body?: body | Input | null,
+    options?: FetchParams
+): Promise<Output> => {
+
     let opts = {
         method: method,
         headers: {
@@ -67,6 +76,7 @@ export const makeFetch = <Input, Output>(method: 'POST'|'GET'|'PUT'|'PATCH'|'DEL
         },
     };
 
+
   if (body !== null && typeof body !== 'undefined') {
       Object.assign(opts, {body: JSON.stringify(body)})
     }
@@ -90,6 +100,10 @@ export const makeFetch = <Input, Output>(method: 'POST'|'GET'|'PUT'|'PATCH'|'DEL
             throw AccessException(response);
         }
 
+        if (response.status === 409) {
+            throw ConflictHttpException(response);
+        }
+
         throw {
             name: 'Exception',
             sta: response.status,
@@ -220,3 +234,12 @@ const ServerException = (code: number, body: string): ServerExceptionInterface =
 
   return error;
 }
+
+const ConflictHttpException = (response: Response): ConflictHttpExceptionInterface => {
+    const error = {} as ConflictHttpExceptionInterface;
+
+    error.name = 'ConflictHttpException';
+    error.violations = ['Sorry, but someone else has already changed this entity. Please refresh the page and apply the changes again']
+
+    return error;
+}
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
index 47e46cb6b..00d2f9026 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
@@ -15,15 +15,23 @@ use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\MainBundle\Serializer\Model\Counter;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
+use Doctrine\DBAL\LockMode;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\OptimisticLockException;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingCourseWorkApiController extends ApiController
 {
-    public function __construct(private readonly AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository)
-    {
-    }
+    public function __construct(
+        private readonly AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository,
+        private readonly EntityManagerInterface $em,
+        private readonly TranslatorInterface $translator,
+    ) {}
 
     /**
      * @Route("/api/1.0/person/accompanying-period/work/my-near-end")
@@ -67,4 +75,18 @@ class AccompanyingCourseWorkApiController extends ApiController
 
         return parent::getContextForSerialization($action, $request, $_format, $entity);
     }
+
+    public function entityPut($action, Request $request, $id, string $_format): Response
+    {
+        $entity = $this->accompanyingPeriodWorkRepository->findBy(['id' => $id])[0];
+        $expectedVersion = $entity->getVersion();
+
+        try {
+            $this->em->lock($entity, LockMode::OPTIMISTIC, $expectedVersion);
+
+            return parent::entityPut($action, $request, $id, $_format);
+        } catch (OptimisticLockException) {
+            throw new ConflictHttpException($this->translator->trans('Sorry, but someone else has already changed this entity. Please refresh the page and apply the changes again'));
+        }
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index be385c664..618918695 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -245,10 +245,12 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
     private ?User $updatedBy = null;
 
     /**
-    * @ORM\Column(type="integer", nullable=false, options={"default": 1})
-    *
-    * @Serializer\Groups({"read", "accompanying_period_work:edit"})
-    */
+     * @ORM\Column(type="integer", nullable=false, options={"default": 1})
+     *
+     * @Serializer\Groups({"read", "accompanying_period_work:edit"})
+     *
+     * @ORM\Version
+     */
     private int $version = 1;
 
     public function __construct()
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index dd4ddb664..e50b42c2c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -599,7 +599,7 @@ export default {
       },
       submit() {
          this.$store.dispatch('submit').catch((error) => {
-            if (error.name === 'ValidationException' || error.name === 'AccessException') {
+            if (error.name === 'ValidationException' || error.name === 'AccessException' || error.name === 'ConflictHttpException') {
                error.violations.forEach((violation) => this.$toast.open({message: violation}));
             } else {
                this.$toast.open({message: 'An error occurred'});
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index 5175ba70c..bec89d088 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -75,6 +75,7 @@ const store = createStore({
       return {
         type: 'accompanying_period_work',
         id: state.work.id,
+        version: state.version,
         startDate: state.startDate === null || state.startDate === '' ? null : {
           datetime: datetimeToISO(ISOToDate(state.startDate))
         },
@@ -505,19 +506,22 @@ const store = createStore({
         url = `/api/1.0/person/accompanying-course/work/${state.work.id}.json`,
         errors = []
       ;
+
       commit('setIsPosting', true);
 
-      console.log('the social action', payload);
+      // console.log('the social action', payload);
 
       return makeFetch('PUT', url, payload)
         .then(data => {
           if (typeof(callback) !== 'undefined') {
             return callback(data);
           } else {
-            console.info('nothing to do here, bye bye');
+            // console.log('payload', payload.privateComment)
+            // console.info('nothing to do here, bye bye');
             window.location.assign(`/fr/person/accompanying-period/${state.work.accompanyingPeriod.id}/work`);
           }
         }).catch(error => {
+          console.log('error', error)
           commit('setIsPosting', false);
           throw error;
         });
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20231129113816.php b/src/Bundle/ChillPersonBundle/migrations/Version20231129113816.php
index 51731db8a..20bc3b446 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20231129113816.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20231129113816.php
@@ -2,6 +2,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
diff --git a/src/Bundle/ChillPersonBundle/translations/validators.fr.yml b/src/Bundle/ChillPersonBundle/translations/validators.fr.yml
index f005755b1..691fef833 100644
--- a/src/Bundle/ChillPersonBundle/translations/validators.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/validators.fr.yml
@@ -21,6 +21,7 @@ The firstname cannot be empty: Le prénom ne peut pas être vide
 The lastname cannot be empty: Le nom de famille ne peut pas être vide
 The gender must be set: Le genre doit être renseigné
 You are not allowed to perform this action: Vous n'avez pas le droit de changer cette valeur.
+Sorry, but someone else has already changed this entity. Please refresh the page and apply the changes again: Désolé, mais quelqu'un d'autre a déjà modifié cette entité. Veuillez actualiser la page et appliquer à nouveau les modifications
 
 A center is required: Un centre est requis
 

From aa0cadfa84c4c192889f79980cba6c54d7f99e85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 8 Feb 2024 11:40:48 +0100
Subject: [PATCH 5/7] Add conflict resolution for generated API + add test

Implemented additional code to handle version conflicts when editing accompanying period work. By keeping track of the current version and returning an HTTP conflict response when it doesn't match with the provided entity version, users are properly alerted to update their entity before continuing. Furthermore, adjusted BadRequestHttpException to match correct arguments order and introduced entity version as query parameter for the URL.

ensure kernel is shutdown after generating data
---
 .../Controller/AbstractCRUDController.php     |  19 +++
 .../CRUD/Controller/ApiController.php         |   4 +-
 .../AccompanyingCourseWorkApiController.php   |  28 +---
 .../vuejs/AccompanyingCourseWorkEdit/store.js |   3 +-
 .../ConflictTest.php                          | 157 ++++++++++++++++++
 5 files changed, 183 insertions(+), 28 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCoursWorkApiController/ConflictTest.php

diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
index f3982d0d5..9ee0d9e19 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
@@ -15,10 +15,14 @@ use Chill\MainBundle\CRUD\Resolver\Resolver;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Pagination\PaginatorInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Doctrine\DBAL\LockMode;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\OptimisticLockException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -173,6 +177,21 @@ abstract class AbstractCRUDController extends AbstractController
         if (null === $e) {
             throw $this->createNotFoundException(sprintf('The object %s for id %s is not found', $this->getEntityClass(), $id));
         }
+        if ($request->query->has('entity_version')) {
+            $expectedVersion = $request->query->getInt('entity_version');
+
+            try {
+                $manager = $this->getDoctrine()->getManagerForClass($this->getEntityClass());
+
+                if ($manager instanceof EntityManagerInterface) {
+                    $manager->lock($e, LockMode::OPTIMISTIC, $expectedVersion);
+                } else {
+                    throw new \LogicException('This manager does not allow locking.');
+                }
+            } catch (OptimisticLockException $e) {
+                throw new ConflictHttpException('Sorry, but someone else has already changed this entity. Please refresh the page and apply the changes again', $e);
+            }
+        }
 
         return $e;
     }
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
index 78bdc96d5..a6675424e 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
@@ -135,7 +135,7 @@ class ApiController extends AbstractCRUDController
         try {
             $entity = $this->deserialize($action, $request, $_format, $entity);
         } catch (NotEncodableValueException $e) {
-            throw new BadRequestHttpException('invalid json', 400, $e);
+            throw new BadRequestHttpException('invalid json', $e, 400);
         }
 
         $errors = $this->validate($action, $request, $_format, $entity);
@@ -153,7 +153,7 @@ class ApiController extends AbstractCRUDController
             return $response;
         }
 
-        $this->getDoctrine()->getManager()->flush();
+        $this->getDoctrine()->getManagerForClass($this->getEntityClass())->flush();
 
         $response = $this->onAfterFlush($action, $request, $_format, $entity, $errors);
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
index 00d2f9026..47e46cb6b 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
@@ -15,23 +15,15 @@ use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\MainBundle\Serializer\Model\Counter;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
-use Doctrine\DBAL\LockMode;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\OptimisticLockException;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingCourseWorkApiController extends ApiController
 {
-    public function __construct(
-        private readonly AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository,
-        private readonly EntityManagerInterface $em,
-        private readonly TranslatorInterface $translator,
-    ) {}
+    public function __construct(private readonly AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository)
+    {
+    }
 
     /**
      * @Route("/api/1.0/person/accompanying-period/work/my-near-end")
@@ -75,18 +67,4 @@ class AccompanyingCourseWorkApiController extends ApiController
 
         return parent::getContextForSerialization($action, $request, $_format, $entity);
     }
-
-    public function entityPut($action, Request $request, $id, string $_format): Response
-    {
-        $entity = $this->accompanyingPeriodWorkRepository->findBy(['id' => $id])[0];
-        $expectedVersion = $entity->getVersion();
-
-        try {
-            $this->em->lock($entity, LockMode::OPTIMISTIC, $expectedVersion);
-
-            return parent::entityPut($action, $request, $id, $_format);
-        } catch (OptimisticLockException) {
-            throw new ConflictHttpException($this->translator->trans('Sorry, but someone else has already changed this entity. Please refresh the page and apply the changes again'));
-        }
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index bec89d088..44be6d5f2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -503,7 +503,8 @@ const store = createStore({
     submit({ getters, state, commit }, callback) {
       let
         payload = getters.buildPayload,
-        url = `/api/1.0/person/accompanying-course/work/${state.work.id}.json`,
+        params = new URLSearchParams({'entity_version': state.version}),
+        url = `/api/1.0/person/accompanying-course/work/${state.work.id}.json?${params}`,
         errors = []
       ;
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCoursWorkApiController/ConflictTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCoursWorkApiController/ConflictTest.php
new file mode 100644
index 000000000..b16560831
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCoursWorkApiController/ConflictTest.php
@@ -0,0 +1,157 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Controller\AccompanyingCoursWorkApiController;
+
+use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Test\PrepareClientTrait;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class ConflictTest extends WebTestCase
+{
+    use PrepareClientTrait;
+
+    protected function setUp(): void
+    {
+        self::ensureKernelShutdown();
+    }
+
+    protected function tearDown(): void
+    {
+        self::ensureKernelShutdown();
+    }
+
+    /**
+     * @dataProvider generateAccompanyingPeriodWork
+     *
+     * @throws \JsonException
+     */
+    public function testWhenEditionAccompanyingPeriodWorkWithCurrentVersionNoConflictOccurs(AccompanyingPeriod\AccompanyingPeriodWork $work, int $personId): void
+    {
+        $client = $this->getClientAuthenticated();
+
+        $currentVersion = $work->getVersion();
+
+        $client->request(
+            'PUT',
+            "/api/1.0/person/accompanying-course/work/{$work->getid()}.json?entity_version={$currentVersion}",
+            content: json_encode([
+                'type' => 'accompanying_period_work',
+                'id' => $work->getId(),
+                'startDate' => [
+                    'datetime' => '2023-12-15T00:00:00+01:00',
+                ],
+                'endDate' => null,
+                'note' => 'This is a note',
+                'accompanyingPeriodWorkEvaluations' => [],
+                'goals' => [],
+                'handlingThirdParty' => null,
+                'persons' => [[
+                    'type' => 'person',
+                    'id' => $personId,
+                ],
+                ],
+                'privateComment' => '',
+                'refferers' => [],
+                'results' => [],
+                'thirdParties' => [],
+            ], JSON_THROW_ON_ERROR)
+        );
+
+        self::assertResponseIsSuccessful();
+        $w = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
+
+        self::assertEquals($work->getVersion() + 1, $w['version']);
+    }
+
+    /**
+     * @dataProvider generateAccompanyingPeriodWork
+     */
+    public function testWhenEditingAccompanyingPeriodWorkWithPreviousVersionAnHttpConflictResponseOccurs(AccompanyingPeriod\AccompanyingPeriodWork $work, int $personId): void
+    {
+        $client = $this->getClientAuthenticated();
+
+        $previous = $work->getVersion() - 1;
+
+        $client->request(
+            'PUT',
+            "/api/1.0/person/accompanying-course/work/{$work->getid()}.json?entity_version={$previous}",
+            content: json_encode([
+                'type' => 'accompanying_period_work',
+                'id' => $work->getId(),
+                'startDate' => [
+                    'datetime' => '2023-12-15T00:00:00+01:00',
+                ],
+                'endDate' => null,
+                'note' => 'This is a note',
+                'accompanyingPeriodWorkEvaluations' => [],
+                'goals' => [],
+                'handlingThirdParty' => null,
+                'persons' => [[
+                    'type' => 'person',
+                    'id' => $personId,
+                ],
+                ],
+                'privateComment' => '',
+                'refferers' => [],
+                'results' => [],
+                'thirdParties' => [],
+            ], JSON_THROW_ON_ERROR)
+        );
+
+        self::assertResponseStatusCodeSame(409);
+    }
+
+    public function generateAccompanyingPeriodWork(): iterable
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+        $userRepository = self::$container->get(UserRepositoryInterface::class);
+        $user = $userRepository->findOneByUsernameOrEmail('center a_social');
+
+        $period = new AccompanyingPeriod();
+        $em->persist($period);
+        $period->addPerson(($p = new Person())->setFirstName('test')->setLastName('test')
+            ->setBirthdate(new \DateTime('1980-01-01'))->setGender(Person::BOTH_GENDER));
+        $em->persist($p);
+        $issue = (new SocialIssue())->setTitle(['fr' => 'test']);
+        $em->persist($issue);
+        $action = (new SocialAction())->setIssue($issue);
+        $em->persist($action);
+
+        $work = new AccompanyingPeriod\AccompanyingPeriodWork();
+        $work
+            ->setAccompanyingPeriod($period)
+            ->setStartDate(new \DateTimeImmutable())
+            ->addPerson($p)
+            ->setSocialAction($action)
+            ->setCreatedBy($user)
+            ->setUpdatedBy($user)
+        ;
+        $em->persist($work);
+
+        $em->flush();
+
+        self::ensureKernelShutdown();
+
+        yield [$work, $p->getId()];
+    }
+}

From cc281762b34a37900ab71ed1fc099641565d00af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 8 Feb 2024 12:32:42 +0100
Subject: [PATCH 6/7] Translate message on conflict in
 AccompanyingPeriodWorkEdit App

---
 .../public/vuejs/AccompanyingCourseWorkEdit/App.vue   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index e50b42c2c..07b735dee 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -351,6 +351,7 @@ const i18n = {
          action: {
            save: "Enregistrer"
          },
+         conflict_on_save: "Désolé, cette action d'accompagnement a été modifiée dans une autre fenêtre ou par un autre utilisateur. Rechargez la page pour voir ses changements.",
          action_title: "Action d'accompagnement",
          comments: "Commentaire",
          startDate: "Date de début",
@@ -599,8 +600,10 @@ export default {
       },
       submit() {
          this.$store.dispatch('submit').catch((error) => {
-            if (error.name === 'ValidationException' || error.name === 'AccessException' || error.name === 'ConflictHttpException') {
-               error.violations.forEach((violation) => this.$toast.open({message: violation}));
+            if (error.name === 'ValidationException' || error.name === 'AccessException') {
+              error.violations.forEach((violation) => this.$toast.open({message: violation}));
+            } else if (error.name === 'ConflictHttpException') {
+              this.$toast.open({message: this.$t('conflict_on_save')});
             } else {
                this.$toast.open({message: 'An error occurred'});
                throw error;
@@ -626,8 +629,10 @@ export default {
                   for (let v of error.violations) {
                         this.$toast.open({message: v });
                   }
+               } else if (error.name === 'ConflictHttpException') {
+                 this.$toast.open({message: this.$t('conflict_on_save')});
                } else {
-                     this.$toast.open({message: 'An error occurred'});
+                 this.$toast.open({message: 'An error occurred'});
                }
             })
       },

From 63dd71037aaf1da1e01d786943e97615738d3d10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 8 Feb 2024 12:33:35 +0100
Subject: [PATCH 7/7] Add changie file

---
 .changes/unreleased/Feature-20240208-123318.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changes/unreleased/Feature-20240208-123318.yaml

diff --git a/.changes/unreleased/Feature-20240208-123318.yaml b/.changes/unreleased/Feature-20240208-123318.yaml
new file mode 100644
index 000000000..b883306e8
--- /dev/null
+++ b/.changes/unreleased/Feature-20240208-123318.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Prevent social work to be saved when another user edited conccurently the social
+  work
+time: 2024-02-08T12:33:18.319442398+01:00
+custom:
+  Issue: "115"