Skip to content

Commit

Permalink
fix: remove migration consultation team (#1793)
Browse files Browse the repository at this point in the history
  • Loading branch information
arnaudambro authored Nov 30, 2023
1 parent fa0f1d0 commit 8ff1499
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 113 deletions.
3 changes: 0 additions & 3 deletions .kontinuous/env/prod/templates/dashboard.sealed-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ 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_ID_FOR_MIGRATION: AgBdBYa90iyTgjeNXXhLzag5bX+IjGtSatmUOMybSVhPm3xU0Ja/iP1cyZLsIgG89/94fAAKOt+hVPCjnVjbDYBbLnsHxgnNWzmoPATNu6IO9FolYmf44IEnf4UMt914lKfOD8ylUqCGZUwp3110P21VxHTTPYXpVQzsFTAn22I6urn4d4Lq/GGqzy9nODcfwu6VEsvnK5d8tFIkmEJacn48Foc9D27DPO5X+oFVajC4RESIUe6TYNg1fXCeF/qCtFWTLnO349e/9iAJ5ujY08mHrxbzfF5LFCLMLMTOzjlu1Tu8bJcf5m9MZizHWYHNSyVTuK8QKGpdwQ5lbDmyFOS2QFivirNS/fhwKOfkdYlM7iJeq65IqcS7+IiLcQBFxf2ZebhQ/Ff3Qf5Hg4qykVnYTPbVdSIFeIykgXRahH94wpKgGEp/z0u8gdsWporUzzaS25PjVNmuFsNGr7/myFvcbErCiaVIY5iI02kcy32ok7MNJuyMuzK0cHUvM6s50MtN8EIClgGh0m9CiXnJ28bEUsxfvPn5/qVXRLXeVZz2Yj3gNsCfu6H1/1Zlcpem2DLRCtNdm3OtpcstckenUhxfOdIQ76EI9CTbFsdVWA0hEYYAlQAfJeklfMGLuRWrAOd61ri/EmQNM/TdvbRWBYlHqixfN+38tU11b90DjzGJAKLbNA2VNNP8oCxLt/OiAR5sIhu58zouoMmboNToLqXPvwTaXIR97TxEJm4fle/Lu/mxou8=
REACT_APP_TEAM_1: AgCUtzV8DriFamwW2Ce56W5JVAfJXr1MZt3Ig9W6yi9dgroyXl0s1n9sBA1c6HFBzkLbAIZj/TZEInUjoqnYgGYBF3SJWRpV0w3bZeecjv6Y0EeAwwUy4aQUbFsnfGiWw1Je7/vjEnoXBHchDVFeYADs0ed55qU1Nq5o5bPIKDwa3tbx7Ck5gNP03CpVqpJ/2pJvmyTb/gFmVOueX6kUsWVocYFDLzbNbAvWWSRXBJ2rG2IqnbM0N8DAQYa9Ts6/UCvklp3vnY0PhqegfOcK6i7dwc8HYCS4E2qU6ZvF42o645A07RFpO1TG26KRNRmEVhf3zC1wDRVj0EAauzm8ZxSCB10kCma/bMoa+039rrHEOs6B8h7+tk4LHZUrFDgy5UP47oRBsXaXA6L00SyWn+LMrtdayKtR3dSgwWx4WAvJu5w9bjOD/wr3IJqTmM8IPdKy8vRKh6fU86vDWmIW9aW2q2NtXSLMHactMz7qO/wgiJ/ob9plweBH/7ilSxD1gyQUqB881SlvyIE3V418bUks4p3tfnqUeI4ECXU547SL6CQYIIaE7Md/BQPNe9L9QZOvGRCVkVCrXj8gU3ELUokX9GbA35Fztg665s/Ef1klEi9wGM8EdzbCduOvx7dqJMSQTnCDgD4MXCHXcrpnBkFYDIfgxL3K85gPv6cgI65PsxOdwEeFLoUsLCQArSnC+Gf/XvptcHO//rG4sgxSO19bAkUar0lkRkeyEWVGSGuCnqi9xAw=
REACT_APP_TEAM_2: AgA73t4A6RXklnwHFicNoKJjvWrOvqqGMRWMoZZwvpuY4PM04WaNKTxyefNaso+HIm6zcU4xTKh3Zv8J/6olGt73KBldCuefg+Usy0IDe90u9kbl/PoRtGJef1uSfX4YGKNQkoQaJ6S9P8MwvFhAptuk63QWEHIjPfyZZ1TqNqptgYhyneHhvqM/TFWjMi4zSWpbR8X+L52YviMLemqqzzOM0p9xtN5wY+WSVblORWFQcdeNaAYn6QMZgIW8sH987+z7yFIzlrKNYrOd694zVela2AGOc4pwnOkfa62Yv5jgxR9Ein2+2Jd2ZzDKAY+QIKNIffCHo83xt0ONlUKhhryeUw5fIBdJrbxmirx9wmQ13zHoHEFEaQGUSGNuaV+vNQBlq0p5aQGbV5DYpuNgNnKObF4A9YfB/zUXcekGYJaggAUBdihFtt32EA18QFQMoPJDY6Gd48MWO7qfM7/Oy4cX1LaG5mstu83nC4eJYHh2kBf3gA+d9awiyqS4p7zfqI0E8V4R65jNaKKPsvhJ7WOh+Ph4BcgEbkFDQE/OHGhBYcCLadNBIC0vQeiY8oephknF5EaX2mnBS1ES9m7An++9olUNGCya2o2y9RqnvtEoMcLEergjOLCbnr2eMyQ0XT/0BnrDoByz9TrWmicJsYFJAah2Hq5c7C+YxT7HeMovRFgSVpdN8LRH0MVhHwx14c24tf9x6T5SWeDLB/8qjdipsuqr8wLmedfLO2nXpuMU4T8Qs74=
template:
metadata:
annotations:
Expand Down
9 changes: 0 additions & 9 deletions .kontinuous/env/prod/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,3 @@ jobs:
sentry_auth_token:
secretName: dashboard
secretKey: SENTRY_AUTH_TOKEN
react_app_org_id_for_migration:
secretName: dashboard
secretKey: REACT_APP_ORG_ID_FOR_MIGRATION
react_app_team_1:
secretName: dashboard
secretKey: REACT_APP_TEAM_1
react_app_team_2:
secretName: dashboard
secretKey: REACT_APP_TEAM_2
19 changes: 0 additions & 19 deletions api/src/controllers/migration.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,25 +65,6 @@ router.put(
// End of example of migration.
*/

if (req.params.migrationName === "add-team-to-consultation") {
try {
z.array(
z.object({
_id: z.string().regex(looseUuidRegex),
encrypted: z.string(),
encryptedEntityKey: z.string(),
})
).parse(req.body.encryptedConsultationsToUpdate);
} catch (e) {
const error = new Error(`Invalid request in add-team-to-consultation: ${e}`);
error.status = 400;
throw error;
}
for (const { _id, encrypted, encryptedEntityKey } of req.body.encryptedConsultationsToUpdate) {
await Consultation.update({ encrypted, encryptedEntityKey }, { where: { _id }, transaction: tx, paranoid: false });
}
}

organisation.set({ migrating: false });
await organisation.save({ transaction: tx });
});
Expand Down
12 changes: 0 additions & 12 deletions dashboard/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,6 @@ COPY --chown=1000:1000 dashboard/. .
ENV NODE_ENV=production

