Rename models on backend

This commit is contained in:
2023-01-05 19:25:32 +01:00
parent 2784c3ed7e
commit fd179d82ca
7 changed files with 32 additions and 32 deletions

View File

@@ -21,13 +21,13 @@ namespace WebAPI.Controllers
[ApiController]
[Route("api/[controller]")]
[Authorize]
public class DataSetsController : Controller
public class LayersController : Controller
{
private readonly AppDbContext db;
private SpreadsheetsResource.ValuesResource googleSheetValues;
private GoogleDriveHelper googleDriveHelper;
private readonly IConfiguration configuration;
public DataSetsController(
public LayersController(
AppDbContext _db,
GoogleSheetsHelper _googleSheetsHelper,
GoogleDriveHelper _googleDriveHelper,
@@ -52,12 +52,12 @@ namespace WebAPI.Controllers
}
}
[HttpPost]
public IActionResult Save(DataSet input)
public IActionResult Save(Layer input)
{
try
{
Request.Headers.TryGetValue("userId", out var value);
Guid currentUserId = new Guid(value);
Guid currentUserId = new Guid(value!);
return Ok(AddDataSet(input, currentUserId).Id);
} catch (Exception e)
{
@@ -72,7 +72,7 @@ namespace WebAPI.Controllers
{
return Ok(db.DataSets
.Include(x => x.CreatedBy)
.Include(x => x.DataRows)
.Include(x => x.Records)
.Where(x => x.Id == id && !x.IsDeleted).First());
}
catch (Exception e)
@@ -100,8 +100,8 @@ namespace WebAPI.Controllers
[Route("exportToGoogleSheet/{id}")]
public IActionResult ExportToGoogleSheet(Guid id)
{
DataSet dataSet = db.DataSets
.Include(x => x.DataRows)
Layer dataSet = db.DataSets
.Include(x => x.Records)
.Where(x => x.Id == id && !x.IsDeleted).First();
var export = new googleSheetExport(googleDriveHelper, googleSheetValues);
@@ -121,12 +121,12 @@ namespace WebAPI.Controllers
string sheetId = "1G_Hu8DTP-PSPNXTaVYhc_ppnTQi6HWoA4oXSSdUmM9E";
string sheetName = "KOSZTY";
DataSet dataSet = new DataSet();
Layer dataSet = new Layer();
dataSet.Source = "GoogleSheet";
dataSet.Number = db.DataSets.Count() + 1;
var parser = new googleSheetParser(googleSheetValues);
dynamic parsedSheet = parser.parse(sheetId);
dataSet.DataRows = parsedSheet.dataRows;
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"));
@@ -134,7 +134,7 @@ namespace WebAPI.Controllers
}
//
private DataSet AddDataSet(DataSet input, Guid currentUserId)
private Layer AddDataSet(Layer input, Guid currentUserId)
{
input.Number = db.DataSets.Count() + 1;
input.CreatedById = currentUserId;
@@ -143,17 +143,17 @@ namespace WebAPI.Controllers
input.ModifiedAt = DateTime.UtcNow;
db.DataSets.Add(input);
SaveDataRows(input.Id, input.DataRows, currentUserId);
SaveDataRows(input.Id, input.Records!, currentUserId);
db.SaveChanges();
return input;
}
private void SaveDataRows(Guid id, ICollection<Models.DataRow> dataRows, Guid currentUserId)
private void SaveDataRows(Guid id, ICollection<Models.Record> dataRows, Guid currentUserId)
{
try
{
List<Guid> ids = new List<Guid>();
foreach (Models.DataRow dataRow in dataRows)
foreach (Models.Record dataRow in dataRows)
{
dataRow.CreatedById = currentUserId;
dataRow.CreatedAt = DateTime.UtcNow;