feat(custom-js): implement DELETE /processors/{processor_id} (#231)

* feat(api): add api spec for processors resource

closes #185

fix #185

* feat(api): add api spec for processors resource (#200)

* feat(api): add api spec for processors resource

* fix(typo): typo date_time to date-time

* fix(typo): typo date_time to date-time

* chore(openapi3): code review comments addressed

* docs(api): add download endpoint for processor files

* chore(dependencies): update cassandra-driver to v4.1.0 (#210)

* chore: fix rebase to master

* WIP: feat(custom-js): implement POST /processors (#213)

* docs(image): fix outdated image in docs (#214)

* chore(ci/cd): remove circleci docker_layer_caching (#218)

* feat(api): add api spec for processors resource (#200)

* feat(api): add api spec for processors resource

* feat(api): add api spec for processors resource

closes #185

fix #185

* fix(typo): typo date_time to date-time

* fix(typo): typo date_time to date-time

* chore(openapi3): code review comments addressed

* docs(api): add download endpoint for processor files

* chore(dependencies): update cassandra-driver to v4.1.0 (#210)

* chore: fix rebase to master

* feat(custom-js): implement POST /processors

* test(processors): add tests for POST /processors (#217)

* test(processors): add tests for POST /processors

* style(processors): fix processors cassandra connector name

* feat(processors): add js validation on POST /processors

* fix(processors): add updated_at/created_at to processors resource

* test(processors): add validateJavascriptContent unit-tests

* test(create-test): fix processor file download error message in test

* feat(custom-js): implement GET /processors (#212)

* chore(dependencies): update cassandra-driver to v4.1.0 (#210)

* feat(custom-js): implement GET /processors (Sequelize only)

* test(processors): add tests for GET /processors (#186)

* feat(custom-js): implement GET /processors (cassandra)

* test(processors): add unit-tests for insertProcessor

* feat(custom-js): implement DELETE /processors/{processor_id}

* feat(custom-js): implement DELETE /processors/{processor_id}

src/app.js

@@ -76,4 +76,4 @@ module.exports = () => {
 
             return app;
         });
-};
+};

src/processors/controllers/processorController.js

@@ -34,3 +34,13 @@ module.exports.getProcessor = async function (req, res, next) {
         return next(err);
     }
 };
+
+module.exports.deleteProcessor = async function (req, res, next) {
+    let { params: { processor_id: processorId } } = req;
+    try {
+        await processorManager.deleteProcessor(processorId);
+        return res.status(204).json();
+    } catch (err) {
+        return next(err);
+    }
+};

src/processors/models/database/cassandra/cassandraConnector.js

@@ -6,12 +6,14 @@ let client;
 const INSERT_PROCESSOR = 'INSERT INTO processors(id, name, description, type, file_url, javascript, created_at, updated_at) values(?,?,?,?,?,?,?,?)';
 const GET_ALL_PROCESSORS = 'SELECT * FROM processors';
 const GET_PROCESSOR = 'SELECT * FROM processors where id=?';
+const DELETE_PROCESSOR = 'DELETE FROM processors WHERE id=?';
 
 module.exports = {
     init,
     insertProcessor,
     getAllProcessors,
-    getProcessor
+    getProcessor,
+    deleteProcessor
 };
 
 let queryOptions = {
@@ -33,6 +35,11 @@ async function getProcessor(processorId) {
     return processor[0];
 }
 
+function deleteProcessor(processorId) {
+    let params = [processorId];
+    return executeQuery(DELETE_PROCESSOR, params, queryOptions);
+}
+
 async function insertProcessor(processorId, processorInfo) {
     let params = [processorId, processorInfo.name, processorInfo.description, processorInfo.type, processorInfo.file_url, processorInfo.javascript, Date.now(), Date.now()];
     const processor = await executeQuery(INSERT_PROCESSOR, params, queryOptions);

src/processors/models/database/databaseConnector.js

@@ -7,6 +7,7 @@ module.exports = {
     getAllProcessors,
     insertProcessor,
     getProcessor,
+    deleteProcessor,
     closeConnection
 };
 
@@ -29,3 +30,7 @@ async function getAllProcessors(from, limit) {
 async function getProcessor(processorId) {
     return databaseConnector.getProcessor(processorId);
 }
+
+async function deleteProcessor(processorId) {
+    return databaseConnector.deleteProcessor(processorId);
+}

src/processors/models/database/sequelize/sequelizeConnector.js

@@ -7,7 +7,8 @@ module.exports = {
     init,
     getAllProcessors,
     insertProcessor,
-    getProcessor
+    getProcessor,
+    deleteProcessor
 };
 
 async function init(sequelizeClient) {
@@ -44,6 +45,15 @@ async function getProcessor(processorId) {
     return processors[0];
 }
 
+async function deleteProcessor(processorId) {
+    const processorsModel = client.model('processor');
+    return processorsModel.destroy({
+        where: {
+            id: processorId
+        }
+    });
+}
+
 async function initSchemas() {
     const processorsFiles = client.define('processor', {
         id: {

src/processors/models/processorsManager.js

@@ -39,3 +39,7 @@ module.exports.getProcessor = async function(processorId) {
         throw error;
     }
 };
+
+module.exports.deleteProcessor = async function (processorId) {
+    return databaseConnector.deleteProcessor(processorId);
+};

src/processors/routes/processorsRoute.js

@@ -9,5 +9,6 @@ let processors = require('../controllers/processorController');
 router.get('/', swaggerValidator.validate, processors.getAllProcessors);
 router.post('/', swaggerValidator.validate, processors.createProcessor);
 router.get('/:processor_id', swaggerValidator.validate, processors.getProcessor);
+router.delete('/:processor_id', swaggerValidator.validate, processors.deleteProcessor);
 
-module.exports = router;
+module.exports = router;

tests/integration-tests/processors/helpers/requestCreator.js

@@ -8,7 +8,8 @@ module.exports = {
     init,
     createProcessor,
     getProcessors,
-    getProcessor
+    getProcessor,
+    deleteProcessor
 };
 
 async function init() {
@@ -37,6 +38,13 @@ function getProcessors(from, limit) {
             return res;
         });
 }
+function deleteProcessor(processorId) {
+    return request(app).delete(`/v1/processors/${processorId}`)
+        .set({ 'Content-Type': 'application/json' })
+        .expect(function (res) {
+            return res;
+        });
+}
 
 function getProcessor(processorId) {
     return request(app).get(`/v1/processors/${processorId}`)

tests/integration-tests/processors/processors-test.js

@@ -65,7 +65,33 @@ describe('Processors api', function() {
                 should(processors.length).greaterThanOrEqual(101);
             });
             after(async function() {
-                // TODO: when DELETE /processors is implemented, use processorsInserted to empty the table.
+                const processorIds = processorsInserted.map(processor => processor.body.id);
+                processorIds.forEach(async (processorId) => {
+                    await requestSender.deleteProcessor(processorId);
+                });
+            });
+        });
+        describe('DELETE /v1/processors/{processor_id}', () => {
+            it('insert a processor and then delete it', async () => {
+                const processor = generateRawJSProcessor('some_id');
+                const insertResponse = await requestSender.createProcessor(processor, validHeaders);
+
+                should(insertResponse.statusCode).equal(201);
+                const processorId = insertResponse.body.id;
+
+                const deleteResponse = await requestSender.deleteProcessor(processorId);
+                should(deleteResponse.statusCode).equal(204);
+
+                const getProcessorResponse = await requestSender.getProcessor(processorId);
+                should(getProcessorResponse.statusCode).equal(404);
+            });
+
+            it('delete a processor that doesn\'t exist - expect status code 204', async () => {
+                const processorId = uuid();
+                // making sure that there is no processor with the generated uuid (not taking any chances :) )
+                await requestSender.deleteProcessor(processorId);
+                const deleteResponse = await requestSender.deleteProcessor(processorId);
+                should(deleteResponse.statusCode).equal(204);
             });
         });
         describe('GET /v1/processors/{processor_id}', function () {

tests/unit-tests/processors/models/sequelize/sequelizeConnector-test.js

@@ -86,7 +86,7 @@ describe('Sequelize client tests', function () {
             const processorId = processor.id;
             await sequelizeConnector.getProcessor(processorId);
             should(sequelizeGetStub.calledOnce).eql(true);
-            should(sequelizeGetStub.args[0][0]).containDeep({ where: { id: processorId }});
+            should(sequelizeGetStub.args[0][0]).containDeep({ where: { id: processorId } });
         });
     });
 
@@ -99,4 +99,12 @@ describe('Sequelize client tests', function () {
             should(paramsArg).has.properties(['created_at', 'updated_at']);
         });
     });
+
+    describe('Delete processor', () => {
+        it('validate query', async () => {
+            const processorId = 'A-B-C';
+            await sequelizeConnector.deleteProcessor(processorId);
+            should(sequelizeDeleteStub.args[0][0]).deepEqual({ where: { id: processorId } });
+        });
+    });
 });