Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions EstateReportingAPI.DataTrasferObjects/CalendarYear.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ public class CalendarYear
public Int32 Year{ get; set; }
}

public class ComparisonDate{
public Int32 OrderValue{ get; set; }
public DateTime Date { get; set; }
public String Description { get; set; }

}

public class CalendarDate
{
public DateTime Date { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion EstateReportingAPI/Bootstrapper/MiddlewareRegistry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public MiddlewareRegistry(){
options.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
options.SerializerSettings.TypeNameHandling = TypeNameHandling.None;
options.SerializerSettings.Formatting = Formatting.Indented;
options.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.Utc;
options.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.Unspecified;
options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
});

Expand Down
43 changes: 42 additions & 1 deletion EstateReportingAPI/Controllers/Dimensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,48 @@ public async Task<IActionResult> GetCalendarDates([FromHeader] Guid estateId, [F
YearWeekNumber = d.YearWeekNumber,
}));

return this.Ok(dates);
return this.Ok(response);
}

[HttpGet]
[Route("calendar/comparisondates")]
public async Task<IActionResult> GetCalendarComparisonDates([FromHeader] Guid estateId, CancellationToken cancellationToken)
{
EstateManagementGenericContext? context = await this.ContextFactory.GetContext(estateId, DimensionsController.ConnectionStringIdentifier, cancellationToken);

DateTime startOfYear = new DateTime(DateTime.Now.Year, 1, 1);

List<Calendar> dates = context.Calendar.Where(c => c.Date >= startOfYear && c.Date < DateTime.Now.Date.AddDays(-1)).OrderByDescending(d => d.Date).ToList();

List<ComparisonDate> response = new List<ComparisonDate>();

response.Add(new ComparisonDate{
Date = DateTime.Now.Date.AddDays(-1),
Description = "Yesterday",
OrderValue = 0
});

response.Add(new ComparisonDate{
Date = DateTime.Now.Date.AddDays(-7),
Description = "Last Week",
OrderValue = 1
});
response.Add(new ComparisonDate{
Date = DateTime.Now.Date.AddMonths(-1),
Description = "Last Month",
OrderValue = 2
});
Int32 orderValue = 3;
dates.ForEach(d => {
response.Add(new ComparisonDate{
Date = d.Date,
Description = d.Date.ToString("yyyy-MM-dd"),
OrderValue = orderValue
});
orderValue++;
});

return this.Ok(response.OrderBy(d => d.OrderValue));
}
}

Expand Down