[chore:] introducing KasPerson.id (refsid remains but isn't used in the mgmt-backend anymore)
This commit is contained in:
@@ -32,7 +32,8 @@ public class DataImport
|
||||
return (false, null);
|
||||
}
|
||||
|
||||
var imported = new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
||||
var imported =
|
||||
new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
||||
|
||||
while (!reader.EndOfStream)
|
||||
{
|
||||
@@ -50,7 +51,7 @@ public class DataImport
|
||||
|
||||
try
|
||||
{
|
||||
var person = new KasPerson(
|
||||
var person = new KasPerson(KasPerson.GenerateNewID(imported.KasPersons.Count),
|
||||
ParseInt(parts[0]),
|
||||
parts[1],
|
||||
parts[2],
|
||||
@@ -108,7 +109,8 @@ public class DataImport
|
||||
|
||||
var headers = headerLine.Split(separator).Select(h => h.Trim()).ToArray();
|
||||
|
||||
var imported = new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
||||
var imported =
|
||||
new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
||||
var patchType = typeof(AddressPatch);
|
||||
var binding = BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase;
|
||||
|
||||
@@ -116,7 +118,7 @@ public class DataImport
|
||||
.Where(p => p.PropertyType == typeof(bool) && p.Name.StartsWith("has_", StringComparison.OrdinalIgnoreCase))
|
||||
.ToArray();
|
||||
|
||||
var last_refsid = 1000000;
|
||||
//var last_refsid = 1000000;
|
||||
|
||||
while (!reader.EndOfStream)
|
||||
{
|
||||
@@ -128,12 +130,12 @@ public class DataImport
|
||||
|
||||
var fieldValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
var refsid_existing = false;
|
||||
//var refsid_existing = false;
|
||||
|
||||
foreach (var hasProp in hasProperties)
|
||||
{
|
||||
var fieldName = hasProp.Name.Substring(4);
|
||||
|
||||
|
||||
|
||||
var hasObj = hasProp.GetValue(patch);
|
||||
var has = hasObj is bool b && b;
|
||||
@@ -161,7 +163,7 @@ public class DataImport
|
||||
var altIdx = Array.FindIndex(headers, h =>
|
||||
string.Equals(h, fieldName, StringComparison.OrdinalIgnoreCase) ||
|
||||
string.Equals(h, fieldName + "_is", StringComparison.OrdinalIgnoreCase));
|
||||
|
||||
|
||||
if (altIdx >= 0 && altIdx < parts.Length)
|
||||
resolvedValue = parts[altIdx];
|
||||
else
|
||||
@@ -177,16 +179,13 @@ public class DataImport
|
||||
return fieldValues.TryGetValue(name, out var v) ? v : "";
|
||||
}
|
||||
|
||||
var new_refsid = last_refsid;
|
||||
if (!patch.has_refsid)
|
||||
new_refsid = GenerateNewRefsid();
|
||||
else
|
||||
new_refsid = ParseInt(GetField("refsid"));
|
||||
var refsid = 0;
|
||||
if (patch.has_refsid)
|
||||
refsid = ParseInt(GetField("refsid"));
|
||||
|
||||
try
|
||||
{
|
||||
var person = new KasPerson(
|
||||
new_refsid,
|
||||
var person = new KasPerson(KasPerson.GenerateNewID(imported.KasPersons.Count), refsid,
|
||||
GetField("anrede"),
|
||||
GetField("titel"),
|
||||
GetField("vorname"),
|
||||
@@ -224,23 +223,17 @@ public class DataImport
|
||||
|
||||
return (true, imported);
|
||||
|
||||
int GenerateNewRefsid()
|
||||
{
|
||||
|
||||
int biggest = last_refsid;
|
||||
foreach (var set in Settings._instance.addressSets.addresses)
|
||||
{
|
||||
foreach (var address in set.KasPersons)
|
||||
{
|
||||
if (biggest < address.refsid)
|
||||
{
|
||||
biggest = address.refsid+1;
|
||||
}
|
||||
}
|
||||
}
|
||||
last_refsid = biggest+1;
|
||||
return last_refsid;
|
||||
}
|
||||
// int GenerateNewRefsid()
|
||||
// {
|
||||
// var biggest = last_refsid;
|
||||
// foreach (var set in Settings._instance.addressSets.addresses)
|
||||
// foreach (var address in set.KasPersons)
|
||||
// if (biggest < address.id)
|
||||
// biggest = address.id + 1;
|
||||
//
|
||||
// last_refsid = biggest + 1;
|
||||
// return last_refsid;
|
||||
// }
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user