diff --git a/WebAPI/Controllers/LayersController.cs b/WebAPI/Controllers/LayersController.cs index 5d1547f..0b135b7 100644 --- a/WebAPI/Controllers/LayersController.cs +++ b/WebAPI/Controllers/LayersController.cs @@ -252,13 +252,21 @@ namespace WebAPI.Controllers { case "Copy": CopyProcessor cp = new CopyProcessor(db, googleSheetValues, this); - cp.process(sourceLayer, processWorker?.Id); + cp.process(sourceLayer, processWorker?.Id); break; case "Deaggregation": DeaggregationProcessor dp = new DeaggregationProcessor(db, googleSheetValues, this); dp.process(sourceLayer, processWorker?.Id); + break; - } + } + logsController.AddEntry(new LogEntry + { + Title = $"Process Success, {sourceLayer.Name}", + Type = LogEntryType.info, + LogType = LogType.process, + CreatedAt = DateTime.UtcNow + }); } } } diff --git a/WebAPI/dataProcessors/copy.processor.cs b/WebAPI/dataProcessors/copy.processor.cs index a8e3dce..64af792 100644 --- a/WebAPI/dataProcessors/copy.processor.cs +++ b/WebAPI/dataProcessors/copy.processor.cs @@ -125,8 +125,7 @@ namespace WebAPI.dataProcessors ModifiedAt = DateTime.UtcNow }; processedLayer.Records.Add(record); - } - controller.SaveRecords(processedLayer.Id, processedLayer.Records, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D")); + } if (isNew) { db.Layers.Add(processedLayer); @@ -134,7 +133,7 @@ namespace WebAPI.dataProcessors { db.Layers.Update(processedLayer); } - db.Layers.Update(processedLayer); + controller.SaveRecords(processedLayer.Id, processedLayer.Records, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D")); db.SaveChanges(); } } diff --git a/WebAPI/dataProcessors/deaggregation.processor.cs b/WebAPI/dataProcessors/deaggregation.processor.cs index 73ad68b..22aabd2 100644 --- a/WebAPI/dataProcessors/deaggregation.processor.cs +++ b/WebAPI/dataProcessors/deaggregation.processor.cs @@ -177,7 +177,7 @@ namespace WebAPI.dataProcessors newRecords.Add(processedRecord); } - controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D")); + if (isNew) { db.Layers.Add(processedLayer); @@ -185,6 +185,7 @@ namespace WebAPI.dataProcessors { db.Layers.Update(processedLayer); } + controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D")); db.SaveChanges(); } private void setValue(Record record, int number, float? value)