From cffec795a76003fccde9ef0b127e2c6ea53fe799 Mon Sep 17 00:00:00 2001 From: Carlos Mesquita Date: Wed, 4 Sep 2024 16:59:47 +0100 Subject: [PATCH 1/5] Swapped .env vars --- .env | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 0368d65..9c43834 100644 --- a/.env +++ b/.env @@ -5,9 +5,8 @@ GOOGLE_APPLICATION_CREDENTIALS=firebase-configs/storied-phalanx-349916.json HEY_GEN_TOKEN=MjY4MDE0MjdjZmNhNDFmYTlhZGRkNmI3MGFlMzYwZDItMTY5NTExNzY3MA== GPT_ZERO_API_KEY=0195b9bb24c5439899f71230809c74af -FIREBASE_SCRYPT_B64_SIGNER_KEY="qjo/b5U5oNxA8o+PHFMZx/ZfG8ZQ7688zYmwMOcfZvVjOM6aHe4Jf270xgyrVArqLIQwFi7VkFnbysBjueMbVw==" +FIREBASE_SCRYPT_B64_SIGNER_KEY="vbO3Xii2lajSeSkCstq3s/dCwpXP7J2YN9rP/KRreU2vGOT1fg+wzSuy1kIhBECqJHG82tmwAilSxLFFtNKVMA==" FIREBASE_SCRYPT_B64_SALT_SEPARATOR="Bw==" FIREBASE_SCRYPT_ROUNDS=8 FIREBASE_SCRYPT_MEM_COST=14 -FIREBASE_PROJECT_ID=encoach-staging -FIREBASE_CLI_TOKEN="1//03QsSa_vSDOqoCgYIARAAGAMSNwF-L9IrA0nxAZtglYBbiYqnKB9dayShPlN6xMQVI4PALPGIwr8hSpcyRuaZL0dUH-Qa7pohefo" +FIREBASE_PROJECT_ID=storied-phalanx-349916 From bb26282d25605b31c54006a1e8bf351ee38eb83a Mon Sep 17 00:00:00 2001 From: Carlos Mesquita Date: Wed, 4 Sep 2024 17:09:51 +0100 Subject: [PATCH 2/5] Forgot to change this, should not affect, but still --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 243c05c..0aed909 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ FROM python:3.11-slim # Allow statements and log messages to immediately appear in the logs ENV PYTHONUNBUFFERED True -ENV GOOGLE_APPLICATION_CREDENTIALS=/app/firebase-configs/encoach-staging.json +ENV GOOGLE_APPLICATION_CREDENTIALS=/app/firebase-configs/storied-phalanx-349916.json # Copy local code to the container image. ENV APP_HOME /app From a88d6bb568616497d65f9cff6b489bc5d9ea265e Mon Sep 17 00:00:00 2001 From: Tiago Ribeiro Date: Thu, 5 Sep 2024 10:56:58 +0100 Subject: [PATCH 3/5] Updated the code to create the Students/Teachers group if it does not exist yet --- modules/batch_users/service.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/batch_users/service.py b/modules/batch_users/service.py index 8cca45e..df00d9e 100644 --- a/modules/batch_users/service.py +++ b/modules/batch_users/service.py @@ -223,6 +223,17 @@ class BatchUsers: if user_id not in participants: participants.append(user_id) group.reference.update({'participants': participants}) + + else: + group = { + 'admin': corporate_user.id, + 'id': str(uuid.uuid4()), + 'name': group_type, + 'participants': [user_id], + 'disableEditing': True, + } + + self._db.collection('groups').document(group['id']).set(group) def _assign_user_to_group_by_name(self, user: UserDTO, maker_id: str): user_id = str(user.id) From 3a27c42a69cfb49dcb9a5d09ffee44efc09bb8b4 Mon Sep 17 00:00:00 2001 From: Carlos Mesquita Date: Thu, 5 Sep 2024 11:41:56 +0100 Subject: [PATCH 4/5] Removed .env, will add it to gitignore in next commit --- .env | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 .env diff --git a/.env b/.env deleted file mode 100644 index 9c43834..0000000 --- a/.env +++ /dev/null @@ -1,12 +0,0 @@ -OPENAI_API_KEY=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 -JWT_SECRET_KEY=6e9c124ba92e8814719dcb0f21200c8aa4d0f119a994ac5e06eb90a366c83ab2 -JWT_TEST_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJ0ZXN0In0.Emrs2D3BmMP4b3zMjw0fJTPeyMwWEBDbxx2vvaWguO0 -GOOGLE_APPLICATION_CREDENTIALS=firebase-configs/storied-phalanx-349916.json -HEY_GEN_TOKEN=MjY4MDE0MjdjZmNhNDFmYTlhZGRkNmI3MGFlMzYwZDItMTY5NTExNzY3MA== -GPT_ZERO_API_KEY=0195b9bb24c5439899f71230809c74af - -FIREBASE_SCRYPT_B64_SIGNER_KEY="vbO3Xii2lajSeSkCstq3s/dCwpXP7J2YN9rP/KRreU2vGOT1fg+wzSuy1kIhBECqJHG82tmwAilSxLFFtNKVMA==" -FIREBASE_SCRYPT_B64_SALT_SEPARATOR="Bw==" -FIREBASE_SCRYPT_ROUNDS=8 -FIREBASE_SCRYPT_MEM_COST=14 -FIREBASE_PROJECT_ID=storied-phalanx-349916 From 0427d6e1b475f534fe42a09f2ae2f7bf0550790a Mon Sep 17 00:00:00 2001 From: Carlos Mesquita Date: Thu, 5 Sep 2024 11:47:34 +0100 Subject: [PATCH 5/5] Deleted google creds ENV from Dockerfile since those will be supplied by cloud run --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0aed909..939b732 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,6 @@ FROM python:3.11-slim # Allow statements and log messages to immediately appear in the logs ENV PYTHONUNBUFFERED True -ENV GOOGLE_APPLICATION_CREDENTIALS=/app/firebase-configs/storied-phalanx-349916.json - # Copy local code to the container image. ENV APP_HOME /app WORKDIR $APP_HOME