server/AyaNova/biz/TravelRateBiz.cs

@@ -343,32 +343,59 @@ namespace AyaNova.Biz
         public async Task<List<string>> ImportData(AyImportData importData)
         {
             List<string> ImportResult = new List<string>();
-            string ImportTag = $"imported-{FileUtil.GetSafeDateFileName()}";
-
+            string ImportTag = ImportUtil.GetImportTag();
+            //ignore these fields
             var jsset = JsonSerializer.CreateDefault(new JsonSerializerSettings { ContractResolver = new AyaNova.Util.JsonUtil.ShouldSerializeContractResolver(new string[] { "Concurrency", "Id", "CustomFields" }) });
             foreach (JObject j in importData.Data)
             {
-                var w = j.ToObject<TravelRate>(jsset);
-                if (j["CustomFields"] != null)
-                    w.CustomFields = j["CustomFields"].ToString();
-                w.Tags.Add(ImportTag);//so user can find them all and revert later if necessary
-                var res = await CreateAsync(w);
-                if (res == null)
+                long existingId = await ct.TravelRate.AsNoTracking().Where(z => z.Name == (string)j["Name"]).Select(x => x.Id).FirstOrDefaultAsync();
+                if (existingId == 0)
                 {
-                    ImportResult.Add($"* {w.Name} - {this.GetErrorsAsString()}");
-                    this.ClearErrors();
+                    if (importData.DoImport)
+                    {
+                        //import this record
+                        var Target = j.ToObject<TravelRate>(jsset);
+                        Target.Tags.Add(ImportTag);
+                        var res = await CreateAsync(Target);
+                        if (res == null)
+                        {
+                            ImportResult.Add($"❌ {Target.Name}\r\n{this.GetErrorsAsString()}");
+                            this.ClearErrors();
+                        }
+                        else
+                        {
+                            ImportResult.Add($"✔️ {Target.Name}");
+                        }
+                    }
                 }
                 else
                 {
-                    ImportResult.Add($"{w.Name} - ok");
+                    if (importData.DoUpdate)
+                    {
+                        //update this record with any data provided
+                        //load existing record
+                        var Target = await GetAsync((long)existingId);
+                        var Source = j.ToObject<TravelRate>(jsset);
+                        var propertiesToUpdate = j.Properties().Select(p => p.Name).ToList();
+                        propertiesToUpdate.Remove("Name");
+                        ImportUtil.Update(Source, Target, propertiesToUpdate);
+                        var res = await PutAsync(Target);
+                        if (res == null)
+                        {
+                            ImportResult.Add($"❌ {Target.Name} - {this.GetErrorsAsString()}");
+                            this.ClearErrors();
+                        }
+                        else
+                        {
+                            ImportResult.Add($"✔️ {Target.Name}");
+                        }
+                    }
                 }
             }
             return ImportResult;
         }
 
 
-
-
         ////////////////////////////////////////////////////////////////////////////////////////////////
         //JOB / OPERATIONS
         //