Merge branch 'SIMSBIOHUB-424' of https://github.com/bcgov/biohubbc-pl…

…atform into SIMSBIOHUB-424
bcgov · Jan 16, 2024 · f8fbd1e · f8fbd1e
2 parents 2f1ce3b + 54cf8f4
commit f8fbd1e
Show file tree

Hide file tree

Showing 27 changed files with 2,023 additions and 1,654 deletions.
diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/src/paths/administrative/security/apply.ts b/api/src/paths/administrative/security/apply.ts
diff --git a/...administrative/security/category/index.ts → ...ths/administrative/security/categories.ts b/...administrative/security/category/index.ts → ...ths/administrative/security/categories.ts
@@ -1,12 +1,12 @@
 import { RequestHandler } from 'express';
 import { Operation } from 'express-openapi';
-import { SYSTEM_ROLE } from '../../../../constants/roles';
-import { getDBConnection } from '../../../../database/db';
-import { authorizeRequestHandler } from '../../../../request-handlers/security/authorization';
-import { SecurityService } from '../../../../services/security-service';
-import { getLogger } from '../../../../utils/logger';
+import { SYSTEM_ROLE } from '../../../constants/roles';
+import { getDBConnection } from '../../../database/db';
+import { authorizeRequestHandler } from '../../../request-handlers/security/authorization';
+import { SecurityService } from '../../../services/security-service';
+import { getLogger } from '../../../utils/logger';
 
-const defaultLog = getLogger('paths/administrative/security/category');
+const defaultLog = getLogger('paths/administrative/security/categories');
 
 export const GET: Operation = [
   authorizeRequestHandler(() => {
@@ -23,7 +23,8 @@ export const GET: Operation = [
 ];
 
 GET.apiDoc = {
-  description: 'Get all active security categories.',
+  description:
+    'Get all active security rules with their associated categories. A security category is active if it has not been end-dated.',
   tags: ['security'],
   security: [
     {
@@ -39,9 +40,21 @@ GET.apiDoc = {
             type: 'array',
             items: {
               type: 'object',
+              required: [
+                'security_category_id',
+                'name',
+                'description',
+                'record_effective_date',
+                'record_end_date',
+                'create_date',
+                'create_user',
+                'update_date',
+                'update_user',
+                'revision_count'
+              ],
               properties: {
                 security_category_id: {
-                  type: 'number'
+                  type: 'integer'
                 },
                 name: {
                   type: 'string'
@@ -60,7 +73,7 @@ GET.apiDoc = {
                   type: 'string'
                 },
                 create_user: {
-                  type: 'string'
+                  type: 'integer'
                 },
                 update_date: {
                   type: 'string',
@@ -71,7 +84,7 @@ GET.apiDoc = {
                   nullable: true
                 },
                 revision_count: {
-                  type: 'number'
+                  type: 'integer'
                 }
               }
             }
@@ -111,7 +124,7 @@ export function getActiveSecurityCategories(): RequestHandler {
 
       return res.status(200).json(data);
     } catch (error) {
-      defaultLog.error({ label: 'getActiveSecurityRules', message: 'error', error });
+      defaultLog.error({ label: 'getActiveSecurityCategories', message: 'error', error });
       await connection.rollback();
       throw error;
     } finally {

diff --git a/api/src/paths/administrative/security/category/fetch.ts b/api/src/paths/administrative/security/category/fetch.ts