fix(ds): import Psy state (#86)

SocialGouv · Mar 8, 2022 · 69220bb · 69220bb
1 parent 85a992f
commit 69220bb
Show file tree

Hide file tree

Showing 10 changed files with 77 additions and 23 deletions.
diff --git a/.socialgouv/environments/preprod/yaml/importState.yaml b/.socialgouv/environments/preprod/yaml/importState.yaml
@@ -23,5 +23,5 @@ spec:
                 - yarn
                 - run
                 - cron:launch
-                - importData
+                - importState
           restartPolicy: Never
diff --git a/src/db/migrations/20220301190442-state.js b/src/db/migrations/20220301190442-state.js
@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports = {
+  async up (queryInterface, Sequelize) {
+    await queryInterface.addColumn("psychologist", "state", {
+      type: Sequelize.STRING,
+    })
+  },
+
+  async down (queryInterface, Sequelize) {
+    await queryInterface.removeColumn("psychologist", "state")
+  }
+};
diff --git a/src/db/models/psychologist.ts b/src/db/models/psychologist.ts
@@ -23,6 +23,7 @@ export default (sequelize) => {
       lastName: DataTypes.STRING,
       phone: DataTypes.STRING,
       public: DataTypes.STRING,
+      state: DataTypes.STRING,
       teleconsultation: DataTypes.BOOLEAN,
       visible: DataTypes.BOOLEAN,
       website: DataTypes.STRING,

diff --git a/src/db/seeds/psychologist.ts b/src/db/seeds/psychologist.ts
@@ -43,6 +43,7 @@ export const getOnePsychologist = (
   lastName: faker.name.lastName(),
   phone: faker.phone.phoneNumber("0# ## ## ## ##"),
   public: faker.random.arrayElement(allPublics),
+  state: "accepte",
   teleconsultation: faker.datatype.boolean(),
   visible: true,
   website: faker.helpers.randomize([

diff --git a/src/services/demarchesSimplifiees/buildRequest.ts b/src/services/demarchesSimplifiees/buildRequest.ts
@@ -26,6 +26,7 @@ export const requestPsychologistsState = async (
       }
       nodes {
           archived
+          state
           number
       }
     }

diff --git a/src/services/demarchesSimplifiees/import.ts b/src/services/demarchesSimplifiees/import.ts
@@ -64,5 +64,6 @@ export const getPsychologistState = async (): Promise<
   return list.psychologists.map((dossier) => ({
     archived: dossier.archived,
     id: dossier.number,
+    state: dossier.state,
   }));
 };
diff --git a/src/services/demarchesSimplifiees/parsePsychologists.ts b/src/services/demarchesSimplifiees/parsePsychologists.ts
@@ -11,6 +11,7 @@ const parseDossierMetadata = async (
     id: dossier.number,
     instructorId: dossier.groupeInstructeur.id,
     lastName: dossier.demandeur.nom,
+    state: dossier.state,
   };
 
   JSON.parse(config.demarchesSimplifiees.champs).forEach(([id, field]) => {

diff --git a/src/services/psychologists.spec.ts b/src/services/psychologists.spec.ts
@@ -19,24 +19,28 @@ import {
 describe("Service psychologists", () => {
   beforeEach(async () => {
     await models.Psychologist.destroy({ where: {} });
+    const states = ["accepte", "en_instruction", "refuse"];
     const archiveds = [true, false];
     const visibles = [true, false];
     const teleconsultations = [true, false];
     const instructorIds = ["1", "2", "3"];
 
     // 2 x 2 x 2 x 3 x 3 = 72 psys
     const psychologists = archiveds.flatMap((archived) =>
-      visibles.flatMap((visible) =>
-        teleconsultations.flatMap((teleconsultation) =>
-          instructorIds.flatMap((instructorId) =>
-            allPublics.map((p) =>
-              getOnePsychologist({
-                archived,
-                instructorId,
-                public: p,
-                teleconsultation,
-                visible,
-              })
+      states.flatMap((state) =>
+        visibles.flatMap((visible) =>
+          teleconsultations.flatMap((teleconsultation) =>
+            instructorIds.flatMap((instructorId) =>
+              allPublics.map((p) =>
+                getOnePsychologist({
+                  archived,
+                  instructorId,
+                  public: p,
+                  state,
+                  teleconsultation,
+                  visible,
+                })
+              )
             )
           )
         )
@@ -242,21 +246,41 @@ describe("Service psychologists", () => {
 
     beforeEach(async () => {
       const psychologists = [
-        getOnePsychologist({ archived: true, id: 1, instructorId }),
-        getOnePsychologist({ archived: false, id: 2, instructorId }),
-        getOnePsychologist({ archived: true, id: 3, instructorId }),
-        getOnePsychologist({ archived: false, id: 4, instructorId }),
+        getOnePsychologist({
+          archived: true,
+          id: 1,
+          instructorId,
+          state: "initial",
+        }),
+        getOnePsychologist({
+          archived: false,
+          id: 2,
+          instructorId,
+          state: "initial",
+        }),
+        getOnePsychologist({
+          archived: true,
+          id: 3,
+          instructorId,
+          state: "initial",
+        }),
+        getOnePsychologist({
+          archived: false,
+          id: 4,
+          instructorId,
+          state: "initial",
+        }),
       ];
 
       //@ts-ignore
       await models.Psychologist.bulkCreate(psychologists);
     });
 
-    it("Should only update archived value", async () => {
+    it("Should only update state & archived value", async () => {
       await updateState([
-        { archived: true, id: 0 },
-        { archived: false, id: 1 },
-        { archived: true, id: 2 },
+        { archived: true, id: 0, state: "final" },
+        { archived: false, id: 1, state: "final" },
+        { archived: true, id: 2, state: "final" },
       ]);
 
       // @ts-ignore
@@ -266,9 +290,17 @@ describe("Service psychologists", () => {
 
       expect(psychologists.find((psy) => psy.id === 0)).toEqual(undefined);
       expect(psychologists.find((psy) => psy.id === 1).archived).toEqual(false);
+      expect(psychologists.find((psy) => psy.id === 1).state).toEqual("final");
       expect(psychologists.find((psy) => psy.id === 2).archived).toEqual(true);
+      expect(psychologists.find((psy) => psy.id === 2).state).toEqual("final");
       expect(psychologists.find((psy) => psy.id === 3).archived).toEqual(true);
+      expect(psychologists.find((psy) => psy.id === 3).state).toEqual(
+        "initial"
+      );
       expect(psychologists.find((psy) => psy.id === 4).archived).toEqual(false);
+      expect(psychologists.find((psy) => psy.id === 4).state).toEqual(
+        "initial"
+      );
     });
   });
 });
diff --git a/src/services/psychologists.ts b/src/services/psychologists.ts
@@ -21,12 +21,14 @@ export const getByInstructor = async (
   // @ts-ignore
   return models.Psychologist.findAll({
     raw: true,
-    where: { archived: false, instructorId: group },
+    where: { archived: false, instructorId: group, state: "accepte" },
   });
 };
 
 export const countAll = async () =>
-  models.Psychologist.count({ where: { archived: false, visible: true } });
+  models.Psychologist.count({
+    where: { archived: false, state: "accepte", visible: true },
+  });
 
 const DEFAULT_PAGE_SIZE = 50;
 export const getAll = async (filters: {
@@ -36,7 +38,7 @@ export const getAll = async (filters: {
     ? parseInt(filters[FILTER.PAGE_SIZE] as string, 10)
     : DEFAULT_PAGE_SIZE;
 
-  const where: any = { archived: false, visible: true };
+  const where: any = { archived: false, state: "accepte", visible: true };
   const query: Sequelize.FindOptions<any> = {
     limit: pageSize,
     offset: parseInt(filters[FILTER.PAGE_INDEX] as string, 10) * pageSize,
@@ -123,6 +125,7 @@ export const updateState = async (newStates: Partial<Psychologist>[]) => {
       models.Psychologist.update(
         {
           archived: newState.archived,
+          state: newState.state,
         },
         { where: { id: newState.id } }
       )

diff --git a/src/types/psychologist.d.ts b/src/types/psychologist.d.ts
@@ -15,6 +15,7 @@ export interface Psychologist {
   website: string;
   coordinates: { type: string; coordinates: [number, number] };
   instructorId: string;
+  state: string;
 }
 
 export interface DSPsychologist {