mz/DiunaBI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

processedLayer - save fix

Browse Source
This commit is contained in:
Michał Zieliński
2023-10-07 14:53:27 +02:00
parent ac7b01482e
commit 23ef41089f
2 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
WebAPI/Controllers/LayersController.cs
View File

@@ -248,16 +248,15 @@ namespace WebAPI.Controllers
return BadRequest(); return BadRequest();
} else } else
{ {
Layer? processedLayer = null;
switch (processType) switch (processType)
{ {
case "Copy": case "Copy":
CopyProcessor cp = new CopyProcessor(db, googleSheetValues, this); //CopyProcessor cp = new CopyProcessor(db, googleSheetValues, this);
cp.process(sourceLayer, processWorker?.Id); //cp.process(sourceLayer, processWorker?.Id);
break; break;
case "Deaggregation": case "Deaggregation":
DeaggregationProcessor dp = new DeaggregationProcessor(db, googleSheetValues); DeaggregationProcessor dp = new DeaggregationProcessor(db, googleSheetValues, this);
processedLayer = dp.process(sourceLayer, processWorker?.Id); dp.process(sourceLayer, processWorker?.Id);
break; break;
} }
} }

58
WebAPI/dataProcessors/deaggregation.processor.cs
View File

@@ -1,7 +1,9 @@
using Google.Apis.Sheets.v4; using Google.Apis.Sheets.v4;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System; using System;
using System.Globalization; using System.Globalization;
using WebAPI.Controllers;
using WebAPI.Models; using WebAPI.Models;
namespace WebAPI.dataProcessors namespace WebAPI.dataProcessors
@@ -10,16 +12,19 @@ namespace WebAPI.dataProcessors
{ {
private AppDbContext db; private AppDbContext db;
private SpreadsheetsResource.ValuesResource googleSheetValues; private SpreadsheetsResource.ValuesResource googleSheetValues;
private LayersController controller;
public DeaggregationProcessor( public DeaggregationProcessor(
AppDbContext _db, AppDbContext _db,
SpreadsheetsResource.ValuesResource _googleSheetValues) SpreadsheetsResource.ValuesResource _googleSheetValues,
LayersController _controller)
{ {
db = _db; db = _db;
googleSheetValues = _googleSheetValues; googleSheetValues = _googleSheetValues;
controller = _controller;
} }
public Layer process(Layer sourceImportWorker, Guid? parentId) public void process(Layer sourceImportWorker, Guid? parentId)
{ {
string? sheetId = sourceImportWorker.Records!.Where(x => x.Code == "SheetId").FirstOrDefault()?.Desc1; string? sheetId = sourceImportWorker.Records!.Where(x => x.Code == "SheetId").FirstOrDefault()?.Desc1;
if (sheetId == null) if (sheetId == null)
@@ -65,17 +70,34 @@ namespace WebAPI.dataProcessors
throw new Exception($"ImportMonth cell is empty, {sourceImportWorker.Name}"); throw new Exception($"ImportMonth cell is empty, {sourceImportWorker.Name}");
} }
Layer response = new Layer
Layer? processedLayer = db.Layers
.Where(x => x.ParentId == parentId)
.OrderByDescending(x => x.CreatedAt)
.FirstOrDefault();
if (processedLayer == null)
{ {
Id = Guid.NewGuid(), processedLayer = new Layer
Source = "", {
Type = LayerType.processed, Id = Guid.NewGuid(),
ParentId = parentId, Source = "",
Number = db.Layers.Count() + 1, Type = LayerType.processed,
Records = new List<Record>(), ParentId = parentId,
// Sources = new List<ProcessSource>() Number = db.Layers.Count() + 1,
}; };
response.Name = $"L{response.Number}-P-{name}-{year}/{month}-{DateTime.Now.ToString("yyyyMMddHHmm")}"; processedLayer.Name = $"L{processedLayer.Number}-P-{name}-{year}/{month}-{DateTime.Now.ToString("yyyyMMddHHmm")}";
processedLayer.CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
processedLayer.CreatedAt = DateTime.UtcNow;
processedLayer.ModifiedAt = DateTime.UtcNow;
db.Layers.Add(processedLayer);
}
processedLayer.Records = new List<Record>();
processedLayer.Sources = new List<ProcessSource>();
processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
processedLayer.ModifiedAt = DateTime.UtcNow;
List<Layer> dataSources = db.Layers List<Layer> dataSources = db.Layers
.Include(x => x.Records) .Include(x => x.Records)
@@ -97,9 +119,7 @@ namespace WebAPI.dataProcessors
} }
*/ */
List<Record> allRecords = dataSources.SelectMany(x => x.Records!).ToList(); List<Record> allRecords = dataSources.SelectMany(x => x.Records!).Where(x => x.Code == "500").ToList();
foreach (Record baseRecord in dataSources.First()?.Records!) foreach (Record baseRecord in dataSources.First()?.Records!)
{ {
@@ -123,8 +143,6 @@ namespace WebAPI.dataProcessors
setValue(processedRecord, 1, firstVal); setValue(processedRecord, 1, firstVal);
previousValue = firstVal; previousValue = firstVal;
//days 2-29/30 //days 2-29/30
for (int i=2; i<lastDayInMonth; i++) for (int i=2; i<lastDayInMonth; i++)
{ {
float? dayVal = codeRecords float? dayVal = codeRecords
@@ -155,9 +173,11 @@ namespace WebAPI.dataProcessors
setValue(processedRecord, lastDayInMonth, (lastVal ?? 0) - previousValue); setValue(processedRecord, lastDayInMonth, (lastVal ?? 0) - previousValue);
} }
response.Records.Add(processedRecord); processedLayer.Records.Add(processedRecord);
} }
return response; controller.SaveRecords(processedLayer.Id, processedLayer.Records, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
db.Layers.Update(processedLayer);
db.SaveChanges();
} }
private void setValue(Record record, int number, float? value) private void setValue(Record record, int number, float? value)
{ {