Refactoring collections service

app/controllers/collections-controller.js

@@ -2,8 +2,9 @@
 
 const collectionsService = require('../services/collections-service');
 const logger = require('../lib/logger');
+const { BadlyFormattedParameterError, InvalidQueryStringParameterError, DuplicateIdError } = require('../exceptions');
 
-exports.retrieveAll = function(req, res) {
+exports.retrieveAll = async function(req, res) {
     const options = {
         offset: req.query.offset || 0,
         limit: req.query.limit || 0,
@@ -14,77 +15,73 @@
         search: req.query.search,
         lastUpdatedBy: req.query.lastUpdatedBy,
     }
+    try {
+        const collections = await collectionsService.retrieveAll(options);
+        logger.debug(`Success: Retrieved ${ collections.length } collection(s)`);
+        return res.status(200).send(collections);
+    }
+    catch (err) {
+        logger.error('Failed with error: ' + err);
+        return res.status(500).send('Unable to get collections. Server error.');
+    }
 
-    collectionsService.retrieveAll(options, function(err, collections) {
-        if (err) {
-            logger.error('Failed with error: ' + err);
-            return res.status(500).send('Unable to get collections. Server error.');
-        }
-        else {
-            logger.debug(`Success: Retrieved ${ collections.length } collection(s)`);
-            return res.status(200).send(collections);
-        }
-    });
 };
 
-exports.retrieveById = function(req, res) {
+exports.retrieveById = async function(req, res) {
     const options = {
         versions: req.query.versions || 'latest',
         retrieveContents: req.query.retrieveContents
     }
 
-    collectionsService.retrieveById(req.params.stixId, options, function (err, collections) {
-        if (err) {
-            if (err.message === collectionsService.errors.badlyFormattedParameter) {
-                logger.warn('Badly formatted stix id: ' + req.params.stixId);
-                return res.status(400).send('Stix id is badly formatted.');
-            }
-            else if (err.message === collectionsService.errors.invalidQueryStringParameter) {
-                logger.warn('Invalid query string: versions=' + req.query.versions);
-                return res.status(400).send('Query string parameter versions is invalid.');
-            }
-            else {
-                logger.error('Failed with error: ' + err);
-                return res.status(500).send('Unable to get collections. Server error.');
-            }
+    try {
+        const collections = await collectionsService.retrieveById(req.params.stixId, options);
+        if (collections.length === 0) {
+            return res.status(404).send('Collection not found.');
         }
         else {
-            if (collections.length === 0) {
-                return res.status(404).send('Collection not found.');
-            }
-            else {
-                logger.debug(`Success: Retrieved ${ collections.length } collection(s) with id ${ req.params.stixId }`);
-                return res.status(200).send(collections);
-            }
+            logger.debug(`Success: Retrieved ${ collections.length } collection(s) with id ${ req.params.stixId }`);
+            return res.status(200).send(collections);
+        }
+    } 
+    catch (err) {
+        if (err instanceof BadlyFormattedParameterError) {
+            logger.warn('Badly formatted stix id: ' + req.params.stixId);
+            return res.status(400).send('Stix id is badly formatted.');
+        }
+        else if (err instanceof InvalidQueryStringParameterError) {
+            logger.warn('Invalid query string: versions=' + req.query.versions);
+            return res.status(400).send('Query string parameter versions is invalid.');
         }
-    });
+        else {
+            logger.error('Failed with error: ' + err);
+            return res.status(500).send('Unable to get collections. Server error.');
+        }
+    }
 };
 
-exports.retrieveVersionById = function(req, res) {
+exports.retrieveVersionById = async function(req, res) {
     const options = {
         retrieveContents: req.query.retrieveContents
     }
-    collectionsService.retrieveVersionById(req.params.stixId, req.params.modified, options, function(err, collection) {
-        if (err) {
-            if (err.message === collectionsService.errors.badlyFormattedParameter) {
-                logger.warn('Badly formatted stix id: ' + req.params.stixId);
-                return res.status(400).send('Stix id is badly formatted.');
-            }
-            else {
-                logger.error('Failed with error: ' + err);
-                return res.status(500).send('Unable to get collections. Server error.');
-            }
-        } 
+    try {
+        const collection = await collectionsService.retrieveVersionById(req.params.stixId, req.params.modified, options);
+        if (!collection) {
+            return res.status(404).send('Collection not found.');
+        }
+        else {
+            logger.debug(`Success: Retrieved collection with id ${collection.id}`);
+            return res.status(200).send(collection);
+        }
+    } catch (err) {
+        if (err instanceof BadlyFormattedParameterError) {
+            logger.warn('Badly formatted stix id: ' + req.params.stixId);
+            return res.status(400).send('Stix id is badly formatted.');
+        }
         else {
-            if (!collection) {
-                return res.status(404).send('Collection not found.');
-            }
-            else {
-                logger.debug(`Success: Retrieved collection with id ${collection.id}`);
-                return res.status(200).send(collection);
-            }
+            logger.error('Failed with error: ' + err);
+            return res.status(500).send('Unable to get collections. Server error.');
         }
-    })
+    } 
 }
 
 exports.create = async function(req, res) {
@@ -106,7 +103,7 @@
         return res.status(201).send(savedCollection);
     }
     catch(err) {
-        if (err.message === collectionsService.errors.duplicateId) {
+        if (err instanceof DuplicateIdError) {
             logger.warn("Duplicate stix.id and stix.modified");
             return res.status(409).send('Unable to create collection. Duplicate stix.id and stix.modified properties.');
         }
@@ -143,7 +140,7 @@
             return res.status(204).end();
         }
     } catch (error) {
-    logger.error('Delete collection failed. ' + error);
-    return res.status(500).send('Unable to delete collection. Server error.');
+        logger.error('Delete collection failed. ' + error);
+        return res.status(500).send('Unable to delete collection. Server error.');
     }
 };

app/repository/collections-repository.js

@@ -0,0 +1,9 @@
+'use strict';
+
+const BaseRepository = require('./_base.repository');
+const Collection = require('../models/collection-model');
+
+class CollectionsRepository extends BaseRepository {  
+}
+
+module.exports = new CollectionsRepository(Collection);

app/services/_base.service.js

@@ -238,6 +238,9 @@ class BaseService extends AbstractService {
 
                 // Record the user account that created the object
                 if (options.userAccountId) {
+
+                    data.workspace.workflow = data.workspace.workflow ?? {}
+
                     data.workspace.workflow.created_by_user_account = options.userAccountId;
                 }
 

app/services/collection-bundles-service.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const uuid = require('uuid');
-const util = require('util');
 const semver = require('semver');
 
 const collectionsService = require('../services/collections-service');
@@ -175,6 +174,9 @@ exports.importBundle = function(collection, data, options, callback) {
                 additions: [],
                 changes: [],
                 duplicates: []
+            },
+            workflow : {
+
             }
         },
         stix: collection
@@ -669,8 +671,7 @@ exports.exportBundle = async function(options) {
     if (options.collectionModified) {
         // Retrieve the collection with the provided id and modified date
         const retrievalOptions = { retrieveContents: true };
-        const retrieveCollection = util.promisify(collectionsService.retrieveVersionById);
-        const collection = await retrieveCollection(options.collectionId, options.collectionModified, retrievalOptions);
+        const collection = await collectionsService.retrieveVersionById(options.collectionId, options.collectionModified, retrievalOptions);
         if (collection) {
             const bundle = await createBundle(collection, options);
             return bundle;
@@ -686,8 +687,7 @@ exports.exportBundle = async function(options) {
             versions: 'latest',
             retrieveContents: true
         };
-        const retrieveCollection = util.promisify(collectionsService.retrieveById);
-        const collections = await retrieveCollection(options.collectionId, retrievalOptions);
+        const collections = await collectionsService.retrieveById(options.collectionId, retrievalOptions);
         if (collections.length === 1) {
             const exportedCollection = collections[0];
             const bundle = await createBundle(exportedCollection, options);