More updates

bcgov · Dec 10, 2024 · 66e36c0 · 66e36c0
1 parent 51f2e70
commit 66e36c0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/jobs/notebook-report/config.py b/jobs/notebook-report/config.py
@@ -8,17 +8,22 @@
 
 class Config(object):
     """Class configuring our environment variables in one defined place."""
+
     PROJECT_ROOT = os.getcwd()
     APP_FILE = os.getenv("APP_FILE", "")
     SENDER_EMAIL = os.getenv("SENDER_EMAIL", "")
     ERROR_EMAIL_RECIPIENTS = os.getenv("ERROR_EMAIL_RECIPIENTS", "")
-    DAILY_RECONCILIATION_RECIPIENTS = os.getenv("DAILY_RECONCILIATION_RECIPIENTS", "")
+    WEEKLY_PAY_RECIPIENTS = os.getenv("WEEKLY_PAY_RECIPIENTS", "")
+
+    # MIGHT REMOVE THESE TWO:
     VS_DAILY_RECONCILIATION_RECIPIENTS = os.getenv("VS_DAILY_RECONCILIATION_RECIPIENTS", "")
     CSO_DAILY_RECONCILIATION_RECIPIENTS = os.getenv("CSO_DAILY_RECONCILIATION_RECIPIENTS", "")
-    WEEKLY_PAY_RECIPIENTS = os.getenv("WEEKLY_PAY_RECIPIENTS", "")
-    MONTHLY_RECONCILIATION_RECIPIENTS = os.getenv("MONTHLY_RECONCILIATION_RECIPIENTS", "")
+
     VS_MONTHLY_RECONCILIATION_RECIPIENTS = os.getenv("VS_MONTHLY_RECONCILIATION_RECIPIENTS", "")
     CSO_MONTHLY_RECONCILIATION_RECIPIENTS = os.getenv("CSO_MONTHLY_RECONCILIATION_RECIPIENTS", "")
+    RPT_MONTHLY_RECONCILIATION_RECIPIENTS = os.getenv("RPT_MONTHLY_RECONCILIATION_RECIPIENTS", "")
+    ESRA_MONTHLY_RECONCILIATION_RECIPIENTS = os.getenv("ESRA_MONTHLY_RECONCILIATION_RECIPIENTS", "")
+
     EMAIL_SMTP = os.getenv("EMAIL_SMTP", "")
     ENVIRONMENT = os.getenv("ENVIRONMENT", "")
     WEEKLY_REPORT_DATES = os.getenv("WEEKLY_REPORT_DATES", "[1]")

diff --git a/jobs/notebook-report/monthly/reconciliation_summary.ipynb b/jobs/notebook-report/monthly/reconciliation_summary.ipynb
@@ -196,10 +196,11 @@
    "source": [
     "%%sql monthly_reconciliation_summary  <<\n",
     "SELECT\n",
-    "    id,\n",
+    "    id as transaction_id,\n",
     "    (created_on AT TIME ZONE 'UTC' AT TIME ZONE 'America/Vancouver')::date AS created_date_pacific,\n",
     "    total,\n",
     "    service_fees,\n",
+    "    total - service_fees as subtotal,\n",
     "    payment_method_code,\n",
     "    corp_type_code,\n",
     "    created_by,\n",