Merge remote-tracking branch 'origin/SIMSBIOHUB-627' into SIMSBIOHUB-…

…627-Device-Frontend-3
bcgov · Oct 25, 2024 · 60ba7f6 · 60ba7f6
2 parents 3a1d750 + 6e74f1f
commit 60ba7f6
Show file tree

Hide file tree

Showing 27 changed files with 452 additions and 1,484 deletions.
diff --git a/api/src/database-models/deployment.ts b/api/src/database-models/deployment.ts
@@ -18,7 +18,7 @@ export const DeploymentModel = z.object({
   attachment_start_timestamp: z.string(),
   attachment_end_date: z.string().nullable(),
   attachment_end_time: z.string().nullable(),
-  attachment_end_timestamp: z.string(),
+  attachment_end_timestamp: z.string().nullable(),
   critterbase_start_capture_id: z.string().uuid().nullable(),
   critterbase_end_capture_id: z.string().uuid().nullable(),
   critterbase_end_mortality_id: z.string().uuid().nullable(),
@@ -37,11 +37,6 @@ export type DeploymentModel = z.infer<typeof DeploymentModel>;
  * @description Data record for `deployment`.
  */
 export const DeploymentRecord = DeploymentModel.omit({
-  // internal fields
-  device_key: true,
-  attachment_start_timestamp: true,
-  attachment_end_timestamp: true,
-  // audit fields
   create_date: true,
   create_user: true,
   update_date: true,

diff --git a/api/src/database-models/device_make.ts b/api/src/database-models/device_make.ts
@@ -0,0 +1,38 @@
+import { z } from 'zod';
+/**
+ * Device Make Model.
+ *
+ * @description Data model for `device_make`.
+ */
+export const DeviceMakeModel = z.object({
+  device_make_id: z.number(),
+  name: z.string(),
+  description: z.string().nullable(),
+  notes: z.string().nullable(),
+  record_effective_date: z.string().nullable(),
+  record_end_date: z.string().nullable(),
+  create_date: z.string(),
+  create_user: z.number(),
+  update_date: z.string().nullable(),
+  update_user: z.number().nullable(),
+  revision_count: z.number()
+});
+
+export type DeviceMakeModel = z.infer<typeof DeviceMakeModel>;
+
+/**
+ * Device Make Record.
+ *
+ * @description Data record for `device_make`.
+ */
+export const DeviceMakeRecord = DeviceMakeModel.omit({
+  record_effective_date: true,
+  record_end_date: true,
+  create_date: true,
+  create_user: true,
+  update_date: true,
+  update_user: true,
+  revision_count: true
+});
+
+export type DeviceMakeRecord = z.infer<typeof DeviceMakeRecord>;
diff --git a/api/src/paths/codes.ts b/api/src/paths/codes.ts
@@ -37,7 +37,8 @@ GET.apiDoc = {
               'site_selection_strategies',
               'survey_progress',
               'method_response_metrics',
-              'attractants'
+              'attractants',
+              'telemetry_device_makes'
             ],
             properties: {
               management_action_type: {
@@ -382,6 +383,27 @@ GET.apiDoc = {
                     }
                   }
                 }
+              },
+              telemetry_device_makes: {
+                type: 'array',
+                description: 'Active telemetry device manufacturers / makes / vendors.',
+                items: {
+                  type: 'object',
+                  additionalProperties: false,
+                  required: ['id', 'name', 'description'],
+                  properties: {
+                    id: {
+                      type: 'integer',
+                      minimum: 1
+                    },
+                    name: {
+                      type: 'string'
+                    },
+                    description: {
+                      type: 'string'
+                    }
+                  }
+                }
               }
             }
           }