.gitlab-ci.yml

-image: docker:git
-
-services:
-  - docker:dind
-
 stages:
   - test
   - sonar-analysis
@@ -10,7 +5,7 @@ stages:
   - deploy
 
 build:
-  image: docker:18.09
+  image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:18.09
   services:
     - docker:18.09-dind
   only:
@@ -41,7 +36,7 @@ deploy_dev:
 
 test:
   stage: test
-  image: node:14.15.4
+  image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:14.15.4
   before_script:
     - export GHOST_HOST_AND_PORT=http://localhost:2368
     - export GHOST_ADMIN_API_KEY=60142bc9e33940000156bccc:6217742e2671e322612e89cac9bab61fcd01822709fe5d8f5e6a5b3e54d5e6bb
@@ -60,29 +55,32 @@ test:
     - dev
     - merge_requests
 
-code_analysis:
-  image: registry.forge.grandlyon.com/apoyen2/sonnar-scanner-gl:master
-  services:
-    - docker:18.09-dind
-  stage: sonar-analysis
-  only:
-    - dev
-  before_script:
-    - export NODE_PATH=$NODE_PATH:`npm root -g`
-    - npm install -g typescript
-  script:
-    - >
-      sonar-scanner
-      -Dsonar.projectName=${SONAR_PROJECT_KEY}
-      -Dsonar.projectVersion=1.0
-      -Dsonar.sourceEncoding=UTF-8
-      -Dsonar.projectBaseDir=.
-      -Dsonar.host.url=${SONAR_URL}
-      -Dsonar.projectKey=${SONAR_PROJECT_KEY}
-      -Dsonar.login=${SONAR_TOKEN}
+# code_analysis:
+#   image: registry.forge.grandlyon.com/apoyen2/sonnar-scanner-gl:master
+#   services:
+#     - docker:18.09-dind
+#   stage: sonar-analysis
+#   only:
+#     - dev
+#     - merge_requests
+#   before_script:
+#     - export NODE_PATH=$NODE_PATH:`npm root -g`
+#     - npm install -g typescript
+#   script:
+#     - >
+#       sonar-scanner
+#       -Dsonar.projectName=${SONAR_PROJECT_KEY}
+#       -Dsonar.projectVersion=1.0
+#       -Dsonar.sourceEncoding=UTF-8
+#       -Dsonar.projectBaseDir=.
+#       -Dsonar.host.url=${SONAR_URL}
+#       -Dsonar.projectKey=${SONAR_PROJECT_KEY}
+#       -Dsonar.exclusions=scripts/**,**/*mock.*.ts,**/*spec.ts
+#       -Dsonar.login=${SONAR_TOKEN}
+#       -Dsonar.qualitygate.wait=true
 
 mr:
-  image: docker:18.09
+  image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:18.09
   services:
     - docker:18.09-dind
   stage: build

docker-compose.yml

@@ -84,7 +84,7 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: ${GHOST_DB_PASSWORD}
     volumes:
-      - db-ghost
+      - db-ghost:/var/lib/mysql
 
   es01:
     image: elasticsearch:7.6.1
@@ -96,7 +96,7 @@ services:
       xpack.security.enabled: ${ELASTIC_SECURITY}
       ELASTIC_PASSWORD: ${ELASTICSEARCH_PASSWORD}
     volumes:
-      - db-elastic
+      - db-elastic:/usr/share/elasticsearch/data
     networks:
       - elastic
     ports:
@@ -120,10 +120,14 @@ services:
 
 volumes:
   db-ram:
+    driver: local
   db-ghost:
+    driver: local
   db-elastic:
+    driver: local
 
 networks:
   backend:
+    driver: bridge
   elastic:
     driver: bridge

