[Import GeoJSON] Write imported LOIs using new schema

functions/package.json

@@ -10,7 +10,7 @@
     "lint": "eslint --ext .js,.ts src/",
     "lint:fix": "npm run lint -- --fix",
     "shell": "firebase functions:shell",
-    "emulators": "firebase emulators:start --only functions,firestore --project $npm_config_project",
+    "emulators": "firebase emulators:start --only functions,firestore --project local",
     "deploy": "firebase login && firebase deploy --project $npm_config_project --only functions",
     "logs": "firebase functions:log",
     "test": "jasmine --config=jasmine.json",
@@ -25,6 +25,7 @@
   "dependencies": {
     "@fast-csv/format": "4.3.5",
     "@ground/lib": "file:../lib",
+    "@ground/proto": "file:../proto",
     "@terraformer/wkt": "2.1.2",
     "busboy": "1.5.0",
     "cookie-parser": "^1.4.6",
@@ -49,14 +50,18 @@
     "@types/busboy": "^1.5.0",
     "@types/cookie-parser": "^1.4.4",
     "@types/cors": "2.8.12",
+    "@types/geojson": "^7946.0.14",
     "@types/jasmine": "^4.3.5",
     "@types/jsonstream": "0.8.30",
     "@types/terraformer__wkt": "2.0.0",
     "firebase-functions-test": "^3.3.0",
     "firebase-tools": "13.6.0",
+    "form-data-encoder": "^4.0.2",
+    "formdata-node": "^6.0.3",
     "gts": "^5.3.1",
     "jasmine": "^5.1.0",
     "prettier": "^2.8.1",
+    "source-map-support": "^0.5.21",
     "ts-mocha": "^10.0.0",
     "typescript": "4.8.4",
     "wkt": "0.1.1"

functions/src/common/auth.ts

@@ -22,7 +22,7 @@ import {EmulatorIdToken} from '../handlers';
 // This is the only cookie not stripped by Firebase CDN.
 // https://firebase.google.com/docs/hosting/manage-cache#using_cookies
 export const SESSION_COOKIE_NAME = '__session';
-const OWNER_ROLE = 'OWNER';
+export const OWNER_ROLE = 'OWNER';
 const DATA_COLLECTOR_ROLE = 'DATA_COLLECTOR';
 
 /**

functions/src/common/context.ts

@@ -18,7 +18,7 @@ import {Datastore} from './datastore';
 import {initializeApp, getApp} from 'firebase-admin/app';
 import {getFirestore} from 'firebase-admin/firestore';
 
-let datastore: Datastore;
+let datastore: Datastore | undefined;
 
 export function initializeFirebaseApp() {
   try {
@@ -35,3 +35,7 @@ export function getDatastore(): Datastore {
   }
   return datastore;
 }
+
+export function resetDatastore() {
+  datastore = undefined;
+}

functions/src/common/datastore.ts

@@ -16,14 +16,14 @@
 
 import * as functions from 'firebase-functions';
 import {firestore} from 'firebase-admin';
-import {GeoPoint} from 'firebase-admin/firestore';
+import {DocumentData, GeoPoint} from 'firebase-admin/firestore';
 
 /**
  *
  */
 type pseudoGeoJsonGeometry = {
   type: string;
   coordinates: any;
 };
 
 /**
@@ -138,17 +138,8 @@
     return this.fetchDoc_(`${survey(surveyId)}/sheets/config`);
   }
 
-  async insertLocationOfInterest(surveyId: string, loi: any) {
-    const loiDoc = {
-      ...loi,
-      geometry: Datastore.toFirestoreMap(loi.geometry),
-    };
-    const docRef = this.db_.doc(survey(surveyId));
-    const doc = await docRef.get();
-    if (!doc.exists) {
-      throw new Error(`${survey(surveyId)} not found`);
-    }
-    await docRef.collection('lois').add(loiDoc);
+  async insertLocationOfInterest(surveyId: string, loiDoc: DocumentData) {
+    await this.db_.doc(survey(surveyId)).collection('lois').add(loiDoc);
   }
 
   async countSubmissionsForLoi(
@@ -175,7 +166,7 @@
     await loiRef.update({properties});
   }
 
   static toFirestoreMap(geometry: any) {
     return Object.fromEntries(
       Object.entries(geometry).map(([key, value]) => [
         key,
@@ -184,7 +175,7 @@
     );
   }
 
   static toFirestoreValue(value: any): any {
     if (value === null) {
       return null;
     }
@@ -212,7 +203,7 @@
    *
    * @returns GeoJSON geometry object (with geometry as list of lists)
    */
   static fromFirestoreMap(geoJsonGeometry: any): any {
     const geometryObject = geoJsonGeometry as pseudoGeoJsonGeometry;
     if (!geometryObject) {
       throw new Error(
@@ -227,7 +218,7 @@
     return geometryObject;
   }
 
   static fromFirestoreValue(coordinates: any) {
     if (coordinates instanceof GeoPoint) {
       // Note: GeoJSON coordinates are in lng-lat order.
       return [coordinates.longitude, coordinates.latitude];
@@ -236,7 +227,7 @@
     if (typeof coordinates !== 'object') {
       return coordinates;
     }
     const result = new Array<any>(coordinates.length);
 
     Object.entries(coordinates).map(([i, nestedValue]) => {
       const index = Number.parseInt(i);

functions/src/handlers.ts

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-import * as cors from 'cors';
+import cors from 'cors';
 import {DecodedIdToken} from 'firebase-admin/auth';
 import {https, Response} from 'firebase-functions';
 import {getDecodedIdToken} from './common/auth';
 import {INTERNAL_SERVER_ERROR, UNAUTHORIZED} from 'http-status-codes';
-import * as cookieParser from 'cookie-parser';
+import cookieParser from 'cookie-parser';
+import HttpStatus from 'http-status-codes';
 
 const corsOptions = {origin: true};
 const corsMiddleware = cors(corsOptions);
@@ -59,7 +60,7 @@ async function requireIdToken(
 
 function onError(res: any, err: any) {
   console.error(err);
-  res.status(INTERNAL_SERVER_ERROR).send('Internal error');
+  res.status(INTERNAL_SERVER_ERROR).end(`Internal error: ${err.message}`);
 }
 
 export type HttpsRequestHandler = (
@@ -68,13 +69,101 @@ export type HttpsRequestHandler = (
   idToken: DecodedIdToken
 ) => Promise<any>;
 
+/**
+ * A synchronous HTTPS request handler. The HTTPS request is closed as soon as the handler resolves.
+ */
 export function onHttpsRequest(handler: HttpsRequestHandler) {
   return https.onRequest((req: https.Request, res: Response) =>
     corsMiddleware(req, res, () =>
-      cookieParser()(req, res, () =>
-        requireIdToken(req, res, (idToken: DecodedIdToken) =>
-          handler(req, res, idToken).catch((error: any) => onError(res, error))
-        )
+      cookieParser()(
+        req,
+        res,
+        async () =>
+          await requireIdToken(req, res, async (idToken: DecodedIdToken) => {
+            try {
+              await handler(req, res, idToken);
+            } catch (error) {
+              onError(res, error);
+            }
+          })
+      )
+    )
+  );
+}
+
+/** A function which is to be called by HTTPS callbacks on failure. */
+export type ErrorHandler = (httpStatusCode: number, message: string) => void;
+
+/**
+ * A callback-based HTTPS request handler. Functions of this type are expected to call
+ * `done()` on completion or `error()` on failure. The function itself may return before
+ * work is completed, but the HTTPS request will not complete until one of those two
+ * callbacks are invoked.
+ */
+export type HttpsRequestCallback = (
+  req: https.Request,
+  res: Response<any>,
+  user: DecodedIdToken,
+  done: () => void,
+  error: ErrorHandler
+) => void;
+
+export async function invokeCallbackAsync(
+  callback: HttpsRequestCallback,
+  req: https.Request,
+  res: Response<any>,
+  user: DecodedIdToken
+) {
+  await new Promise((resolve, reject) =>
+    invokeCallback(
+      callback,
+      req,
+      res,
+      user,
+      () => {
+        res.status(HttpStatus.OK).end();
+        resolve(undefined);
+      },
+      (errorCode: number, message: string) => {
+        res.status(errorCode).end(message);
+        reject(`${message} (HTTP status ${errorCode})`);
+      }
+    )
+  );
+}
+
+function invokeCallback(
+  callback: HttpsRequestCallback,
+  req: https.Request,
+  res: Response<any>,
+  user: DecodedIdToken,
+  done: () => void,
+  error: ErrorHandler
+) {
+  try {
+    callback(req, res, user, done, error);
+  } catch (e: any) {
+    console.error('Unhandled exception', e);
+    error(HttpStatus.INTERNAL_SERVER_ERROR, e.toString());
+  }
+}
+
+/**
+ * Call an asynchronous HTTPS request handler. Handlers of this type are expected to call
+ * `done()` on completion or `error()` on failure. The handler itself may return before
+ * work is completed, but the HTTPS request will not complete until one of those two
+ * callbacks are invoked.
+ */
+export function onHttpsRequestAsync(callback: HttpsRequestCallback) {
+  return https.onRequest((req: https.Request, res: Response) =>
+    corsMiddleware(req, res, () =>
+      cookieParser()(
+        req,
+        res,
+        async () =>
+          await requireIdToken(req, res, async (idToken: DecodedIdToken) => {
+            await invokeCallbackAsync(callback, req, res, idToken);
+          })
       )
     )
   );