Skip to content

Added Pending figures to Todays Settlement #54

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

Merged
StuartFerguson merged 2 commits into from
Oct 10, 2023
Merged

Added Pending figures to Todays Settlement #54

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
5c351af
Added Pending figures to Todays Settlement
StuartFerguson Oct 10, 2023
7ef3948
Add missing client methods
StuartFerguson Oct 10, 2023
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
57 changes: 32 additions & 25 deletions EstateReportingAPI.BusinessLogic/ReportingManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ on settlement.SettlementReportingId equals merchantSettlementFee.SettlementRepor
join transaction in context.Transactions
on merchantSettlementFee.TransactionReportingId equals transaction.TransactionReportingId
where settlement.SettlementDate == settlementDate
&& merchantSettlementFee.IsSettled
group new
{
settlement.SettlementDate,
Expand Down Expand Up @@ -295,33 +296,39 @@ on today.Hour equals comparison.Hour
public async Task<TodaysSettlement> GetTodaysSettlement(Guid estateId, DateTime comparisonDate, CancellationToken cancellationToken){
EstateManagementGenericContext? context = await this.ContextFactory.GetContext(estateId, ReportingManager.ConnectionStringIdentifier, cancellationToken);

// First we need to get a value of todays sales
Decimal todaysSettlementValue = (from s in context.Settlements
join f in context.MerchantSettlementFees on s.SettlementReportingId equals f.SettlementReportingId
where f.IsSettled && s.SettlementDate == DateTime.Now.Date
select f.CalculatedValue).Sum();

Int32 todaysSettlementCount = (from s in context.Settlements
join f in context.MerchantSettlementFees on s.SettlementReportingId equals f.SettlementReportingId
where f.IsSettled && s.SettlementDate == DateTime.Now.Date
select f.CalculatedValue).Count();

Decimal comparisonSettlementValue = (from s in context.Settlements
join f in context.MerchantSettlementFees on s.SettlementReportingId equals f.SettlementReportingId
where f.IsSettled && s.SettlementDate == comparisonDate
select f.CalculatedValue).Sum();

Int32 comparisonSettlementCount = (from s in context.Settlements
join f in context.MerchantSettlementFees on s.SettlementReportingId equals f.SettlementReportingId
where f.IsSettled && s.SettlementDate == comparisonDate
select f.CalculatedValue).Count();
var todaySettlementData = (from s in context.Settlements
join f in context.MerchantSettlementFees on s.SettlementReportingId equals f.SettlementReportingId
where s.SettlementDate == DateTime.Now.Date
group f by f.IsSettled into grouped
select new
{
IsSettled = grouped.Key,
CalculatedValueSum = grouped.Sum(item => item.CalculatedValue),
CalculatedValueCount = grouped.Count()
}).ToList();

var comparisonSettlementData = (from s in context.Settlements
join f in context.MerchantSettlementFees on s.SettlementReportingId equals f.SettlementReportingId
where s.SettlementDate == comparisonDate
group f by f.IsSettled into grouped
select new
{
IsSettled = grouped.Key,
CalculatedValueSum = grouped.Sum(item => item.CalculatedValue),
CalculatedValueCount = grouped.Count()
}).ToList();


TodaysSettlement response = new TodaysSettlement{
ComparisonSettlementCount = comparisonSettlementCount,
ComparisonSettlementValue = comparisonSettlementValue,
TodaysSettlementCount = todaysSettlementCount,
TodaysSettlementValue = todaysSettlementValue
};
ComparisonSettlementCount = comparisonSettlementData.FirstOrDefault(x => x.IsSettled)?.CalculatedValueCount ?? 0,
ComparisonSettlementValue = comparisonSettlementData.FirstOrDefault(x => x.IsSettled)?.CalculatedValueSum ?? 0,
ComparisonPendingSettlementCount = comparisonSettlementData.FirstOrDefault(x => x.IsSettled == false)?.CalculatedValueCount ?? 0,
ComparisonPendingSettlementValue = comparisonSettlementData.FirstOrDefault(x => x.IsSettled == false)?.CalculatedValueSum ?? 0,
TodaysSettlementCount = todaySettlementData.FirstOrDefault(x => x.IsSettled)?.CalculatedValueCount ?? 0,
TodaysSettlementValue = todaySettlementData.FirstOrDefault(x => x.IsSettled)?.CalculatedValueSum ?? 0,
TodaysPendingSettlementCount = todaySettlementData.FirstOrDefault(x => x.IsSettled == false)?.CalculatedValueCount ?? 0,
TodaysPendingSettlementValue = todaySettlementData.FirstOrDefault(x => x.IsSettled == false)?.CalculatedValueSum ?? 0
};

return response;
}
Expand Down
Loading