Removed unnecessarily files and fixed certain issues

Author: DanielCortild

.firebaserc

@@ -0,0 +1,5 @@
+{
+  "projects": {
+    "default": "ilplatform"
+  }
+}

.gitignore

@@ -10,13 +10,6 @@ firebase-debug.*.log*
 # Firebase cache
 .firebase/
 
-# Firebase config
-
-# Uncomment this if you'd like others to create their own Firebase project.
-# For a team working on the same Firebase project(s), it is recommended to leave
-# it commented so all members can deploy to the same project(s) in .firebaserc.
-.firebaserc
-
 # Runtime data
 pids
 *.pid

README.md

@@ -25,39 +25,12 @@ In order for the code to make sense, you need to generate the following files:
   GMAIL_USER_EMAIL=
   GMAIL_PASSWORD=
   
-  # Google Calendar IDs
-  CALENDAR_CLASSES_ID=
-  CALENDAR_CAMPS_ID=
-  CALENDAR_TESTING_ID=
-  
-  # Document Template IDs
-  ATTESTATION_TEMPLATE_ID=
-  PRESTATION_TEMPLATE_ID=
-  CONVENTION_TEMPLATE_ID=
-  PAYMENTS_TEMPLATE_ID=
-  STUDENT_CONTRACT_TEMPLATE_ID=
-  VOLUNTEER_CONTRACT_TEMPLATE_ID=
-  
-  # Google Form Template IDs
-  CLASSES_FORM_ID=
-  CAMPS_FORM_ID=
-  
-  # Google Drive Folder IDs
-  DOCUMENTS_BY_BOT_ID=
-  DRIVE_CAMPS_PHOTOS_ID=
-  
-  # Google Sheet IDs
-  SHEETS_PAYMENTS_ID=
-  
-  # Salesforce Standard IDs
-  SF_TEACHERS_ACCOUNT_ID=
-  SF_TEACHER_CONTRACT_RECORD_TYPE_ID=
-  
   # WhatsApp Configuration
   WHATSAPP_ACCESS_TOKEN=
   WHATSAPP_PHONE_ID=
-  WHATSAPP_ADMINS_TEST=
-  WHATSAPP_ADMINS=
+  
+  # Google Drive Folder ID (public folder to store photos)
+  DRIVE_CAMPS_PHOTOS_ID
   ```
 - `functions/venv` - Contains the Python virtual environment for the backend. Can be created by running
   ```bash

functions/Actions/__init__.py

@@ -1,5 +1,6 @@
 from .EventsToText import generate_confirmation_text, get_teacher_dict
 from .CampsForm import get_camps_form
 from .UpdatePaymentsSheet import update_payment_sheet
-from .CampsEvents import update_and_create_camps_per_week, update_and_create_camps
-from .ClassesEvents import update_and_create_classes_per_week
+# from .CampsEvents import update_and_create_camps_per_week
+from .CampsEvents import update_and_create_camps
+# from .ClassesEvents import update_and_create_classes_per_week

functions/Google/Connector.py

@@ -1,4 +1,3 @@
-import json
 import os
 from google.oauth2.credentials import Credentials
 from google_auth_oauthlib.flow import InstalledAppFlow

functions/Google/Document.py

@@ -1,5 +1,3 @@
-from google.oauth2 import service_account
-from datetime import datetime
 import os
 from datetime import date
 

functions/Google/Events.py

@@ -1,5 +1,3 @@
-from google.oauth2 import service_account
-from googleapiclient.discovery import build
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 import os

functions/Salesforce/SFConnector.py

@@ -12,7 +12,7 @@ def __init__(self, SF_USERNAME, SF_PASSWORD, SF_SECURITY_TOKEN, SF_DOMAIN):
                     username=SF_USERNAME,
                     password=SF_PASSWORD,
                     security_token=SF_SECURITY_TOKEN,
