fix: reimport d'utilisateurs supprimés (#2061)

* fix: add suffix to deleted accounts It will free the email and the username for later * fix: add hours and minutes * fix: review changes
gip-inclusion · Dec 20, 2023 · d18f85d · d18f85d
1 parent 9851e83
commit d18f85d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/app/src/lib/ui/ProfessionalList/List.svelte b/app/src/lib/ui/ProfessionalList/List.svelte
@@ -23,7 +23,17 @@
 	const deleteAccount = mutation(deleteAccountMutation);
 
 	async function removeProfessional(professional: Professional) {
-		await deleteAccount({ accountId: professional.account.id });
+		const nowDate = new Date();
+		const suffix = '.deleted' + nowDate.toISOString();
+		const newEmail = professional.email + suffix;
+		const newUsername = professional.account.username + suffix;
+
+		await deleteAccount({
+			accountId: professional.account.id,
+			professionalId: professional.id,
+			newEmail: newEmail,
+			newUsername: newUsername,
+		});
 	}
 </script>
 

diff --git a/app/src/lib/ui/ProfessionalList/_deleteAccount.gql b/app/src/lib/ui/ProfessionalList/_deleteAccount.gql
@@ -1,5 +1,16 @@
-mutation DeleteAccount($accountId: uuid!) {
-  update_account_by_pk(pk_columns: { id: $accountId }, _set: { deletedAt: now }) {
+mutation DeleteAccount(
+  $accountId: uuid!
+  $professionalId: uuid!
+  $newEmail: citext!
+  $newUsername: String!
+) {
+  update_account_by_pk(
+    pk_columns: { id: $accountId }
+    _set: { deletedAt: now, username: $newUsername }
+  ) {
+    id
+  }
+  update_professional_by_pk(pk_columns: { id: $professionalId }, _set: { email: $newEmail }) {
     id
   }
   update_notebook_member(

diff --git a/app/src/lib/ui/ProfessionalList/_getProfessionalsForStructure.gql b/app/src/lib/ui/ProfessionalList/_getProfessionalsForStructure.gql
@@ -11,6 +11,7 @@ query GetProfessionalsForStructure($structureId: uuid!) {
     position
     account {
       id
+      username
       onboardingDone
       notebooksWhereMember_aggregate(
         where: { active: { _eq: true }, memberType: { _eq: "referent" } }

diff --git a/hasura/metadata/databases/carnet_de_bord/tables/public_account.yaml b/hasura/metadata/databases/carnet_de_bord/tables/public_account.yaml
@@ -390,6 +390,7 @@ update_permissions:
         - cgu_validated_at
         - deleted_at
         - onboarding_done
+        - username
       filter:
         _or:
           - id: