Merge pull request #72 from NSWC-Crane/CHRIS_DEV

Reference pull request for full details.
NSWC-Crane · Jun 4, 2024 · c78b647 · c78b647
2 parents 73fd57b + 5c46c46
commit c78b647
Show file tree

Hide file tree

Showing 55 changed files with 571 additions and 401 deletions.
diff --git a/Database/POAM_Tracking_Tool_Data_Model.sql b/Database/POAM_Tracking_Tool_Data_Model.sql
diff --git a/api/Controllers/Asset.js b/api/Controllers/Asset.js
@@ -8,7 +8,7 @@
 !########################################################################
 */
 
-const assetService = require('../Services/mysql/assetService')
+const assetService = require('../Services/assetService')
 
 module.exports.getAssets = async function getAssets(req, res, next) {
     try {

diff --git a/api/Controllers/AssetLabel.js b/api/Controllers/AssetLabel.js
@@ -8,7 +8,7 @@
 !########################################################################
 */
 
-const assetLabelService = require('../Services/mysql/assetLabelService')
+const assetLabelService = require('../Services/assetLabelService')
 
 module.exports.getAssetLabels = async function getAssetLabels(req, res, next) {
     try {

diff --git a/api/Controllers/Collection.js b/api/Controllers/Collection.js
@@ -8,7 +8,7 @@
 !########################################################################
 */
 
-const collectionService = require('../Services/mysql/collectionService');
+const collectionService = require('../Services/collectionService');
 
 
 module.exports.getCollectionBasicList = async function getCollectionBasicList(req, res, next) {

diff --git a/api/Controllers/Import.js b/api/Controllers/Import.js
@@ -8,7 +8,7 @@
 !########################################################################
 */
 
-const importService = require('../Services/mysql/importService');
+const importService = require('../Services/importService');
 
 module.exports.updatePoamAssetsWithStigManagerData = async function updatePoamAssetsWithStigManagerData(req, res, next) {
     try {

diff --git a/api/Controllers/Label.js b/api/Controllers/Label.js
@@ -8,7 +8,7 @@
 !########################################################################
 */
 
-const labelService = require('../Services/mysql/labelService');
+const labelService = require('../Services/labelService');
 
 module.exports.getLabels = async function getLabels(req, res, next) {
     try {

diff --git a/api/Controllers/Metrics.js b/api/Controllers/Metrics.js
@@ -8,7 +8,7 @@
 !########################################################################
 */
 
-const metricsService = require('../Services/mysql/metricsService');
+const metricsService = require('../Services/metricsService');
 
 module.exports.getCollectionAssetLabel = async function getCollectionAssetLabel(req, res, next) {
     try {

diff --git a/api/Controllers/Notification.js b/api/Controllers/Notification.js
@@ -8,7 +8,7 @@
 !########################################################################
 */
 
-const notificationService = require('../Services/mysql/notificationService');
+const notificationService = require('../Services/notificationService');
 
 module.exports.getAllNotificationsByUserId = async function getAllNotificationsByUserId(req, res, next) {
     try {

diff --git a/api/Controllers/Operation.js b/api/Controllers/Operation.js
@@ -8,7 +8,7 @@
 !########################################################################
 */
 
-const operationService = require('../Services/mysql/operationService');
+const operationService = require('../Services/operationService');
 const config = require('../utils/config');
 
 module.exports.getConfiguration = async function getConfiguration(req, res, next) {

diff --git a/api/Controllers/POAM.js b/api/Controllers/POAM.js
@@ -8,7 +8,7 @@
 !########################################################################
 */
 
-const poamService = require('../Services/mysql/poamService');
+const poamService = require('../Services/poamService');
 
 module.exports.getAvailablePoams = async function getAvailablePoams(req, res, next) {
     try {

diff --git a/api/Controllers/Permissions.js b/api/Controllers/Permissions.js
@@ -8,7 +8,7 @@
 !########################################################################
 */
 
-const permissionService = require('../Services/mysql/permissionsService');
+const permissionService = require('../Services/permissionsService');
 
 module.exports.getCollectionPermission = async function getCollectionPermission(req, res, next) {
     try {

diff --git a/api/Controllers/PoamApprover.js b/api/Controllers/PoamApprover.js
@@ -8,7 +8,7 @@
 !########################################################################
 */
 
-const poamApproverService = require('../Services/mysql/poamApproverService')
+const poamApproverService = require('../Services/poamApproverService')
 
 module.exports.getPoamApprovers = async function getPoamApprovers(req, res, next) {
     try {