Bugfix: Survey block Openapi schema (#1443)

- Get survey optimization - Update survey block seed data (geojson)
bcgov · Dec 4, 2024 · a7bcd49 · a7bcd49
1 parent bd62fe6
commit a7bcd49
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 6 deletions.
diff --git a/api/src/openapi/schemas/survey.ts b/api/src/openapi/schemas/survey.ts
@@ -1,4 +1,5 @@
 import { OpenAPIV3 } from 'openapi-types';
+import { GeoJSONFeature } from './geoJson';
 import { updateCreateUserPropertiesSchema } from './user';
 
 export const surveyDetailsSchema: OpenAPIV3.SchemaObject = {
@@ -506,8 +507,7 @@ export const surveyBlockSchema: OpenAPIV3.SchemaObject = {
       nullable: true
     },
     geojson: {
-      description: 'Geojson',
-      type: 'object',
+      ...(GeoJSONFeature as object),
       nullable: true
     },
     sample_block_count: {

diff --git a/api/src/paths/project/{projectId}/survey/{surveyId}/view.ts b/api/src/paths/project/{projectId}/survey/{surveyId}/view.ts
@@ -162,10 +162,11 @@ export function getSurvey(): RequestHandler {
 
       const surveyService = new SurveyService(connection);
 
-      const surveyData = await surveyService.getSurveyById(surveyId);
-
       // @TODO safe to delete survey supplementary data code?
-      const surveySupplementaryData = await surveyService.getSurveySupplementaryDataById(Number(req.params.surveyId));
+      const [surveyData, surveySupplementaryData] = await Promise.all([
+        surveyService.getSurveyById(surveyId),
+        surveyService.getSurveySupplementaryDataById(surveyId)
+      ]);
 
       await connection.commit();
 

diff --git a/database/src/seeds/03_basic_project_survey_setup.ts b/database/src/seeds/03_basic_project_survey_setup.ts
@@ -191,7 +191,37 @@ const insertSurveyBlockData = (surveyId: number) => `
       ${surveyId},
       '${faker.lorem.words(2)}',
       '${faker.lorem.words(10)}',
-      NULL
+      '{
+          "type": "Feature",
+          "geometry": {
+            "type": "Polygon",
+            "coordinates": [
+              [
+                [
+                  -121.904297,
+                  50.930738
+                ],
+                [
+                  -121.904297,
+                  51.971346
+                ],
+                [
+                  -120.19043,
+                  51.971346
+                ],
+                [
+                  -120.19043,
+                  50.930738
+                ],
+                [
+                  -121.904297,
+                  50.930738
+                ]
+              ]
+            ]
+          },
+          "properties": {}
+      }'
     )
   ;
 `;