Merge pull request #1089 from stevenc987/main

Create job to schedule reports - invoice reconciliation #14945
bcgov · Feb 6, 2023 · ea5f4cb · ea5f4cb
2 parents 9b1ef00 + 72c07c5
commit ea5f4cb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/jobs/notebook-report/daily/reconciliation_details.ipynb b/jobs/notebook-report/daily/reconciliation_details.ipynb
@@ -100,13 +100,13 @@
    "outputs": [],
    "source": [
     "%%sql daily_reconciliation_details  <<\n",
-    "SELECT created_on, id, (total - service_fees) AS subtotal, service_fees, total, disbursement_status_code, payment_method_code, invoice_status_code, corp_type_code \n",
-    "FROM invoices \n",
-    "WHERE corp_type_code = 'CSO' \n",
-    "AND invoice_status_code IN ('PAID', 'REFUNDED', 'CANCELLED', 'CREDITED') \n",
-    "AND payment_method_code IN ('PAD','EJV', 'DRAWDOWN') \n",
-    "AND date(created_on)  > date(current_date - 1 - interval '1 days')\n",
-    "AND date(created_on)  <= date(current_date - 1)\n",
+    "SELECT i.created_on, i.updated_on, i.id, ir.invoice_number, (i.total - i.service_fees) AS subtotal, i.service_fees, i.total, i.disbursement_status_code, i.payment_method_code, i.invoice_status_code, i.corp_type_code \n",
+    "FROM invoices i join invoice_references ir on ir.invoice_id = i.id\n",
+    "WHERE i.corp_type_code = 'CSO' \n",
+    "AND i.invoice_status_code IN ('PAID', 'REFUNDED', 'CANCELLED', 'CREDITED') \n",
+    "AND i.payment_method_code IN ('PAD','EJV', 'DRAWDOWN') \n",
+    "AND date(i.created_on)  > date(current_date - 1 - interval '1 days')\n",
+    "AND date(i.created_on)  <= date(current_date - 1)\n",
     "ORDER BY 1;"
    ]
   },

diff --git a/jobs/notebook-report/monthly/reconciliation_summary.ipynb b/jobs/notebook-report/monthly/reconciliation_summary.ipynb
@@ -107,7 +107,7 @@
     "AND invoice_status_code = 'PAID' \n",
     "AND payment_method_code in ('PAD','EJV', 'DRAWDOWN') \n",
     "AND date(created_on)  > date(current_date - 1 - interval '1 months')\n",
-    "AND date(created_on)  <= date(current_date - 1)\n",
+    "AND date(created_on) <= date(current_date - 1)\n",
     "GROUP BY (created_on)::date, payment_method_code, corp_type_code;"
    ]
   },
@@ -141,15 +141,15 @@
    "outputs": [],
    "source": [
     "%%sql monthly_reconciliation_disbursed  <<\n",
-    "SELECT count(*) as transaction_count, sum(total - service_fees) as subtotal, sum(service_fees) as service_fees, sum(total) as total, (created_on)::date, payment_method_code, corp_type_code \n",
-    "FROM invoices \n",
-    "WHERE corp_type_code = 'CSO' \n",
-    "AND invoice_status_code = 'PAID' \n",
-    "AND payment_method_code in ('PAD','EJV') \n",
-    "AND disbursement_status_code = 'COMPLETED' \n",
-    "AND date(created_on)  > date(current_date - 1 - interval '1 months')\n",
-    "AND date(created_on)  <= date(current_date - 1)\n",
-    "GROUP BY (created_on)::date, payment_method_code, corp_type_code;"
+    "SELECT count(*) as transaction_count, sum(total - service_fees) as subtotal, sum(service_fees) as service_fees, sum(total) as total, (updated_on)::date, payment_method_code, corp_type_code\n",
+    "FROM invoices\n",
+    "WHERE corp_type_code = 'CSO'\n",
+    "AND invoice_status_code = 'PAID'\n",
+    "AND payment_method_code in ('PAD','EJV')\n",
+    "AND disbursement_status_code = 'COMPLETED'\n",
+    "AND date(updated_on)  > date(current_date - 1 - interval '1 months')\n",
+    "AND date(updated_on)  <= date(current_date - 1)\n",
+    "GROUP BY (updated_on)::date, payment_method_code, corp_type_code;"
    ]
   },
   {