Merge pull request #300 from eficode/fix/cd-pipeline

pattkrajnik · web-flow · commit 6ef5e4f0224f · 2023-01-18T18:30:20.000+01:00
Fix/cd pipeline
diff --git a/.firebaserc b/.firebaserc
@@ -1,9 +1,9 @@
 {
   "projects": {
-    "default": "pipeline-game-dev"
+    "default": "pipeline-game-development"
   },
   "targets": {
-    "pipeline-game-dev": {
+    "pipeline-game-development": {
       "database": {
         "main": [
           "x"
diff --git a/.github/workflows/build-and-deploy-on-merge.yml b/.github/workflows/build-and-deploy-on-merge.yml
@@ -9,6 +9,11 @@ jobs:
     runs-on: ubuntu-latest
     environment: dev
     steps:
+      - name: Install Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: '14'
+          
       - name: Checkout merged code
         uses: actions/checkout@v2
 
diff --git a/.github/workflows/build-and-deploy-on-version.yml b/.github/workflows/build-and-deploy-on-version.yml
@@ -8,6 +8,11 @@ jobs:
     runs-on: ubuntu-latest
     environment: test
     steps:
+      - name: Install Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: '14'
+          
       - name: Checkout merged code
         uses: actions/checkout@v2
 
diff --git a/.github/workflows/build-and-test-on-pr.yml b/.github/workflows/build-and-test-on-pr.yml
@@ -43,6 +43,10 @@ jobs:
         env:
           FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
 
+      - name: Sleep for 30 seconds
+        run: sleep 30s
+        shell: bash
+        
       - name: Load initial data
         run: npm run scripts:load-initial-data
         env:
diff --git a/README.md b/README.md
@@ -178,7 +178,7 @@ variables**:
 FIRESTORE_EMULATOR_HOST=localhost:8080
 FIREBASE_AUTH_EMULATOR_HOST=localhost:9099
 FIREBASE_DATABASE_EMULATOR_HOST=localhost:9000
-GCLOUD_PROJECT=pipeline-game-dev
+GCLOUD_PROJECT=pipeline-game-development
 ```
 
 If you want to skip signup and email verification
diff --git a/packages/functions/package.json b/packages/functions/package.json
@@ -14,7 +14,7 @@
     "update-package-lock": "npm i"
   },
   "engines": {
-    "node": "12"
+    "node": "14"
   },
   "main": "lib/index.js",
   "dependencies": {
diff --git a/packages/functions/src/rtdbInstances.ts b/packages/functions/src/rtdbInstances.ts
@@ -1,12 +1,12 @@
 const rtdbInstancesUrl = [
   {
-    url: 'https://pipeline-game-dev-default-rtdb.firebasedatabase.app',
-    name: 'pipeline-game-dev-default-rtdb',
+    url: 'https://pipeline-game-development-default-rtdb.firebasedatabase.app',
+    name: 'pipeline-game-development-default-rtdb',
     id: 'default-rtdb',
   },
   {
-    url: 'https://pipeline-game-dev-instance-1.firebasedatabase.app',
-    name: 'pipeline-game-dev-instance-1',
+    url: 'https://pipeline-game-development-instance-1.firebasedatabase.app',
+    name: 'pipeline-game-development-instance-1',
     id: 'instance-1',
   },
 ];
diff --git a/packages/functions/test/onConnectionsDelete.spec.ts b/packages/functions/test/onConnectionsDelete.spec.ts
@@ -65,7 +65,7 @@ describe("onConnectionsDelete", () => {
       .set({
         lastPlayerDisconnectedAt: null,
       });
-    await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`)
+    await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`)
       .ref(`${RTDBPaths.Cards}/${gameId}`).set({
         randomId1: {
           lockedBy: userId,
@@ -87,7 +87,7 @@ describe("onConnectionsDelete", () => {
 
     await assert.isFulfilled(wrapped(snap, {params: {gameId, userId}}));
 
-    const cardsSnap = await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`)
+    const cardsSnap = await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`)
       .ref(`${RTDBPaths.Cards}/${gameId}`).get();
 
     expect(cardsSnap.exists()).to.eq(true);
@@ -113,7 +113,7 @@ describe("onConnectionsDelete", () => {
       .set({
         lastPlayerDisconnectedAt: null,
       });
-    await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`)
+    await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`)
       .ref(`${RTDBPaths.Cards}/${gameId}`).set({
         randomId1: {
           lockedBy: 'randomUserId1',
@@ -135,7 +135,7 @@ describe("onConnectionsDelete", () => {
 
     await assert.isFulfilled(wrapped(snap, {params: {gameId, userId}}));
 
-    const cardsSnap = await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`)
+    const cardsSnap = await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`)
       .ref(`${RTDBPaths.Cards}/${gameId}`).get();
 
     expect(cardsSnap.exists()).to.eq(true);
@@ -164,9 +164,9 @@ describe("onConnectionsDelete", () => {
       .set({
         lastPlayerDisconnectedAt: null,
       });
-    await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`)
+    await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`)
       .ref(`${RTDBPaths.Connections}/${gameId}/${userId}`).push({updatedAt: 124342});
-    await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`)
+    await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`)
       .ref(`${RTDBPaths.Connections}/${gameId}/randomUserId`).push({updatedAt: 124342});
 
     const snap = test.database.makeDataSnapshot(
diff --git a/packages/functions/test/scheduledMoveGame.spec.ts b/packages/functions/test/scheduledMoveGame.spec.ts
@@ -33,48 +33,48 @@ describe("scheduledMoveGame", () => {
   it("should not move game with recent lastPlayerDisconnectedAt", async () => {
     await admin.firestore().doc(`${FirebaseCollection.Games}/gameId1`)
       .set({lastPlayerDisconnectedAt: admin.firestore.FieldValue.serverTimestamp()});
-    await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`)
+    await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`)
       .set({something: ''});
 
     await assert.isFulfilled(functions.scheduledMoveGame());
 
-    const rtdbGameSnap = await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`).get();
+    const rtdbGameSnap = await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`).get();
     expect(rtdbGameSnap.exists()).eq(true);
   });
 
   it("should not move game with null lastPlayerDisconnectedAt", async () => {
     await admin.firestore().doc(`${FirebaseCollection.Games}/gameId1`)
       .set({lastPlayerDisconnectedAt: null});
-    await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`)
+    await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`)
       .set({something: ''});
 
     await assert.isFulfilled(functions.scheduledMoveGame());
 
-    const rtdbGameSnap = await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`).get();
+    const rtdbGameSnap = await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`).get();
 
     expect(rtdbGameSnap.exists()).eq(true);
   });
 
   it("should move game and cards if lastPlayerDisconnectedAt is < now - 24h ", async () => {
     await admin.firestore().doc(`${FirebaseCollection.Games}/gameId1`)
       .set({
-        rtdbInstance: 'pipeline-game-dev-default-rtdb.europe-west1',
+        rtdbInstance: 'pipeline-game-development-default-rtdb.europe-west1',
         lastPlayerDisconnectedAt: new admin.firestore.Timestamp(Math.floor((Date.now() - 24 * 60 * 60 * 1000) / 1000), 100),
       });
-    await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`)
+    await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`)
       .set({
         createdAt: {
           _seconds: 14424,
           _nanoseconds: 1424,
         },
       });
-    await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Cards}/gameId1`)
+    await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Cards}/gameId1`)
       .set({something: ''});
 
     await assert.isFulfilled(functions.scheduledMoveGame());
 
-    const rtdbGameSnap = await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`).get();
-    const cardsSnap = await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Cards}/gameId1`).get();
+    const rtdbGameSnap = await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`).get();
+    const cardsSnap = await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Cards}/gameId1`).get();
 
     expect(rtdbGameSnap.exists()).eq(false);
     expect(cardsSnap.exists()).eq(false);
@@ -83,17 +83,17 @@ describe("scheduledMoveGame", () => {
   it("should move game if lastPlayerDisconnectedAt is < now - 24h preserving createdAt", async () => {
     await admin.firestore().doc(`${FirebaseCollection.Games}/gameId1`)
       .set({
-        rtdbInstance: 'pipeline-game-dev-default-rtdb.europe-west1',
+        rtdbInstance: 'pipeline-game-development-default-rtdb.europe-west1',
         lastPlayerDisconnectedAt: new admin.firestore.Timestamp(Math.floor((Date.now() - 24 * 60 * 60 * 1000) / 1000), 100),
       });
-    await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`)
+    await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`)
       .set({
         createdAt: {
           _seconds: 14424,
           _nanoseconds: 1424,
         },
       });
-    await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Cards}/gameId1`)
+    await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Cards}/gameId1`)
       .set({something: ''});
 
     await assert.isFulfilled(functions.scheduledMoveGame());
@@ -107,20 +107,20 @@ describe("scheduledMoveGame", () => {
   it("should move game if lastPlayerDisconnectedAt is < now - 24h updating movedAt", async () => {
     await admin.firestore().doc(`${FirebaseCollection.Games}/gameId1`)
       .set({
-        rtdbInstance: 'pipeline-game-dev-default-rtdb.europe-west1',
+        rtdbInstance: 'pipeline-game-development-default-rtdb.europe-west1',
         movedAt: admin.firestore.FieldValue.serverTimestamp(),
         lastPlayerDisconnectedAt: new admin.firestore.Timestamp(Math.floor((Date.now() - 24 * 60 * 60 * 1000) / 1000), 100),
       });
     const oldMovedAt = ((await admin.firestore().doc(`${FirebaseCollection.Games}/gameId1`)
       .get()).data() as Game).movedAt as admin.firestore.Timestamp;
-    await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`)
+    await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`)
       .set({
         createdAt: {
           _seconds: 14424,
           _nanoseconds: 1424,
         },
       });
-    await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Cards}/gameId1`)
+    await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Cards}/gameId1`)
       .set({something: ''});
 
     await assert.isFulfilled(functions.scheduledMoveGame());
@@ -134,17 +134,17 @@ describe("scheduledMoveGame", () => {
   it("should unlock locked cards if lastPlayerDisconnectedAt is < now - 24h", async () => {
     await admin.firestore().doc(`${FirebaseCollection.Games}/gameId1`)
       .set({
-        rtdbInstance: 'pipeline-game-dev-default-rtdb.europe-west1',
+        rtdbInstance: 'pipeline-game-development-default-rtdb.europe-west1',
         lastPlayerDisconnectedAt: new admin.firestore.Timestamp(Math.floor((Date.now() - 24 * 60 * 60 * 1000) / 1000), 100),
       });
-    await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`)
+    await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`)
       .set({
         createdAt: {
           _seconds: 14424,
           _nanoseconds: 1424,
         },
       });
-    await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Cards}/gameId1`)
+    await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Cards}/gameId1`)
       .set({
         cardId1: {
           lockedBy: 'someone',
@@ -181,17 +181,17 @@ describe("scheduledMoveGame", () => {
   it("should normalize cards zIndex if lastPlayerDisconnectedAt is < now - 24h", async () => {
     await admin.firestore().doc(`${FirebaseCollection.Games}/gameId1`)
       .set({
-        rtdbInstance: 'pipeline-game-dev-default-rtdb.europe-west1',
+        rtdbInstance: 'pipeline-game-development-default-rtdb.europe-west1',
         lastPlayerDisconnectedAt: new admin.firestore.Timestamp(Math.floor((Date.now() - 24 * 60 * 60 * 1000) / 1000), 100),
       });
-    await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`)
+    await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Games}/gameId1`)
       .set({
         createdAt: {
           _seconds: 14424,
           _nanoseconds: 1424,
         },
       });
-    await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Cards}/gameId1`)
+    await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`).ref(`${RTDBPaths.Cards}/gameId1`)
       .set({
         cardId1: {
           lockedBy: 'someone',
diff --git a/packages/functions/test/selectBestRTDBInstance.spec.ts b/packages/functions/test/selectBestRTDBInstance.spec.ts
@@ -70,9 +70,9 @@ describe("SelectBestRTDBInstance", () => {
     const wrapped = test.wrap(functions.selectBestRTDBInstance);
     const auth = test.auth.exampleUserRecord();
     await expect(wrapped({gameId: gameDoc.id}, {auth})).to.eventually.deep.eq({
-      bestRTDBInstanceName: 'pipeline-game-dev-default-rtdb.europe-west1',
+      bestRTDBInstanceName: 'pipeline-game-development-default-rtdb.europe-west1',
     });
-    const snap = await admin.app().database(`https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app`)
+    const snap = await admin.app().database(`https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app`)
       .ref(`${RTDBPaths.Games}/${gameDoc.id}`).get();
     expect(snap.exists()).to.eq(true);
     return expect(snap.val()).to.deep.eq(gameData);
diff --git a/packages/functions/test/utils.ts b/packages/functions/test/utils.ts
@@ -73,6 +73,6 @@ export function getAdminFirestore() {
  * Creates a new admin FirebaseApp and returns a Database instance.
  */
 export function getAdminDatabase() {
-  return firebase.initializeAdminApp({ projectId: PROJECT_ID }).database('https://pipeline-game-dev-default-rtdb.europe-west1.firebasedatabase.app');
+  return firebase.initializeAdminApp({ projectId: PROJECT_ID }).database('https://pipeline-game-development-default-rtdb.europe-west1.firebasedatabase.app');
 }
 
