fix: deletedAt

SocialGouv · Dec 7, 2023 · b508a01 · b508a01
1 parent 4d5f9b6
commit b508a01
Show file tree

Hide file tree

Showing 23 changed files with 61 additions and 5 deletions.
diff --git a/.kontinuous/env/prod/templates/dashboard.sealed-secret.yaml b/.kontinuous/env/prod/templates/dashboard.sealed-secret.yaml
@@ -8,6 +8,11 @@ metadata:
 spec:
   encryptedData:
     SENTRY_AUTH_TOKEN: AgCYmBko6+0bjL94Ok4xU0pQHeE8Ft45OzMHLlxOrK5bSXlwOK67SjFBlWLVcbnv8Hy8N+aUNRxMHD7dhD5yAyEDRWLTJUt6JojLP8f4OkX1hkt4nDI0pubzD5GRQTjLGnfS0mLHB5iIjbWc8gi2fnVx5TblhhmbbcPh8CEH12thKqFnI7TONLs3PVaieT2WTpWE8ZaxokngcERns/cEHJEuf6+744ee0QDgFNeaDxDWsrfcAUCHHo974QaYNhBI2qUxYXPnsiXyynS35f0HDJ3rVwtoQIwQYiM9YzD3BUMxK0evzGl6lciFEsq/69OK0PxFwClBndCyBVcThaKG4ikqgtQUZ1lW8QTdP8jN7k6sU/3sv9g+QkBqEc30YzVqbGjxpt1x5xIIjUu2Ub/NQ1T0KnC98I50DlN/48BWkoepDaWBGZEJ+5hPXwMQ9sF93jvBpF8dti/9Wv1dpcWxKqTNiPqosZ8A+Dt0nP/AVwxji7uLkXX7Df3KDZ0eLamEWO+Lth1a1D2IuYeYQoXk/H/XHvQxBEXKbOmx/g0KiuOMyl1c2pBT/R3A9GNasrV2dI3efcjsaopbtafsbDu5XvSsZt/1A3y4rGW6pEMYh4acr4WrF1X0EXT80n+jLSSCg0M7heMrbrChb4d680V5tPkMfvzNk6D8kVnK/QLmRp/FOjkF300/xR6+41TvbD3cg1z9ONY3N0rRoGp3nP5o1RPXYUQdBvGikOVA6dmUtY7X9SlB0J2MQTEctoabeW630D1vziZ6nV8/ozZn/eH017uu
