Issue336 internal create action fixes

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php

@@ -110,6 +110,34 @@ class AccompanyingCourseController extends Controller
         ]);
     }
 
+    /**
+     * Comments page of Accompanying Course section.
+     *
+     * @Route("/{_locale}/parcours/{accompanying_period_id}/comments", name="chill_person_accompanying_period_comment_list")
+     * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
+     */
+    public function commentAction(AccompanyingPeriod $accompanyingCourse, Request $request): Response
+    {
+        $comment = new AccompanyingPeriod\Comment();
+
+        $form = $this->createForm(AccompanyingCourseCommentType::class, $comment, []);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $em = $this->getDoctrine()->getManager();
+
+            $em->persist($comment);
+            $em->flush();
+
+            return $this->redirectToRoute($route);
+        }
+
+        return $this->render('@ChillPerson/AccompanyingCourse/comment_list.html.twig', [
+            'accompanyingCourse' => $accompanyingCourse,
+            'form' => $form->createView(),
+        ]);
+    }
+
     /**
      * Edit page of Accompanying Course section.
      *
@@ -217,35 +245,4 @@ class AccompanyingCourseController extends Controller
             'accompanying_period_id' => $period->getId(),
         ]);
     }
-
-    /**
-     * Comments page of Accompanying Course section.
-     *
-     * @Route("/{_locale}/parcours/{accompanying_period_id}/comments", name="chill_person_accompanying_period_comment_list")
-     * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
-     */
-    public function commentAction(AccompanyingPeriod $accompanyingCourse, Request $request): Response
-    {
-
-        $comment = new AccompanyingPeriod\Comment();
-
-        $form = $this->createForm(AccompanyingCourseCommentType::class, $comment, []);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-
-            $em = $this->getDoctrine()->getManager();
-
-            $em->persist($comment);
-            $em->flush();
-
-            return $this->redirectToRoute($route);
-        }
-
-        return $this->render('@ChillPerson/AccompanyingCourse/comment_list.html.twig', [
-            'accompanyingCourse' => $accompanyingCourse,
-            'form' => $form->createView()
-        ]);
-    }
-
 }

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php

@@ -95,7 +95,7 @@ class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture
             // 1 of 10, force an evaluation
             if (0 === $i % 10) {
                 $evaluation = $this->getRandomEvaluation();
-                $action = $evaluation->getSocialAction();
+                $action = $evaluation->getSocialActions()->first();
                 $issue = $action->getIssue();
 
                 $period->addSocialIssue($issue);

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -180,14 +180,6 @@ class AccompanyingPeriod implements
      */
     private ?int $id = null;
 
-    /**
-     * @ORM\ManyToOne(
-     *     targetEntity=Comment::class
-     * )
-     * @Groups({"read"})
-     */
-    private ?Comment $pinnedComment = null;
-
     /**
      * @var string
      * @ORM\Column(type="string", nullable=true)
@@ -229,6 +221,14 @@ class AccompanyingPeriod implements
      */
     private ?Person $personLocation = null;
 
+    /**
+     * @ORM\ManyToOne(
+     *     targetEntity=Comment::class
+     * )
+     * @Groups({"read"})
+     */
+    private ?Comment $pinnedComment = null;
+
     /**
      * @ORM\Column(type="text")
      * @Groups({"read", "write"})
@@ -603,14 +603,6 @@ class AccompanyingPeriod implements
         return $this->id;
     }
 
-    /**
-     * @Groups({"read"})
-     */
-    public function getPinnedComment(): ?Comment
-    {
-        return $this->pinnedComment;
-    }
-
     public function getIntensity(): ?string
     {
         return $this->intensity;
@@ -738,6 +730,14 @@ class AccompanyingPeriod implements
             );
     }
 
+    /**
+     * @Groups({"read"})
+     */
+    public function getPinnedComment(): ?Comment
+    {
+        return $this->pinnedComment;
+    }
+
     /**
      * @return Collection|SocialAction[] All the descendant social actions of all
      * the descendants of the entity
@@ -1027,24 +1027,6 @@ class AccompanyingPeriod implements
         return $this;
     }
 
-    /**
-     * @Groups({"write"})
-     */
-    public function setPinnedComment(?Comment $comment = null): self
-    {
-        if (null !== $this->pinnedComment) {
-            $this->removeComment($this->pinnedComment);
-        }
-
-        if ($comment instanceof Comment) {
-            $this->addComment($comment);
-        }
-
-        $this->pinnedComment = $comment;
-
-        return $this;
-    }
-
     public function setIntensity(string $intensity): self
     {
         $this->intensity = $intensity;
@@ -1083,6 +1065,24 @@ class AccompanyingPeriod implements
         return $this;
     }
 
