reorg routes deleteProject deleteProjects deleteList

doc/swagger.yml

@@ -34,7 +34,7 @@ paths:
       tags:
         - jobs
       summary: "Réinitialisation des jobs"
-      description: "Réinitialise le statut à ready, le log, start_date, end_date, return_code de tous les jobs passé en paramétre"
+      description: "Réinitialise le statut à ready, le log, start_date, end_date, return_code de tous les jobs passés en paramètre"
       requestBody:
         description: l'ensemble des identifiants des jobs à réinitialiser
         required: true
@@ -224,22 +224,6 @@ paths:
        '200':
          description: OK
   '/project/{id}':
-    delete:
-     tags:
-       - projects
-     summary: "Suppression d'un projet"
-     parameters:
-        - in: path
-          name: id
-          description: l'identifiant du job à supprimer
-          required: true
-          schema:
-            type: integer
-     responses:
-       '200':
-         description: OK
-       '404':
-         description: Not Found
     get:
       tags:
         - projects
@@ -343,38 +327,29 @@ paths:
           description: OK
   '/projects/delete':
     delete:
-     tags:
-       - projects
-     summary: "Suppression de tous les projets de la base"
-     description: "Supprime tous les projets de la base ainsi que les jobs, dependances correspondantes"
-     responses:
-       '200':
-         description: OK
-  '/projects/deleteList':
-    delete:
-     tags:
-       - projects
-     summary: "Suppression d'une liste de projets"
-     description: "Supprime tous les projets d'une liste ainsi que les jobs, dependances correspondantes"
-     requestBody:
-       description: la structure du projet
-       required: true
-       content:
-         application/json:
-           schema:
-              type: object
-              properties:
-                projects:
-                  type: array
-                  items:
-                    $ref: '#/components/schemas/projects'
-              example: 
-                projects:
-                  - 1
-                  - 2
-     responses:
-       '200':
-         description: OK
+      tags:
+        - projects
+      summary: "Suppression d'une liste de projets"
+      description: "Supprime tous les projets d'une liste"
+      requestBody:
+        description: la structure du projet
+        required: true
+        content:
+          application/json:
+            schema:
+                type: object
+                properties:
+                  ids:
+                    type: array
+                    items:
+                      type: integer
+                example: 
+                  ids:
+                    - 1
+                    - 2
+      responses:
+        '200':
+          description: OK
   '/nodes':
     get:
       tags:

middlewares/project.js

@@ -157,24 +157,6 @@ async function getAllProjects(req, res, next) {
   next();
 }
 
-async function deleteProject(req, res, next) {
-  const params = matchedData(req);
-  const { id } = params;
-  debug('id : ', id);
-  await req.client.query('DELETE FROM projects WHERE id=$1', [id])
-    .then((results) => {
-      req.result = results.rows;
-    })
-    .catch((error) => {
-      req.error = {
-        msg: error.toString(),
-        code: 404,
-        function: 'deleteProject',
-      };
-    });
-  next();
-}
-
 async function getStatusByJobs(req, res, next) {
   await req.client.query('SELECT * FROM view_project_status_by_jobs ORDER BY id_project DESC')
     .then((results) => {
@@ -220,35 +202,6 @@ async function getJobsOfProject(req, res, next) {
   next();
 }
 
-async function deleteProjects(req, res, next) {
-  await req.client.query('TRUNCATE TABLE projects CASCADE')
-    .then((results) => {
-      req.result = results.rows;
-    })
-    .catch((error) => {
-      req.error = {
-        msg: error.toString(),
-        code: 404,
-        function: 'deleteProjects',
-      };
-    });
-  next();
-}
-
-async function deleteList(req, res, next) {
-  const { projects } = req.body;
-  await req.client.query('DELETE FROM projects WHERE id = ANY($1::int[])', [projects])
-    .then((results) => { req.result = results.rows; })
-    .catch((error) => {
-      req.error = {
-        msg: error.toString(),
-        code: 500,
-        function: 'deleteList',
-      };
-    });
-  next();
-}
-
 async function getProject(req, res, next) {
   const params = matchedData(req);
   const { id } = params;
@@ -286,15 +239,28 @@ async function setPriority(req, res, next) {
   next();
 }
 
+async function deleteProjects(req, res, next) {
+  const { ids } = req.body;
+  debug('id : ', ids);
+  await req.client.query('DELETE FROM projects WHERE id = ANY($1::int[])', [ids])
+    .then((results) => { req.result = results.rows; })
+    .catch((error) => {
+      req.error = {
+        msg: error.toString(),
+        code: 500,
+        function: 'deleteProjects',
+      };
+    });
+  next();
+}
+
 module.exports = {
   insertProjectFromJson,
   getAllProjects,
   getProject,
   getStatusByJobs,
   getProjectStatus,
   getJobsOfProject,
-  deleteProject,
-  deleteProjects,
-  deleteList,
   setPriority,
+  deleteProjects,
 };

routes/projects/index.js

@@ -23,17 +23,6 @@ router.put('/project',
   pgClient.close,
   returnMsg);
 
-router.delete('/project/:id',
-  param('id')
-    .exists().withMessage(createErrorMsg.getMissingParameterMsg('id'))
-    .isInt({ min: 1 })
-    .withMessage(createErrorMsg.getInvalidParameterMsg('id')),
-  validateParams,
-  pgClient.open,
-  project.deleteProject,
-  pgClient.close,
-  returnMsg);
-
 router.get('/projects',
   pgClient.open,
   project.getAllProjects,
@@ -52,21 +41,6 @@ router.get('/projects/status',
   pgClient.close,
   returnMsg);
 
-router.delete('/projects/delete',
-  pgClient.open,
-  project.deleteProjects,
-  pgClient.close,
-  returnMsg);
-
-router.delete('/projects/deleteList',
-  // body()
-  // .exists().withMessage(createErrorMsg.getMissingParameterMsg('body')),
-  validateParams,
-  pgClient.open,
-  project.deleteList,
-  pgClient.close,
-  returnMsg);
-
 router.get('/project/:id', [
   param('id')
     .exists().withMessage(createErrorMsg.getMissingParameterMsg('id'))
@@ -106,4 +80,11 @@ router.post('/project/:id/setPriority',
   pgClient.close,
   returnMsg);
 
+router.delete('/projects/delete',
+  validateParams,
+  pgClient.open,
+  project.deleteProjects,
+  pgClient.close,
+  returnMsg);
+
 module.exports = router;

test/projects.js

@@ -130,36 +130,12 @@ describe('Projects', () => {
         });
     });
   });
-  describe('Delete one project', () => {
-    it('should return an array', (done) => {
-      chai.request(server)
-        .delete(`/api/project/${idProject}`)
-        .end((err, res) => {
-          should.equal(err, null);
-          res.should.have.status(200);
-          res.body.should.be.an('array');
-          done();
-        });
-    });
-  });
-  describe('Delete all projects', () => {
+  describe('Delete projects from list', () => {
     it('should return an array', (done) => {
       chai.request(server)
         .delete('/api/projects/delete')
-        .end((err, res) => {
-          should.equal(err, null);
-          res.should.have.status(200);
-          res.body.should.be.an('array');
-          done();
-        });
-    });
-  });
-  describe('Delete project from list', () => {
-    it('should return an array', (done) => {
-      chai.request(server)
-        .delete('/api/projects/deleteList')
         .send({
-          projects: [0, 1],
+          ids: [0, 1],
         })
         .end((err, res) => {
           should.equal(err, null);