Merge pull request #91 from NSWC-Crane/CHRIS_DEV

Reference pull request for full details.

Author: crodriguez6497

api/Controllers/AAPackage.js

@@ -0,0 +1,76 @@
+/*
+!#######################################################################
+! C-PATTM SOFTWARE
+! CRANE C-PATTM plan of action and milestones software. Use is governed by the Open Source Academic Research License Agreement contained in the file
+! crane_C_PAT.1_license.txt, which is part of this software package. BY
+! USING OR MODIFYING THIS SOFTWARE, YOU ARE AGREEING TO THE TERMS AND    
+! CONDITIONS OF THE LICENSE.  
+!########################################################################
+*/
+
+const aaPackageService = require('../Services/aaPackageService');
+
+module.exports.getAAPackages = async function getAAPackages(req, res, next) {
+    try {
+        const aaPackages = await aaPackageService.getAAPackages(req, res, next);
+        res.status(200).json(aaPackages);
+    } catch (error) {
+        if (error.status === 400) {
+            res.status(400).json({ error: 'Validation Error', detail: error.errors });
+        } else {
+            res.status(500).json({ error: 'Internal Server Error', detail: error.message });
+        }
+    }
+};
+
+module.exports.getAAPackage = async function getAAPackage(req, res, next) {
+    try {
+        const aaPackage = await aaPackageService.getAAPackage(req, res, next);
+            res.status(200).json(aaPackage);
+    } catch (error) {
+        if (error.status === 400) {
+            res.status(400).json({ error: 'Validation Error', detail: error.errors });
+        } else {
+            res.status(500).json({ error: 'Internal Server Error', detail: error.message });
+        }
+    }
+};
+
+module.exports.postAAPackage = async function postAAPackage(req, res, next) {
+    try {
+        const aaPackage = await aaPackageService.postAAPackage(req, res, next);
+        res.status(201).json(aaPackage);
+    } catch (error) {
+        if (error.status === 400) {
+            res.status(400).json({ error: 'Validation Error', detail: error.errors });
+        } else {
+            res.status(500).json({ error: 'Internal Server Error', detail: error.message });
+        }
+    }
+};
+
+module.exports.putAAPackage = async function putAAPackage(req, res, next) {
+    try {
+        const aaPackage = await aaPackageService.putAAPackage(req, res, next);
+        res.status(200).json(aaPackage);
+    } catch (error) {
+        if (error.status === 400) {
+            res.status(400).json({ error: 'Validation Error', detail: error.errors });
+        } else {
+            res.status(500).json({ error: 'Internal Server Error', detail: error.message });
+        }
+    }
+};
+
+module.exports.deleteAAPackage = async function deleteAAPackage(req, res, next) {
+    try {
+        await aaPackageService.deleteAAPackage(req, res, next);
+        res.status(204).send();
+    } catch (error) {
+        if (error.status === 400) {
+            res.status(400).json({ error: 'Validation Error', detail: error.errors });
+        } else {
+            res.status(500).json({ error: 'Internal Server Error', detail: error.message });
+        }
+    }
+};

api/Controllers/Asset.js

@@ -10,15 +10,6 @@
 
 const assetService = require('../Services/assetService')
 
-module.exports.getAssets = async function getAssets(req, res, next) {
-    try {
-        const assets = await assetService.getAssets(req, res, next);
-        res.status(200).json(assets);
-    } catch (error) {
-        res.status(500).json({ error: 'Internal Server Error', detail: error.message });
-    }
-}
-
 module.exports.getAsset = async function getAsset(req, res, next) {
     try {
         const asset = await assetService.getAsset(req, res, next);

api/Controllers/Import.js

@@ -10,18 +10,6 @@
 
 const importService = require('../Services/importService');
 
-module.exports.putPoamAssetsWithStigManagerData = async function putPoamAssetsWithStigManagerData(req, res, next) {
-    try {
-        const poamAsset = await importService.putPoamAssetsWithStigManagerData(req, res, next);
-        res.status(200).json(poamAsset);
-    } catch (error) {
-        if (error.status === 400) {
-            res.status(400).json({ error: 'Validation Error', detail: error.errors });
-        } else {
-            res.status(500).json({ error: 'Internal Server Error', detail: error.message });
-        }
-    }
-}
 
 module.exports.uploadPoamFile = async (req, res, next) => {
     const file = req.files[0];
@@ -71,24 +59,4 @@ module.exports.importVRAMExcel = async (req, res, next) => {
             }
         }
     });