+    REACT_APP_ORG_DUPLICATED_1_ID: AgCTng9t0GaHqdqgtYZ6FA93K0Qai+dPXLWNud+aZu8O9gMYYcAYIRhR5ramB6lxOjF3N/kqNGqcydtDvEt6E5JaZvsKy850UskWG3BE+TYMi40mg0IFgzVJ4RLSnw4aqOiT7Ov2+nO/rSxqN+05m+RA+OEQ+M227vxjrzGrMQ7Cm7ceH7Ni5qgjEUYuWedQB8eC6Jb0+JsxfSGerRf/jqIPchRFpwkoEuzlBYrNluG7p2ZnffRc1BpQsyIWYg3ANZQF43IHgDQlazmFlpZHttNjXZth2S5xRFcduvexerVO8XxXQgbKub1LYCgBtpXOjrvH5+OW8hMWjP11cxzTykHvn1dSw6x7Flr5/1k7cr07o4IIoFt97YfwByV6CG0AayMhvNAUEFfTuFdvMKJQolbf8CPCDTF8ZSDVBiJRKAKQWS7Z313lzXfLYaAL5eIvOaW4OGG0lN5lpAUncEUL3S6fJ/XDqKzGH5bPVf2JToI/XToliI6zu6a/S1dGtFei42qLJ82O2vhaU54oDEpFRfCqCVq6GeHoamOrESrGYD7+vDfp+NEyUIrLsVOaLs45v/K5Dv91Hjkth/z7oTpEHjLoa8quYB7ZUmE/IHYD4OdfvpVe2bXL/eM+sttznLanEoSITtHPwPe1n5jei4bsGZdNo6cN0WE2MXTZRcxa5gFXZLYCZ1sMCWOLHu3Jo4vTfF+YzJqDcdBHLPlQNqfz2J709PPAyqtk7PT+KMfkIAZkqsdgVFg=
+    REACT_APP_ORG_DUPLICATED_1_NAME: AgBcdMIfd+Nx5aRBoPhQ4x/4oAFKUkrVK33RGobuQrihoDKNJKXAm9hrVygVRqR+kiAJx3k4KykDpRwgkBjgKc4DsCkNm0yl9PukcDdnQ4QguouFgCdHyyhKhCHRDh94SASvO1HY9lWqURsJhxDTtKd0IK+M8ArX9T+4Z+pAmkkomszAan6fLpV15q/kFTMADJBGj6JGtzTX4MokhiFen1fm0iVISCFBLIv431smgp2y/BH9PX5RM/ge99wZWjdzyj4YYZRVE9rD72BoG/qcZ9spyACRpJFMKmau8hupVZTHTckvMIGFMlr00bq/U8jvj7ZfVawUmQyL4nnCuWgjSCz4NhzyEf8Nvnb39apGL4SLW+UOLw37SlCFuRj46tMUHJIhJvQzJ8sj0VEjWoFxHByD9IJGa7Ku8R2Ve/BHE/VcVwwNgcNC7gKlo7R8M49wa/o+WpUkIdkL2QP+WF9zbq6Mf4e3vA1D+80X1LRUpONTNALzngcFydEPqATkHVz5lPex8eX21eQZqTdn5ZxU5QjoHFufWCMmVFTE12UB1Nh5YryndyeaaCbbn6EejxO3Ny/owXgpIad09BNmDtvHV68/lFU7GL7vrLn+00x/rw4TqICN6DAojIdRLJJM9EN8cJKiyeMLpTk80J4mN1voVYeI2Gyj3RVXGFhcEiUawLoFsqqf2aMrbi7rrqIXoR7pds9092LY
+    REACT_APP_ORG_DUPLICATED_2_ID: AgAZ8LV4WzLHjV+SkDWuTaBHIeaWMSdfQSPfR+UFjlHqXuDclb6dtliwFpXvT55TVTPdI1TEEqHh/St5DIb2qqsMP743VzvT3VHzCbjlJNMoHPYl5cvzSFA6Zs2lVo2cqDSZeAgEjZvOZyodU9UeGCBjv0oxF+ZRHrxOv9fgFi/WlH/1yyHh4nrocC8hq3Y5RknwRG4ADPhn5KD+/j0Vg8EgtK8wauf8zr6xBfDEiUmI/IIydgKK7mLGNlI3REd3LpRUpf8T/ORdZAOShEr+/R/dJR4xlCrey3roT4r9PAVrlQpsocvFigGtgQqZ8Tug29gLgzowisly9xAMC3EyfIZxqvamKphexrfhLcnds7gkMVJ85wAjDsYpC51J/4hGv+NCJohQwFQY8chX8Z2sj9A5QrZuA9LIysOsYolVDECmtO/Ac3bBvFarDo0AUwtcUEGKCmFM8MRuS2faKgp97nunayUptir9JttGm9DusF0nDI8tXtHROFYF8RCIgsZIeZDRNGKPDuwiFuSoWNYgJyWA2m4RWWNCGE+z0kG5aND1A4oVfP2xn/lpgKDFreExJNu7mR3ZtDQtyM5ijKX8WGeLDL9V1MX5ptUvPsLft54eYtLjbkN+DMm/0iBoH0gjJk5c+a04UMdvj9DKpZJenWSVAraK9a+/M+Lfau6/DYZL7/JTJKmus3H8VFWUwDqSuaeGJQyX0gWH1dLxaL8sP17vfGEVGYQbxCXKOJlZXBm5kaKYNkY=
+    REACT_APP_ORG_DUPLICATED_2_NAME: AgAa3XCOGX/87tcfLI3GEwDJz043m4EfPfTRLqGGC11T2tqKrh8xRlvCJByKwid0jT0Nv6z7AGrpQGsYoT3paRo75mndhaqDZGr3wIil3jlq4auZKJ9/b8fAREFNCRGn3em656WKLf4Hh8AGbDo2Kyqvr/9ZpBe5kkAkUD6yInl0XKxqEQTIU5RCfu+xyzuBpwtwJnGoTK0rL6M30tRgD6Lk/JvA2gHWCkgCdBI1r93MkaI1ndFsaA29Q0i7eogu0qAeMrCTubsDBWudIfdjaXL/GEi4n/RWEYSOhoFNNTsiARGJ1dp+n7Bv1+VVoqBBAwjLXD9+Af65tOeqiNn5Znjj8vUPgwbADbpL4LRdXeGJLs5L6ykgIcAhJ4bMEOsJz6612G2OiKIEvveHI2+oq6FtFkpoF05uKEbLVlgZ0nxOVR2+8TDT9ZScnQvci1BnVzyGAAe/L6LnkwMiidX+KsivKd2CUrImba+RvLi1gI12joCDJ0Tfm6c6hwEbE+cLQnG3ZmntLoC1tBhM9u+tnBt5TpEXCBCM1/6eVr5G+NoNOPWYydzzAQb/mQyVpw5O9kVbJD7UeoZlLRYyrGj76OBcDCFgXo/RgfuvxTogLmRW1YOH4T60jSXHa2vL1hvfps641sYt/n0IT81zy1L70c/BFldr9gpTurCVU3DAUaXifdcqqB3yQ/EljU0jV7+53J3B/1w=
+    REACT_APP_ORG_ID_FOR_TRUPLICATION: AgBCd5dfswonkjZn7GU1PBgC890egeBKWiPg0TqeEmgqRIKFOhtttVJbqJSVXJHLFJ+u5HkipYt2JkL3KPNWW6KLsiUBqBh0ZBfMnfvodeyCRt2QbIf50X3zAKLyRNmx8khGhmYzX6MIIoh9H0UWy0AJAIjn80NySOJWmFi1vHTLJSlG2bx6me/HHyIOogjCbiL6sQMKMP5hFgi28TTq5M/MW3zYqnmzX8Po67MFeDQ6s1pMF4orDsqFr2YN/KoX94VKEQvbi46241ojpkABgk2YHTCX5fWwI722Dy28fGeRTAU0v+HTFS+0e3NkL6NP1cWEIqrglhv61xzqTK5OVLl0WcPjv/ZuyZvf7D7gO3WKVZPCAFB8ayXbojhuEK0o11BIDFdGV6v5wbyeyZ7k+roZnqF/iHii7julSfii4S4V3WTDCZ3qPsqf19059xxhWnhNiDgPmL7XnPQEeAOh2iIR73mNsEGnvFVccMfx/UTZ61ST5aqgSPUjKqNIi/g+IzaEcqBajYdn6NP1DU8BWJezZVC6/DIu6XEB+a0iTLbt3S2f1gsw5q52tKNGPSfjGWptmQ6jlMZXo1l1C6SoXqI/8W2ojiuhpKWyxnUAG52IkF477PUKnX+kk7SE9qg2ploY14s/hMtrdSy9+wBzklMTH9zODFXn84LrYC/qNmbhEPjrBvBcYGZctUzH0B3C6m8lkSr2MuvKjr2eA8uSwqmdcYPZhF1+TN9/wnpmSRyZR/9F8Wk=
   template:
     metadata:
       annotations:

