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

WIP: Add "Beginning Cash Balance" to total contributions #234

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −2
Open

WIP: Add "Beginning Cash Balance" to total contributions #234

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 34 additions & 2 deletions calculators/total_contributions_calculator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ def fetch
WHERE "Filer_ID" = "FPPC"::varchar
AND "Form_Type" = 'F460'
AND "Line_Item" = '5'
AND ("Start_Date" IS NULL OR "Rpt_Date" >= "Start_Date")
AND ("End_Date" IS NULL OR "Rpt_Date" <= "End_Date")
AND ("Start_Date" IS NULL OR "From_Date" >= "Start_Date")
AND ("End_Date" IS NULL OR "Thru_Date" <= "End_Date")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this is just a bug fix. While it should not happen, it seems like there could be a problem where the reporting period spans the Start or End date. This would imply that the date recorded as the start/end of the campaign was not accurate, I think. I recall these dates are set fairly arbitrarily.

GROUP BY "Filer_ID"
ORDER BY "Filer_ID"
SQL
Expand Down Expand Up @@ -46,10 +46,42 @@ def fetch
contributions_by_filer_id[filer_id] += result['Total'].to_f
end

# For candidates where we specify a "Start Date", we include their initial
# "Beginning Cash Balance" as a contribution so that our calculation of
# their remaining balance matches up with their actual reported balance.
starting_balances_by_filer_id.each do |filer_id, result|
# Skip records with no Summary sheet for now, to prevent conflicting
# `total_contributions` calculation with contribution_list_calculator.
next unless contributions_by_filer_id.include?(filer_id)

contributions_by_filer_id[filer_id] += result['Starting_Balance'].to_f
end

contributions_by_filer_id.each do |filer_id, total_contributions|
candidate = @candidates_by_filer_id[filer_id]
candidate.save_calculation(:total_contributions, total_contributions)
end
end

def starting_balances_by_filer_id
ActiveRecord::Base.connection.execute(<<-SQL).index_by { |r| r['Filer_ID'] }
WITH first_filing_after_start_dates AS (
-- Get the first report after the Start Date for each filer
SELECT "Filer_ID", MIN("Thru_Date") as "Thru_Date"
FROM "Summary", candidates
WHERE "Filer_ID" = "FPPC"::varchar
AND "Start_Date" IS NOT NULL
AND "Thru_Date" >= "Start_Date"
GROUP BY "Filer_ID"
)
SELECT "Summary"."Filer_ID", "Summary"."Thru_Date", "Amount_A" as "Starting_Balance"
FROM "Summary"
INNER JOIN first_filing_after_start_dates
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Love the use of two different syntax forms for inner join ;)

ON first_filing_after_start_dates."Filer_ID" = "Summary"."Filer_ID"
AND first_filing_after_start_dates."Thru_Date" = "Summary"."Thru_Date"
WHERE "Form_Type" = 'F460'
AND "Line_Item" = '12';
SQL
end
end