This commit is contained in:
2018-08-30 17:52:33 +00:00
parent 0422598686
commit 8c4998ce81

View File

@@ -239,35 +239,44 @@ namespace AyaNova.Biz
case "GZTW.AyaNova.BLL.Region": case "GZTW.AyaNova.BLL.Region":
case "GZTW.AyaNova.BLL.UnitModelCategory": case "GZTW.AyaNova.BLL.UnitModelCategory":
{ {
var name = j["Name"].Value<string>(); var NewTagName = j["Name"].Value<string>();
var oldId = new Guid(j["ID"].Value<string>()); var OldV7Id = new Guid(j["ID"].Value<string>());
//In RAVEN tags can only be 35 characters //In RAVEN tags can only be 35 characters
name = StringUtil.MaxLength(name, 35); NewTagName = StringUtil.MaxLength(NewTagName, 35);
//There might already be a tag of the same name since so many different types of V7 objects are becoming tags //There might already be a tag of the same name since so many different types of V7 objects are becoming tags
//Weighed the pros and cons of uniquifying by object type versus just using the same name for different object types: //Weighed the pros and cons of uniquifying by object type versus just using the same name for different object types:
//it seems to me at this point that people might desire the same exact name because if they used it that way they probably //it seems to me at this point that people might desire the same exact name because if they used it that way they probably
//intended it that way, so this bit of code will check if it already exists and then use that ID in the importMap instead //intended it that way, so this bit of code will check if it already exists and then use that ID in the importMap instead
//for matching other objects imported to tags //for matching other objects imported to tags
if (ct.Tag.Where(m => m.Name == inObj).FirstOrDefault() != null)
//Already present?
var AlreadyTag = ct.Tag.Where(m => m.Name == NewTagName).FirstOrDefault();
if (AlreadyTag != null)
{
//map it to the existing tag of same name
var mapItem = new ImportAyaNova7MapItem(OldV7Id, AyaType.Tag, AlreadyTag.Id);
}
else
{
Tag o = await CreateAsync(name); Tag o = await CreateAsync(NewTagName);
if (HasErrors) if (HasErrors)
{ {
//If there are any validation errors, log in joblog and move on //If there are any validation errors, log in joblog and move on
JobsBiz.LogJob(jobId, $"TagBiz::ImportV7Async -> import object \"{name}\" of type \"{SourceType}\" source id {oldId.ToString()} failed validation and was not imported: {GetErrorsAsString()} ", ct); JobsBiz.LogJob(jobId, $"TagBiz::ImportV7Async -> import object \"{NewTagName}\" of type \"{SourceType}\" source id {OldV7Id.ToString()} failed validation and was not imported: {GetErrorsAsString()} ", ct);
return false; return false;
} }
else else
{ {
await ct.SaveChangesAsync(); await ct.SaveChangesAsync();
var mapItem = new ImportAyaNova7MapItem(oldId, AyaType.Tag, o.Id); var mapItem = new ImportAyaNova7MapItem(OldV7Id, AyaType.Tag, o.Id);
//Log //Log
EventLogProcessor.AddEntry(new Event(userId, o.Id, AyaType.Tag, AyaEvent.Created), ct); EventLogProcessor.AddEntry(new Event(userId, o.Id, AyaType.Tag, AyaEvent.Created), ct);
await ct.SaveChangesAsync(); await ct.SaveChangesAsync();
} }
}
} }
break; break;