-};
-
-module.exports.postStigManagerAssets = async function postStigManagerAssets(req, res) {
-    try {
-        const { assets } = req.body;
-        const importedAssets = await importService.postStigManagerAssets(assets);
-        res.status(201).json({ message: 'Assets Imported Successfully', assets: importedAssets });
-    } catch (error) {
-        res.status(500).json({ message: 'Internal Server Error' });
-    }
-};
-
-module.exports.postStigManagerCollection = async function postStigManagerCollection(req, res) {
-    try {
-        const { collection, assets } = req.body;
-        await importService.postStigManagerCollection(collection, assets);
-        res.status(201).json({ message: 'Collection, Assets, and Labels Imported Successfully' });
-    } catch (error) {
-        res.status(500).json({ message: 'Internal Server Error' });
-    }
-}
+};

api/Controllers/PoamExtensionMilestones.js

@@ -38,8 +38,7 @@ module.exports = (sequelize, DataTypes) => {
             defaultValue: ''
         },
         description: {
-            type: DataTypes.STRING(255),
-            defaultValue: ''
+            type: DataTypes.TEXT
         },
         rawSeverity: {
             type: DataTypes.STRING(10),
@@ -67,9 +66,6 @@ module.exports = (sequelize, DataTypes) => {
         residualRisk: {
             type: DataTypes.TEXT
         },
-        notes: {
-            type: DataTypes.TEXT
-        },
         status: {
             type: DataTypes.STRING(10),
             allowNull: false,
@@ -106,12 +102,10 @@ module.exports = (sequelize, DataTypes) => {
         },
         severity: {
             type: DataTypes.STRING(15),
-            allowNull: false,
             defaultValue: ''
         },
         relevanceOfThreat: {
             type: DataTypes.STRING(15),
-            allowNull: false,
             defaultValue: ''
         },
         threatDescription: {

api/Models/poam.model.js

@@ -1,5 +1,5 @@
 module.exports = (sequelize, DataTypes) => {
-    const poamMilestone = sequelize.define("poammilestones", {
+    const poamMilestones = sequelize.define("poammilestones", {
         milestoneId: {
             type: DataTypes.INTEGER,
             allowNull: false,
@@ -12,22 +12,37 @@ module.exports = (sequelize, DataTypes) => {
         },
         milestoneDate: {
             type: DataTypes.DATEONLY,
-            allowNull: true,
+            allowNull: true
         },
         milestoneComments: {
             type: DataTypes.STRING(2000),
             allowNull: true,
-            defaultValue: ''
+            defaultValue: null
         },
         milestoneStatus: {
             type: DataTypes.STRING(10),
             allowNull: true,
             defaultValue: 'Pending'
         },
+        milestoneChangeComments: {
+            type: DataTypes.STRING(2000),
+            allowNull: true,
+            defaultValue: null
+        },
+        milestoneChangeDate: {
+            type: DataTypes.DATEONLY,
+            allowNull: true
+        },
+        milestoneTeam: {
+            type: DataTypes.STRING(45),
+            allowNull: true,
+            defaultValue: null
+        }
     }, {
+        tableName: 'poammilestones',
         freezeTableName: true,
-        timestamps: false,
+        timestamps: false
     });
 
-    return poamMilestone;
+    return poamMilestones;
 };