Updated Reimbursements

Author: DanielCortild

functions/Actions/CampsEvents.py

@@ -52,7 +52,7 @@ def callback2(request_id, response, exception):
             print(f'[ERROR] In batch3: {exception}')
         else:
             # Keep track of first non excluded day
-            first_non_exluded_day = True
+            # first_non_exluded_day = True
 
             # Loop through the instances (sorted by start date)
             for instance in sorted(response['items'], key=lambda item: item["start"]["dateTime"]):
@@ -61,11 +61,11 @@ def callback2(request_id, response, exception):
                     # Delete the excluded instances
                     instance["status"] = "cancelled"
                     updated = True
-                elif first_non_exluded_day:
-                    # Update the start date of the first instance
-                    instance["start"]["dateTime"] = camp_info["start_day1"]
-                    first_non_exluded_day = False
-                    updated = True
+                # elif first_non_exluded_day:
+                #     # Update the start date of the first instance
+                #     instance["start"]["dateTime"] = camp_info["start_day1"]
+                #     first_non_exluded_day = False
+                #     updated = True
 
                 # Find the replacement day, if any
                 replacement = next((c for c in camp_info.get("replacements") if c["date"] == instance["start"]["dateTime"][:10]), None)

functions/Actions/__init__.py

@@ -1,6 +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
+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/FunctionsCurriculum/Events/Events_A_UpdateCamps.py

@@ -0,0 +1,23 @@
+from Helpers import firebase_functions_custom, https_fn_custom
+from Salesforce import getSF
+from Actions import update_and_create_camps_per_week
+from Google.Connector import GoogleConnector
+from firebase_functions import https_fn, options
+
+@https_fn_custom(timeout_sec=540)
+@firebase_functions_custom(auth_level=2)
+def events_a_update_camps(data):
+    """HTTPS Cloud Function to update calendar events for camps."""
+    # Initialize the Salesforce client
+    sf = getSF()
+
+    # Initialize the Google client
+    google = GoogleConnector()
+
+    # Update Calendar Events
+    message, success = update_and_create_camps_per_week(google, sf, data["week_codes"])
+
+    # # Create Picture Folders
+    # create_camp_pictures(google, sf, data["week_codes"])
+
+    return {"data": {"response": message, "status": 200}}

functions/FunctionsCurriculum/Events/__init__.py

@@ -1,3 +1,4 @@
 from .Events_U_UpdateClass import events_u_update_class
 from .Events_U_UpdateCamp import events_u_update_camp
 from .getSchedule import getSchedule
+from .Events_A_UpdateCamps import events_a_update_camps

functions/FunctionsCurriculum/Reimbursements/Reimbursements_A_Approve.py

@@ -1,20 +1,32 @@
+from datetime import datetime
+
 from Helpers import firebase_functions_custom, https_fn_custom, safe_create
 from Salesforce import getSF
 
+
 @https_fn_custom()
 @firebase_functions_custom(auth_level=3)
 def reimbursements_a_approve(data):
     # Initialize DB and SF
     sf = getSF()
 
     # Get all payments from SF
-    details = data.get("details")
-    details["RecordTypeId"] = "012P5000001tcX7IAI"
-    details["Beneficiary__c"] = details["Employee__c"]
-    details["Name"] = "Remboursement " + details["Name"]
+    details = data.get("details", {})
 
     # Create the payment
-    payment = safe_create(sf.sf.Payment__c, details)
+    payment = safe_create(sf.sf.Payment__c, {
+        "RecordTypeId": "012P5000001tcX7IAI",
+        "Beneficiary__c": details.get("Employee__r", {}).get("Id", ""),
+        "Name": "Remboursement " + details.get("Name", ""),
+        "Amount__c": details.get("Amount__c", 0),
+        "Month__c": datetime.now().month,
+        "Year__c": datetime.now().year
+    })
+
+    # Update the reimbursement status to "Accepted"
+    sf.sf.Reimbursement__c.update(details.get("Id", ""), {
+        "Status__c": "Accepted"
+    })
 
     # Return the payment ID
-    return {"data": {"response": {"Id": payment.get("id")}, "status": 200}}
+    return {"data": {"response": {"Id": payment.get("id")}, "status": 200}}

functions/FunctionsCurriculum/Reimbursements/Reimbursements_A_Get.py

@@ -6,8 +6,8 @@
 def reimbursements_a_get(data):
     return getter(f"""
         SELECT
-            Id, CreatedDate, Date__c, Amount__c, Justification__c, Attachment__c, Status__c,
-            Status_Justification__c, Summary__c, Employee__r.Full_Name__c
+            Id, Name, CreatedDate, Date__c, Amount__c, Justification__c, Attachment__c, Status__c,
+            Status_Justification__c, Summary__c, Employee__r.Full_Name__c, Employee__r.Id
         FROM Reimbursement__c
         WHERE RecordType.Name = 'UserRequested'
             AND Deleted__c = False