fix: add gestionnaires from 'GESTIONNAIRES - API' into 'GESTIONNAIRES…

…' with columns 'Tags FCU' and 'Réseaux' merged
betagouv · Dec 18, 2023 · f5ffbd4 · f5ffbd4
1 parent 68dc58b
commit f5ffbd4
Showing 1 changed file with 35 additions and 4 deletions.
diff --git a/src/services/users.ts b/src/services/users.ts
@@ -11,9 +11,12 @@ export const upsertUsersFromApi = async (
   account: ApiAccount,
   networks: ApiNetwork[]
 ) => {
+  //Users from tab "GESTIONNAIRES_API" where the new users from outside API are saved
   const airtableUsersAPI = await base(Airtable.GESTIONNAIRES_API)
     .select()
     .all();
+  //Users from tab "GESTIONNAIRES" - all the users of the website
+  const airtableUsers = await base(Airtable.GESTIONNAIRES).select().all();
 
   const warnings: string[] = [];
   const emails = networks.flatMap((user) => user.contacts);
@@ -88,9 +91,16 @@ export const upsertUsersFromApi = async (
         const airtableUserAPI = airtableUsersAPI.find(
           (airtableUserAPI) => airtableUserAPI.get('Email') === user
         );
+        const airtableUser = airtableUsers.find(
+          (airtableUser) => airtableUser.get('Email') === user
+        );
         const fcuTags = airtableUserAPI
           ? (airtableUserAPI.get('Tags FCU') as string[])
           : [];
+        let allGestionnaires = gestionnaires;
+        if (airtableUserAPI && fcuTags && fcuTags.length > 0) {
+          allGestionnaires = allGestionnaires.concat(fcuTags);
+        }
         const promises: Promise<any>[] = [
           db('users')
             .insert({
@@ -99,10 +109,7 @@ export const upsertUsersFromApi = async (
                 Math.random().toString(36).slice(2, 10),
                 salt
               ),
-              gestionnaires:
-                airtableUserAPI && fcuTags && fcuTags.length > 0
-                  ? gestionnaires.concat(fcuTags)
-                  : gestionnaires,
+              gestionnaires: allGestionnaires,
               from_api: account.key,
               receive_new_demands: true,
               receive_old_demands: true,
@@ -135,6 +142,30 @@ export const upsertUsersFromApi = async (
                   typecast: true,
                 }
               ),
+          airtableUser
+            ? base(Airtable.GESTIONNAIRES).update(
+                airtableUser.id,
+                {
+                  Email: user,
+                  Gestionnaires: allGestionnaires,
+                },
+                {
+                  typecast: true,
+                }
+              )
+            : base(Airtable.GESTIONNAIRES).create(
+                [
+                  {
+                    fields: {
+                      Email: user,
+                      Gestionnaires: allGestionnaires,
+                    },
+                  },
+                ],
+                {
+                  typecast: true,
+                }
+              ),
         ];
 
         if (