feat(functions-load-balancing): adapt to new common model

eficode · Jan 26, 2021 · a14d488 · a14d488
1 parent a4be30d
commit a14d488
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 3 deletions.
diff --git a/packages/functions/package.json b/packages/functions/package.json
@@ -19,7 +19,6 @@
   "dependencies": {
     "firebase-admin": "^9.2.0",
     "firebase-functions": "^3.11.0",
-    "axios": "^0.21.1",
     "@pipeline/common": "^0.2.0",
     "express": "^4.17.1",
     "lodash": "^4.17.20"

diff --git a/packages/functions/src/index.ts b/packages/functions/src/index.ts
@@ -2,6 +2,14 @@ import * as admin from "firebase-admin";
 
 admin.initializeApp();
 
+if (!process.env.FUNCTION_NAME || process.env.FUNCTION_NAME === 'onOnlineGameStatusCreate') {
+  exports.onOnlineGameStatusCreate = require('./load-balancing/onOnlineGameStatusCreate').onOnlineGameStatusCreate;
+}
+
+if (!process.env.FUNCTION_NAME || process.env.FUNCTION_NAME === 'onOnlineGameStatusDelete') {
+  exports.onOnlineGameStatusDelete = require('./load-balancing/onOnlineGameStatusDelete').onOnlineGameStatusDelete;
+}
+
 if (!process.env.FUNCTION_NAME || process.env.FUNCTION_NAME === 'onOnlineGameStatusUpdate') {
   exports.onOnlineGameStatusUpdate = require('./load-balancing/onOnlineGameStatusUpdate').onOnlineGameStatusUpdate;
 }

diff --git a/packages/functions/src/models/FirebaseTypes.ts b/packages/functions/src/models/FirebaseTypes.ts
@@ -0,0 +1,4 @@
+import * as admin from "firebase-admin";
+
+export type FirebaseTimestamp = admin.firestore.Timestamp
+export type FirebaseFieldValue = admin.firestore.FieldValue
diff --git a/packages/functions/src/models/Game.ts b/packages/functions/src/models/Game.ts
@@ -0,0 +1,5 @@
+import {Game as InnerGame} from '@pipeline/common';
+import {FirebaseFieldValue, FirebaseTimestamp} from "./FirebaseTypes";
+
+
+export type Game = InnerGame<FirebaseTimestamp, FirebaseFieldValue>;
diff --git a/packages/functions/src/models/RTDBGame.ts b/packages/functions/src/models/RTDBGame.ts
@@ -0,0 +1,5 @@
+import {RTDBGame as InnerRTDBGame} from '@pipeline/common';
+import {FirebaseFieldValue, FirebaseTimestamp} from "./FirebaseTypes";
+
+
+export type RTDBGame = InnerRTDBGame<FirebaseTimestamp, FirebaseFieldValue>;
diff --git a/packages/functions/src/models/Status.ts b/packages/functions/src/models/Status.ts
@@ -0,0 +1,5 @@
+import {Status as InnerStatus} from '@pipeline/common';
+import {FirebaseFieldValue, FirebaseTimestamp} from "./FirebaseTypes";
+
+
+export type Status = InnerStatus<FirebaseTimestamp, FirebaseFieldValue>;
diff --git a/packages/functions/src/utils/db.ts b/packages/functions/src/utils/db.ts
@@ -16,7 +16,6 @@ const runTransactionWithRetryHelper = async (db: admin.firestore.Firestore, upda
     await db.runTransaction(updateFunction);
     return null
   } catch (e) {
-    console.log(e);
     if (e.code === 10) {
       console.log(`Transaction abort error! Running it again: #${retry} retries.`);
       if (retry < maxRetries) {
@@ -26,7 +25,7 @@ const runTransactionWithRetryHelper = async (db: admin.firestore.Firestore, upda
         return null;
       }
     } else {
-      throw  e;
+      throw e;
     }
   }
 };