admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2018-08-30 17:46:33 +00:00
parent 99eef872c8
commit 0422598686
2 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/AyaNova/biz/ImportAyaNova7Biz.cs
View File

@@ -100,6 +100,9 @@ namespace AyaNova.Biz
//USERS - Import first so all other objects can be properly attributed in event log
//IMPORT UNIT MODEL CATEGORIES AS TAGS
await DoImport("GZTW.AyaNova.BLL.UnitModelCategory", AyaType.Tag, job.GId, importMap, importFileName, zipEntries);
//IMPORT REGIONS AS TAGS
await DoImport("GZTW.AyaNova.BLL.Region", AyaType.Tag, job.GId, importMap, importFileName, zipEntries);

15
server/AyaNova/biz/TagBiz.cs
View File

@@ -233,9 +233,11 @@ namespace AyaNova.Biz
/// IMPORT v7 implementation
public async Task<bool> ImportV7Async(JObject j, List<ImportAyaNova7MapItem> importMap, Guid jobId)
{
switch (j["V7_TYPE"].Value<string>())
string SourceType=j["V7_TYPE"].Value<string>();
switch (SourceType)
{
case "GZTW.AyaNova.BLL.Region":
case "GZTW.AyaNova.BLL.UnitModelCategory":
{
var name = j["Name"].Value<string>();
var oldId = new Guid(j["ID"].Value<string>());
@@ -243,11 +245,19 @@ namespace AyaNova.Biz
//In RAVEN tags can only be 35 characters
name = StringUtil.MaxLength(name, 35);
//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:
//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
//for matching other objects imported to tags
if (ct.Tag.Where(m => m.Name == inObj).FirstOrDefault() != null)
Tag o = await CreateAsync(name);
if (HasErrors)
{
//If there are any validation errors, log in joblog and move on
JobsBiz.LogJob(jobId, $"TagBiz::ImportV7Async -> import object \"{name}\" source id {oldId.ToString()} failed validation and was not imported: {GetErrorsAsString()} ", ct);
JobsBiz.LogJob(jobId, $"TagBiz::ImportV7Async -> import object \"{name}\" of type \"{SourceType}\" source id {oldId.ToString()} failed validation and was not imported: {GetErrorsAsString()} ", ct);
return false;
}
else
@@ -261,6 +271,7 @@ namespace AyaNova.Biz
}
break;
}
//this is the equivalent of returning void for a Task signature with nothing to return