pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #555 from dod-ccpo/fix-reporting

Browse Source 
Fix mock reporting
This commit is contained in:
patricksmithdds 2019-01-17 16:08:25 -05:00 committed by GitHub
commit 0dccef9bb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
atst/domain/csp/reports.py
View File

@ -183,7 +183,7 @@ class MockReportingProvider(ReportingInterface):
"Beluga": { "Beluga": {
"cumulative": CUMULATIVE_BUDGET_BELUGA, "cumulative": CUMULATIVE_BUDGET_BELUGA,
"applications": [ "applications": [
MockApplication("NP02", ["Integ", "PreProd", "NP02_Prod"]), MockApplication("NP02", ["Integ", "PreProd", "Prod"]),
MockApplication("FM", ["Integ", "Prod"]), MockApplication("FM", ["Integ", "Prod"]),
], ],
"budget": 70000, "budget": 70000,
@ -296,10 +296,13 @@ class MockReportingProvider(ReportingInterface):
else: else:
budget_months = {} budget_months = {}
this_year = pendulum.now().year end = pendulum.now()
start = end.subtract(months=12)
period = pendulum.period(start, end)
all_months = OrderedDict() all_months = OrderedDict()
for m in range(1, 13): for t in period.range("months"):
month_str = "{month:02d}/{year}".format(month=m, year=this_year) month_str = "{month:02d}/{year}".format(month=t.month, year=t.year)
all_months[month_str] = budget_months.get(month_str, None) all_months[month_str] = budget_months.get(month_str, None)
return {"months": all_months} return {"months": all_months}

2
tests/domain/test_reports.py
View File

@ -35,4 +35,4 @@ def test_cumulative_budget():
portfolio = PortfolioFactory.create(request=request) portfolio = PortfolioFactory.create(request=request)
months = Reports.cumulative_budget(portfolio) months = Reports.cumulative_budget(portfolio)
assert len(months["months"]) == 12 assert len(months["months"]) >= 12