chore: move types to schema

digidem · Feb 6, 2025 · 858c067 · 858c067
1 parent 458fdd7
commit 858c067
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 103 deletions.
diff --git a/src/routes/observations.js b/src/routes/observations.js
@@ -83,43 +83,7 @@ export default async function observationRoutes(
         versionId: Type.Optional(Type.String()),
         category: Type.Optional(Type.String()),
       }),
-      body: Type.Union([
-        // For creating new observations
-        Type.Object({
-          lat: Type.Number(),
-          lon: Type.Number(),
-          tags: Type.Optional(Type.Record(Type.String(), Type.String())),
-          attachments: Type.Optional(
-            Type.Array(
-              Type.Object({
-                type: Type.Union([
-                  Type.Literal('photo'),
-                  Type.Literal('audio'),
-                ]),
-                name: Type.String(),
-                driveDiscoveryId: Type.String(),
-              }),
-            ),
-          ),
-          metadata: Type.Optional(Type.Object({})),
-        }),
-        // For updating existing observations
-        Type.Object({
-          tags: Type.Optional(Type.Record(Type.String(), Type.String())),
-          attachments: Type.Optional(
-            Type.Array(
-              Type.Object({
-                type: Type.Union([
-                  Type.Literal('photo'),
-                  Type.Literal('audio'),
-                ]),
-                name: Type.String(),
-                driveDiscoveryId: Type.String(),
-              }),
-            ),
-          ),
-        }),
-      ]),
+      body: Type.Union([schemas.observationToAdd, schemas.observationToUpdate]),
       response: {
         200: Type.Object({
           versionId: Type.String(),

diff --git a/src/schemas.js b/src/schemas.js
@@ -73,8 +73,8 @@ export const attachmentQuerystring = Type.Object({
 // Observation Schemas
 // -----------------------------------------------------------------
 export const observationToAdd = Type.Object({
-  lat: latitude,
-  lon: longitude,
+  lat: Type.Number(),
+  lon: Type.Number(),
   attachments: Type.Optional(
     Type.Array(
       Type.Object({
@@ -84,48 +84,11 @@ export const observationToAdd = Type.Object({
       }),
     ),
   ),
-  presetRef: Type.Optional(
-    Type.Object({
-      docId: Type.String(),
-      versionId: Type.String(),
-    }),
-  ),
-  tags: Type.Optional(
-    Type.Record(
-      Type.String(),
-      Type.Union([
-        Type.Boolean(),
-        Type.Number(),
-        Type.String(),
-        Type.Null(),
-        Type.Array(
-          Type.Union([
-            Type.Boolean(),
-            Type.Number(),
-            Type.String(),
-            Type.Null(),
-          ]),
-        ),
-      ]),
-    ),
-  ),
-  metadata: Type.Optional(
-    Type.Object({
-      manualLocation: Type.Boolean(),
-      position: Type.Object({
-        mocked: Type.Boolean(),
-        timestamp: Type.String(),
-        coords: Type.Object({
-          latitude: Type.Number(),
-          longitude: Type.Number(),
-        }),
-      }),
-    }),
-  ),
+  tags: Type.Optional(Type.Record(Type.String(), Type.String())),
+  metadata: Type.Optional(Type.Object({})),
 })
 
 export const observationToUpdate = Type.Object({
-  schemaName: Type.Literal('observation'),
   attachments: Type.Optional(
     Type.Array(
       Type.Object({
@@ -135,31 +98,7 @@ export const observationToUpdate = Type.Object({
       }),
     ),
   ),
-  tags: Type.Optional(
-    Type.Record(
-      Type.String(),
-      Type.Union([
-        Type.Boolean(),
-        Type.Number(),
-        Type.String(),
-        Type.Null(),
-        Type.Array(
-          Type.Union([
-            Type.Boolean(),
-            Type.Number(),
-            Type.String(),
-            Type.Null(),
-          ]),
-        ),
-      ]),
-    ),
-  ),
-  presetRef: Type.Optional(
-    Type.Object({
-      docId: Type.String(),
-      versionId: Type.String(),
-    }),
-  ),
+  tags: Type.Optional(Type.Record(Type.String(), Type.String())),
 })
 
 export const observationResult = Type.Object({