Tracking pull request to merge release-1.30.0.1 to master (#917)

Emergency fix for the to_date (#918)
bcgov · Oct 18, 2021 · 8c4dbcd · 8c4dbcd
1 parent 4c5b908
commit 8c4dbcd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/backend/api/viewsets/model_year_report_compliance_obligation.py b/backend/api/viewsets/model_year_report_compliance_obligation.py
@@ -222,17 +222,17 @@ def details(self, request, *args, **kwargs):
 
             if report_year == 2020:
                 from_date = date(2018, 1, 2,)
-                to_date = date(report_year + 1, 9, 30,)
+                to_date = date(report_year + 1, 10, 1,)
             else:
                 from_date = date(report_year, 10, 1,)
-                to_date = date(report_year + 1, 9, 30,)
+                to_date = date(report_year + 1, 10, 1,)
 
             content = []
 
             transfers_in = CreditTransaction.objects.filter(
                 credit_to=organization,
                 transaction_type__transaction_type='Credit Transfer',
-                transaction_timestamp__lte=to_date,
+                transaction_timestamp__lt=to_date,
                 transaction_timestamp__gte=from_date,
             ).values(
                 'credit_class_id', 'model_year_id'
@@ -245,7 +245,7 @@ def details(self, request, *args, **kwargs):
             transfers_out = CreditTransaction.objects.filter(
                 debit_from=organization,
                 transaction_type__transaction_type='Credit Transfer',
-                transaction_timestamp__lte=to_date,
+                transaction_timestamp__lt=to_date,
                 transaction_timestamp__gte=from_date,
             ).values(
                 'credit_class_id', 'model_year_id'
@@ -258,7 +258,7 @@ def details(self, request, *args, **kwargs):
             initative_agreements = CreditTransaction.objects.filter(
                 credit_to=organization,
                 credit_agreement_credit_transaction__credit_agreement__transaction_type=CreditAgreementTransactionTypes.INITIATIVE_AGREEMENT,
-                credit_agreement_credit_transaction__credit_agreement__effective_date__lte=to_date,
+                credit_agreement_credit_transaction__credit_agreement__effective_date__lt=to_date,
                 credit_agreement_credit_transaction__credit_agreement__effective_date__gte=from_date,
             ).values(
                 'credit_class_id', 'model_year_id'
@@ -270,7 +270,7 @@ def details(self, request, *args, **kwargs):
             purchase_agreements = CreditTransaction.objects.filter(
                 credit_to=organization,
                 credit_agreement_credit_transaction__credit_agreement__transaction_type=CreditAgreementTransactionTypes.PURCHASE_AGREEMENT,
-                credit_agreement_credit_transaction__credit_agreement__effective_date__lte=to_date,
+                credit_agreement_credit_transaction__credit_agreement__effective_date__lt=to_date,
                 credit_agreement_credit_transaction__credit_agreement__effective_date__gte=from_date,
             ).values(
                 'credit_class_id', 'model_year_id'
@@ -282,7 +282,7 @@ def details(self, request, *args, **kwargs):
             administrative_credit_alloction = CreditTransaction.objects.filter(
                 credit_to=organization,
                 credit_agreement_credit_transaction__credit_agreement__transaction_type=CreditAgreementTransactionTypes.ADMINISTRATIVE_CREDIT_ALLOCATION,
-                credit_agreement_credit_transaction__credit_agreement__effective_date__lte=to_date,
+                credit_agreement_credit_transaction__credit_agreement__effective_date__lt=to_date,
                 credit_agreement_credit_transaction__credit_agreement__effective_date__gte=from_date,
             ).values(
                 'credit_class_id', 'model_year_id'
@@ -294,7 +294,7 @@ def details(self, request, *args, **kwargs):
             administrative_credit_reduction = CreditTransaction.objects.filter(
                 debit_from=organization,
                 credit_agreement_credit_transaction__credit_agreement__transaction_type=CreditAgreementTransactionTypes.ADMINISTRATIVE_CREDIT_REDUCTION,
-                credit_agreement_credit_transaction__credit_agreement__effective_date__lte=to_date,
+                credit_agreement_credit_transaction__credit_agreement__effective_date__lt=to_date,
                 credit_agreement_credit_transaction__credit_agreement__effective_date__gte=from_date,
             ).values(
                 'credit_class_id', 'model_year_id'
@@ -306,7 +306,7 @@ def details(self, request, *args, **kwargs):
             automatic_administrative_penalty = CreditTransaction.objects.filter(
                 credit_to=organization,
                 credit_agreement_credit_transaction__credit_agreement__transaction_type=CreditAgreementTransactionTypes.AUTOMATIC_ADMINISTRATIVE_PENALTY,
-                credit_agreement_credit_transaction__credit_agreement__effective_date__lte=to_date,
+                credit_agreement_credit_transaction__credit_agreement__effective_date__lt=to_date,
                 credit_agreement_credit_transaction__credit_agreement__effective_date__gte=from_date,
             ).values(
                 'credit_class_id', 'model_year_id'
@@ -318,7 +318,7 @@ def details(self, request, *args, **kwargs):
             credits_issued_sales = CreditTransaction.objects.filter(
                 credit_to=organization,
                 transaction_type__transaction_type='Validation',
-                transaction_timestamp__lte=to_date,
+                transaction_timestamp__lt=to_date,
                 transaction_timestamp__gte=from_date,
             ).values(
                 'credit_class_id', 'model_year_id'
@@ -364,7 +364,7 @@ def details(self, request, *args, **kwargs):
             pending_sales_submissions = SalesSubmission.objects.filter(
                 organization=organization,
                 validation_status__in=['SUBMITTED', 'RECOMMEND_APPROVAL', 'RECOMMEND_REJECTION', 'CHECKED'],
-                submission_date__lte=to_date,
+                submission_date__lt=to_date,
                 submission_date__gte=from_date,
             )
 

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zeva-frontend",
-  "version": "1.30.0",
+  "version": "1.30.0-1",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.13.0",