diff --git a/.kontinuous/env/prod/values.yaml b/.kontinuous/env/prod/values.yaml
@@ -62,3 +62,18 @@ jobs:
           sentry_auth_token:
             secretName: dashboard
             secretKey: SENTRY_AUTH_TOKEN
+          react_app_org_duplicated_1_id:
+            secretName: dashboard
+            secretKey: REACT_APP_ORG_DUPLICATED_1_ID
+          react_app_org_duplicated_1_name:
+            secretName: dashboard
+            secretKey: REACT_APP_ORG_DUPLICATED_1_NAME
+          react_app_org_duplicated_2_id:
+            secretName: dashboard
+            secretKey: REACT_APP_ORG_DUPLICATED_2_ID
+          react_app_org_duplicated_2_name:
+            secretName: dashboard
+            secretKey: REACT_APP_ORG_DUPLICATED_2_NAME
+          react_app_org_id_for_truplication:
+            secretName: dashboard
+            secretKey: REACT_APP_ORG_ID_FOR_TRUPLICATION
diff --git a/api/src/controllers/migration.js b/api/src/controllers/migration.js
@@ -160,6 +160,7 @@ router.put(
             const password = crypto.randomBytes(60).toString("hex"); // A useless password.,
             const forgotPasswordResetExpires = new Date(Date.now() + 60 * 60 * 24 * 30 * 1000); // 30 days
             for (let item of newOrganisation.users) {
+              item.email = item.email.toLocaleLowerCase();
               item.forgotPasswordResetToken = crypto.randomBytes(20).toString("hex");
               item.forgotPasswordResetExpires = forgotPasswordResetExpires;
               item.password = password;

diff --git a/dashboard/Dockerfile b/dashboard/Dockerfile
@@ -17,7 +17,26 @@ COPY --chown=1000:1000 dashboard/. .
 ENV NODE_ENV=production
 
 RUN --mount=type=secret,id=sentry_auth_token,uid=1000 \
-    yarn build; \
+    --mount=type=secret,id=react_app_org_duplicated_1_id,uid=1000 \
+    --mount=type=secret,id=react_app_org_duplicated_1_name,uid=1000 \
+    --mount=type=secret,id=react_app_org_duplicated_2_id,uid=1000 \
+    --mount=type=secret,id=react_app_org_duplicated_2_name,uid=1000 \
+    --mount=type=secret,id=react_app_org_id_for_truplication,uid=1000 \
+    if [ -f "/run/secrets/react_app_org_duplicated_1_id" ]; then \
+        export REACT_APP_ORG_ID_FOR_MIGRATION=$(cat /run/secrets/react_app_org_id_for_migration); \
+    fi; \
+    if [ -f "/run/secrets/react_app_org_duplicated_1_name" ]; then \
+        export REACT_APP_ORG_ID_FOR_MIGRATION=$(cat /run/secrets/react_app_org_id_for_migration); \
+    fi; \
+    if [ -f "/run/secrets/react_app_org_duplicated_2_id" ]; then \
+        export REACT_APP_ORG_ID_FOR_MIGRATION=$(cat /run/secrets/react_app_org_id_for_migration); \
+    fi; \
+    if [ -f "/run/secrets/react_app_org_duplicated_2_name" ]; then \
+        export REACT_APP_TEAM_1=$(cat /run/secrets/react_app_team_1); \
+    fi; \
+    if [ -f "/run/secrets/react_app_org_id_for_truplication" ]; then \
+        export REACT_APP_TEAM_2=$(cat /run/secrets/react_app_team_2); \
+    fi; \
     if [ -f "/run/secrets/sentry_auth_token" ]; then \
         export SENTRY_AUTH_TOKEN=$(cat /run/secrets/sentry_auth_token); \
         yarn sentry:sourcemaps; \

diff --git a/dashboard/src/components/DataMigrator.js b/dashboard/src/components/DataMigrator.js
@@ -206,11 +206,11 @@ const duplicateDecryptedData = async ({
   const personIdsMapped = {};
   const newPersons = [];
   for (const person of persons) {
+    const newPersonId = uuidv4();
+    personIdsMapped[person._id] = newPersonId;
     if (!person.name && !person.deletedAt) {
       continue;
     }
-    const newPersonId = uuidv4();
-    personIdsMapped[person._id] = newPersonId;
     const newPerson = {
       ...person,
       user: userIdsMapped[person.user],
@@ -452,8 +452,6 @@ const duplicateDecryptedData = async ({
     newReports.push(newReport);
   }
 
-  const nextPersons = await Promise.all(newPersons.map(preparePersonForEncryption).map(encryptItem));
-
   return {
     organisationId: nextOrganisationId,
     teams: newTeams,

diff --git a/dashboard/src/recoil/actions.js b/dashboard/src/recoil/actions.js
@@ -96,6 +96,7 @@ export const prepareActionForEncryption = (action, { checkRequiredFields = true
     organisation: action.organisation,
     createdAt: action.createdAt,
     updatedAt: action.updatedAt,
+    deletedAt: action.deletedAt,
 
     completedAt: action.completedAt,
     dueAt: action.dueAt,

diff --git a/dashboard/src/recoil/comments.js b/dashboard/src/recoil/comments.js
@@ -47,6 +47,7 @@ export const prepareCommentForEncryption = (comment, { checkRequiredFields = tru
     _id: comment._id,
     createdAt: comment.createdAt,
     updatedAt: comment.updatedAt,
+    deletedAt: comment.deletedAt,
     organisation: comment.organisation,
 
     decrypted,

diff --git a/dashboard/src/recoil/consultations.ts b/dashboard/src/recoil/consultations.ts
@@ -97,6 +97,7 @@ export const prepareConsultationForEncryption =
       organisation: consultation.organisation,
       createdAt: consultation.createdAt,
       updatedAt: consultation.updatedAt,
+      deletedAt: consultation.deletedAt,
 
       completedAt: consultation.completedAt,
       dueAt: consultation.dueAt,

diff --git a/dashboard/src/recoil/groups.ts b/dashboard/src/recoil/groups.ts
@@ -39,6 +39,7 @@ export const prepareGroupForEncryption = (group: GroupInstance) => {
     _id: group._id,
     createdAt: group.createdAt,
     updatedAt: group.updatedAt,
+    deletedAt: group.deletedAt,
     organisation: group.organisation,
 
     decrypted,

diff --git a/dashboard/src/recoil/medicalFiles.ts b/dashboard/src/recoil/medicalFiles.ts
@@ -48,6 +48,7 @@ export const prepareMedicalFileForEncryption =
       _id: medicalFile._id,
       createdAt: medicalFile.createdAt,
       updatedAt: medicalFile.updatedAt,
+      deletedAt: medicalFile.deletedAt,
       organisation: medicalFile.organisation,
 
       decrypted,

diff --git a/dashboard/src/recoil/passages.js b/dashboard/src/recoil/passages.js
@@ -48,6 +48,7 @@ export const preparePassageForEncryption = (passage, { checkRequiredFields = tru
     _id: passage._id,
     createdAt: passage.createdAt,
     updatedAt: passage.updatedAt,
+    deletedAt: passage.deletedAt,
     organisation: passage.organisation,
 
     decrypted,

diff --git a/dashboard/src/recoil/persons.ts b/dashboard/src/recoil/persons.ts
@@ -165,6 +165,7 @@ export const usePreparePersonForEncryption = () => {
       organisation: person.organisation,
       createdAt: person.createdAt,
       updatedAt: person.updatedAt,
+      deletedAt: person.deletedAt,
       outOfActiveList: person.outOfActiveList,
 
       decrypted,

diff --git a/dashboard/src/recoil/places.js b/dashboard/src/recoil/places.js
@@ -44,6 +44,7 @@ export const preparePlaceForEncryption = (place, { checkRequiredFields = true }
     _id: place._id,
     createdAt: place.createdAt,
     updatedAt: place.updatedAt,
+    deletedAt: place.deletedAt,
     organisation: place.organisation,
 
     decrypted,

diff --git a/dashboard/src/recoil/relPersonPlace.js b/dashboard/src/recoil/relPersonPlace.js
@@ -47,6 +47,7 @@ export const prepareRelPersonPlaceForEncryption = (relPersonPlace, { checkRequir
     _id: relPersonPlace._id,
     createdAt: relPersonPlace.createdAt,
     updatedAt: relPersonPlace.updatedAt,
+    deletedAt: relPersonPlace.deletedAt,
     organisation: relPersonPlace.organisation,
 
     decrypted,

diff --git a/dashboard/src/recoil/rencontres.js b/dashboard/src/recoil/rencontres.js
@@ -50,6 +50,7 @@ export const prepareRencontreForEncryption = (rencontre, { checkRequiredFields =
     _id: rencontre._id,
     createdAt: rencontre.createdAt,
     updatedAt: rencontre.updatedAt,
+    deletedAt: rencontre.deletedAt,
     organisation: rencontre.organisation,
 
     decrypted,

diff --git a/dashboard/src/recoil/reports.js b/dashboard/src/recoil/reports.js
@@ -96,6 +96,7 @@ export const prepareReportForEncryption = (report, { checkRequiredFields = true
     _id: report._id,
     createdAt: report.createdAt,
     updatedAt: report.updatedAt,
+    deletedAt: report.deletedAt,
     organisation: report.organisation,
     date: report.date,
     team: report.team,

diff --git a/dashboard/src/recoil/territory.js b/dashboard/src/recoil/territory.js
@@ -44,6 +44,7 @@ export const prepareTerritoryForEncryption = (territory, { checkRequiredFields =
     _id: territory._id,
     createdAt: territory.createdAt,
     updatedAt: territory.updatedAt,
+    deletedAt: territory.deletedAt,
     organisation: territory.organisation,
 
     decrypted,

diff --git a/dashboard/src/recoil/territoryObservations.js b/dashboard/src/recoil/territoryObservations.js
@@ -123,6 +123,7 @@ export const prepareObsForEncryption =
       _id: obs._id,
       createdAt: obs.createdAt,
       updatedAt: obs.updatedAt,
+      deletedAt: obs.deletedAt,
       organisation: obs.organisation,
 
       decrypted,

diff --git a/dashboard/src/recoil/treatments.ts b/dashboard/src/recoil/treatments.ts
@@ -59,6 +59,7 @@ export const prepareTreatmentForEncryption = (treatment: TreatmentInstance, { ch
     _id: treatment._id,
     createdAt: treatment.createdAt,
     updatedAt: treatment.updatedAt,
+    deletedAt: treatment.deletedAt,
     organisation: treatment.organisation,
 
     decrypted,

diff --git a/dashboard/src/types/group.ts b/dashboard/src/types/group.ts
@@ -20,6 +20,7 @@ export interface GroupInstance extends EncryptedGroupFields {
   organisation: UUIDV4;
   createdAt: Date;
   updatedAt: Date;
+  deletedAt?: Date;
   entityKey: string;
 }
 

diff --git a/dashboard/src/types/medicalFile.ts b/dashboard/src/types/medicalFile.ts
@@ -13,6 +13,7 @@ export interface MedicalFileInstance extends AdditionalProps {
   comments: any[];
   createdAt: Date;
   updatedAt: Date;
+  deletedAt?: Date;
 }
 
 export interface NewMedicalFileInstance extends Omit<MedicalFileInstance, '_id' | 'createdAt' | 'updatedAt'> {}
diff --git a/dashboard/src/types/person.ts b/dashboard/src/types/person.ts
@@ -12,6 +12,7 @@ export interface PersonInstance {
   organisation: UUIDV4;
   createdAt: Date;
   updatedAt: Date;
+  deletedAt?: Date;
   outOfActiveList: boolean;
   user: UUIDV4;
   name: string;

diff --git a/dashboard/src/types/treatment.ts b/dashboard/src/types/treatment.ts
@@ -17,5 +17,6 @@ export interface TreatmentInstance {
   comments: any[];
   createdAt: Date;
   updatedAt: Date;
+  deletedAt?: Date;
   history: any[];
 }