Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Supp report logic - 2867 #2874

Merged
merged 2 commits into from
Apr 19, 2024
Merged

Fix: Supp report logic - 2867 #2874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35d190c
fix: updated org service calculation for max credit offset to account…
Apr 12, 2024
6bd3f00
fix: pending deductions calc change
Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions backend/api/serializers/ComplianceReport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,18 +592,6 @@ def get_max_credit_offset(self, obj):

return max_credit_offset

def get_max_credit_offset_exclude_reserved(self, obj):
max_credit_offset_exclude_reserved = OrganizationService.get_max_credit_offset(
obj.organization,
obj.compliance_period.description,
exclude_reserved=True
)

if max_credit_offset_exclude_reserved < 0:
max_credit_offset_exclude_reserved = 0

return max_credit_offset_exclude_reserved

def get_summary(self, obj):
"""
Retrieve a summary that merges synthetic totals with existing summary data.
Expand Down Expand Up @@ -1267,18 +1255,6 @@ def get_max_credit_offset(self, obj):

return max_credit_offset

def get_max_credit_offset_exclude_reserved(self, obj):
max_credit_offset_exclude_reserved = OrganizationService.get_max_credit_offset(
obj.organization,
obj.compliance_period.description,
exclude_reserved=True
)

if max_credit_offset_exclude_reserved < 0:
max_credit_offset_exclude_reserved = 0

return max_credit_offset_exclude_reserved

def get_history(self, obj):
"""
Returns all the previous status changes for the compliance report
Expand Down
97 changes: 47 additions & 50 deletions backend/api/services/OrganizationService.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,23 +107,28 @@ def get_pending_deductions(
if compliance_report.summary.credits_offset is not None:
deductions += compliance_report.summary.credits_offset

# if report.status.director_status_id == 'Accepted' and \
# ignore_pending_supplemental:
# deductions -= report.summary.credits_offset
if report.status.director_status_id == 'Accepted' and \
ignore_pending_supplemental:
deductions -= report.summary.credits_offset
if deductions < 0:
deductions = 0

return deductions

@staticmethod
def get_max_credit_offset(organization, compliance_year, exclude_reserved=False):
# Calculate the deadline for the compliance period for credit_trades until the end of March the following year.
effective_date_deadline = datetime.date(
int(compliance_year) + 1, 3, 31
)
# Define the start date of the compliance period which is the first of January of the compliance year.
compliance_period_effective_date = datetime.date(
int(compliance_year), 1, 1
)
credits = CreditTrade.objects.filter(

# Query to sum up all the approved and non-rescinded credits for the organization until the deadline.
# Includes different types of credit transactions like selling, buying, and administrative adjustments.
credits_until_deadline = CreditTrade.objects.filter(
(Q(status__status="Approved") &
Q(type__the_type="Sell") &
Q(respondent_id=organization.id) &
Expand Down Expand Up @@ -153,28 +158,26 @@ def get_max_credit_offset(organization, compliance_year, exclude_reserved=False)
Q(number_of_credits__gte=0) &
Q(trade_effective_date__lte=effective_date_deadline))
).aggregate(total=Sum('number_of_credits'))
debits = CreditTrade.objects.filter(

# Query to sum up all approved, non-rescinded debits (outgoing credits) for the organization.
all_debits = CreditTrade.objects.filter(
(Q(status__status="Approved") &
Q(type__the_type="Sell") &
Q(initiator_id=organization.id) &
Q(is_rescinded=False) &
Q(trade_effective_date__lte=effective_date_deadline)) |
Q(is_rescinded=False)) |
(Q(status__status="Approved") &
Q(type__the_type="Buy") &
Q(respondent_id=organization.id) &
Q(is_rescinded=False) &
Q(trade_effective_date__lte=effective_date_deadline)) |
Q(is_rescinded=False)) |
(Q(type__the_type="Credit Reduction") &
Q(status__status="Approved") &
Q(respondent_id=organization.id) &
Q(is_rescinded=False) &
Q(compliance_period__effective_date__lte=compliance_period_effective_date)) |
Q(is_rescinded=False)) |
(Q(type__the_type="Administrative Adjustment") &
Q(status__status="Approved") &
Q(respondent_id=organization.id) &
Q(is_rescinded=False) &
Q(number_of_credits__lt=0) &
Q(trade_effective_date__lte=effective_date_deadline))
Q(number_of_credits__lt=0))
).aggregate(
total=Sum(
Case(
Expand All @@ -188,39 +191,41 @@ def get_max_credit_offset(organization, compliance_year, exclude_reserved=False)
)
)

total_in_compliance_period = 0
if credits and credits.get('total') is not None:
total_in_compliance_period = credits.get('total')
# Calculate the net available balance by subtracting debits from credits.
net_available_balance = 0
if credits_until_deadline and credits_until_deadline.get('total') is not None:
net_available_balance = credits_until_deadline.get('total')

if debits and debits.get('total') is not None:
total_in_compliance_period -= debits.get('total')
if all_debits and all_debits.get('total') is not None:
net_available_balance -= all_debits.get('total')

# Check if reserved credits should be excluded and calculate accordingly.
if exclude_reserved:
pending_deductions = OrganizationService.get_pending_transfers_value(organization)
else:
pending_deductions = OrganizationService.get_pending_deductions(organization, ignore_pending_supplemental=False)

validated_credits = organization.organization_balance.get(
'validated_credits', 0
)
total_balance = validated_credits - pending_deductions
total_available_credits = min(total_in_compliance_period, total_balance)
if total_available_credits < 0:
total_available_credits = 0
# Deduct pending deductions from the available balance and ensure it does not drop below zero.
available_balance_now = net_available_balance - pending_deductions
if available_balance_now < 0:
available_balance_now = 0

return total_available_credits
# Return the current available balance after all calculations.
return available_balance_now


@staticmethod
def get_max_credit_offset_for_interval(organization, compliance_date):
effective_date_deadline = compliance_date.date()
effective_year = effective_date_deadline.year

if effective_date_deadline < datetime.date(effective_year, 4, 1):
effective_year -= 1
compliance_period_effective_date = datetime.date(
int(effective_year), 1, 1
)

credits = CreditTrade.objects.filter(
credits_until_deadline = CreditTrade.objects.filter(
(Q(status__status="Approved") &
Q(type__the_type="Sell") &
Q(respondent_id=organization.id) &
Expand Down Expand Up @@ -249,28 +254,24 @@ def get_max_credit_offset_for_interval(organization, compliance_date):
Q(trade_effective_date__lte=effective_date_deadline))
).aggregate(total=Sum('number_of_credits'))

debits = CreditTrade.objects.filter(
all_debits = CreditTrade.objects.filter(
(Q(status__status="Approved") &
Q(type__the_type="Sell") &
Q(initiator_id=organization.id) &
Q(is_rescinded=False) &
Q(trade_effective_date__lte=effective_date_deadline)) |
Q(is_rescinded=False)) |
(Q(status__status="Approved") &
Q(type__the_type="Buy") &
Q(respondent_id=organization.id) &
Q(is_rescinded=False) &
Q(trade_effective_date__lte=effective_date_deadline)) |
Q(is_rescinded=False)) |
(Q(type__the_type="Credit Reduction") &
Q(status__status="Approved") &
Q(respondent_id=organization.id) &
Q(is_rescinded=False) &
Q(compliance_period__effective_date__lte=compliance_period_effective_date)) |
Q(is_rescinded=False)) |
(Q(type__the_type="Administrative Adjustment") &
Q(status__status="Approved") &
Q(respondent_id=organization.id) &
Q(is_rescinded=False) &
Q(number_of_credits__lt=0) &
Q(trade_effective_date__lte=effective_date_deadline))
Q(number_of_credits__lt=0))
).aggregate(
total=Sum(
Case(
Expand All @@ -284,22 +285,18 @@ def get_max_credit_offset_for_interval(organization, compliance_date):
)
)

total_in_compliance_period = 0
if credits and credits.get('total') is not None:
total_in_compliance_period = credits.get('total')
net_available_balance = 0
if credits_until_deadline and credits_until_deadline.get('total') is not None:
net_available_balance = credits_until_deadline.get('total')

if debits and debits.get('total') is not None:
total_in_compliance_period -= debits.get('total')
pending_deductions = OrganizationService.get_pending_deductions(organization, ignore_pending_supplemental=False)
if all_debits and all_debits.get('total') is not None:
net_available_balance -= all_debits.get('total')

validated_credits = organization.organization_balance.get(
'validated_credits', 0
)
pending_deductions = OrganizationService.get_pending_deductions(organization, ignore_pending_supplemental=False)

total_balance = validated_credits - pending_deductions
total_available_credits = min(total_in_compliance_period, total_balance)
available_balance_now = net_available_balance - pending_deductions

if total_available_credits < 0:
total_available_credits = 0
if available_balance_now < 0:
available_balance_now = 0

return total_available_credits
return available_balance_now