Compare revisions

Hugo SUBTIL · Hugo NOUTS · Hugo NOUTS · Bastien DUMONT · Bastien DUMONT · Hugo SUBTIL
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
 stages:
  - test
-  - sonar-analysis
+  - quality
  - build
  - deploy

@@ -8,9 +8,6 @@ default:
  services:
    - name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:18.09-dind
      alias: docker
-    - name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/elasticsearch:7.16.2
-      alias: elasticsearch
-      command: ['bin/elasticsearch', '-Expack.security.enabled=false', '-Ediscovery.type=single-node']

 variables:
  DEPENDENCY_PROXY: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/
@@ -38,10 +35,8 @@ build_branch:
    DOCKER_DRIVER: overlay2
  image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:18.09
  stage: build
-  except:
-    - master
-    - rec
-    - dev
+  only:
+    - merge_requests
  script:
    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
    - docker build --pull -t "$CI_REGISTRY_IMAGE/feat:$CI_COMMIT_REF_SLUG" --build-arg conf=prod .
@@ -104,39 +99,55 @@ test:
  only:
    - 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
-#     - 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:
-#   variables:
-#     DOCKER_TLS_CERTDIR: ''
-#     DOCKER_HOST: tcp://docker:2375/
-#     DOCKER_DRIVER: overlay2
-#   image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:18.09
-#   stage: build
-#   only:
-#     - merge_requests
-#   script:
-#     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-#     - docker build .
+sonarqube:
+  stage: quality
+  only:
+    - dev
+  image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/sonarsource/sonar-scanner-cli:4
+  variables:
+    SONAR_USER_HOME: '${CI_PROJECT_DIR}/.sonar' # Defines the location of the analysis task cache
+    GIT_DEPTH: '0' # T
+  cache:
+    key: '${CI_JOB_NAME}'
+    paths:
+      - .sonar/cache
+  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}
+      -Dsonar.cpd.exclusions=test/**,scripts/**,src/**/*.spec.ts*
+      -Dsonar.exclusions=test/**,scripts/**,src/**/*.spec.ts*,src/migrations/scripts/**      
+      -Dsonar.qualitygate.wait=true
+
+sonarqube-mr:
+  stage: quality
+  only:
+    - merge_requests
+  image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/sonarsource/sonar-scanner-cli:4
+  variables:
+    SONAR_USER_HOME: '${CI_PROJECT_DIR}/.sonar' # Defines the location of the analysis task cache
+    GIT_DEPTH: '0' # T
+  cache:
+    key: '${CI_JOB_NAME}'
+    paths:
+      - .sonar/cache
+  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_MR_TOKEN}
+      -Dsonar.cpd.exclusions=test/**,scripts/**,src/**/*.spec.ts*
+      -Dsonar.exclusions=test/**,scripts/**,src/**/*.spec.ts*,src/migrations/scripts/**
+      -Dsonar.qualitygate.wait=true
--- a/.gitlab/issue_templates/bug.md
+++ b/.gitlab/issue_templates/bug.md
+## Description du problème
+
+_Donnez une briève description du problème_
+
+## L'environnement
+
+#### Utilisez vous l'application sur :
+
+- [ ] Mobile
+- [ ] Ordinateur
+
+##### En cas de mobile
+
+###### Quel type de mobile utilisez-vous?
+
+- [ ] Android
+- [ ] Iphone
+
+###### Quel navigateur utilisez-vous?
+
+- [ ] Chrome
+- [ ] Safari
+- [ ] Autre
+
+##### En cas d'ordinateur
+
+###### Quel navigateur utilisez-vous?
+
+- [ ] Chrome
+- [ ] Firefox
+- [ ] Safari
+- [ ] Autre
+
+## Le bug
+
+#### Quelles sont les étapes qui ont menées au problème?
+
+_Donnez une description des étapes, il est fortemment conseillé de l'accompagner par des captures d'écran_
+
+#### Quel est le comportement obtenu?
+
+_Donnez une description du comportement obtenu, il est fortemment conseillé de l'accompagner par des captures d'écran_
+
+#### Quel est le comportement attendu?
+
+_Donnez une description du comportement attendu_
--- a/.gitlab/issue_templates/default.md
+++ b/.gitlab/issue_templates/default.md
+/title [Scope] Description
+
+### Résumé du problème
+
+_Donnez une description briève du problème._
+
+### Les étapes pour reproduire le bug
+
+_Listez les étapes qui vous permettent de reproduire ce bug, cette étape est très importante._
+
+### Décrivez le comportement du bug ?
+
+### Quel serez le comportement attendu ?
+
+### Logs et/ou screenshots
+
+### Possible fixes
+
+/label ~"type::bug"
--- a/.gitlab/merge_request_templates/default.md
+++ b/.gitlab/merge_request_templates/default.md
+## What does this MR do and why?
+
+_Describe in detail what your merge request does and why._
+
+| :warning: Keep an up to date checklist based on your icescrum tasks during all the draft phase to help any other developer who would take the job after you to finish it. |
+| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+
+
+## Screenshots or screen recordings
+
+_These are strongly recommended to assist reviewers and reduce the time to merge your change._
+
+## How to set up and validate locally (or on alpha)
+
+_List all steps to set up and validate the changes on local environment._
+
+## MR acceptance checklist
+
+_To be completed by the chosen reviewer._
+
+<!---
+Using checklists improves quality in software engineering and other jobs such as with surgeons and airline pilots.
+More reading on checklists can be found in the "Checklist Manifesto": http://atulgawande.com/book/the-checklist-manifesto/
+
+"It is common to misconceive how checklists function in complex lines of work. They are not comprehensive how-to guides, whether for building a skyscraper or getting a plane out of trouble. They are quick and simple tools aimed to buttress the skills of expert professionals." - Gawande, Atul. The Checklist Manifesto
+--->
+
+### Quality
+
+- [ ] Confirmed
+
+1. For the code that this change impacts, I believe that the automated tests validate functionality that is highly important to users. If the existing automated tests do not cover this functionality, I have added the necessary additional tests or I have added an issue to describe the automation testing gap and linked it to this MR.
+1. I have made sure that the sonar quality coverage is up to standards.
+1. I have considered the impact of this change on the front-end, back-end, and database portions of the system where appropriate and applied.
+1. I have tested this MR in all supported browsers or determined that this testing is not needed.
+1. I have confirmed that this change is backwards compatible across updates (migrate up needs a migrate down), or I have decided that this does not apply.
+
+### Performance, reliability and availability
+
+- [ ] Confirmed
+
+1. I am confident that this MR does not harm performance, or I have asked a reviewer to help assess the performance impact.
+1. I have considered the scalability risk based on future predicted growth.
+
+### Documentation
+
+- [ ] Confirmed
+
+1. I have prepared a squash commit to feed the changelog linked to the current milestone.
+1. I have added/updated documentation (also updated if the changes feature a deprecation) or I have decided that documentation changes are not needed for this MR.
+
+### Security
+
+- [ ] Confirmed
+
+1. I have confirmed that if this MR does not contains any sensitive informations hidden in the changes.
+
+### Deployment
+
+- [ ] Confirmed
+
+1. When featured on a self-data project release, i have made sure my app version in the manifest and package.json is incremented and any relative changes to the permissions are clearly written and transmitted to Cozy.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,28 @@

 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

+## [2.0.0-beta2](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server/compare/v2.0.0-beta1.1...v2.0.0-beta2) (2022-05-24)
+
+
+### Features
+
+* **admin:** administration panel for jobs and employers ([7ed53e7](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server/commit/7ed53e756546b424248f004cf7af9da558a1a434))
+* **admin:** now display last update date next to structure names ([01d5665](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server/commit/01d56659ebd323105dcfa46a9bbb929e482fc05c))
+* **digital helps:** rename "Accompagnement CAF" to "CAF" ([90e106f](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server/commit/90e106f572ea52d990a67b49f00fe434965cc083))
+* **edit-profile:** edit profile page ([23bde5d](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server/commit/23bde5dbcd50620fc946c7663518040b92ee8c48))
+* **structure:** Get more info about structure owner details ([08f9c75](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server/commit/08f9c7539af7dc93d25fb7c97f8320b95f62b618))
+* **structures:** add MaisonFranceService to structure types ([cfea72c](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server/commit/cfea72c594dbb9ccef2382337494be3c3b979c5a))
+
+
+### Bug Fixes
+
+* auth issue with reading env var ([f46b600](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server/commit/f46b6003f87ad808a15bf174ff22059b9c9c52f3))
+* **dependencies:** update minor version to fix vulnerabilities ([629eeab](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server/commit/629eeabd8e3f7ddbdf503027059ad69282a2f925))
+* **deps:** update dependency class-validator to ^0.13.0 ([95f7189](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server/commit/95f71895ff46ea8bfb2f98f55e4753159a504239))
+* elastic unit test ([641e484](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server/commit/641e4849ccf324efaa64ba0e164753709361b2d2))
+* Resolve "Join validation issue for admin" and refactor of string to date for structure updatedAt and createdAt ([df74738](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server/commit/df747380f58b5f093265c185b357e666792c04a9))
+* sonar ([a222df2](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server/commit/a222df249f85d780e31f24e79d52431f4eada6b4))
+
 ## [2.0.0-beta1.1](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server/compare/v2.0.0-beta1...v2.0.0-beta1.1) (2022-04-04)



--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@

 [circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
 [circleci-url]: https://circleci.com/gh/nestjs/nest
-  
+
  <p align="center">A progressive <a href="http://nodejs.org" target="_blank">Node.js</a> framework for building efficient and scalable server-side applications.</p>
    <p align="center">
 <a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/v/@nestjs/core.svg" alt="NPM Version" /></a>
@@ -47,7 +47,6 @@ $ npm install

 ### Base de donnée

-
 ```bash
 $ docker-compose up -d database-ram
 $ docker-compose up -d mongo-express
@@ -70,17 +69,20 @@ $ npm run start:prod

 ```bash
 # Lien vers le swagger
-$ http://localhost:3000/api
+$ http://localhost:3000/doc

 # Lien vers le mongo-express
 $ http://localhost:8081
 ```

-## Documentation 
+## Documentation
+
 A documentation is generated with compodoc in addition of the existing documentation on the wiki.
+
 ```sh
 npm run doc:serve
 ```
+
 You can now visualize it at : `localhost:8080`

 ## Test

--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -113,22 +113,6 @@ services:
    ports:
      - ${ELASTICSEARCH_PORT}:9200

-  kib01:
-    image: docker.elastic.co/kibana/kibana:7.6.1
-    restart: unless-stopped
-    container_name: resin-kib
-    ports:
-      - ${KIBANA_PORT}:5601
-    environment:
-      ELASTICSEARCH_URL: http://es01:9200
-      ELASTICSEARCH_HOSTS: '["http://es01:9200"]'
-      ELASTICSEARCH_USERNAME: elastic
-      ELASTICSEARCH_PASSWORD: ${ELASTICSEARCH_PASSWORD}
-    depends_on:
-      - es01
-    networks:
-      - elastic
-
 volumes:
  db-ram:
    driver: local

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
 {
  "name": "ram_server",
  "private": true,
-  "version": "2.0.0-beta1.1",
+  "version": "2.0.0-beta2",
  "description": "Nest TypeScript starter repository",
  "license": "MIT",
  "scripts": {
@@ -18,7 +18,7 @@
    "release": "standard-version",
    "init-db": "node ./scripts/init-db.js",
    "test": "jest",
-    "test:watch": "jest --config ./test/jest.json --watch",
+    "test:watch": "jest --config ./test/jest.json --watch --coverage",
    "test:cov": "jest --config ./test/jest.json --coverage --ci --reporters=default --reporters=jest-junit",
    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
    "test:e2e": "jest --config ./test/jest-e2e.json",
@@ -42,9 +42,9 @@
    "@types/bcrypt": "^3.0.0",
    "bcrypt": "^5.0.1",
    "class-transformer": "^0.3.1",
-    "class-validator": "^0.12.2",
+    "class-validator": "^0.13.0",
    "dotenv": "^8.2.0",
-    "ejs": "^3.1.6",
+    "ejs": "^3.1.7",
    "form-data": "^3.0.0",
    "luxon": "^1.25.0",
    "migrate": "^1.7.0",
@@ -63,7 +63,7 @@
    "@compodoc/compodoc": "^1.1.16",
    "@golevelup/ts-jest": "^0.3.2",
    "@nestjs/cli": "^7.5.1",
-    "@nestjs/schematics": "^7.1.3",
+    "@nestjs/schematics": "^8.0.0",
    "@nestjs/testing": "^7.5.1",
    "@types/express": "^4.17.8",
    "@types/jest": "^26.0.15",

--- a/renovate.json
+++ b/renovate.json
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>systemes-dinformation/renovate/renovate-config"
+  ]
+}
--- a/scripts/data/structures.js
+++ b/scripts/data/structures.js
@@ -135,7 +135,7 @@ module.exports = {
      accessModality: ['accesLibre', 'surRdv'],
      freeWorkShop: false,
      createdAt: '2020-11-16T10:19:00.000Z',
-      updatedAt: 'Mon May 10 2021 08:45:50 GMT+0000 (Coordinated Universal Time)',
+      updatedAt: '2020-12-16T10:19:00.000Z',
      structureName: 'Pôle emploi (Vénissieux)',
      description: "Espace informatique en libre service le matin Sur RDV l'après-midi, réservation d'un poste",
      lockdownActivity: "Espace libre accès le matin RDV l'après-midi, résercation d'un poste",
@@ -791,8 +791,8 @@ module.exports = {
        street: 'Avenue Général Frère',
        commune: 'Lyon',
      },
-      createdAt: 'Thu Jan 20 2022 10:06:20 GMT+0100 (heure normale d’Europe centrale)',
-      updatedAt: 'Thu Jan 20 2022 10:06:20 GMT+0100 (heure normale d’Europe centrale)',
+      createdAt: '2020-11-13T14:13:00.000Z',
+      updatedAt: '2022-04-13T14:13:00.000Z',
      dataShareConsentDate: null,
      __v: 0,
    },
@@ -828,9 +828,9 @@ module.exports = {
        street: 'Rue Neuve',
        commune: 'Fleurieu-sur-Saône',
      },
-      createdAt: 'Thu Jan 20 2022 10:06:19 GMT+0100 (heure normale d’Europe centrale)',
-      updatedAt: 'Thu Jan 20 2022 10:06:19 GMT+0100 (heure normale d’Europe centrale)',
-      dataShareConsentDate: 'Thu Jan 20 2022 10:06:19 GMT+0100 (heure normale d’Europe centrale)',
+      createdAt: '2022-01-13T14:13:00.000Z',
+      updatedAt: '2022-02-13T14:13:00.000Z',
+      dataShareConsentDate: '2022-01-13T14:13:00.000Z',
      __v: 0,
    },
  ],

--- a/src/admin/admin.controller.spec.ts
+++ b/src/admin/admin.controller.spec.ts
 import { HttpModule } from '@nestjs/common';
 import { getModelToken } from '@nestjs/mongoose';
 import { Test, TestingModule } from '@nestjs/testing';
+import { Types } from 'mongoose';
+import { mockJwtAuthGuard } from '../../test/mock/guards/jwt-auth.mock.guard';
+import { mockRoleGuard } from '../../test/mock/guards/role.mock.guard';
+import { NewsletterServiceMock } from '../../test/mock/services/newsletter.mock.service';
+import { StructuresServiceMock } from '../../test/mock/services/structures.mock.service';
+import { UsersServiceMock } from '../../test/mock/services/user.mock.service';
+import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
 import { ConfigurationModule } from '../configuration/configuration.module';
 import { MailerService } from '../mailer/mailer.service';
 import { NewsletterSubscription } from '../newsletter/newsletter-subscription.schema';
 import { NewsletterService } from '../newsletter/newsletter.service';
 import { SearchModule } from '../search/search.module';
 import { Structure } from '../structures/schemas/structure.schema';
-import { StructuresService } from '../structures/services/structures.service';
 import { StructuresSearchService } from '../structures/services/structures-search.service';
+import { StructuresService } from '../structures/services/structures.service';
+import { RolesGuard } from '../users/guards/roles.guard';
 import { User } from '../users/schemas/user.schema';
+import { EmployerSearchService } from '../users/services/employer-search.service';
+import { EmployerService } from '../users/services/employer.service';
+import { JobsService } from '../users/services/jobs.service';
 import { UsersService } from '../users/services/users.service';
 import { AdminController } from './admin.controller';
-import { mockJwtAuthGuard } from '../../test/mock/guards/jwt-auth.mock.guard';
-import { mockRoleGuard } from '../../test/mock/guards/role.mock.guard';
-import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
-import { RolesGuard } from '../users/guards/roles.guard';
-import { UsersServiceMock } from '../../test/mock/services/user.mock.service';
-import { StructuresServiceMock } from '../../test/mock/services/structures.mock.service';
-import { NewsletterServiceMock } from '../../test/mock/services/newsletter.mock.service';
+import { AdminService } from './admin.service';

 describe('AdminController', () => {
  let controller: AdminController;
+  let userService: UsersService;
+
+  const mockEmployerSearchService = {
+    indexEmployer: jest.fn(),
+    search: jest.fn(),
+    dropIndex: jest.fn(),
+    createEmployerIndex: jest.fn(),
+    deleteIndex: jest.fn(),
+  };
+
+  const mockEmployerService = {
+    findOne: jest.fn(),
+    deleteOneId: jest.fn(),
+    findByName: jest.fn(),
+    findAllValidated: jest.fn(),
+    findAllUnvalidated: jest.fn(),
+    createEmployerFromAdmin: jest.fn(),
+    validate: jest.fn(),
+    update: jest.fn(),
+    mergeEmployer: jest.fn(),
+    deleteInvalidEmployer: jest.fn(),
+  };
+
+  const mockJobService = {
+    findOne: jest.fn(),
+    findByName: jest.fn(),
+    deleteOneId: jest.fn(),
+    findAll: jest.fn(),
+    findAllUnvalidated: jest.fn(),
+    createJobFromAdmin: jest.fn(),
+    validate: jest.fn(),
+    update: jest.fn(),
+    mergeJob: jest.fn(),
+    deleteInvalidJob: jest.fn(),
+  };

  beforeEach(async () => {
    const module: TestingModule = await Test.createTestingModule({
@@ -39,8 +79,24 @@ describe('AdminController', () => {
          provide: NewsletterService,
          useClass: NewsletterServiceMock,
        },
+        {
+          provide: AdminService,
+          useClass: AdminService,
+        },
        StructuresSearchService,
        MailerService,
+        {
+          provide: EmployerService,
+          useValue: mockEmployerService,
+        },
+        {
+          provide: JobsService,
+          useValue: mockJobService,
+        },
+        {
+          provide: EmployerSearchService,
+          useValue: mockEmployerSearchService,
+        },
        {
          provide: getModelToken('User'),
          useValue: User,
@@ -63,6 +119,7 @@ describe('AdminController', () => {
      .compile();

    controller = module.get<AdminController>(AdminController);
+    userService = module.get<UsersService>(UsersService);
  });

  it('should be defined', () => {
@@ -71,7 +128,7 @@ describe('AdminController', () => {

  it('should get pending attachments', async () => {
    expect((await controller.getPendingAttachments()).length).toBe(2);
-    expect(Object.keys((await controller.getPendingAttachments())[0]).length).toBe(3);
+    expect(Object.keys((await controller.getPendingAttachments())[0]).length).toBe(5);
  });

  describe('Pending structures validation', () => {
@@ -80,9 +137,11 @@ describe('AdminController', () => {
        structureId: '6093ba0e2ab5775cfc01ed3e',
        structureName: 'test',
        userEmail: 'jean.paul@mii.com',
+        createdAt: new Date('2021-02-02T10:07:48.000Z'),
+        updatedAt: new Date('2021-03-02T10:07:48.000Z'),
      };
      expect((await controller.validatePendingStructure(pendingStructureTest)).length).toBe(2);
-      expect(Object.keys((await controller.validatePendingStructure(pendingStructureTest))[0]).length).toBe(3);
+      expect(Object.keys((await controller.validatePendingStructure(pendingStructureTest))[0]).length).toBe(5);
    });

    it('should get structure does not exist', async () => {
@@ -90,6 +149,8 @@ describe('AdminController', () => {
        structureId: '1093ba0e2ab5775cfc01z2ki',
        structureName: 'test',
        userEmail: 'jean.paul@mii.com',
+        createdAt: new Date('2021-02-02T10:07:48.000Z'),
+        updatedAt: new Date('2021-03-02T10:07:48.000Z'),
      };
      try {
        await controller.validatePendingStructure(pendingStructureTest);
@@ -106,9 +167,11 @@ describe('AdminController', () => {
        structureId: '6093ba0e2ab5775cfc01ed3e',
        structureName: 'test',
        userEmail: 'jean.paul@mii.com',
+        createdAt: new Date('2021-02-02T10:07:48.000Z'),
+        updatedAt: new Date('2021-03-02T10:07:48.000Z'),
      };
      expect((await controller.refusePendingStructure(pendingStructureTest)).length).toBe(2);
-      expect(Object.keys((await controller.refusePendingStructure(pendingStructureTest))[0]).length).toBe(3);
+      expect(Object.keys((await controller.refusePendingStructure(pendingStructureTest))[0]).length).toBe(5);
    });

    it('should get structure does not exist', async () => {
@@ -116,6 +179,8 @@ describe('AdminController', () => {
        structureId: '1093ba0e2ab5775cfc01z2ki',
        structureName: 'test',
        userEmail: 'jean.paul@mii.com',
+        createdAt: new Date('2021-02-02T10:07:48.000Z'),
+        updatedAt: new Date('2021-03-02T10:07:48.000Z'),
      };
      try {
        await controller.refusePendingStructure(pendingStructureTest);
@@ -140,6 +205,134 @@ describe('AdminController', () => {
    });
  });

+  describe('setUserEmployer', () => {
+    it('should set a new employer to the user', async () => {
+      const spyer = jest.spyOn(userService, 'updateUserEmployer');
+      const mockUserId = '6231aefe76598527c8d0b5bc';
+      const mockEmployer = {
+        _id: Types.ObjectId('6231aefe76598527c8d0b5ba'),
+        name: 'Sopra',
+        validated: true,
+      };
+      mockEmployerService.findOne.mockResolvedValueOnce(mockEmployer);
+      const reply = await controller.setUserEmployer({
+        userId: mockUserId,
+        employerId: String(mockEmployer._id),
+      });
+      expect(spyer).toBeCalledTimes(1);
+      expect(spyer).toBeCalledWith(mockUserId, mockEmployer);
+      expect(reply).toBeTruthy();
+    });
+
+    it('should not set a new employer to the user if the employer does not exist', async () => {
+      const spyer = jest.spyOn(userService, 'updateUserEmployer');
+      const mockUserId = '6231aefe76598527c8d0b5bc';
+      const mockEmployer = {
+        _id: Types.ObjectId('6231aefe76598527c8d0b5ba'),
+        name: 'Sopra',
+        validated: true,
+      };
+      mockEmployerService.findOne.mockResolvedValueOnce(null);
+      try {
+        await controller.setUserEmployer({
+          userId: mockUserId,
+          employerId: String(mockEmployer._id),
+        });
+        expect(true).toBe(false);
+      } catch (e) {
+        expect(spyer).toBeCalledTimes(0);
+        expect(e.message).toBe('Employer does not exist');
+        expect(e.status).toBe(400);
+      }
+    });
+
+    it('should not set a new employer to the user if the user does not exist', async () => {
+      const spyer = jest.spyOn(userService, 'updateUserEmployer');
+      const mockUserId = 'thisuserdoesnotexist';
+      const mockEmployer = {
+        _id: Types.ObjectId('6231aefe76598527c8d0b5ba'),
+        name: 'Sopra',
+        validated: true,
+      };
+      mockEmployerService.findOne.mockResolvedValueOnce(mockEmployer);
+      try {
+        await controller.setUserEmployer({
+          userId: mockUserId,
+          employerId: String(mockEmployer._id),
+        });
+        expect(true).toBe(false);
+      } catch (e) {
+        expect(spyer).toBeCalledTimes(0);
+        expect(e.message).toBe('User does not exist');
+        expect(e.status).toBe(400);
+      }
+    });
+  });
+
+  describe('setUserJob', () => {
+    it('should set a new job to the user', async () => {
+      const spyer = jest.spyOn(userService, 'updateUserJob');
+      const mockUserId = '6231aefe76598527c8d0b5bc';
+      const mockJob = {
+        _id: Types.ObjectId('6231aefe76598527c8d0b5ba'),
+        name: 'Toto',
+        validated: true,
+      };
+      mockJobService.findOne.mockResolvedValueOnce(mockJob);
+      const reply = await controller.setUserJob({
+        userId: mockUserId,
+        jobId: String(mockJob._id),
+      });
+      expect(spyer).toBeCalledTimes(1);
+      expect(spyer).toBeCalledWith(mockUserId, mockJob);
+      expect(reply).toBeTruthy();
+    });
+
+    it('should not set a new job to the user if the job does not exist', async () => {
+      const spyer = jest.spyOn(userService, 'updateUserJob');
+      const mockUserId = '6231aefe76598527c8d0b5bc';
+      const mockJob = {
+        _id: Types.ObjectId('6231aefe76598527c8d0b5ba'),
+        name: 'Dev',
+        validated: true,
+      };
+      mockJobService.findOne.mockResolvedValueOnce(null);
+      try {
+        await controller.setUserJob({
+          userId: mockUserId,
+          jobId: String(mockJob._id),
+        });
+        expect(true).toBe(false);
+      } catch (e) {
+        expect(spyer).toBeCalledTimes(0);
+        expect(e.message).toBe('Job does not exist');
+        expect(e.status).toBe(400);
+      }
+    });
+
+    it('should not set a new job to the user if the user does not exist', async () => {
+      const spyer = jest.spyOn(userService, 'updateUserJob');
+      const mockUserId = 'thisuserdoesntexist';
+      const mockJob = {
+        _id: Types.ObjectId('6231aefe76598527c8d0b5ba'),
+        name: 'Dev',
+        validated: true,
+      };
+      mockJobService.findOne.mockResolvedValueOnce(mockJob);
+      try {
+        await controller.setUserJob({
+          userId: mockUserId,
+          jobId: String(mockJob._id),
+        });
+        expect(true).toBe(false);
+      } catch (e) {
+        expect(spyer).toBeCalledTimes(0);
+        expect(e.message).toBe('User does not exist');
+        expect(e.status).toBe(400);
+      }
+    });
+  });
+
  describe('Search user', () => {
    it('should return all users, empty string', async () => {
      expect((await controller.searchUsers({ searchString: '' })).length).toBe(2);
@@ -156,7 +349,7 @@ describe('AdminController', () => {
    });
  });

-  describe('Search user newleetter subscription', () => {
+  describe('Search user newsletter subscription', () => {
    it('should return all subscribed users, empty string', async () => {
      expect((await controller.getNewsletterSubscriptions({ searchString: '' })).length).toBe(3);
    });

--- a/src/admin/admin.controller.ts
+++ b/src/admin/admin.controller.ts
-import { ApiOperation, ApiParam } from '@nestjs/swagger';
-import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
 import {
  Body,
-  Delete,
-  Param,
  Controller,
+  Delete,
  Get,
-  Post,
-  UseGuards,
-  HttpStatus,
  HttpException,
+  HttpStatus,
  Logger,
+  Param,
+  Post,
+  Put,
+  UseGuards,
 } from '@nestjs/common';
+import { ApiBearerAuth, ApiOperation, ApiParam, ApiResponse, ApiTags } from '@nestjs/swagger';
+import { validate } from 'class-validator';
+import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
 import { NewsletterSubscription } from '../newsletter/newsletter-subscription.schema';
 import { NewsletterService } from '../newsletter/newsletter.service';
+import { Structure } from '../structures/schemas/structure.schema';
 import { StructuresService } from '../structures/services/structures.service';
 import { Roles } from '../users/decorators/roles.decorator';
 import { RolesGuard } from '../users/guards/roles.guard';
+import { IUser } from '../users/interfaces/user.interface';
+import { EmployerService } from '../users/services/employer.service';
+import { JobsService } from '../users/services/jobs.service';
 import { UsersService } from '../users/services/users.service';
+import { AdminService } from './admin.service';
 import { PendingStructureDto } from './dto/pending-structure.dto';
-import { validate } from 'class-validator';
-import { Structure } from '../structures/schemas/structure.schema';
-import { IUser } from '../users/interfaces/user.interface';
+import { SetUserEmployerDto } from './dto/set-user-employer.dto';
+import { SetUserJobDto } from './dto/set-user-job.dto';

+@ApiTags('admin')
 @Controller('admin')
 export class AdminController {
  private readonly logger = new Logger(AdminController.name);
  constructor(
    private usersService: UsersService,
    private structuresService: StructuresService,
-    private newsletterService: NewsletterService
+    private jobsService: JobsService,
+    private employerService: EmployerService,
+    private newsletterService: NewsletterService,
+    private adminService: AdminService
  ) {}

  @UseGuards(JwtAuthGuard, RolesGuard)
  @Roles('admin')
  @Get('pendingStructures')
-  @ApiOperation({ description: 'Get pending structre for validation' })
+  @ApiOperation({ description: 'Get pending structures for validation' })
  public async getPendingAttachments(): Promise<PendingStructureDto[]> {
    const pendingStructure = await this.usersService.getPendingStructures();
    return Promise.all(
      pendingStructure.map(async (structure) => {
-        structure.structureName = (await this.structuresService.findOne(structure.structureId)).structureName;
+        const structureDocument = await this.structuresService.findOne(structure.structureId);
+        structure.structureName = structureDocument.structureName;
+        structure.createdAt = structureDocument.createdAt;
+        structure.updatedAt = structureDocument.updatedAt;
        return structure;
      })
    );
@@ -49,13 +62,32 @@ export class AdminController {
  @UseGuards(JwtAuthGuard, RolesGuard)
  @Roles('admin')
  @Get('adminStructuresList')
-  @ApiOperation({ description: 'Get pending structre for validation' })
+  @ApiOperation({ description: 'Get pending structures for validation' })
  public async getAdminStructuresList(): Promise<any> {
+    this.logger.debug('getAdminStructuresList');
    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)
-    );
+    const inClaimStructures = await this.getPendingAttachments();
+    structuresList.inClaim = inClaimStructures.map((structure) => {
+      const lastUpdateDate = this.adminService.getLastUpdateDate(structure);
+      return {
+        structureId: structure.structureId,
+        structureName: structure.structureName,
+        updatedAt: lastUpdateDate,
+        isOutdated: this.adminService.isDateOutdated(lastUpdateDate, 6),
+      };
+    });
+    const toClaimStructures = await this.structuresService.findAllUnclaimed();
+    structuresList.toClaim = toClaimStructures
+      .filter((demand) => !structuresList.inClaim.find((elem) => elem.structureId == demand.structureId))
+      .map((structure) => {
+        const lastUpdateDate = this.adminService.getLastUpdateDate(structure);
+        return {
+          structureId: structure.structureId,
+          structureName: structure.structureName,
+          updatedAt: lastUpdateDate,
+          isOutdated: this.adminService.isDateOutdated(lastUpdateDate, 6),
+        };
+      });
    const allStructures = await this.structuresService.findAll();
    structuresList.claimed = allStructures
      .filter(
@@ -64,14 +96,26 @@ export class AdminController {
          !structuresList.toClaim.find((elem) => elem.structureId == demand.id)
      )
      .map((structure) => {
-        return { structureId: structure.id, structureName: structure.structureName };
+        const lastUpdateDate = this.adminService.getLastUpdateDate(structure);
+        return {
+          structureId: structure.id,
+          structureName: structure.structureName,
+          updatedAt: lastUpdateDate,
+          isOutdated: this.adminService.isDateOutdated(lastUpdateDate, 6),
+        };
      });
    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 };
+          const lastUpdateDate = this.adminService.getLastUpdateDate(struct);
+          return {
+            structureId: struct.id,
+            structureName: struct.structureName,
+            updatedAt: lastUpdateDate,
+            isOutdated: this.adminService.isDateOutdated(lastUpdateDate, 6),
+          };
        } else {
          this.logger.debug('getAdminStructuresList - validation succeed');
          return null;
@@ -141,6 +185,7 @@ export class AdminController {
  @UseGuards(JwtAuthGuard, RolesGuard)
  @Roles('admin')
  @Delete('user/:id')
+  @ApiBearerAuth('JWT')
  @ApiParam({ name: 'id', type: String, required: true })
  public async deleteUser(@Param() params) {
    const user = await this.usersService.deleteOneId(params.id);
@@ -156,6 +201,7 @@ export class AdminController {

  @UseGuards(JwtAuthGuard, RolesGuard)
  @Roles('admin')
+  @ApiBearerAuth('JWT')
  @Post('searchUsers')
  public async searchUsers(@Body() searchString: { searchString: string }) {
    if (searchString && searchString.searchString && searchString.searchString.length > 0)
@@ -165,14 +211,28 @@ export class AdminController {

  @UseGuards(JwtAuthGuard, RolesGuard)
  @Roles('admin')
-  @Get('getUnAttachedUsers')
+  @ApiBearerAuth('JWT')
+  @Get('unAttachedUsers')
  public async findUnattachedUsers() {
-    return this.usersService.findAllUnattached();
+    return this.usersService.findAllUnattached().then((formatUsers) => {
+      return formatUsers.map((user) => {
+        return {
+          id: user._id,
+          surname: user.surname,
+          name: user.name,
+          email: user.email,
+          phone: user.phone,
+          job: user.job,
+          employer: user.employer,
+        };
+      });
+    });
  }

  @UseGuards(JwtAuthGuard, RolesGuard)
  @Roles('admin')
-  @Get('getAttachedUsers')
+  @ApiBearerAuth('JWT')
+  @Get('attachedUsers')
  public async findAttachedUsers() {
    return this.usersService.findAllAttached().then(async (users: IUser[]) => {
      return this.structuresService.getAllUserCompletedStructures(users);
@@ -180,8 +240,9 @@ export class AdminController {
  }

  @UseGuards(JwtAuthGuard, RolesGuard)
+  @ApiBearerAuth('JWT')
  @Roles('admin')
-  @Get('getUnVerifiedUsers')
+  @Get('unVerifiedUsers')
  public async findUnVerifiedUsers() {
    return this.usersService.findAllUnVerified().then(async (users: IUser[]) => {
      return this.structuresService.getAllUserCompletedStructures(users);
@@ -190,6 +251,7 @@ export class AdminController {

  @UseGuards(JwtAuthGuard, RolesGuard)
  @Roles('admin')
+  @ApiBearerAuth('JWT')
  @Post('searchNewsletterSubscriptions')
  public async getNewsletterSubscriptions(@Body() searchString: { searchString: string }) {
    if (searchString && searchString.searchString && searchString.searchString.length > 0)
@@ -199,6 +261,7 @@ export class AdminController {

  @UseGuards(JwtAuthGuard, RolesGuard)
  @Roles('admin')
+  @ApiBearerAuth('JWT')
  @Get('countNewsletterSubscriptions')
  public async countNewsletterSubscriptions(): Promise<number> {
    return this.newsletterService.countNewsletterSubscriptions();
@@ -206,9 +269,60 @@ export class AdminController {

  @UseGuards(JwtAuthGuard, RolesGuard)
  @Roles('admin')
+  @ApiBearerAuth('JWT')
  @Delete('newsletterSubscription/:email')
  @ApiParam({ name: 'email', type: String, required: true })
  public async unsubscribeUserFromNewsletter(@Param() params): Promise<NewsletterSubscription> {
    return this.newsletterService.newsletterUnsubscribe(params.email);
  }
+
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles('admin')
+  @ApiBearerAuth('JWT')
+  @ApiOperation({ description: 'Set user job' })
+  @ApiResponse({ status: HttpStatus.OK, description: 'Return user profile' })
+  @ApiResponse({ status: HttpStatus.BAD_REQUEST, description: 'User does not exist' })
+  @ApiResponse({ status: HttpStatus.BAD_REQUEST, description: 'Job does not exist' })
+  @Put('setUserJob')
+  public async setUserJob(@Body() setUserJob: SetUserJobDto): Promise<IUser> {
+    this.logger.debug(`setUserJob`);
+    const jobDocument = await this.jobsService.findOne(setUserJob.jobId);
+    if (!jobDocument) {
+      this.logger.warn(`Job does not exist: ${setUserJob.jobId}`);
+      throw new HttpException('Job does not exist', HttpStatus.BAD_REQUEST);
+    }
+
+    const userDocument = await this.usersService.findById(setUserJob.userId);
+    if (!userDocument) {
+      this.logger.warn(`User does not exist: ${setUserJob.userId}`);
+      throw new HttpException('User does not exist', HttpStatus.BAD_REQUEST);
+    }
+    await this.usersService.updateUserJob(userDocument._id, jobDocument);
+    return this.usersService.findById(setUserJob.userId);
+  }
+
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles('admin')
+  @ApiBearerAuth('JWT')
+  @ApiOperation({ description: 'Set user employer' })
+  @ApiResponse({ status: HttpStatus.OK, description: 'Return user profile' })
+  @ApiResponse({ status: HttpStatus.BAD_REQUEST, description: 'User does not exist' })
+  @ApiResponse({ status: HttpStatus.BAD_REQUEST, description: 'Employer does not exist' })
+  @Put('setUserEmployer')
+  public async setUserEmployer(@Body() setUserEmployer: SetUserEmployerDto): Promise<IUser> {
+    this.logger.debug(`setUserEmployer`);
+    const employerDocument = await this.employerService.findOne(setUserEmployer.employerId);
+    if (!employerDocument) {
+      this.logger.warn(`Employer does not exist: ${setUserEmployer.employerId}`);
+      throw new HttpException('Employer does not exist', HttpStatus.BAD_REQUEST);
+    }
+
+    const userDocument = await this.usersService.findById(setUserEmployer.userId);
+    if (!userDocument) {
+      this.logger.warn(`User does not exist: ${setUserEmployer.userId}`);
+      throw new HttpException('User does not exist', HttpStatus.BAD_REQUEST);
+    }
+    await this.usersService.updateUserEmployer(userDocument._id, employerDocument);
+    return this.usersService.findById(setUserEmployer.userId);
+  }
 }
--- a/src/admin/admin.service.ts
+++ b/src/admin/admin.service.ts
 import { Injectable } from '@nestjs/common';
+import { DateTime, Interval } from 'luxon';
+import { Structure } from '../structures/schemas/structure.schema';
+import { PendingStructureDto } from './dto/pending-structure.dto';
+import { UnclaimedStructureDto } from './dto/unclaimed-structure-dto';

 @Injectable()
-export class AdminService {}
+export class AdminService {
+  public isDateOutdated(date: DateTime, nbMonths: number): boolean {
+    const today = DateTime.local().setZone('utc', { keepLocalTime: true });
+    return Interval.fromDateTimes(date, today).length('months') > nbMonths;
+  }
+  public getLastUpdateDate(structure: Structure | UnclaimedStructureDto | PendingStructureDto): DateTime {
+    return structure.updatedAt ? structure.updatedAt : structure.createdAt;
+  }
+}
--- a/src/admin/dto/merge-employer.dto.ts
+++ b/src/admin/dto/merge-employer.dto.ts
+import { ApiProperty } from '@nestjs/swagger';
+import { IsNotEmpty } from 'class-validator';
+
+export class MergeEmployerDto {
+  @IsNotEmpty()
+  @ApiProperty({ type: String })
+  sourceEmployerId: string;
+
+  @IsNotEmpty()
+  @ApiProperty({ type: String })
+  targetEmployerId: string;
+}
--- a/src/admin/dto/merge-job.dto.ts
+++ b/src/admin/dto/merge-job.dto.ts
+import { ApiProperty } from '@nestjs/swagger';
+import { IsNotEmpty } from 'class-validator';
+
+export class MergeJobDto {
+  @IsNotEmpty()
+  @ApiProperty({ type: String })
+  sourceJobId: string;
+
+  @IsNotEmpty()
+  @ApiProperty({ type: String })
+  targetJobId: string;
+}
--- a/src/admin/dto/pending-structure.dto.ts
+++ b/src/admin/dto/pending-structure.dto.ts
@@ -16,4 +16,10 @@ export class PendingStructureDto {
  @IsString()
  @ApiProperty({ type: String })
  structureName: string;
+
+  @ApiProperty({ type: Date })
+  updatedAt: Date;
+
+  @ApiProperty({ type: Date })
+  createdAt: Date;
 }
--- a/src/admin/dto/set-user-employer.dto.ts
+++ b/src/admin/dto/set-user-employer.dto.ts
+import { IsNotEmpty } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+
+export class SetUserEmployerDto {
+  @IsNotEmpty()
+  @ApiProperty({ type: String })
+  userId: string;
+
+  @IsNotEmpty()
+  @ApiProperty({ type: String })
+  employerId: string;
+}
--- a/src/admin/dto/set-user-job.dto.ts
+++ b/src/admin/dto/set-user-job.dto.ts
+import { IsNotEmpty } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+
+export class SetUserJobDto {
+  @IsNotEmpty()
+  @ApiProperty({ type: String })
+  userId: string;
+
+  @IsNotEmpty()
+  @ApiProperty({ type: String })
+  jobId: string;
+}
--- a/src/admin/dto/unclaimed-structure-dto.ts
+++ b/src/admin/dto/unclaimed-structure-dto.ts
@@ -11,4 +11,10 @@ export class UnclaimedStructureDto {
  @IsString()
  @ApiProperty({ type: String })
  structureName: string;
+
+  @ApiProperty({ type: String })
+  updatedAt: Date;
+
+  @ApiProperty({ type: String })
+  createdAt: Date;
 }
No results found