RUN --mount=type=secret,id=sentry_auth_token,uid=1000 \
--mount=type=secret,id=react_app_org_id_for_migration,uid=1000 \
--mount=type=secret,id=react_app_team_1,uid=1000 \
--mount=type=secret,id=react_app_team_2,uid=1000 \
if [ -f "/run/secrets/react_app_org_id_for_migration" ]; then \
export REACT_APP_ORG_ID_FOR_MIGRATION=$(cat /run/secrets/react_app_org_id_for_migration); \
fi; \
if [ -f "/run/secrets/react_app_team_1" ]; then \
export REACT_APP_TEAM_1=$(cat /run/secrets/react_app_team_1); \
fi; \
if [ -f "/run/secrets/react_app_team_2" ]; then \
export REACT_APP_TEAM_2=$(cat /run/secrets/react_app_team_2); \
fi; \
yarn build; \
if [ -f "/run/secrets/sentry_auth_token" ]; then \
export SENTRY_AUTH_TOKEN=$(cat /run/secrets/sentry_auth_token); \
Expand Down
70 changes: 0 additions & 70 deletions dashboard/src/components/DataMigrator.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { looseUuidRegex } from '../utils';
import { prepareCommentForEncryption } from '../recoil/comments';
import { prepareGroupForEncryption } from '../recoil/groups';
import { capture } from '../services/sentry';
import { prepareConsultationForEncryption } from '../recoil/consultations';

const LOADING_TEXT = 'Mise à jour des données de votre organisation…';

Expand Down Expand Up @@ -57,75 +56,6 @@ export default function useDataMigrator() {
// End of example of migration.
*/

console.log('mgration', process.env.REACT_APP_ORG_ID_FOR_MIGRATION);
if (organisation._id === process.env.REACT_APP_ORG_ID_FOR_MIGRATION && !organisation.migrations?.includes('add-team-to-consultation')) {
setLoadingText('Ajout des équipes dans vos consultations');
const consultationsRes = await API.get({
path: '/consultation',
query: { organisation: organisationId, after: 0, withDeleted: false },
}).then((res) => res.decryptedData || []);

const consultationsToUpdate = consultationsRes
.filter((c) => !c.teams?.length)
.map((consultation) => {
// do something
switch (consultation.type) {
case 'Médecine générale':
case 'Odontologie':
case 'Ophtalmologie':
case 'Gynécologie':
case 'Social':
case 'Pédiatrie':
case 'Pneumologie':
case 'Cardiologie':
case 'ORL':
case 'IDE':
case 'Psycho CDS':
case 'Accueil / Secrétariat':
case 'Rhumatologie':
case 'Maladies Infectieuses':
case 'Médiateur Covid':
case 'Endocrinologie':
case 'Radiologie':
case 'Psychiatrie':
case 'Psychologique':
case 'Infirmier':
return {
...consultation,
teams: [process.env.REACT_APP_TEAM_1],
};
case 'Perm. Médicale Accueil De Jour':
case 'EMSP SOINS':
case 'EMSP COORDO':
case 'EMSP SOCIAL':
case 'EMSP PERM':
case 'EMSP Psycho':
return {
...consultation,
teams: [process.env.REACT_APP_TEAM_2],
};
default:
capture('Unknown consultation type', { consultation });
return consultation;
}
});

const encryptedConsultationsToUpdate = await Promise.all(
consultationsToUpdate.map(prepareConsultationForEncryption(organisation.consultations)).map(encryptItem)
);
const response = await API.put({
path: `/migration/add-team-to-consultation`,
body: { encryptedConsultationsToUpdate },
query: { migrationLastUpdateAt },
});
if (response.ok) {
setOrganisation(response.organisation);
migrationLastUpdateAt = response.organisation.migrationLastUpdateAt;
} else {
return false;
}
}

return true;
},
};
Expand Down

0 comments on commit 8ff1499

Please sign in to comment.