winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

Billing: Rename bins to buckets

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-11-02 13:06:32 +01:00
parent 9f67448b72
commit eebddf0527
11 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Elwig/Helpers/Billing/Billing.cs
View File

@ -38,7 +38,7 @@ namespace Elwig.Helpers.Billing {
}
}
public async Task CalculateBins(bool allowAttrsIntoLowerBins, bool avoidUnderDeliveries, bool honorGebunden) {
public async Task CalculateBuckets(bool allowAttrsIntoLower, bool avoidUnderDeliveries, bool honorGebunden) {
var attrVals = Context.WineAttributes.ToDictionary(a => a.AttrId, a => (a.IsStrict, a.FillLower));
var attrForced = attrVals.Where(a => a.Value.IsStrict && a.Value.FillLower == 0).Select(a => a.Key).ToArray();
using var cnx = await AppDbContext.ConnectAsync();
@ -103,7 +103,7 @@ namespace Elwig.Helpers.Billing {
inserts.Add((did, dpnr, i, key[2..], v));
w -= v;
}
if (w == 0 || (!allowAttrsIntoLowerBins && isStrict)) break;
if (w == 0 || (!allowAttrsIntoLower && isStrict)) break;
}
inserts.Add((did, dpnr, 0, "_", w));
lastMgNr = mgnr;
@ -138,7 +138,7 @@ namespace Elwig.Helpers.Billing {
}
}
var fittingBins = new Dictionary<(int, string), int>();
var fittingBuckets = new Dictionary<(int, string), int>();
using (var cmd = cnx.CreateCommand()) {
cmd.CommandText = $"""
SELECT c.mgnr, c.bucket, COALESCE(p.weight, 0) - c.min_kg AS diff
@ -148,11 +148,11 @@ namespace Elwig.Helpers.Billing {
""";
using var reader = await cmd.ExecuteReaderAsync();
while (await reader.ReadAsync()) {
fittingBins[(reader.GetInt32(0), reader.GetString(1))] = reader.GetInt32(2);
fittingBuckets[(reader.GetInt32(0), reader.GetString(1))] = reader.GetInt32(2);
}
}
foreach (var item in fittingBins) {
foreach (var item in fittingBuckets) {
var mgnr = item.Key.Item1;
var id = item.Key.Item2[..2];
var attr = item.Key.Item2[2..];