Add user asserts

Author: mRoca

README.md

@@ -1,5 +1,4 @@
 # crf-resop
-=======
 
 [![pipeline status](https://gitlab.com/mRoca/resop/badges/master/pipeline.svg)](https://gitlab.com/mRoca/resop/commits/master)
 [![coverage report](https://gitlab.com/mRoca/resop/badges/master/coverage.svg)](https://gitlab.com/mRoca/resop/commits/master)
@@ -26,11 +25,11 @@ make
 # On MacOS, run:
 make pre-configure
 make configure
-# Now, update the docker-compose.override.yml and the .env files to match with your host
+# Now, update the docker-compose.override.yml file to match with your host
 make all
 ```
 
-Then, go to [http://resop.vcap.me:7500/](http://resop.vcap.me:7500/).
+Then, go to [http://resop.vcap.me:7500/](http://resop.vcap.me:7500/), or [https://resop.vcap.me:7583/](https://resop.vcap.me:7583/) for https.
 
 If you want to run a symfony or a php command: `bin/tools <command>`, example: `bin/tools bin/console`
 
@@ -89,3 +88,11 @@ make test-advanced
 make test-unit
 make test-unit-coverage
 ```
+
+## Node
+
+A node container is available in order to run `yarn` commands for `webpack encore`:
+
+```bash
+bin/node-tools yarn encore dev
+```

composer.json

@@ -8,6 +8,7 @@
         "beberlei/assert": "^3.2",
         "doctrine/annotations": "^1.8",
         "doctrine/doctrine-fixtures-bundle": "^3.3",
+        "martin-georgiev/postgresql-for-doctrine": "^1.3",
         "sensio/framework-extra-bundle": "5.*",
         "symfony/console": "5.*",
         "symfony/dotenv": "5.*",

composer.lock

@@ -1,14 +1,22 @@
 doctrine:
     dbal:
         url: '%env(resolve:DATABASE_URL)%'
-
-        # IMPORTANT: You MUST configure your server version,
-        # either here or in the DATABASE_URL env var (see .env file)
-        #server_version: '5.7'
+        server_version: '11'
+        types:
+            text[]: MartinGeorgiev\Doctrine\DBAL\Types\TextArray
+            # Some other types are available in MartinGeorgiev\Doctrine
+        mapping_types:
+            text[]: text[]
+            _text: text[]
     orm:
         auto_generate_proxy_classes: true
         naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
         auto_mapping: true
+        dql:
+            string_functions:
+                ALL_OF: MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\All
+                ANY_OF: MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\Any
+                IN_ARRAY: MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\InArray
         mappings:
             App:
                 is_bundle: false

config/packages/doctrine.yaml

@@ -8,9 +8,11 @@
 use App\Entity\Organization;
 use App\Entity\User;
 use App\Entity\UserAvailability;
+use App\Exception\ConstraintViolationListException;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 final class ApplicationFixtures extends Fixture
 {
@@ -35,17 +37,20 @@ final class ApplicationFixtures extends Fixture
         'UL 20',
     ];
 
+    private ValidatorInterface $validator;
+
+    private EncoderFactoryInterface $encoders;
+
     /** @var Organization[] */
     private array $organizations = [];
 
     /** @var User[] */
     private array $users = [];
 
-    private EncoderFactoryInterface $encoders;
-
-    public function __construct(EncoderFactoryInterface $encoders)
+    public function __construct(EncoderFactoryInterface $encoders, ValidatorInterface $validator)
     {
         $this->encoders = $encoders;
+        $this->validator = $validator;
     }
 
     public function load(ObjectManager $manager): void
@@ -74,7 +79,7 @@ private function loadOrganizations(ObjectManager $manager): void
 
         // Persist all organizations
         foreach ($this->organizations as $organization) {
-            $manager->persist($organization);
+            $this->validateAndPersist($manager, $organization);
         }
     }
 
@@ -114,13 +119,13 @@ private function loadUsers(ObjectManager $manager): void
         $user->birthday = '1990-02-28';
         $user->occupation = 'Pharmacien';
         $user->organizationOccupation = 'Secouriste';
-        $user->skillSet = ['CI Alpha', 'CI Réseau'];
+        $user->skillSet = ['ci_alpha', 'ci_reseau'];
         $user->vulnerable = true;
         $user->fullyEquipped = true;
 
         $this->users[$user->getIdentificationNumber()] = $user;
 
-        $manager->persist($user);
+        $this->validateAndPersist($manager, $user);
     }
 
     private function loadUserAvailabilities(ObjectManager $manager): void
@@ -171,4 +176,15 @@ private function addOrganization(Organization $organization): void
     {
         $this->organizations[$organization->name] = $organization;
     }
+
+    private function validateAndPersist(ObjectManager $manager, object $object): void
+    {
+        $violations = $this->validator->validate($object);
+
+        if ($violations->count() > 0) {
+            throw new ConstraintViolationListException($violations);
+        }
+
+        $manager->persist($object);
+    }
 }

src/DataFixtures/ApplicationFixtures.php

@@ -5,6 +5,7 @@
 namespace App\Entity;
 
 use Assert\Assertion;
+use Symfony\Component\Validator\Constraints as Assert;
 
 trait AvailabilitableTrait
 {
@@ -13,7 +14,7 @@ trait AvailabilitableTrait
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer", options={"unsigned": true})
      */
-    public ?int $id;
+    public ?int $id = null;
 
     /**
      * @ORM\Column(type="datetimetz_immutable")
@@ -27,19 +28,21 @@ trait AvailabilitableTrait
 
     /**
      * @ORM\Column
+     * @Assert\NotBlank
+     * @Assert\Choice(choices=AvailabilityInterface::STATUSES)
      */
-    public string $status;
+    public string $status = '';
 
     /**
      * @ORM\ManyToOne(targetEntity="App\Entity\User")
      * @ORM\JoinColumn(nullable=true)
      */
-    public ?User $planningAgent;
+    public ?User $planningAgent = null;
 
     /**
      * @ORM\Column(type="datetimetz_immutable", nullable=true)
      */
-    public ?\DateTimeImmutable $bookedAt;
+    public ?\DateTimeImmutable $bookedAt = null;
 
     /**
      * @ORM\Column(type="datetimetz_immutable")
@@ -49,7 +52,7 @@ trait AvailabilitableTrait
     /**
      * @ORM\Column(type="datetimetz_immutable", nullable=true)
      */
-    public ?\DateTimeImmutable $updatedAt;
+    public ?\DateTimeImmutable $updatedAt = null;
 
     public static function createImmutableDateTime(): \DateTimeImmutable
     {
@@ -63,8 +66,6 @@ public static function createImmutableDateTime(): \DateTimeImmutable
 
     private function initialize(?int $id, \DateTimeImmutable $startTime, \DateTimeImmutable $endTime, string $status = self::STATUS_LOCKED): void
     {
-        Assertion::inArray($status, AvailabilityInterface::STATUSES);
-
         $this->id = $id;
         $this->startTime = $startTime;
         $this->endTime = $endTime;

src/Entity/AvailabilitableTrait.php

@@ -4,15 +4,15 @@
 
 namespace App\Entity;
 
-use Assert\Assertion;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity(repositoryClass="App\Repository\CommissionableAssetRepository")
  */
 class CommissionableAsset
 {
-    private const TYPES = [
+    public const TYPES = [
         'Véhicule léger' => 'VL',
         'Véhicule de premiers secours' => 'VPSP',
     ];
@@ -22,17 +22,20 @@ class CommissionableAsset
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer", options={"unsigned": true})
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column
+     * @Assert\NotBlank
+     * @Assert\Choice(choices=CommissionableAsset::TYPES)
      */
-    public string $type;
+    public string $type = '';
 
     /**
      * @ORM\Column
+     * @Assert\NotBlank
      */
-    public string $name;
+    public string $name = '';
 
     /**
      * @ORM\ManyToOne(targetEntity="App\Entity\Organization")
@@ -43,16 +46,14 @@ class CommissionableAsset
     /**
      * @ORM\Column(type="datetimetz_immutable", nullable=true)
      */
-    public ?\DateTimeImmutable $lastCommissionDate;
+    public ?\DateTimeImmutable $lastCommissionDate = null;
 
     public function __construct(
         ?int $id,
         Organization $organization,
         string $type,
         string $name
     ) {
-        Assertion::inArray($type, self::TYPES);
-
         $this->id = $id;
         $this->organization = $organization;
         $this->type = $type;

src/Entity/CommissionableAsset.php

@@ -6,6 +6,7 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Table(
@@ -22,12 +23,13 @@ class Organization implements UserInterface
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer", options={"unsigned": true})
      */
-    public ?int $id;
+    public ?int $id = null;
 
     /**
      * @ORM\Column
+     * @Assert\NotBlank
      */
-    public string $name;
+    public string $name = '';
 
     /**
      * @ORM\Column(nullable=true)
@@ -37,7 +39,7 @@ class Organization implements UserInterface
     /**
      * @ORM\ManyToOne(targetEntity="App\Entity\Organization")
      */
-    public ?self $parent;
+    public ?self $parent = null;
 
     public function __construct(?int $id, string $name, self $parent = null)
     {