-                    domain="test")
+                    domain=SF_DOMAIN)
             else:
                 self.sf = Salesforce(
                     username=SF_USERNAME,
@@ -25,5 +25,5 @@ def __init__(self, SF_USERNAME, SF_PASSWORD, SF_SECURITY_TOKEN, SF_DOMAIN):
     def update_opportunity(self, id, data):
         return self.sf.Opportunity.update(id, data)
 
-    def update_picklist(self, id, data):
-        return self.sf.Picklist__c.update(id, data)
+    # def update_picklist(self, id, data):
+    #     return self.sf.Picklist__c.update(id, data)

functions/Salesforce/SFProcessor.py

@@ -12,36 +12,36 @@ def __init__(self, SF_USERNAME, SF_PASSWORD, SF_SECURITY_TOKEN, SF_DOMAIN) -> No
         super().__init__(SF_USERNAME, SF_PASSWORD, SF_SECURITY_TOKEN, SF_DOMAIN)
         self.queries = SFQueries()
 
-    def __process_camp_details(self, data):
-        nl = '\n\n'
-        address = f'{data["Account"]["BillingAddress"]["street"]}, {data["Account"]["BillingAddress"]["postalCode"]} {data["Account"]["BillingAddress"]["city"]}, {data["Account"]["BillingAddress"]["country"]}'
-        processed_data = {
-            "id": data["Id"],
-            "code": data["Camp_Code__c"],
-            "name": data["Name"],
-            "event_id": data["Google_Event__c"],
-            "picture_grand_parent_id": data.get("Week__r").get("Holiday__r").get("Google_Drive_Pictures_ID__c"),
-            "picture_parent_id": data.get("Week__r").get("Google_Drive_Pictures_ID__c"),
-            "picture_parent_name": f'{data.get("Week__r").get("Name")} ({data["Week__r"]["Start_Date__c"][8:10]}/{data["Week__r"]["Start_Date__c"][5:7]}-{data["Week__r"]["End_Date__c"][8:10]}/{data["Week__r"]["End_Date__c"][5:7]})',
-            "week_name": data.get("Week__r").get("Name"),
-            "week_id": data.get("Week__r").get("Id"),
-            "holiday_id": data.get("Week__r").get("Holiday__r").get("Id"),
-            "pictures_id": data["Google_Drive_Pictures__c"],
-            "pictures_name": f'{data.get("Account").get("Name")} ({data.get("Time_Schedule__r").get("Time_Slot__c", "")[3:]})',
-            "summary": f'{data["Camp_Code__c"]} - Stage {data["Account"]["Name"]} [{data["Ages_Real__c"] if data["Ages_Real__c"] != "" else "???"} ans]',
-            "teacher_text": f'{data["Time_Schedule__r"]["Name"]} {data["Account"]["Name"]} ({address}) [{data["Ages_Real__c"] if data["Ages_Real__c"] != "" else "???"} ans]',
-            "teacher_email": data["Teacher__r"]["Email__c"] if data["Teacher__r"] else None,
-            "start_time": data["Time_Schedule__r"]["Start_Pay_Time__c"][:-1],
-            "start": f'{data["Week__r"]["Start_Date__c"]}T{data["Time_Schedule__r"]["Start_Pay_Time__c"][:-1]}',
-            "end_day1": f'{data["Week__r"]["Start_Date__c"]}T{data["Time_Schedule__r"]["End_Pay_Time__c"][:-1]}',
-            "start_day1": f'{(data["Week__r"]["Start_Date__c"] + "T" + data.get("Time_Schedule__r", {}).get("Start_Pay_Time_Day_1__c")[:-1]) if data.get("Time_Schedule__r", {}).get("Start_Pay_Time_Day_1__c") else (data["Week__r"]["Start_Date__c"] + "T" + data["Time_Schedule__r"]["Start_Pay_Time__c"][:-1])}',
-            "address": address,
-            "description": f'{"".join(["Notes importantes: ", data["Description"], nl]) if data["Description"] else ""}{data["Time_Schedule__r"]["Description__c"]}',
-            "excluded_day": data.get("Week__r").get("Excluded_Day__c"),
-            "replacements": [{"date": replacement.get("Date__c"), "email": replacement.get("Teacher__r").get("Email__c")} for replacement in (data.get("Replacements__r") or {}).get('records', [])],
-            "overwrite_cancelled": data.get("Overwrite_Cancelled__c"),
-        }
-        return processed_data
+    # def __process_camp_details(self, data):
+    #     nl = '\n\n'
+    #     address = f'{data["Account"]["BillingAddress"]["street"]}, {data["Account"]["BillingAddress"]["postalCode"]} {data["Account"]["BillingAddress"]["city"]}, {data["Account"]["BillingAddress"]["country"]}'
+    #     processed_data = {
+    #         "id": data["Id"],
+    #         "code": data["Camp_Code__c"],
+    #         "name": data["Name"],
+    #         "event_id": data["Google_Event__c"],
+    #         "picture_grand_parent_id": data.get("Week__r").get("Holiday__r").get("Google_Drive_Pictures_ID__c"),
+    #         "picture_parent_id": data.get("Week__r").get("Google_Drive_Pictures_ID__c"),
+    #         "picture_parent_name": f'{data.get("Week__r").get("Name")} ({data["Week__r"]["Start_Date__c"][8:10]}/{data["Week__r"]["Start_Date__c"][5:7]}-{data["Week__r"]["End_Date__c"][8:10]}/{data["Week__r"]["End_Date__c"][5:7]})',
+    #         "week_name": data.get("Week__r").get("Name"),
+    #         "week_id": data.get("Week__r").get("Id"),
+    #         "holiday_id": data.get("Week__r").get("Holiday__r").get("Id"),
+    #         "pictures_id": data["Google_Drive_Pictures__c"],
+    #         "pictures_name": f'{data.get("Account").get("Name")} ({data.get("Time_Schedule__r").get("Time_Slot__c", "")[3:]})',
+    #         "summary": f'{data["Camp_Code__c"]} - Stage {data["Account"]["Name"]} [{data["Ages_Real__c"] if data["Ages_Real__c"] != "" else "???"} ans]',
+    #         "teacher_text": f'{data["Time_Schedule__r"]["Name"]} {data["Account"]["Name"]} ({address}) [{data["Ages_Real__c"] if data["Ages_Real__c"] != "" else "???"} ans]',
+    #         "teacher_email": data["Teacher__r"]["Email__c"] if data["Teacher__r"] else None,
+    #         "start_time": data["Time_Schedule__r"]["Start_Pay_Time__c"][:-1],
+    #         "start": f'{data["Week__r"]["Start_Date__c"]}T{data["Time_Schedule__r"]["Start_Pay_Time__c"][:-1]}',
+    #         "end_day1": f'{data["Week__r"]["Start_Date__c"]}T{data["Time_Schedule__r"]["End_Pay_Time__c"][:-1]}',
+    #         "start_day1": f'{(data["Week__r"]["Start_Date__c"] + "T" + data.get("Time_Schedule__r", {}).get("Start_Pay_Time_Day_1__c")[:-1]) if data.get("Time_Schedule__r", {}).get("Start_Pay_Time_Day_1__c") else (data["Week__r"]["Start_Date__c"] + "T" + data["Time_Schedule__r"]["Start_Pay_Time__c"][:-1])}',
+    #         "address": address,
+    #         "description": f'{"".join(["Notes importantes: ", data["Description"], nl]) if data["Description"] else ""}{data["Time_Schedule__r"]["Description__c"]}',
+    #         "excluded_day": data.get("Week__r").get("Excluded_Day__c"),
+    #         "replacements": [{"date": replacement.get("Date__c"), "email": replacement.get("Teacher__r").get("Email__c")} for replacement in (data.get("Replacements__r") or {}).get('records', [])],
+    #         "overwrite_cancelled": data.get("Overwrite_Cancelled__c"),
+    #     }
+    #     return processed_data
 
     def get_camp_details(self, code, confirmed=True):
         if confirmed:
@@ -60,48 +60,48 @@ def get_all_camp_details(self, week_codes):
         processed = [self.__process_camp_details(r) for r in results]
         return processed
 
-    def __process_class_details(self, data):
-        nl = '\n\n'
-        address = f'{data["Account"]["BillingAddress"]["street"]}, {data["Account"]["BillingAddress"]["postalCode"]} {data["Account"]["BillingAddress"]["city"]}, {data["Account"]["BillingAddress"]["country"]}'
-
-
-        processed_data = {
-            "id": data["Id"],
-            "code": data["Code__c"],
-            "name": data["Name"],
-            "event": {
-                "id": data["Google_Event__c"],
-                "school": data["Account"]["Name"],
-                "summary": f'{data["Code__c"]} - {data["Account"]["Name"]} [{data["Ages_Announced__c"] if data.get("Ages_Announced__c") and data.get("Ages_Announced__c") != "" else "???"}]',
-                "email": data["Teacher__r"]["Email__c"] if data["Teacher__r"] else None,
-                "start_time": data["Start_Time__c"][:-1],
-                "end_time": data["End_Time__c"][:-1],
-                "address": address,
-                "start_date": data["Yearly_Schedule__r"]["Start_Date__c"],
-                "end_date": data["Yearly_Schedule__r"]["End_Date__c"],
-                "day": data["Day_of_Week__c"],
-                "additional_invite": data.get("Additional_Invite__c"),
-                "online": data.get("Account").get("Online__c"),
-            },
-            "holidays": {
-                "weeks": data["Yearly_Schedule__r"]["Associated_Calendar__r"]["Holiday_Weeks__c"],
-                "days": data["Yearly_Schedule__r"]["Associated_Calendar__r"]["Holiday_Days__c"],
-                "overwrite_cancelled_ys": data["Yearly_Schedule__r"]["Overwrite_Cancelled__c"],
-                "overwrite_cancelled": data["Overwrite_Cancelled__c"],
-            },
-            "replacements": {
-                "one_time": [{
-                    "date": r.get("Date__c"),
-                    "email": r["Teacher__r"].get("Email__c") if r.get("Teacher__r") else None
-                } for r in filter(lambda x: x.get("RecordTypeId") == "012P5000001QASzIAO", (data.get("Replacements__r") or {}).get('records', []))],
-                "permanent": [{
-                    "date": r.get("Date__c"),
-                    "email": r["Teacher__r"].get("Email__c") if r.get("Teacher__r") else None
-                } for r in filter(lambda x: x.get("RecordTypeId") == "012P5000001QAUbIAO", (data.get("Replacements__r") or {}).get('records', []))],
-            },
-        }
-        print(processed_data)
-        return processed_data
+    # def __process_class_details(self, data):
+    #     nl = '\n\n'
+    #     address = f'{data["Account"]["BillingAddress"]["street"]}, {data["Account"]["BillingAddress"]["postalCode"]} {data["Account"]["BillingAddress"]["city"]}, {data["Account"]["BillingAddress"]["country"]}'
+    #
+    #
+    #     processed_data = {
+    #         "id": data["Id"],
+    #         "code": data["Code__c"],
+    #         "name": data["Name"],
+    #         "event": {
+    #             "id": data["Google_Event__c"],
+    #             "school": data["Account"]["Name"],
+    #             "summary": f'{data["Code__c"]} - {data["Account"]["Name"]} [{data["Ages_Announced__c"] if data.get("Ages_Announced__c") and data.get("Ages_Announced__c") != "" else "???"}]',
+    #             "email": data["Teacher__r"]["Email__c"] if data["Teacher__r"] else None,
+    #             "start_time": data["Start_Time__c"][:-1],
+    #             "end_time": data["End_Time__c"][:-1],
+    #             "address": address,
+    #             "start_date": data["Yearly_Schedule__r"]["Start_Date__c"],
+    #             "end_date": data["Yearly_Schedule__r"]["End_Date__c"],
+    #             "day": data["Day_of_Week__c"],
+    #             "additional_invite": data.get("Additional_Invite__c"),
+    #             "online": data.get("Account").get("Online__c"),
+    #         },
+    #         "holidays": {
+    #             "weeks": data["Yearly_Schedule__r"]["Associated_Calendar__r"]["Holiday_Weeks__c"],
+    #             "days": data["Yearly_Schedule__r"]["Associated_Calendar__r"]["Holiday_Days__c"],
+    #             "overwrite_cancelled_ys": data["Yearly_Schedule__r"]["Overwrite_Cancelled__c"],
+    #             "overwrite_cancelled": data["Overwrite_Cancelled__c"],
+    #         },
+    #         "replacements": {
+    #             "one_time": [{
+    #                 "date": r.get("Date__c"),
+    #                 "email": r["Teacher__r"].get("Email__c") if r.get("Teacher__r") else None
+    #             } for r in filter(lambda x: x.get("RecordTypeId") == "012P5000001QASzIAO", (data.get("Replacements__r") or {}).get('records', []))],
+    #             "permanent": [{
+    #                 "date": r.get("Date__c"),
+    #                 "email": r["Teacher__r"].get("Email__c") if r.get("Teacher__r") else None
+    #             } for r in filter(lambda x: x.get("RecordTypeId") == "012P5000001QAUbIAO", (data.get("Replacements__r") or {}).get('records', []))],
+    #         },
+    #     }
+    #     print(processed_data)
+    #     return processed_data
 
     def get_all_class_details(self, year_code):
         query = self.queries.get_all_class_details(year_code)
@@ -128,36 +128,36 @@ def get_all_class_details3(self, class_id):
             return self.__process_class_details(results_list[0])
 
 
-    def get_camp_weeks(self):
-        query = self.queries.get_camp_weeks()
-        data = self.sf.query_all_iter(query)
-
-        processed_data = [{
-            "code": d["Week_Code__c"],
-            "period": d["Name"],
-            "start": d["Start_Date__c"],
-            "end": d["End_Date__c"],
-            "days": d["Number_of_Days__c"]
-        } for d in data]
-
-        return processed_data
+    # def get_camp_weeks(self):
+    #     query = self.queries.get_camp_weeks()
+    #     data = self.sf.query_all_iter(query)
+    #
+    #     processed_data = [{
+    #         "code": d["Week_Code__c"],
+    #         "period": d["Name"],
+    #         "start": d["Start_Date__c"],
+    #         "end": d["End_Date__c"],
+    #         "days": d["Number_of_Days__c"]
+    #     } for d in data]
+    #
+    #     return processed_data
 
     def get_camps_per_week(self, week_code, confirmed=True):
         query = self.queries.get_camps_per_week(week_code, confirmed)
         data = self.sf.query(query)["records"]
         return [d["Camp_Code__c"] for d in data]
 
-    def get_camps_per_week_with_name(self, week_code, confirmed=True):
-        query = self.queries.get_camps_per_week(week_code, confirmed)
-        data = self.sf.query(query)["records"]
-        return [{"code": d["Camp_Code__c"], "name": d["Name"]} for d in data]
+    # def get_camps_per_week_with_name(self, week_code, confirmed=True):
+    #     query = self.queries.get_camps_per_week(week_code, confirmed)
+    #     data = self.sf.query(query)["records"]
+    #     return [{"code": d["Camp_Code__c"], "name": d["Name"]} for d in data]
 
-    def get_teachers_for_partners(self, partner, only_confirmed=True):
-        query = self.queries.get_teachers_for_partners(partner, only_confirmed)
-        data = self.sf.query_all_iter(query)
-
-        processed_data = [f'{d["Week__r"]["Name"]} {d["Time_Schedule__r"]["Name"]}, {d["Account"]["Name"]} -> {d["Teacher__r"]["Name"] if d["Teacher__r"] else "???"} ({d["Teacher__r"]["Phone__c"] if d["Teacher__r"] else "???"})' for d in data]
-        return processed_data
+    # def get_teachers_for_partners(self, partner, only_confirmed=True):
+    #     query = self.queries.get_teachers_for_partners(partner, only_confirmed)
+    #     data = self.sf.query_all_iter(query)
+    #
+    #     processed_data = [f'{d["Week__r"]["Name"]} {d["Time_Schedule__r"]["Name"]}, {d["Account"]["Name"]} -> {d["Teacher__r"]["Name"] if d["Teacher__r"] else "???"} ({d["Teacher__r"]["Phone__c"] if d["Teacher__r"] else "???"})' for d in data]
+    #     return processed_data
 
     def get_week_long_name(self, week_code):
         query = self.queries.get_week_name(week_code)
@@ -193,8 +193,8 @@ def get_teacher_details(self, email):
 
     def create_contract(self, teacher_id, start, end, contract_type, link):
         contract = self.sf.Contract.create({
-            "AccountId": os.getenv("SF_TEACHERS_ACCOUNT_ID"),
-            "RecordTypeId": os.getenv("SF_TEACHER_CONTRACT_RECORD_TYPE_ID"),
+            "AccountId": "0010600002Fm3UIAAZ",
+            "RecordTypeId": "012P5000001H6wTIAS",
             "Teacher__c": teacher_id,
             "StartDate": start,
             "Contract_End_Date__c": end,