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

Update names part 2

Browse Source
This commit is contained in:
Michał Zieliński
2023-01-06 11:10:58 +01:00
parent fd179d82ca
commit 0daf0c582a
30 changed files with 664 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
WebAPI/Controllers/LayersController.cs
View File

@@ -44,7 +44,7 @@ namespace WebAPI.Controllers
{
try
{
return Ok(db.DataSets.Where(x => !x.IsDeleted).ToList());
return Ok(db.Layers.Where(x => !x.IsDeleted).ToList());
}
catch (Exception e)
{
@@ -58,7 +58,7 @@ namespace WebAPI.Controllers
{
Request.Headers.TryGetValue("userId", out var value);
Guid currentUserId = new Guid(value!);
return Ok(AddDataSet(input, currentUserId).Id);
return Ok(AddLayer(input, currentUserId).Id);
} catch (Exception e)
{
return BadRequest(e.ToString());
@@ -70,7 +70,7 @@ namespace WebAPI.Controllers
{
try
{
return Ok(db.DataSets
return Ok(db.Layers
.Include(x => x.CreatedBy)
.Include(x => x.Records)
.Where(x => x.Id == id && !x.IsDeleted).First());
@@ -100,12 +100,12 @@ namespace WebAPI.Controllers
[Route("exportToGoogleSheet/{id}")]
public IActionResult ExportToGoogleSheet(Guid id)
{
Layer dataSet = db.DataSets
Layer layer = db.Layers
.Include(x => x.Records)
.Where(x => x.Id == id && !x.IsDeleted).First();
var export = new googleSheetExport(googleDriveHelper, googleSheetValues);
export.export(dataSet);
export.export(layer);
return Ok(true);
}
@@ -121,47 +121,47 @@ namespace WebAPI.Controllers
string sheetId = "1G_Hu8DTP-PSPNXTaVYhc_ppnTQi6HWoA4oXSSdUmM9E";
string sheetName = "KOSZTY";
Layer dataSet = new Layer();
dataSet.Source = "GoogleSheet";
dataSet.Number = db.DataSets.Count() + 1;
Layer layer = new Layer();
layer.Source = "GoogleSheet";
layer.Number = db.Layers.Count() + 1;
var parser = new googleSheetParser(googleSheetValues);
dynamic parsedSheet = parser.parse(sheetId);
dataSet.Records = parsedSheet.records;
dataSet.Name = $"W{dataSet.Number}-I-{sheetName}-{parsedSheet.date}-{DateTime.Now.ToString("yyyyMMddHHmm")}";
AddDataSet(dataSet, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
layer.Records = parsedSheet.records;
layer.Name = $"W{layer.Number}-I-{sheetName}-{parsedSheet.date}-{DateTime.Now.ToString("yyyyMMddHHmm")}";
AddLayer(layer, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
return Ok("OK");
}
//
private Layer AddDataSet(Layer input, Guid currentUserId)
private Layer AddLayer(Layer input, Guid currentUserId)
{
input.Number = db.DataSets.Count() + 1;
input.Number = db.Layers.Count() + 1;
input.CreatedById = currentUserId;
input.ModifiedById = currentUserId;
input.CreatedAt = DateTime.UtcNow;
input.ModifiedAt = DateTime.UtcNow;
db.DataSets.Add(input);
SaveDataRows(input.Id, input.Records!, currentUserId);
db.Layers.Add(input);
SaveRecords(input.Id, input.Records!, currentUserId);
db.SaveChanges();
return input;
}
private void SaveDataRows(Guid id, ICollection<Models.Record> dataRows, Guid currentUserId)
private void SaveRecords(Guid id, ICollection<Models.Record> records, Guid currentUserId)
{
try
{
List<Guid> ids = new List<Guid>();
foreach (Models.Record dataRow in dataRows)
foreach (Record record in records)
{
dataRow.CreatedById = currentUserId;
dataRow.CreatedAt = DateTime.UtcNow;
dataRow.ModifiedById = currentUserId;
dataRow.ModifiedAt = DateTime.UtcNow;
dataRow.DataSetId= id;
record.CreatedById = currentUserId;
record.CreatedAt = DateTime.UtcNow;
record.ModifiedById = currentUserId;
record.ModifiedAt = DateTime.UtcNow;
record.LayerId= id;
db.DataRows.Add(dataRow);
db.Records.Add(record);
}
}
catch (Exception)