continued work with inserting attributes

api/src/paths/project/{projectId}/survey/{surveyId}/observations/index.ts

@@ -316,7 +316,8 @@ PUT.apiDoc = {
                     ],
                     properties: {
                       survey_observation_id: {
-                        type: 'number'
+                        type: 'number',
+                        nullable: true
                       },
                       wldtaxonomic_units_id: {
                         oneOf: [{ type: 'integer' }, { type: 'string' }]
@@ -510,6 +511,27 @@ export function insertUpdateSurveyObservations(): RequestHandler {
         } as InsertObservation | UpdateObservation;
       });
 
+      console.log('__________________________');
+      console.log('__________________________');
+      console.log('__________________________');
+      console.log('__________________________');
+      console.log('__________________________');
+      console.log('UHH');
+      const measurements: any[] = req.body.surveyObservations.map((item: any) => {
+        console.log(item.measurementColumns);
+        return {
+          survey_observation_id: item.standardColumns.survey_observation_id,
+          measurements: item.measurementColumns.map((measurement: any) => {
+            return {
+              count: null,
+              measurement_id: measurement.id,
+              value: measurement.value
+            };
+          })
+        };
+      });
+      console.log(measurements);
+
       const surveyObservations = await observationService.insertUpdateSurveyObservations(surveyId, records);
 
       await connection.commit();

api/src/repositories/subcount-repository.ts

@@ -0,0 +1,37 @@
+import { z } from 'zod';
+import { BaseRepository } from './base-repository';
+
+export const ObservationSubCountRecord = z.object({
+  observation_subcount_id: z.number(),
+  survey_observation_id: z.number(),
+  subcount: z.number().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 ObservationSubCountRecord = z.infer<typeof ObservationSubCountRecord>;
+export type InsertObservationSubCount = Pick<
+  ObservationSubCountRecord,
+  'observation_subcount_id' | 'survey_observation_id' | 'subcount'
+>;
+
+export const SubCountAttributeRecord = z.object({
+  subcount_attribute_id: z.number(),
+  observation_subcount_id: z.number(),
+  critterbase_event_id: z.string(),
+  create_date: z.string(),
+  create_user: z.number(),
+  update_date: z.string().nullable(),
+  update_user: z.number().nullable(),
+  revision_count: z.number()
+});
+export type SubCountAttributeRecord = z.infer<typeof SubCountAttributeRecord>;
+export type InsertSubCountAttribute = Pick<SubCountAttributeRecord, 'observation_subcount_id' | 'critterbase_event_id'>;
+
+export class SubCountRepository extends BaseRepository {
+  async insertObservationSubCount(record: InsertObservationSubCount) {}
+
+  async insertSubCountAttribute(observationSubCountId: number, records: InsertSubCountAttribute[]) {}
+}

api/src/services/critterbase-service.ts

@@ -302,7 +302,7 @@ export class CritterbaseService {
   }
 
   async getAttributes(ids: (string | null)[]): Promise<any> {
-    const response = await this.axiosInstance.post('', ids);
-    return response.data;
+    // const response = await this.axiosInstance.post('', ids);
+    return [];
   }
 }

api/src/services/subcount-service.ts

@@ -0,0 +1,24 @@
+import { IDBConnection } from '../database/db';
+import {
+  InsertObservationSubCount,
+  InsertSubCountAttribute,
+  SubCountRepository
+} from '../repositories/subcount-repository';
+import { DBService } from './db-service';
+
+export class SubCountService extends DBService {
+  subCountRepository: SubCountRepository;
+
+  constructor(connection: IDBConnection) {
+    super(connection);
+    this.subCountRepository = new SubCountRepository(connection);
+  }
+
+  async insertObservationSubCount(record: InsertObservationSubCount) {
+    return this.subCountRepository.insertObservationSubCount(record);
+  }
+
+  async insertSubCountAttribute(observationSubCountId: number, records: InsertSubCountAttribute[]) {
+    return this.subCountRepository.insertSubCountAttribute(observationSubCountId, records);
+  }
+}