From fd179d82ca0d3124d87ae4cd140ce1c34283d55c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Zieli=C5=84ski?= Date: Thu, 5 Jan 2023 19:25:32 +0100 Subject: [PATCH] Rename models on backend --- WebAPI/AppDbContext.cs | 4 +-- ...aSetsController.cs => LayersController.cs} | 26 +++++++++---------- WebAPI/Exports/googleSheet.export.cs | 4 +-- WebAPI/Models/{DataSet.cs => Layer.cs} | 4 +-- WebAPI/Models/{DataRow.cs => Record.cs} | 2 +- WebAPI/dataParsers/csv.parser.cs | 6 ++--- WebAPI/dataParsers/googleSheet.parser.cs | 18 ++++++------- 7 files changed, 32 insertions(+), 32 deletions(-) rename WebAPI/Controllers/{DataSetsController.cs => LayersController.cs} (87%) rename WebAPI/Models/{DataSet.cs => Layer.cs} (90%) rename WebAPI/Models/{DataRow.cs => Record.cs} (97%) diff --git a/WebAPI/AppDbContext.cs b/WebAPI/AppDbContext.cs index b58aa28..2497739 100644 --- a/WebAPI/AppDbContext.cs +++ b/WebAPI/AppDbContext.cs @@ -7,8 +7,8 @@ namespace WebAPI public class AppDbContext : DbContext { public DbSet Users { get; set; } - public DbSet DataSets { get; set; } - public DbSet DataRows { get; set; } + public DbSet DataSets { get; set; } + public DbSet DataRows { get; set; } public AppDbContext(DbContextOptions options) : base(options) { diff --git a/WebAPI/Controllers/DataSetsController.cs b/WebAPI/Controllers/LayersController.cs similarity index 87% rename from WebAPI/Controllers/DataSetsController.cs rename to WebAPI/Controllers/LayersController.cs index 16306ba..aae5d21 100644 --- a/WebAPI/Controllers/DataSetsController.cs +++ b/WebAPI/Controllers/LayersController.cs @@ -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 dataRows, Guid currentUserId) + private void SaveDataRows(Guid id, ICollection dataRows, Guid currentUserId) { try { List ids = new List(); - foreach (Models.DataRow dataRow in dataRows) + foreach (Models.Record dataRow in dataRows) { dataRow.CreatedById = currentUserId; dataRow.CreatedAt = DateTime.UtcNow; diff --git a/WebAPI/Exports/googleSheet.export.cs b/WebAPI/Exports/googleSheet.export.cs index 07bfd08..9ce07f6 100644 --- a/WebAPI/Exports/googleSheet.export.cs +++ b/WebAPI/Exports/googleSheet.export.cs @@ -15,12 +15,12 @@ namespace WebAPI.Exports googleDriveHelper = _googleDriveHelper; googleSheetValues = _googleSheetValues; } - public void export(DataSet dataSet) + public void export(Layer dataSet) { try { List> data = new List>() { new List() { dataSet.Name, dataSet.Number } }; - foreach (DataRow dataRow in dataSet.DataRows) + foreach (Record dataRow in dataSet.Records) { data.Add(new List { dataRow.Code, dataRow.Value }); } diff --git a/WebAPI/Models/DataSet.cs b/WebAPI/Models/Layer.cs similarity index 90% rename from WebAPI/Models/DataSet.cs rename to WebAPI/Models/Layer.cs index 30fd8e8..e54cd42 100644 --- a/WebAPI/Models/DataSet.cs +++ b/WebAPI/Models/Layer.cs @@ -2,7 +2,7 @@ namespace WebAPI.Models { - public class DataSet + public class Layer { #region Properties [Key] @@ -21,7 +21,7 @@ namespace WebAPI.Models public bool IsDeleted { get; set; } #endregion #region Relations - public ICollection? DataRows { get; set; } + public ICollection? Records { get; set; } [Required] public Guid CreatedById { get; set; } public User? CreatedBy { get; set; } diff --git a/WebAPI/Models/DataRow.cs b/WebAPI/Models/Record.cs similarity index 97% rename from WebAPI/Models/DataRow.cs rename to WebAPI/Models/Record.cs index 10e28ad..4f0109f 100644 --- a/WebAPI/Models/DataRow.cs +++ b/WebAPI/Models/Record.cs @@ -2,7 +2,7 @@ namespace WebAPI.Models { - public class DataRow + public class Record { #region Properties [Key] diff --git a/WebAPI/dataParsers/csv.parser.cs b/WebAPI/dataParsers/csv.parser.cs index 0da3b52..3eb57d5 100644 --- a/WebAPI/dataParsers/csv.parser.cs +++ b/WebAPI/dataParsers/csv.parser.cs @@ -10,12 +10,12 @@ namespace WebAPI.dataParsers { public class csvParser { - public List parse(IFormFile file) + public List parse(IFormFile file) { var info = CultureInfo.CurrentCulture; Console.WriteLine(info); - List dataRows = new List(); + List dataRows = new List(); var stream = new StreamReader(file.OpenReadStream()); string content = stream.ReadToEnd(); @@ -35,7 +35,7 @@ namespace WebAPI.dataParsers float value = float.Parse(data[j][i], CultureInfo.GetCultureInfo("pl-PL")); if (value > 0) { - DataRow dataRow = new DataRow(); + Record dataRow = new Record(); dataRow.Id = Guid.NewGuid(); dataRow.Code = data[0][i]; dataRow.Desc1 = data[j][0]; diff --git a/WebAPI/dataParsers/googleSheet.parser.cs b/WebAPI/dataParsers/googleSheet.parser.cs index 112f2cd..bfee7e7 100644 --- a/WebAPI/dataParsers/googleSheet.parser.cs +++ b/WebAPI/dataParsers/googleSheet.parser.cs @@ -21,7 +21,7 @@ namespace WebAPI.dataParsers var response = request.Execute(); var data = response.Values; - List dataRows = new List(); + List records = new List(); string date = (string)data[0][0]; @@ -30,18 +30,18 @@ namespace WebAPI.dataParsers float value = float.Parse(data[i][1].ToString(), CultureInfo.GetCultureInfo("pl-PL")); if (value > 0) { - DataRow dataRow = new DataRow(); - dataRow.Id = Guid.NewGuid(); - dataRow.Code = data[i][0].ToString(); - dataRow.Value = value; - dataRow.CreatedAt = DateTime.UtcNow; - dataRow.ModifiedAt = DateTime.UtcNow; - dataRows.Add(dataRow); + Record record = new Record(); + record.Id = Guid.NewGuid(); + record.Code = data[i][0].ToString(); + record.Value = value; + record.CreatedAt = DateTime.UtcNow; + record.ModifiedAt = DateTime.UtcNow; + records.Add(record); } } return new { - dataRows = dataRows, + records = records, date = date }; }