fix(interactions): get correct date when delete interaction

SocialGouv · Nov 29, 2023 · a768bbc · a768bbc
1 parent 751563b
commit a768bbc
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 19 deletions.
diff --git a/.talismanrc b/.talismanrc
@@ -17,6 +17,8 @@ fileignoreconfig:
   checksum: 459ec0c5e439bca5375d3a06f4868f8078ca2ad1895fdc5c84bc81cc6bc394fc
 - filename: packages/frontend/src/app/modules/general/components/login/login.component.ts
   checksum: 478ac6427b28b5473166ea12bc5ffe275d6dfb1bf3c190c1d852012907f4d317
+- filename: packages/frontend/src/app/modules/users/components/user-structure-password-form/user-structure-password-form.component.html
+  checksum: 6b7878776dbcf983b920e6fdb090a52f5f79f3e4e36187c1460aff17c0cfba83
 - filename: packages/frontend/src/assets/files/news.json
   checksum: eef674a077a8c6b56e087ae5d664b10ba956b435f6e29cc241f90ba55f8c1f7a
 - filename: packages/portail-usagers/src/app/modules/general/components/_static/cgu/cgu.component.html

diff --git a/packages/backend/src/interactions/services/InteractionsDeletor.service.ts b/packages/backend/src/interactions/services/InteractionsDeletor.service.ts
@@ -73,6 +73,7 @@ export class InteractionsDeletor {
           usagerUUID: usager.uuid,
           type: In(INTERACTION_OK_LIST),
           content: Not(Like("%Courrier remis au mandataire%")),
+          uuid: Not(interaction.uuid),
         },
         select: {
           dateInteraction: true,

diff --git a/...users/components/user-structure-password-form/user-structure-password-form.component.html b/...users/components/user-structure-password-form/user-structure-password-form.component.html
@@ -48,8 +48,8 @@
       <p
         class="my-1"
         [ngClass]="
-          parentFormGroup.controls.password.hasError('required') ||
-          parentFormGroup.controls.password.hasError('hasNumber')
+          parentFormGroup.controls.password?.errors?.required ||
+          parentFormGroup.controls.password?.errors?.hasNumber
             ? 'text-danger'
             : 'text-success'
         "
@@ -58,8 +58,8 @@
           aria-hidden="true"
           [icon]="[
             'fas',
-            parentFormGroup.controls.password.hasError('required') ||
-            parentFormGroup.controls.password.hasError('hasNumber')
+            parentFormGroup.controls.password?.errors?.required ||
+            parentFormGroup.controls.password?.errors?.hasNumber
               ? 'times-circle'
               : 'check-circle'
           ]"
@@ -69,17 +69,17 @@
       <p
         class="my-1"
         [ngClass]="
-          parentFormGroup.controls.password.hasError('required') ||
-          parentFormGroup.controls.password.hasError('hasCapitalCase')
+          parentFormGroup.controls.password?.errors?.required ||
+          parentFormGroup.controls.password?.errors?.hasCapitalCase
             ? 'text-danger'
             : 'text-success'
         "
       >
         <fa-icon
           [icon]="[
             'fas',
-            parentFormGroup.controls.password.hasError('required') ||
-            parentFormGroup.controls.password.hasError('hasCapitalCase')
+            parentFormGroup.controls.password?.errors?.required ||
+            parentFormGroup.controls.password?.errors?.hasCapitalCase
               ? 'times-circle'
               : 'check-circle'
           ]"
@@ -90,8 +90,8 @@
       <p
         class="my-1"
         [ngClass]="
-          parentFormGroup.controls.password.hasError('required') ||
-          parentFormGroup.controls.password.hasError('hasLowerCase')
+          parentFormGroup.controls.password?.errors?.required ||
+          parentFormGroup.controls.password?.errors?.hasLowerCase
             ? 'text-danger'
             : 'text-success'
         "
@@ -100,8 +100,8 @@
           aria-hidden="true"
           [icon]="[
             'fas',
-            parentFormGroup.controls.password.hasError('required') ||
-            parentFormGroup.controls.password.hasError('hasLowerCase')
+            parentFormGroup.controls.password?.errors?.required ||
+            parentFormGroup.controls.password?.errors?.hasLowerCase
               ? 'times-circle'
               : 'check-circle'
           ]"
@@ -111,9 +111,8 @@
       <p
         class="my-1"
         [ngClass]="
-          parentFormGroup.controls.password.hasError('required') ||
-          parentFormGroup.controls.password.hasError('minlength') ||
-          parentFormGroup.controls.password.hasError('maxlength')
+          parentFormGroup.controls.password?.errors?.required ||
+          parentFormGroup.controls.password?.errors?.hasSpecialCharacter
             ? 'text-danger'
             : 'text-success'
         "
@@ -122,9 +121,32 @@
           aria-hidden="true"
           [icon]="[
             'fas',
-            parentFormGroup.controls.password.hasError('required') ||
-            parentFormGroup.controls.password.hasError('minlength') ||
-            parentFormGroup.controls.password.hasError('maxlength')
+            parentFormGroup.controls.password?.errors?.required ||
+            parentFormGroup.controls.password?.errors?.hasSpecialCharacter
+              ? 'times-circle'
+              : 'check-circle'
+          ]"
+        ></fa-icon>
+        Au moins un caractère spécial:
+        @[]^_!"#$%&amp;&apos;()*+,\-./:;&lbrace;&rbrace;&lt;&gt;=|~?
+      </p>
+      <p
+        class="my-1"
+        [ngClass]="
+          parentFormGroup.controls.password?.errors?.required ||
+          parentFormGroup.controls.password?.errors?.minlength ||
+          parentFormGroup.controls.password?.errors?.maxlength
+            ? 'text-danger'
+            : 'text-success'
+        "
+      >
+        <fa-icon
+          aria-hidden="true"
+          [icon]="[
+            'fas',
+            parentFormGroup.controls.password?.errors?.required ||
+            parentFormGroup.controls.password?.errors?.minlength ||
+            parentFormGroup.controls.password?.errors?.maxlength
               ? 'times-circle'
               : 'check-circle'
           ]"
@@ -191,7 +213,7 @@
         class="text-danger col-md-12"
         *ngIf="
           passwordConfirmation &&
-          parentFormGroup.controls.passwordConfirmation.hasError('required')
+          parentFormGroup.controls.passwordConfirmation?.errors?.required
         "
       >
         La confirmation du mot de passe est obligatoire