package.json

 {
   "name": "ram_server",
   "private": true,
-  "version": "1.9.1",
+  "version": "1.10.0",
   "description": "Nest TypeScript starter repository",
   "license": "MIT",
   "scripts": {
@@ -12,8 +12,8 @@
     "start:dev": "nodemon",
     "start:debug": "nodemon --config nodemon-debug.json",
     "start:prod": "npm run migrate:up && node dist/main",
-    "doc": "npx @compodoc/compodoc -p tsconfig.json -s -n 'Resin api documentation'",
-    "doc:serve": "npm run doc && npx compodoc -s",
+    "doc": "./node_modules/.bin/compodoc compodoc -p tsconfig.json -s -n 'Resin api documentation'",
+    "doc:serve": "./node_modules/.bin/compodoc compodoc -s",
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
     "release": "standard-version",
     "init-db": "node ./scripts/init-db.js",
@@ -38,9 +38,9 @@
     "@nestjs/platform-express": "^7.5.1",
     "@nestjs/schedule": "^0.4.1",
     "@nestjs/swagger": "^4.7.5",
-    "@tryghost/admin-api": "^1.3.8",
+    "@tryghost/admin-api": "^1.4.4",
     "@types/bcrypt": "^3.0.0",
-    "bcrypt": "^5.0.0",
+    "bcrypt": "^5.0.1",
     "class-transformer": "^0.3.1",
     "class-validator": "^0.12.2",
     "dotenv": "^8.2.0",
@@ -55,11 +55,11 @@
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
     "rxjs": "^6.6.3",
-    "standard-version": "^9.0.0",
-    "swagger-ui-express": "^4.1.5"
+    "standard-version": "^9.3.2",
+    "swagger-ui-express": "^4.3.0"
   },
   "devDependencies": {
-    "@compodoc/compodoc": "^1.1.11",
+    "@compodoc/compodoc": "^1.1.16",
     "@nestjs/cli": "^7.5.1",
     "@nestjs/schematics": "^7.1.3",
     "@nestjs/testing": "^7.5.1",

scripts/data/categoriesAccompanements.js

+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const mongoose = require('mongoose');
+
+module.exports = {
+  data: [
+    {
+      _id: mongoose.Types.ObjectId('5fbb931c80a5c257dc0161f4'),
+      modules: [
+        {
+          id: 'accompagnantCaf',
+          text: 'Accompagnant CAF',
+        },
+        {
+          id: 'poleEmploi',
+          text: 'Pôle Emploi',
+        },
+        {
+          id: 'cpam',
+          text: 'CPAM',
+        },
+        {
+          id: 'impots',
+          text: 'Impôts',
+        },
+        {
+          id: 'logement',
+          text: 'Logement',
+        },
+        {
+          id: 'carsat',
+          text: 'CARSAT',
+        },
+        {
+          id: 'demarcheMetropolitaine',
+          text: 'Démarches Métropolitaines',
+        },
+        {
+          id: 'autres',
+          text: 'Autres',
+        },
+      ],
+      name: 'Accompagnement des démarches',
+      id: 'proceduresAccompaniment',
+      __v: 0,
+    },
+  ],
+};

scripts/data/categoriesFormation.js

+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const mongoose = require('mongoose');
+
+module.exports = {
+  data: [
+    {
+      _id: mongoose.Types.ObjectId('5fbb933b80a5c257dc0161f5'),
+      modules: [
+        {
+          id: '84',
+          display_id: '84',
+          display_name: 'Modules APTIC - n°84',
+          digest: 'Pôle Emploi : faire ses déclarations en ligne',
+          text: 'Pôle Emploi : faire ses déclarations en ligne',
+        },
+        {
+          id: '85',
+          display_id: '85',
+          display_name: 'Modules APTIC - n°85',
+          digest: 'Déclarer ses revenus en ligne et découvertes des services proposés',
+          text: 'Déclarer ses revenus en ligne et découvertes des services proposés',
+        },
+        {
+          id: '86',
+          display_id: '86',
+          display_name: 'Modules APTIC - n°86',
+          digest: 'Accéder à ses droits sociaux et les gérer en ligne (RSA…)',
+          text: 'Accéder à ses droits sociaux et les gérer en ligne (RSA…)',
+        },
+        {
+          id: '87',
+          display_id: '87',
+          display_name: 'Modules APTIC - n°87',
+          digest: 'Ouvrir et gérer son dossier de retraite (CNAF/CARSAT) en ligne',
+          text: 'Ouvrir et gérer son dossier de retraite (CNAF/CARSAT) en ligne',
+        },
+        {
+          id: '88',
+          display_id: '88',
+          display_name: 'Modules APTIC - n°88',
+          digest: "Gérer son abonnement et ses factures d'électricité/gaz en ligne",
+          text: "Gérer son abonnement et ses factures d'électricité/gaz en ligne",
+        },
+        {
+          id: '89',
+          display_id: '89',
+          display_name: 'Modules APTIC - n°89',
+          digest: "Gérer ses droits d'assuré social en ligne/sur internet",
+          text: "Gérer ses droits d'assuré social en ligne/sur internet",
+        },
+        {
+          id: '93',
+          display_id: '93',
+          display_name: 'Modules APTIC - n°93',
+          digest: 'Plateforme Ameli.fr : la sécurité sociale en ligne',
+          text: 'Plateforme Ameli.fr : la sécurité sociale en ligne',
+        },
+        {
+          id: '95',
+          display_id: '95',
+          display_name: 'Modules APTIC - n°95',
+          digest: 'Plateforme France Connect',
+          text: 'Plateforme France Connect',
+        },
+      ],
+      name: 'Accès aux droits',
+      id: 'accessRight',
+      __v: 0,
+    },
+    {
+      modules: [
+        {
+          id: '260',
+          display_id: '260',
+          display_name: 'Modules APTIC - n°260',
+          digest: 'Maitrise de l’environnement d’un ordinateur (clavier, souris)',
+          text: 'Maitrise de l’environnement d’un ordinateur (clavier, souris)',
+        },
+        {
+          id: '1',
+          display_id: '1',
+          display_name: 'Modules APTIC - n°1',
+          digest: 'Composantes et facettes de l’identité numérique',
+          text: 'Composantes et facettes de l’identité numérique',
+        },
+        {
+          id: '11',
+          display_id: '11',
+          display_name: 'Modules APTIC - n°11',
+          digest: 'Internet : fonctionnement et outils de navigation web',
+          text: 'Internet : fonctionnement et outils de navigation web',
+        },
+        {
+          id: '38',
+          display_id: '38',
+          display_name: 'Modules APTIC - n°38',
+          digest: 'Le smartphone : principes de fonctionnement',
+          text: 'Le smartphone : principes de fonctionnement',
+        },
+        {
+          id: '48',
+          display_id: '48',
+          display_name: 'Modules APTIC - n°48',
+          digest: 'Internet : envoyer, recevoir, gérer ses emails',
+          text: 'Internet : envoyer, recevoir, gérer ses emails',
+        },
+        {
+          id: '74',
+          display_id: '74',
+          display_name: 'Modules APTIC - n°74',
+          digest: 'Smartphones et Tablettes sous Androïd',
+          text: 'Smartphones et Tablettes sous Androïd',
+        },
+        {
+          id: '77',
+          display_id: '77',
+          display_name: 'Modules APTIC - n°77',
+          digest: "Smartphone : Les principaux gestes pour l'écran tactile",
+          text: "Smartphone : Les principaux gestes pour l'écran tactile",
+        },
+      ],
+      name: 'Les compétences de base',
+      id: 'baseSkills',
+      __v: 0,
+    },
+    {
+      modules: [
+        {
+          id: '6',
+          display_id: '6',
+          display_name: 'Modules APTIC - n°6',
+          digest: "Utiliser les réseaux sociaux pour sa recherche d'emploi",
+          text: "Utiliser les réseaux sociaux pour sa recherche d'emploi",
+        },
+        {
+          id: '20',
+          display_id: '20',
+          display_name: 'Modules APTIC - n°20',
+          digest: 'Panorama des plateformes de recherche d’emploi',
+          text: 'Panorama des plateformes de recherche d’emploi',
+        },
+        {
+          id: '66',
+          display_id: '66',
+          display_name: 'Modules APTIC - n°66',
+          digest: 'Traitement de texte : découverte',
+          text: 'Traitement de texte : découverte',
+        },
+        {
+          id: '67',
+          display_id: '67',
+          display_name: 'Modules APTIC - n°67',
+          digest: 'Traitement de texte : utilisation de base',
+          text: 'Traitement de texte : utilisation de base',
+        },
+        {
+          id: '68',
+          display_id: '68',
+          display_name: 'Modules APTIC - n°68',
+          digest: 'Traitement de texte : utilisation avancée',
+          text: 'Traitement de texte : utilisation avancée',
+        },
+        {
+          id: '69',
+          display_id: '69',
+          display_name: 'Modules APTIC - n°69',
+          digest: 'Tableur : découverte',
+          text: 'Tableur : découverte',
+        },
+        {
+          id: '124',
+          display_id: '124',
+          display_name: 'Modules APTIC - n°124',
+          digest: 'Réalisation CV',
+          text: 'Réalisation CV',
+        },
+        {
+          id: '125',
+          display_id: '125',
+          display_name: 'Modules APTIC - n°125',
+          digest: 'Diffuser son CV en ligne',
+          text: 'Diffuser son CV en ligne',
+        },
+        {
+          id: '127',
+          display_id: '127',
+          display_name: 'Modules APTIC - n°127',
+          digest: "Organiser sa recherche d'emploi",
+          text: "Organiser sa recherche d'emploi",
+        },
+      ],
+      name: 'Insertion sociale et professionnelle',
+      id: 'socialAndProfessional',
+      __v: 0,
+    },
+    {
+      _id: mongoose.Types.ObjectId('5fbb934c80a5c257dc0161f8'),
+      modules: [
+        {
+          id: '3',
+          display_id: '3',
+          display_name: 'Modules APTIC - n°3',
+          digest: "Être parent à l'ère numérique: connaître les usages, jouer son rôle de parent",
+          text: "Être parent à l'ère numérique: connaître les usages, jouer son rôle de parent",
+        },
+        {
+          id: '22',
+          display_id: '22',
+          display_name: 'Modules APTIC - n°22',
+          digest: 'Découvrir l’univers des jeux vidéo - 22',
+          text: 'Découvrir l’univers des jeux vidéo',
+        },
+        {
+          id: '82',
+          display_id: '82',
+          display_name: 'Modules APTIC - n°82',
+          digest: 'Suivre la scolarité de son enfant - 82',
+          text: 'Suivre la scolarité de son enfant',
+        },
+        {
+          id: '94',
+          display_id: '94',
+          display_name: 'Modules APTIC - n°94',
+          digest: "Découvrir les services en ligne de l'enfance de votre commune - 94",
+          text: "Découvrir les services en ligne de l'enfance de votre commune",
+        },
+      ],
+      name: 'Aide à la parentalité',
+      id: 'parentingHelp',
+      __v: 0,
+    },
+    {
+      _id: mongoose.Types.ObjectId('5fbb935080a5c257dc0161f9'),
+      modules: [
+        {
+          id: '2',
+          display_id: '2',
+          display_name: 'Modules APTIC - n°2',
+          digest: 'Les conduites à risques et les bons usages du numérique - 02',
+          text: 'Les conduites à risques et les bons usages du numérique',
+        },
+        {
+          id: '5',
+          display_id: '5',
+          display_name: 'Modules APTIC - n°5',
+          digest: 'Découvrir les réseaux sociaux : définition, fonctionnement - 05',
+          text: 'Découvrir les réseaux sociaux : définition, fonctionnement',
+        },
+        {
+          id: '9',
+          display_id: '9',
+          display_name: 'Modules APTIC - n°9',
+          digest: 'Fablab : charte, valeurs et panorama des outils numériques - 09',
+          text: 'Fablab : charte, valeurs et panorama des outils numériques',
+        },
+        {
+          id: '28',
+          display_id: '28',
+          display_name: 'Modules APTIC - n°28',
+          digest: 'Les paiements en ligne - 28',
+          text: 'Les paiements en ligne',
+        },
+        {
+          id: '34',
+          display_id: '34',
+          display_name: 'Modules APTIC - n°34',
+          digest: 'Internet : comprendre les principes de fonctionnement - 35',
+          text: 'Internet : comprendre les principes de fonctionnement',
+        },
+        {
+          id: '39',
+          display_id: '39',
+          display_name: 'Modules APTIC - n°39',
+          digest: 'Techniques de vérification de l’information - 39',
+          text: 'Techniques de vérification de l’information',
+        },
+        {
+          id: '42',
+          display_id: '42',
+          display_name: 'Modules APTIC - n°42',
+          digest: 'Créer et paramétrer un compte Google - 42',
+          text: 'Créer et paramétrer un compte Google',
+        },
+        {
+          id: '51',
+          display_id: '51',
+          display_name: 'Modules APTIC - n°51',
+          digest: 'Gérer ses données : sauvegarde en ligne (dans le cloud) - 51',
+          text: 'Gérer ses données : sauvegarde en ligne (dans le cloud)',
+        },
+        {
+          id: '52',
+          display_id: '52',
+          display_name: 'Modules APTIC - n°52',
+          digest: 'Gérer ses données : sauvegardes locales (disques durs externes, clé USB) - 52',
+          text: 'Gérer ses données : sauvegardes locales (disques durs externes, clé USB)',
+        },
+        {
+          id: '54',
+          display_id: '54',
+          display_name: 'Modules APTIC - n°54',
+          digest: 'Classer, gérer et partager ses photos - 54',
+          text: 'Classer, gérer et partager ses photos',
+        },
+        {
+          id: '65',
+          display_id: '65',
+          display_name: 'Modules APTIC - n°65',
+          digest: 'Skype et autres outils de visioconférence - 65',
+          text: 'Skype et autres outils de visioconférence',
+        },
+        {
+          id: '96',
+          display_id: '96',
+          display_name: 'Modules APTIC - n°96',
+          digest: 'Connaitre et gérer son identité numérique - 96',
+          text: 'Connaitre et gérer son identité numérique',
+        },
+        {
+          id: '97',
+          display_id: '97',
+          display_name: 'Modules APTIC - n°97',
+          digest: 'Nettoyer son identité numérique - 97',
+          text: 'Nettoyer son identité numérique',
+        },
+        {
+          id: '98',
+          display_id: '98',
+          display_name: 'Modules APTIC - n°98',
+          digest: 'Effacer ses traces sur le web, protéger ses données personnelles - 98',
+          text: 'Effacer ses traces sur le web, protéger ses données personnelles',
+        },
+      ],
+      name: 'Culture et sécurité numérique',
+      id: 'digitalCultureSecurity',
+      __v: 0,
+    },
+  ],
+};

scripts/data/categoriesOthers.js

+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const mongoose = require('mongoose');
+
+module.exports = {
+  data: [
+    {
+      _id: mongoose.Types.ObjectId('5fbb92dd80a5c257dc0161ef'),
+      modules: [
+        {
+          id: 'toutPublic',
+          text: 'Tout public',
+        },
+        {
+          id: 'moinsDe16Ans',
+          text: 'Moins de 16 ans',
+        },
+        {
+          id: 'jeunes1625Ans',
+          text: 'Jeunes (16-25 ans)',
+        },
+        {
+          id: 'adultes',
+          text: 'Adultes',
+        },
+        {
+          id: 'seniorsPlusDe65Ans',
+          text: 'Séniors (+ de 65 ans)',
+        },
+      ],
+      name: 'Publics acceptés',
+      id: 'publics',
+      __v: 0,
+    },
+    {
+      _id: mongoose.Types.ObjectId('5fbb92e480a5c257dc0161f0'),
+      modules: [
+        {
+          id: 'aidantsConnect',
+          text: 'Aidants Connect',
+        },
+        {
+          id: 'espacePublicNumeriqueepn',
+          text: 'Espace public numérique',
+        },
+        {
+          id: 'fabriqueDeTerritoire',
+          text: 'Fabrique de territoire',
+        },
+        {
+          id: 'maisonFranceService',
+          text: 'Maison France Service',
+        },
+        {
+          id: 'passNumerique',
+          text: 'Pass numérique',
+        },
+        {
+          id: 'conseillerNumFranceServices',
+          text: 'Conseiller numérique France services',
+        },
+      ],
+      name: 'Labels et qualifications',
+      id: 'labelsQualifications',
+      __v: 0,
+    },
+    {
+      _id: mongoose.Types.ObjectId('5fbb92e980a5c257dc0161f1'),
+      modules: [
+        {
+          id: 'accesLibre',
+          text: 'Accès libre',
+        },
+        {
+          id: 'telephoneVisio',
+          text: 'Téléphone / Visio',
+        },
+        {
+          id: 'surRdv',
+          text: 'Sur RDV',
+        },
+      ],
+      name: "Modalités d'accès",
+      id: 'accessModality',
+      __v: 0,
+    },
+    {
+      _id: mongoose.Types.ObjectId('5fbb92ef80a5c257dc0161f2'),
+      modules: [
+        {
+          id: "Personnes en situation d'illetrisme",
+          text: "Personnes en situation d'illetrisme",
+        },
+        {
+          id: 'Langue étrangère (anglais)',
+          text: 'Langue étrangère (anglais)',
+        },
+        {
+          id: 'Langues étrangères (autres)',
+          text: 'Langues étrangères (autres)',
+        },
+        {
+          id: 'Surdité',
+          text: 'Surdité',
+        },
+        {
+          id: 'Déficience visuelle',
+          text: 'Déficience visuelle',
+        },
+        {
+          id: 'Handicap moteur',
+          text: 'Handicap moteur',
+        },
+      ],
+      name: 'Accompagnement des publics spécifiques',
+      id: 'publicsAccompaniment',
+      __v: 0,
+    },
+    {
+      _id: mongoose.Types.ObjectId('5fbb92f380a5c257dc0161f3'),
+      modules: [
+        {
+          id: 'wifiEnAccesLibre',
+          text: 'Wifi en accès libre',
+        },
+        {
+          id: 'ordinateurs',
+          text: 'Ordinateurs',
+        },
+        {
+          id: 'tablettes',
+          text: 'Tablettes',
+        },
+        {
+          id: 'bornesNumeriques',
+          text: 'Bornes numériques',
+        },
+        {
+          id: 'imprimantes',
+          text: 'Imprimantes',
+        },
+        {
+          id: 'scanners',
+          text: 'Scanners',
+        },
+        {
+          id: 'donDeMateriels',
+          text: 'Prêt / don de matériels',
+        },
+        {
+          id: 'reconditionnementsDeMateriel',
+          text: 'Reconditionnements de matériel',
+        },
+        {
+          id: 'accesLivresInformatiques',
+          text: 'Accès à des revues ou livres informatiques et numériques',
+        },
+      ],
+      name: 'Équipements et services proposés',
+      id: 'equipmentsAndServices',
+      __v: 0,
+    },
+  ],
+};

scripts/data/structuresType.js

+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const mongoose = require('mongoose');
+
+module.exports = {
+  data: [
+    {
+      _id: mongoose.Types.ObjectId('601c223d3f612000068d4366'),
+      name: 'Publique',
+      values: [
+        'mairie',
+        'CAF',
+        'CCAS',
+        'CARSAT',
+        'poleEmploi',
+        'mdm',
+        'mediatheque',
+        'prefecture',
+        'bijPij',
+        'logement',
+      ],
+    },
+    {
+      _id: mongoose.Types.ObjectId('601c22543f612000068d4367'),
+      name: 'Privée à but non lucratif',
+      values: ['association', 'centreSocio', 'mjc', 'pimms', 'sij', 'missionsLocales'],
+    },
+    {
+      _id: mongoose.Types.ObjectId('601c225e3f612000068d4368'),
+      name: 'Privée à but lucratif',
+      values: ['formation', 'insertion'],
+    },
+  ],
+};

scripts/data/users.js

@@ -5,10 +5,7 @@ module.exports = {
   data: [
     {
       pendingStructuresLink: [],
-      structuresLink: [
-        mongoose.Types.ObjectId('60059cf7dfb2ac4b00733db0'),
-        mongoose.Types.ObjectId('6001a48e16b08100062e4180'),
-      ],
+      structuresLink: [],
       phone: '06 06 06 06 06',
       newEmail: null,
       changeEmailToken: null,
@@ -24,7 +21,7 @@ module.exports = {
     {
       structureOutdatedMailSent: [],
       pendingStructuresLink: [],
-      structuresLink: [mongoose.Types.ObjectId('6001a48e16b08100062e4180')],
+      structuresLink: [mongoose.Types.ObjectId('6001a39c16b08100062e4164')],
       newEmail: null,
       changeEmailToken: null,
       role: 0,
@@ -39,7 +36,10 @@ module.exports = {
     {
       structureOutdatedMailSent: [],
       pendingStructuresLink: [],
-      structuresLink: [mongoose.Types.ObjectId('6001a48e16b08100062e4180')],
+      structuresLink: [
+        mongoose.Types.ObjectId('6001a38516b08100062e4161'),
+        mongoose.Types.ObjectId('6001a3aa16b08100062e4166'),
+      ],
       newEmail: null,
       changeEmailToken: null,
       role: 0,

scripts/init-db.js

@@ -2,6 +2,11 @@
 const mongoose = require('mongoose');
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const userData = require('./data/users');
+const structuresTypeData = require('./data/structuresType');
+const categoriesOthersData = require('./data/categoriesOthers');
+const categoriesAccompanementsData = require('./data/categoriesAccompanements');
+const categoriesFormationData = require('./data/categoriesFormation');
+const structuresData = require('./data/structures');
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const bcrypt = require('bcrypt');
 // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -28,6 +33,13 @@ function hashPassword() {
   return bcrypt.hashSync(process.env.USER_PWD, process.env.SALT);
 }
 
+const handleError = async (name, err) => {
+  /* show messages */
+  if (err) {
+    if (err.code === 26) console.error(`-- ${name} collection does not exists --`);
+    else throw err;
+  } else console.log(`-- ${name} collection dropped --`);
+};
 // define Schema
 var usersSchema = mongoose.Schema({
   name: String,
@@ -45,17 +57,82 @@ var usersSchema = mongoose.Schema({
   password: String,
   phone: String,
 });
+var structuresTypeSchema = mongoose.Schema(
+  {
+    name: String,
+    values: [],
+  },
+  { collection: 'structuretype' }
+);
+var categoriesOthersSchema = mongoose.Schema({
+  name: String,
+  id: String,
+  modules: [],
+});
+var categoriesAccompanementsSchema = mongoose.Schema({
+  name: String,
+  id: String,
+  modules: [],
+});
+var categoriesFormationSchema = mongoose.Schema({
+  name: String,
+  id: String,
+  modules: [],
+});
+var structuresSchema = mongoose.Schema({
+  numero: String,
+  createdAt: String,
+  updatedAt: String,
+  structureName: String,
+  structureType: String,
+  description: String,
+  lockdownActivity: String,
+  address: Object,
+  contactPhone: String,
+  contactMail: String,
+  website: String,
+  facebook: String,
+  twitter: String,
+  instagram: String,
+  linkedin: String,
+  pmrAccess: Boolean,
+  accessModality: [],
+  otherDescription: String,
+  labelsQualifications: [],
+  publics: [],
+  exceptionalClosures: String,
+  publicsAccompaniment: [],
+  proceduresAccompaniment: [],
+  remoteAccompaniment: Boolean,
+  baseSkills: [],
+  accessRight: [],
+  socialAndProfessional: [],
+  parentingHelp: [],
+  digitalCultureSecurity: [],
+  equipmentsAndServices: [],
+  freeWorkShop: Boolean,
+  nbComputers: Number,
+  nbPrinters: Number,
+  nbTablets: Number,
+  nbNumericTerminal: Number,
+  nbScanners: Number,
+  hours: Object,
+  coord: [],
+  deletedAt: Date,
+  accountVerified: Boolean,
+});
 
 // compile schema to model
 var User = mongoose.model('Users', usersSchema);
+var structuresType = mongoose.model('structureType', structuresTypeSchema);
+var categoriesOthers = mongoose.model('categoriesOthers', categoriesOthersSchema);
+var categoriesAccompanements = mongoose.model('CategoriesAccompagnement', categoriesAccompanementsSchema);
+var categoriesFormation = mongoose.model('categoriesFormation', categoriesFormationSchema);
+var structures = mongoose.model('structures', structuresSchema);
 
 /* drop users collections */
-mongoose.connection.dropCollection('users', function (err) {
-  /* show messages */
-  if (err) {
-    if (err.code === 26) console.log('-- Users collection does not exists --');
-    else throw err;
-  } else console.log('-- Users collection dropped --');
+mongoose.connection.dropCollection('users', async (err) => {
+  await handleError('Users', err);
 
   // Init passsword
   console.log('-- Users password encryption based on .env --');
@@ -66,6 +143,43 @@ mongoose.connection.dropCollection('users', function (err) {
   User.create(userData.data, function (error, user) {
     if (error) return console.error(error);
     console.log('-- Users collection initialized --');
+  });
+});
+
+/* Create structures ref */
+mongoose.connection.dropCollection('structuretype', async (err) => {
+  await handleError('structureType', err);
+  structuresType.create(structuresTypeData.data, (error) => {
+    if (error) return console.error(error);
+  });
+});
+
+mongoose.connection.dropCollection('categoriesothers', async (err) => {
+  await handleError('categoriesOthers', err);
+  categoriesOthers.create(categoriesOthersData.data, (error) => {
+    if (error) return console.error(error);
+  });
+});
+
+mongoose.connection.dropCollection('categoriesaccompagnements', async (err) => {
+  await handleError('categoriesAccompanements', err);
+  categoriesAccompanements.create(categoriesAccompanementsData.data, (error) => {
+    if (error) return console.error(error);
+  });
+});
+
+mongoose.connection.dropCollection('categoriesformations', async (err) => {
+  await handleError('categoriesFormations', err);
+  categoriesFormation.create(categoriesFormationData.data, (error) => {
+    if (error) return console.error(error);
+  });
+});
+
+/* Create structures */
+mongoose.connection.dropCollection('structures', async (err) => {
+  await handleError('structures', err);
+  structures.create(structuresData.data, (error) => {
+    if (error) return console.error(error);
     process.exit(0);
   });
 });

scripts/init-index.js

+const axios = require('axios');
+const path = require('path');
+require('dotenv').config({ path: path.resolve(__dirname, '../.env') });
+
+axios
+  .post('http://localhost:3000/auth/login', {
+    email: 'admin@admin.com',
+    password: process.env.USER_PWD,
+  })
+  .then((res) => {
+    const config = {
+      headers: { Authorization: `Bearer ${res.data.accessToken}` },
+    };
+    axios
+      .post('http://localhost:3000/structures/resetSearchIndex', {}, config)
+      .then((res) => {
+        console.log(`statusCode: ${res.status}`);
+      })
+      .catch((error) => {
+        console.error('Error in index create');
+        console.error(error);
+      });
+  })
+  .catch((error) => {
+    console.error('Error in auth');
+    console.error(error);
+  });

src/admin/admin.controller.spec.ts

@@ -190,4 +190,11 @@ describe('AdminController', () => {
       }
     });
   });
+
+  it('should get pending structure list for admin', async () => {
+    expect((await controller.getAdminStructuresList()).inClaim.length).toBe(2);
+    expect((await controller.getAdminStructuresList()).toClaim.length).toEqual(2);
+    expect((await controller.getAdminStructuresList()).claimed.length).toEqual(0);
+    expect((await controller.getAdminStructuresList()).incomplete.length).toEqual(2);
+  });
 });

src/admin/admin.controller.ts

 import { ApiOperation, ApiParam } from '@nestjs/swagger';
 import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
-import { Body, Delete, Param, Controller, Get, Post, UseGuards, HttpStatus, HttpException } from '@nestjs/common';
+import {
+  Body,
+  Delete,
+  Param,
+  Controller,
+  Get,
+  Post,
+  UseGuards,
+  HttpStatus,
+  HttpException,
+  Logger,
+} from '@nestjs/common';
 import { NewsletterSubscription } from '../newsletter/newsletter-subscription.schema';
 import { NewsletterService } from '../newsletter/newsletter.service';
 import { StructuresService } from '../structures/services/structures.service';
@@ -8,9 +19,12 @@ import { Roles } from '../users/decorators/roles.decorator';
 import { RolesGuard } from '../users/guards/roles.guard';
 import { UsersService } from '../users/users.service';
 import { PendingStructureDto } from './dto/pending-structure.dto';
+import { validate } from 'class-validator';
+import { Structure } from '../structures/schemas/structure.schema';
 
 @Controller('admin')
 export class AdminController {
+  private readonly logger = new Logger(AdminController.name);
   constructor(
     private usersService: UsersService,
     private structuresService: StructuresService,
@@ -36,12 +50,13 @@ export class AdminController {
   @Get('adminStructuresList')
   @ApiOperation({ description: 'Get pending structre for validation' })
   public async getAdminStructuresList(): Promise<any> {
-    const structuresList = { claimed: [], inClaim: [], toClaim: [] };
+    const structuresList = { claimed: [], inClaim: [], toClaim: [], incomplete: [] };
     structuresList.inClaim = await this.getPendingAttachments();
     structuresList.toClaim = (await this.structuresService.findAllUnclaimed()).filter(
       (demand) => !structuresList.inClaim.find((elem) => elem.structureId == demand.structureId)
     );
-    structuresList.claimed = (await this.structuresService.findAll())
+    const allStructures = await this.structuresService.findAll();
+    structuresList.claimed = allStructures
       .filter(
         (demand) =>
           !structuresList.inClaim.find((elem) => elem.structureId == demand.id) &&
@@ -50,9 +65,23 @@ export class AdminController {
       .map((structure) => {
         return { structureId: structure.id, structureName: structure.structureName };
       });
+    structuresList.incomplete = await Promise.all(
+      allStructures.map(async (struct) => {
+        const validity = await validate(new Structure(struct));
+        if (validity.length > 0) {
+          this.logger.debug(`getAdminStructuresList - validation failed. errors: ${validity.toString()}`);
+          return { structureId: struct.id, structureName: struct.structureName };
+        } else {
+          this.logger.debug('getAdminStructuresList - validation succeed');
+          return null;
+        }
+      })
+    );
+    structuresList.incomplete = structuresList.incomplete.filter((structure) => structure);
     structuresList.claimed.sort((a, b) => a.structureName.localeCompare(b.structureName));
     structuresList.inClaim.sort((a, b) => a.structureName.localeCompare(b.structureName));
     structuresList.toClaim.sort((a, b) => a.structureName.localeCompare(b.structureName));
+    structuresList.incomplete.sort((a, b) => a.structureName.localeCompare(b.structureName));
     return structuresList;
   }
 

src/migrations/scripts/1639062602934-solidarity-sell-service.ts

+import { Db } from 'mongodb';
+import { getDb } from '../migrations-utils/db';
+
+export const up = async () => {
+  const db: Db = await getDb();
+
+  const cursor = db.collection('categoriesothers').find({});
+  let document;
+  while ((document = await cursor.next())) {
+    if (document.id == 'equipmentsAndServices') {
+      const newDoc = updateLabel(document);
+      await db.collection('categoriesothers').updateOne({ _id: document._id }, [{ $set: newDoc }]);
+    }
+  }
+  console.log(`Update done`);
+};
+
+export const down = async () => {
+  const db: Db = await getDb();
+
+  const cursor = db.collection('categoriesothers').find({});
+  let document;
+  while ((document = await cursor.next())) {
+    if (document.id == 'equipmentsAndServices') {
+      const newDoc = downgradeLabel(document);
+      await db.collection('categoriesothers').updateOne({ _id: document._id }, [{ $set: newDoc }]);
+    }
+  }
+  console.log(`Update done`);
+};
+
+function updateLabel(doc) {
+  if (doc.modules) {
+    doc.modules.push({
+      id: 'venteMaterielPrixSolidaire',
+      text: 'Vente de matériel à prix solidaire',
+    });
+  }
+  return doc;
+}
+
+function downgradeLabel(doc) {
+  if (doc.modules) {
+    doc.modules = doc.modules.filter(function (elem) {
+      return elem.id != 'venteMaterielPrixSolidaire';
+    });
+  }
+  return doc;
+}

src/migrations/scripts/1640169291421-france-service.ts

+import { Db } from 'mongodb';
+import { getDb } from '../migrations-utils/db';
+
+export const up = async () => {
+  const db: Db = await getDb();
+
+  const cursor = db.collection('categoriesothers').find({});
+  let document;
+  while ((document = await cursor.next())) {
+    if (document.id == 'labelsQualifications') {
+      const newDoc = updateText(document);
+      await db.collection('categoriesothers').updateOne({ _id: document._id }, [{ $set: newDoc }]);
+    }
+  }
+  console.log(`Update done`);
+};
+
+export const down = async () => {
+  const db: Db = await getDb();
+
+  const cursor = db.collection('categoriesothers').find({});
+  let document;
+  while ((document = await cursor.next())) {
+    if (document.id == 'labelsQualifications') {
+      const newDoc = downgradeText(document);
+      await db.collection('categoriesothers').updateOne({ _id: document._id }, [{ $set: newDoc }]);
+    }
+  }
+  console.log(`Update done`);
+};
+
+function updateText(doc) {
+  doc.modules = doc.modules.filter((elem) => elem.id !== 'maisonFranceService');
+  doc.modules.push({
+    id: 'maisonFranceService',
+    text: 'Maison France services',
+  });
+  return doc;
+}
+
+function downgradeText(doc) {
+  doc.modules = doc.modules.filter((elem) => elem.id !== 'maisonFranceService');
+  doc.modules.push({
+    id: 'maisonFranceService',
+    text: 'Maison France Service',
+  });
+  return doc;
+}

src/posts/posts.controller.ts

-import { Controller, Get, HttpException, HttpService, HttpStatus, Param, Query } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpService, HttpStatus, Logger, Param, Query } from '@nestjs/common';
 import { Observable } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 import { ApiQuery } from '@nestjs/swagger';
@@ -36,7 +36,8 @@ export class PostsController {
       .pipe(
         map((response) => response.data),
         catchError((err) => {
-          throw new HttpException('Invalid structure id', HttpStatus.BAD_REQUEST);
+          Logger.error(err);
+          throw new HttpException('Invalid ghost configuration', HttpStatus.BAD_REQUEST);
         })
       );
     return new Promise((resolve) => {

src/structures/schemas/structure.schema.ts

 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
+import { Type } from 'class-transformer';
+import { ArrayNotEmpty, IsNotEmpty, ValidateNested } from 'class-validator';
 import { Document } from 'mongoose';
 import { Address } from './address.schema';
 import { Week } from './week.schema';
@@ -7,6 +9,50 @@ export type StructureDocument = Structure & Document;
 
 @Schema({ timestamps: true })
 export class Structure {
+  constructor(data: Partial<Structure> = {}) {
+    this.structureName = data.structureName;
+    this.createdAt = data.createdAt;
+    this.updatedAt = data.updatedAt;
+    this.numero = data.numero;
+    this.structureType = data.structureType;
+    this.description = data.description;
+    this.lockdownActivity = data.lockdownActivity;
+    this.address = data.address;
+    this.contactPhone = data.contactPhone;
+    this.contactMail = data.contactMail;
+    this.website = data.website;
+    this.facebook = data.facebook;
+    this.twitter = data.twitter;
+    this.instagram = data.instagram;
+    this.linkedin = data.linkedin;
+    this.pmrAccess = data.pmrAccess;
+    this.accessModality = data.accessModality;
+    this.otherDescription = data.otherDescription;
+    this.labelsQualifications = data.labelsQualifications;
+    this.publics = data.publics;
+    this.exceptionalClosures = data.exceptionalClosures;
+    this.publicsAccompaniment = data.publicsAccompaniment;
+    this.proceduresAccompaniment = data.proceduresAccompaniment;
+    this.remoteAccompaniment = data.remoteAccompaniment;
+    this.baseSkills = data.baseSkills;
+    this.accessRight = data.accessRight;
+    this.socialAndProfessional = data.socialAndProfessional;
+    this.parentingHelp = data.parentingHelp;
+    this.exceptionalClosures = data.exceptionalClosures;
+    this.digitalCultureSecurity = data.digitalCultureSecurity;
+    this.equipmentsAndServices = data.equipmentsAndServices;
+    this.freeWorkShop = data.freeWorkShop;
+    this.nbTablets = data.nbTablets;
+    this.nbPrinters = data.nbPrinters;
+    this.nbComputers = data.nbComputers;
+    this.nbNumericTerminal = data.nbNumericTerminal;
+    this.nbScanners = data.nbScanners;
+    this.hours = data.hours;
+    this.coord = data.coord;
+    this.deletedAt = data.deletedAt;
+    this.accountVerified = data.accountVerified;
+  }
+
   @Prop()
   numero: string;
 
@@ -17,9 +63,11 @@ export class Structure {
   updatedAt: string;
 
   @Prop()
+  @IsNotEmpty()
   structureName: string;
 
   @Prop()
+  @IsNotEmpty()
   structureType: string;
 
   @Prop()
@@ -29,13 +77,18 @@ export class Structure {
   lockdownActivity: string;
 
   @Prop()
+  @ValidateNested({ each: true })
+  @Type(() => Address)
   address: Address;
 
   @Prop()
+  @IsNotEmpty()
   contactPhone: string;
 
   @Prop()
+  @IsNotEmpty()
   contactMail: string;
+
   @Prop()
   website: string;
 
@@ -52,9 +105,11 @@ export class Structure {
   linkedin: string;
 
   @Prop()
+  @IsNotEmpty()
   pmrAccess: boolean;
 
   @Prop()
+  @ArrayNotEmpty()
   accessModality: string[];
 
   @Prop()
@@ -64,6 +119,7 @@ export class Structure {
   labelsQualifications: string[];
 
   @Prop()
+  @ArrayNotEmpty()
   publics: string[];
 
   @Prop()
@@ -76,6 +132,7 @@ export class Structure {
   proceduresAccompaniment: string[];
 
   @Prop()
+  @IsNotEmpty()
   remoteAccompaniment: boolean;
 
   @Prop()
@@ -97,21 +154,26 @@ export class Structure {
   equipmentsAndServices: string[];
 
   @Prop()
+  @IsNotEmpty()
   freeWorkShop: boolean;
 
   @Prop()
   nbComputers: number;
 
   @Prop()
+  @IsNotEmpty()
   nbPrinters: number;
 
   @Prop()
+  @IsNotEmpty()
   nbTablets: number;
 
   @Prop()
+  @IsNotEmpty()
   nbNumericTerminal: number;
 
   @Prop()
+  @IsNotEmpty()
   nbScanners: number;
 
   @Prop()

src/structures/services/structures.service.ts

@@ -33,6 +33,7 @@ export class StructuresService {
   ) {}
 
   async initiateStructureIndex(): Promise<StructureDocument[]> {
+    Logger.log('Reset structures indexes');
     await this.structuresSearchService.dropIndex();
     await this.structuresSearchService.createStructureIndex();
     return this.populateES();
@@ -563,7 +564,10 @@ export class StructuresService {
     if (!structure) {
       throw new HttpException('Invalid structure id', HttpStatus.BAD_REQUEST);
     }
-    const owners = await this.userService.getStructureOwnersMails(idStructure, emailUser);
+    const owners =
+      typeof emailUser == 'undefined'
+        ? await this.userService.getStructureOwnersMails(structure._id, '')
+        : await this.userService.getStructureOwnersMails(structure._id, emailUser);
     return { structure: structure, owners: owners };
   }