Merge remote-tracking branch 'upstream/dev' into Shaked

.gitignore

@@ -1,4 +1,4 @@
-congifKey.ts
+
 
 
 # Logs
@@ -43,3 +43,4 @@ firebase-debug.log
 firebase-debug.log*
 ./firestore.indexes.json
 firestore.rules
+

firestore.rules

@@ -81,7 +81,19 @@ service cloud.firestore {
       allow read: if request.auth.uid != null;
       allow write: if request.auth.uid != null;
     }
-
+     match /rooms/{roomId=**}{
+      allow read: if request.auth.uid != null;
+      allow write: if request.auth.uid != null;
+    }
+     match /participants/{participantId=**}{
+      allow read: if request.auth.uid != null;
+      allow write: if request.auth.uid != null;
+    }
+     match /roomsSettings/{roomSettingsId=**}{
+      allow read: if request.auth.uid != null;
+      allow write: if request.auth.uid != null;
+    }
+
     match /timers-rooms/{timerIdx=**}{
       allow read: if request.auth.uid != null;
       allow write: if request.auth.uid != null;

functions/package.json

@@ -16,7 +16,7 @@
     "main": "lib/index.js",
     "dependencies": {
         "@google/generative-ai": "^0.15.0",
-        "delib-npm": "^1.3.33",
+        "delib-npm": "^1.3.44",
         "dotenv": "^16.4.5",
         "firebase-admin": "^11.8.0",
         "firebase-functions": "^5.1.0",

functions/src/fn_agree.ts

@@ -1,7 +1,7 @@
 import { AgreeDisagree, AgreeDisagreeEnum, AgreeDocument, Collections } from "delib-npm";
 import { logger } from "firebase-functions/v1";
 import { db } from ".";
-import { getAction } from "./fn_approval";
+import { Action, getAction } from "./fn_approval";
 
 
 export async function updateAgrees(event: any) {
@@ -14,17 +14,17 @@ export async function updateAgrees(event: any) {
         const action = getAction(event);
         let results: AgreeDocument = { agree: 0, disagree: 0 };
 
-        if (action === "create") {
+        if (action === Action.create) {
             if (!agreeAfterData) throw new Error("No agreement data found");
             const { agree } = agreeAfterData;
 
             results = getUpdateCreateAgree(combinedAgreement.statementId, agree);
-        } else if (action === "delete") {
+        } else if (action === Action.delete) {
             if (!agreeBeforeData) throw new Error("No agreement data found");
             const { agree } = agreeBeforeData;
 
             results = getUpdateDeleteAgree(combinedAgreement.statementId, agree);
-        } else if (action === "update") {
+        } else if (action === Action.update) {
             if (!agreeAfterData) throw new Error("No agreement data found");
             const { agree: agreeAfter } = agreeAfterData;
             const { agree: agreeBefore } = agreeBeforeData || { agree: undefined };
@@ -44,15 +44,15 @@ export async function updateAgrees(event: any) {
             const { agree, disagree } = statement.data()?.documentAgree || { agree: 0, disagree: 0 } as AgreeDocument;
             const { agree: updateAgree, disagree: updateDisagree } = results;
 
-            
+
 
             const newAgree = agree + updateAgree;
             const newDisagree = disagree + updateDisagree;
             const totalAgree = newAgree + newDisagree;
 
             const updateAgrees: AgreeDocument = {
                 agree: newAgree,
-                disagree:newDisagree,
+                disagree: newDisagree,
                 avgAgree: totalAgree !== 0 ? (newAgree - newDisagree) / totalAgree : 0,
             }
 
@@ -90,7 +90,7 @@ function getUpdateDeleteAgree(statementId: string, agree: AgreeDisagreeEnum): Ag
 
 function getUpdateUpdateAgree(statementId: string, agreeAfter: AgreeDisagreeEnum, agreeBefore: AgreeDisagreeEnum): AgreeDocument {
     try {
-    
+
         const { Agree, Disagree, NoOpinion } = AgreeDisagreeEnum;