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

Database: Change bins once again...

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-10-15 22:46:19 +02:00
parent 4db147e582
commit 3b4340b5e8
10 changed files with 115 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Elwig/Helpers/AppDbUpdater.cs
View File

@ -81,60 +81,37 @@ namespace Elwig.Helpers {
}
private static void UpdateDbSchema_2_To_3(SqliteConnection cnx) {
ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_1_name TEXT DEFAULT NULL");
ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_2_name TEXT DEFAULT NULL");
ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_3_name TEXT DEFAULT NULL");
ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_4_name TEXT DEFAULT NULL");
ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_5_name TEXT DEFAULT NULL");
ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_6_name TEXT DEFAULT NULL");
ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_7_name TEXT DEFAULT NULL");
ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_8_name TEXT DEFAULT NULL");
ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_9_name TEXT DEFAULT NULL");
ExecuteNonQuery(cnx, """
UPDATE season
SET bin_1_name = n.bucket_1_name,
bin_2_name = n.bucket_2_name,
bin_3_name = n.bucket_3_name,
bin_4_name = n.bucket_4_name,
bin_5_name = n.bucket_5_name,
bin_6_name = n.bucket_6_name,
bin_7_name = n.bucket_7_name,
bin_8_name = n.bucket_8_name,
bin_9_name = n.bucket_9_name
FROM (SELECT year, bucket_1_name, bucket_2_name, bucket_3_name, bucket_4_name, bucket_5_name, bucket_6_name, bucket_7_name, bucket_8_name, bucket_9_name
FROM payment_variant GROUP BY year HAVING avnr = MAX(avnr)) AS n
WHERE season.year = n.year
""");
ExecuteNonQuery(cnx, """
CREATE TABLE delivery_part_bin (
year INTEGER NOT NULL,
did INTEGER NOT NULL,
dpnr INTEGER NOT NULL,
binnr INTEGER NOT NULL,
bin_1 INTEGER DEFAULT NULL,
bin_2 INTEGER DEFAULT NULL,
bin_3 INTEGER DEFAULT NULL,
bin_4 INTEGER DEFAULT NULL,
bin_5 INTEGER DEFAULT NULL,
bin_6 INTEGER DEFAULT NULL,
bin_7 INTEGER DEFAULT NULL,
bin_8 INTEGER DEFAULT NULL,
bin_9 INTEGER DEFAULT NULL,
discr TEXT NOT NULL,
value INTEGER NOT NULL,
CONSTRAINT pk_delivery_part_bin PRIMARY KEY (year, did, dpnr),
CONSTRAINT pk_delivery_part_bin PRIMARY KEY (year, did, dpnr, binnr),
CONSTRAINT fk_delivery_part_bin_delivery_part FOREIGN KEY (year, did, dpnr) REFERENCES delivery_part (year, did, dpnr)
ON UPDATE CASCADE
ON DELETE CASCADE
) STRICT;
""");
ExecuteNonQuery(cnx, """
INSERT INTO delivery_part_bin
(year, did, dpnr, bin_1, bin_2, bin_3, bin_4, bin_5, bin_6, bin_7, bin_8, bin_9)
SELECT year, did, dpnr, bucket_1, bucket_2, bucket_3, bucket_4, bucket_5, bucket_6, bucket_7, bucket_8, bucket_9
INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
SELECT year, did, dpnr, 0, '_', bucket_2 + bucket_3
FROM payment_delivery_part
WHERE COALESCE(bucket_1, bucket_2, bucket_3, bucket_4, bucket_5, bucket_6, bucket_7, bucket_8, bucket_9) IS NOT NULL
ON CONFLICT DO NOTHING;
""");
ExecuteNonQuery(cnx, """
INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
SELECT d.year, d.did, d.dpnr, 1, COALESCE(attributes, ''), bucket_1
FROM payment_delivery_part p
JOIN v_delivery d ON (d.year, d.did, d.dpnr) = (p.year, p.did, p.dpnr)
WHERE COALESCE(bucket_1, bucket_2, bucket_3, bucket_4, bucket_5, bucket_6, bucket_7, bucket_8, bucket_9) IS NOT NULL
ON CONFLICT DO NOTHING;
""");
ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_1");
ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_2");
ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_3");
@ -175,10 +152,11 @@ namespace Elwig.Helpers {
JOIN member m ON m.mgnr = d.mgnr
LEFT JOIN delivery_part_attribute pa ON (pa.year, pa.did, pa.dpnr) = (p.year, p.did, p.dpnr)
LEFT JOIN wine_attribute a ON a.attrid = pa.attrid
GROUP BY p.year, p.did, p.dpnr) s
GROUP BY p.year, p.did, p.dpnr
ORDER BY p.year, p.did, p.dpnr, a.attrid) s
LEFT JOIN delivery_part_modifier o ON (o.year, o.did, o.dpnr) = (s.year, s.did, s.dpnr)
GROUP BY s.year, s.lsnr, s.dpnr
ORDER BY s.year, s.lsnr, s.dpnr;
ORDER BY s.year, s.lsnr, s.dpnr, o.modid;
""");
ExecuteNonQuery(cnx, "DROP VIEW v_bucket");
@ -192,9 +170,19 @@ namespace Elwig.Helpers {
ORDER BY year, mgnr, LENGTH(bin) DESC, bin;
""");
ExecuteNonQuery(cnx, "ALTER TABLE wine_attribute ADD COLUMN fill_lower_bins INTEGER NOT NULL CHECK (fill_lower_bins IN (0, 1, 2)) DEFAULT 0");
ExecuteNonQuery(cnx, """
CREATE VIEW v_payment_bin AS
SELECT d.year, d.mgnr,
sortid || discr AS bin,
SUM(value) AS weight
FROM v_delivery d
JOIN delivery_part_bin b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
GROUP BY d.year, d.mgnr, bin
HAVING SUM(value) > 0
ORDER BY d.year, d.mgnr, bin;
""");
ExecuteNonQuery(cnx, "UPDATE delivery_part_bin SET bin_2 = bin_2 + bin_3, bin_3 = NULL WHERE bin_4 IS NULL");
ExecuteNonQuery(cnx, "ALTER TABLE wine_attribute ADD COLUMN fill_lower_bins INTEGER NOT NULL CHECK (fill_lower_bins IN (0, 1, 2)) DEFAULT 0");
}
}
}

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