+    /**
+     * @Groups({"write"})
+     */
+    public function setPinnedComment(?Comment $comment = null): self
+    {
+        if (null !== $this->pinnedComment) {
+            $this->removeComment($this->pinnedComment);
+        }
+
+        if ($comment instanceof Comment) {
+            $this->addComment($comment);
+        }
+
+        $this->pinnedComment = $comment;
+
+        return $this;
+    }
+
     public function setRemark(?string $remark = null): self
     {
         $this->remark = (string) $remark;

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php

@@ -112,6 +112,11 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
         return $this->updatedBy;
     }
 
+    public function isPinned(): bool
+    {
+        return $this->getAccompanyingPeriod()->getPinnedComment() === $this;
+    }
+
     public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
     {
         $this->accompanyingPeriod = $accompanyingPeriod;
@@ -158,9 +163,4 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
 
         return $this;
     }
-
-    public function isPinned(): bool
-    {
-        return $this->getAccompanyingPeriod()->getPinnedComment() === $this;
-    }
 }

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -244,7 +244,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @Assert\Date(
      *     groups={"general", "creation"}
      * )
-     * @Assert\GreaterThan(propertyPath="birthDate")
+     * @Assert\GreaterThanOrEqual(propertyPath="birthdate")
      * @Assert\LessThanOrEqual("today")
      */
     private ?DateTimeImmutable $deathdate = null;

src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php

@@ -91,6 +91,11 @@ class Evaluation
         return $this->notificationDelay;
     }
 
+    public function getSocialActions(): Collection
+    {
+        return $this->socialActions;
+    }
+
     public function getTitle(): array
     {
         return $this->title;

src/Bundle/ChillPersonBundle/Form/AccompanyingCourseCommentType.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Chill is a software for social workers
  *
@@ -19,8 +20,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 class AccompanyingCourseCommentType extends AbstractType
 {
     /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
      * @return void
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -29,7 +28,6 @@ class AccompanyingCourseCommentType extends AbstractType
     }
 
     /**
-     * @param OptionsResolver $resolver
      * @return void
      */
     public function configureOptions(OptionsResolver $resolver)

src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php

@@ -80,7 +80,7 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
                 'accompanying_period_id' => $period->getId(),
             ], ])
             ->setExtras(['order' => 50]);
-        */
+         */
 
         $workflow = $this->registry->get($period, 'accompanying_period_lifecycle');
 

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue

@@ -8,10 +8,10 @@
       <div id="picking">
           <p>{{ $t('pick_social_issue_linked_with_action') }}</p>
           <div v-for="si in socialIssues">
-            <input type="radio" checked v-bind:value="si.id" name="socialIssue" v-model="socialIssuePicked"><span class="badge bg-chill-l-gray text-dark">{{ si.text }}</span>
+            <input type="radio" v-bind:value="si.id" name="socialIssue" v-model="socialIssuePicked"><span class="badge bg-chill-l-gray text-dark">{{ si.text }}</span>
           </div>
       <div class="my-3">
-        <div class="col-8">
+        <div class="col-11">
           <vue-multiselect
               name="otherIssues"
               label="text"
@@ -35,7 +35,7 @@
       </div>
       <div v-if="hasSocialIssuePicked">
         <h2>{{ $t('pick_an_action') }}</h2>
-        <div class="col-8">
+        <div class="col-11">
           <vue-multiselect
             v-model="socialActionPicked"
             label="text"
@@ -77,7 +77,7 @@
         <p>{{ $t('form_has_errors') }}</p>
 
         <ul>
-          <li v-for="e in errors">
+          <li v-for="e in errors" :key="e.id">
             {{ e }}
           </li>
         </ul>
@@ -120,6 +120,7 @@ const i18n = {
       endDate: "Date de fin",
       form_has_errors: "Le formulaire comporte des erreurs",
       pick_social_issue: "Choisir une problématique sociale",
+      pick_other_social_issue: "Veuillez choisir un autre problématique",
       pick_an_action: "Choisir une action d'accompagnement",
       pick_social_issue_linked_with_action: "Indiquez la problématique sociale liée à l'action d'accompagnement",
       persons_involved: "Usagers concernés",
@@ -178,12 +179,10 @@ export default {
     personsPicked: {
       get() {
         let s = this.$store.state.personsPicked.map(p => p.id);
-        // console.log('persons picked', s);
 
         return s;
       },
       set(v) {
-        // console.log('persons picked', v);
         this.$store.commit('setPersonsPickedIds', v);
       }
     },
@@ -226,6 +225,11 @@ export default {
         this.$store.commit('setEndDate', ISOToDate(value));
       }
     },
+    setSocialIssue: {
+      set() {
+        this.$store.dispatch('setSocialIssue', socialIssues[socialIssues.length - 1])
+      }
+    }
   }
 }
 

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js

