BillingData: Compact data even more
This commit is contained in:
@ -252,11 +252,11 @@ namespace Elwig.Helpers.Billing {
|
||||
return curve;
|
||||
}
|
||||
|
||||
protected static void CollapsePaymentData(JsonObject data, IEnumerable<RawVaribute> vaributes, bool useDefault = true) {
|
||||
protected static (Dictionary<string, List<string>>, Dictionary<decimal, List<string>>) GetReverseKeys(JsonObject data, bool strict = true) {
|
||||
Dictionary<string, List<string>> rev1 = [];
|
||||
Dictionary<decimal, List<string>> rev2 = [];
|
||||
foreach (var (k, v) in data) {
|
||||
if (k == "default" || k.StartsWith('/') || !k.Contains('/') || v is not JsonValue val) {
|
||||
if (k == "default" || (strict && (k.StartsWith('/') || !k.Contains('/'))) || v is not JsonValue val) {
|
||||
continue;
|
||||
} else if (val.TryGetValue<decimal>(out var dec)) {
|
||||
rev2[dec] = rev2.GetValueOrDefault(dec) ?? [];
|
||||
@ -266,6 +266,11 @@ namespace Elwig.Helpers.Billing {
|
||||
rev1[cur].Add(k);
|
||||
}
|
||||
}
|
||||
return (rev1, rev2);
|
||||
}
|
||||
|
||||
protected static void CollapsePaymentData(JsonObject data, IEnumerable<RawVaribute> vaributes, bool useDefault = true) {
|
||||
var (rev1, rev2) = GetReverseKeys(data);
|
||||
if (!data.ContainsKey("default")) {
|
||||
foreach (var (v, ks) in rev1) {
|
||||
if ((ks.Count >= vaributes.Count() * 0.5 && useDefault) || ks.Count == vaributes.Count()) {
|
||||
@ -322,6 +327,32 @@ namespace Elwig.Helpers.Billing {
|
||||
data.Add(k.Replace("/-", "-"), val);
|
||||
}
|
||||
}
|
||||
|
||||
(rev1, rev2) = GetReverseKeys(data, false);
|
||||
var keyVaributes = data
|
||||
.Select(e => e.Key.Split('-')[0])
|
||||
.Where(e => e.Length > 0 && e != "default")
|
||||
.Distinct()
|
||||
.ToList();
|
||||
foreach (var idx in keyVaributes) {
|
||||
var len = data.Count(e => e.Key == idx || (e.Key.Length > idx.Length && e.Key.StartsWith(idx) && e.Key[idx.Length] == '-'));
|
||||
foreach (var (v, ks) in rev1) {
|
||||
var myKs = ks.Where(k => k == idx || (k.Length > idx.Length && k.StartsWith(idx) && k[idx.Length] == '-' && !data.ContainsKey(k[idx.Length..]))).ToList();
|
||||
if (myKs.Count == len) {
|
||||
foreach (var k in myKs) {
|
||||
if (k != idx) data.Remove(k);
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach (var (v, ks) in rev2) {
|
||||
var myKs = ks.Where(k => k == idx || (k.Length > idx.Length && k.StartsWith(idx) && k[idx.Length] == '-' && !data.ContainsKey(k[idx.Length..]))).ToList();
|
||||
if (myKs.Count == len) {
|
||||
foreach (var k in myKs) {
|
||||
if (k != idx) data.Remove(k);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static JsonObject FromGraphEntries(
|
||||
|
Reference in New Issue
Block a user