@ -26,20 +26,16 @@ namespace Elwig.Helpers.Billing {
using (var cmd = cnx.CreateCommand()) {
cmd.CommandText = $"""
UPDATE season
SET (start_date, end_date) = (SELECT MIN(date), MAX(date) FROM delivery WHERE year = {Year}),
bin_1_name = 'gebunden mit zwei Attributen',
bin_2_name = 'gebunden mit (erstem) Attribut',
bin_3_name = 'gebunden mit zweitem Attribut',
bin_4_name = 'gebunden ohne Attribut',
bin_5_name = 'ungebunden',
bin_6_name = NULL,
bin_7_name = NULL,
bin_8_name = NULL,
bin_9_name = NULL
SET (start_date, end_date) = (SELECT MIN(date), MAX(date) FROM delivery WHERE year = {Year})
WHERE year = {Year}
""";
await cmd.ExecuteNonQueryAsync();
}
using (var cmd = cnx.CreateCommand()) {
cmd.CommandText = $"DELETE FROM delivery_part_bin WHERE year = {Year}";
await cmd.ExecuteNonQueryAsync();
}
}
public async Task CalculateBins(bool allowAttrsIntoLowerBins, bool avoidUnderDeliveries, bool honorGebunden) {
@ -47,7 +43,7 @@ namespace Elwig.Helpers.Billing {
var attrForced = attrVals.Where(a => a.Value == 0).Select(a => a.Key).ToArray();
using var cnx = await AppDbContext.ConnectAsync();
var memberOblRig = await GetMemberRightsObligations(cnx, Year);
var inserts = new List<(int, int, int, int, int, int, int)>();
var inserts = new List<(int, int, int, string, int)>();
var deliveries = new List<(int, int, int, string, int, double, string, string[], string[], bool?)>();
using (var cmd = cnx.CreateCommand()) {
@ -91,7 +87,7 @@ namespace Elwig.Helpers.Billing {
// Mitglied hat keine Flächenbindungen, oder
// Nicht mindestens Qualitätswein (QUW)
// -> ungebunden
inserts.Add((did, dpnr, 0, 0, 0, 0, weight));
inserts.Add((did, dpnr, 0, "_", weight));
continue;
}
@ -99,44 +95,36 @@ namespace Elwig.Helpers.Billing {
throw new NotSupportedException();
int w = weight;
int[] b = new int[4];
foreach (var p in Utils.Permutate(attributes, attributes.Intersect(attrForced))) {
var c = p.Count();
var key = sortid + string.Join("", p);
if (rights.ContainsKey(key) && obligations.ContainsKey(key)) {
int i = 0;
int i = 4;
if (c == 1) {
i = (p.ElementAt(0) == attributes[0]) ? 1 : 2;
i = (p.ElementAt(0) == attributes[0]) ? 2 : 3;
} else if (c == 0) {
i = b.Length - 1;
i = 1;
}
var vr = Math.Max(0, Math.Min(rights[key] - used.GetValueOrDefault(key, 0), w));
var vo = Math.Max(0, Math.Min(obligations[key] - used.GetValueOrDefault(key, 0), w));
var u = used.GetValueOrDefault(key, 0);
var vr = Math.Max(0, Math.Min(rights[key] - u, w));
var vo = Math.Max(0, Math.Min(obligations[key] - u, w));
var v = (c == 0 || p.Select(a => attrVals[a]).Min() == 2) ? vr : vo;
b[i] += v;
used[key] = used.GetValueOrDefault(key, 0) + v;
used[key] = u + v;
inserts.Add((did, dpnr, i, key[2..], v));
w -= v;
}
if (w == 0 || !allowAttrsIntoLowerBins) break;
}
inserts.Add((did, dpnr, b[0], b[1], b[2], b[3], weight - b[0] - b[1] - b[2] - b[3]));
inserts.Add((did, dpnr, 0, "_", w));
lastMgNr = mgnr;
}
using (var cmd = cnx.CreateCommand()) {
cmd.CommandText = $"""
INSERT INTO delivery_part_bin (year, did, dpnr, bin_1, bin_2, bin_3, bin_4, bin_5)
VALUES {string.Join(",\n ", inserts.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, {i.Item4}, {i.Item5}, {i.Item6}, {i.Item7})"))}
INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
VALUES {string.Join(",\n ", inserts.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '{i.Item4}', {i.Item5})"))}
ON CONFLICT DO UPDATE
SET bin_1 = excluded.bin_1,
bin_2 = excluded.bin_2,
bin_3 = excluded.bin_3,
bin_4 = excluded.bin_4,
bin_5 = excluded.bin_5,
bin_6 = NULL,
bin_7 = NULL,
bin_8 = NULL,
bin_9 = NULL;
SET discr = excluded.discr, value = value + excluded.value
""";
await cmd.ExecuteNonQueryAsync();
}