@@ -31,7 +31,6 @@ const store = createStore({
       return null !== state.socialActionPicked;
     },
     hasSocialIssuePicked(state) {
-      console.log(state.socialIssuePicked);
       return null !== state.socialIssuePicked;
     },
     isLoadingSocialActions(state) {
@@ -74,36 +73,27 @@ const store = createStore({
   },
   mutations: {
     setSocialActionsReachables(state, actions) {
-      // console.log('set social action reachables');
-      // console.log(actions);
-
       state.socialActionsReachables = actions;
     },
     setSocialAction(state, socialAction) {
-      // console.log('socialAction', socialAction);
       state.socialActionPicked = socialAction;
     },
     setSocialIssue(state, socialIssueId) {
-      // console.log('set social issue', socialIssueId);
       if (socialIssueId === null) {
         state.socialIssuePicked = null;
       } else {
         let mapped = state.socialIssues
           .find(e => e.id === socialIssueId);
         state.socialIssuePicked = mapped;
-        // console.log('social issue setted', state.socialIssuePicked);
       }
     },
     addIssueInList(state, issue) {
-      //console.log('add issue list', issue.id);
       state.socialIssues.push(issue);
     },
     updateIssuesOther(state, payload) {
-      //console.log('update issues other');
       state.socialIssuesOther = payload;
     },
     removeIssueInOther(state, issue) {
-      //console.log('remove issue other', issue.id);
       state.socialIssuesOther = state.socialIssuesOther.filter(
           (i) => i.id !== issue.id
       );
@@ -124,12 +114,12 @@ const store = createStore({
       state.endDate = date;
     },
     setPersonsPickedIds(state, ids) {
-      console.log('persons ids', ids);
+
       state.personsPicked = state.personsReachables
         .filter(p => ids.includes(p.id))
     },
     addErrors(state, { errors, cancel_posting }) {
-      console.log('add errors', errors);
+
       state.errors = errors;
       if (cancel_posting) {
         state.isPostingWork = false;
@@ -138,8 +128,6 @@ const store = createStore({
   },
   actions: {
     pickSocialIssue({ commit }, socialIssueId) {
-      console.log('pick social issue');
-
       commit('setIsLoadingSocialActions', true);
       commit('setSocialAction', null);
       commit('setSocialActionsReachables', []);

src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php

@@ -60,32 +60,6 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
         $this->assertFalse($period->isClosingAfterOpening());
     }
 
-    public function testPinnedComment()
-    {
-        $period = new AccompanyingPeriod(new DateTime());
-        $comment = new Comment();
-        $replacingComment = new Comment();
-
-        $period->setPinnedComment(null);
-        $this->assertNull($period->getPinnedComment());
-
-        $period->setPinnedComment($comment);
-        $this->assertSame($period->getPinnedComment(), $comment);
-        $this->assertSame($period, $comment->getAccompanyingPeriod());
-        $this->assertEquals(0, count($period->getComments()), 'The initial comment should not appears in the list of comments');
-
-        $period->setPinnedComment($replacingComment);
-        $this->assertSame($period->getPinnedComment(), $replacingComment);
-        $this->assertSame($period, $replacingComment->getAccompanyingPeriod());
-        $this->assertEquals(0, count($period->getComments()), 'The initial comment should not appears in the list of comments');
-        $this->assertNull($comment->getAccompanyingPeriod());
-
-        $period->setPinnedComment(null);
-        $this->assertNull($period->getPinnedComment());
-        $this->assertNull($replacingComment->getAccompanyingPeriod());
-        $this->assertEquals(0, count($period->getComments()), 'The initial comment should not appears in the list of comments');
-    }
-
     public function testIsClosed()
     {
         $period = new AccompanyingPeriod(new DateTime());
@@ -145,6 +119,32 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals(1, $period->getParticipationsContainsPerson($person4)->count());
     }
 
+    public function testPinnedComment()
+    {
+        $period = new AccompanyingPeriod(new DateTime());
+        $comment = new Comment();
+        $replacingComment = new Comment();
+
+        $period->setPinnedComment(null);
+        $this->assertNull($period->getPinnedComment());
+
+        $period->setPinnedComment($comment);
+        $this->assertSame($period->getPinnedComment(), $comment);
+        $this->assertSame($period, $comment->getAccompanyingPeriod());
+        $this->assertEquals(0, count($period->getComments()), 'The initial comment should not appears in the list of comments');
+
+        $period->setPinnedComment($replacingComment);
+        $this->assertSame($period->getPinnedComment(), $replacingComment);
+        $this->assertSame($period, $replacingComment->getAccompanyingPeriod());
+        $this->assertEquals(0, count($period->getComments()), 'The initial comment should not appears in the list of comments');
+        $this->assertNull($comment->getAccompanyingPeriod());
+
+        $period->setPinnedComment(null);
+        $this->assertNull($period->getPinnedComment());
+        $this->assertNull($replacingComment->getAccompanyingPeriod());
+        $this->assertEquals(0, count($period->getComments()), 'The initial comment should not appears in the list of comments');
+    }
+
     public function testRequestor()
     {
         $period = new AccompanyingPeriod(new DateTime());

src/Bundle/ChillPersonBundle/migrations/Version20211213150253.php

@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * 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.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -9,10 +16,18 @@ use Doctrine\Migrations\AbstractMigration;
 
 /**
  * Auto-generated Migration: Please modify to your needs!
- * @author Mathieu Jaumotte mathieu.jaumotte@champs-libres.coop
  */
 final class Version20211213150253 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT FK_E260A868B0804E90');
+        $this->addSql('DROP INDEX IDX_E260A868B0804E90');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period RENAME COLUMN pinnedcomment_id TO initialcomment_id');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT fk_e260a8683111d50b FOREIGN KEY (initialcomment_id) REFERENCES chill_person_accompanying_period_comment (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX idx_e260a8683111d50b ON chill_person_accompanying_period (initialcomment_id)');
+    }
+
     public function getDescription(): string
     {
         return 'rename initialComment attribute to pinnedComment';
@@ -26,13 +41,4 @@ final class Version20211213150253 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT FK_E260A868B0804E90 FOREIGN KEY (pinnedcomment_id) REFERENCES chill_person_accompanying_period_comment (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('CREATE INDEX IDX_E260A868B0804E90 ON chill_person_accompanying_period (pinnedcomment_id)');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT FK_E260A868B0804E90');
-        $this->addSql('DROP INDEX IDX_E260A868B0804E90');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period RENAME COLUMN pinnedcomment_id TO initialcomment_id');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT fk_e260a8683111d50b FOREIGN KEY (initialcomment_id) REFERENCES chill_person_accompanying_period_comment (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('CREATE INDEX idx_e260a8683111d50b ON chill_person_accompanying_period (initialcomment_id)');
-    }
 }

src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php

@@ -219,7 +219,6 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     private ?string $telephone = null;
 
     /**
-     * @var array|null
      * @ORM\Column(name="types", type="json", nullable=true)
      */
     private ?array $thirdPartyTypes = [];

src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php

@@ -1,13 +1,25 @@
 <?php
 
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Test\Serializer\Normalizer;
 
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-class ThirdPartyJsonDenormalizerTest extends KernelTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ThirdPartyJsonDenormalizerTest extends KernelTestCase
 {
     private DenormalizerInterface $normalizer;
 
@@ -20,18 +32,18 @@ class ThirdPartyJsonDenormalizerTest extends KernelTestCase
 
     public function testDenormalizeContact()
     {
-        $str = <<<JSON
+        $str = <<<'JSON'
-        {
+            {
-          "type": "thirdparty",
+              "type": "thirdparty",
-          "name": "badaboum",
+              "name": "badaboum",
-          "email": "badaboum@email.com",
+              "email": "badaboum@email.com",
-          "telephone": "+32486540660",
+              "telephone": "+32486540660",
-          "kind": "contact"
+              "kind": "contact"
-        }
+            }
-        JSON;
+            JSON;
 
         $actual = $this->normalizer->denormalize(json_decode($str, true), ThirdParty::class, 'json', [
-            'groups' => ['write']
+            'groups' => ['write'],
         ]);
 
         $this->assertInstanceOf(ThirdParty::class, $actual);
@@ -39,5 +51,4 @@ class ThirdPartyJsonDenormalizerTest extends KernelTestCase
         $this->assertEquals('badaboum@email.com', $actual->getEmail());
         $this->assertEquals(ThirdParty::KIND_CONTACT, $actual->getKind());
     }
-
 }