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

Rename models on backend

Browse Source
This commit is contained in:
Michał Zieliński
2023-01-05 19:25:32 +01:00
parent 2784c3ed7e
commit fd179d82ca
7 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WebAPI/AppDbContext.cs
View File

@@ -7,8 +7,8 @@ namespace WebAPI
public class AppDbContext : DbContext public class AppDbContext : DbContext
{ {
public DbSet<User> Users { get; set; } public DbSet<User> Users { get; set; }
public DbSet<DataSet> DataSets { get; set; } public DbSet<Layer> DataSets { get; set; }
public DbSet<DataRow> DataRows { get; set; } public DbSet<Record> DataRows { get; set; }
public AppDbContext(DbContextOptions<AppDbContext> options) : base(options) public AppDbContext(DbContextOptions<AppDbContext> options) : base(options)
{ {

26
WebAPI/Controllers/DataSetsController.cs → WebAPI/Controllers/LayersController.cs
View File

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

4
WebAPI/Exports/googleSheet.export.cs
View File

@@ -15,12 +15,12 @@ namespace WebAPI.Exports
googleDriveHelper = _googleDriveHelper; googleDriveHelper = _googleDriveHelper;
googleSheetValues = _googleSheetValues; googleSheetValues = _googleSheetValues;
} }
public void export(DataSet dataSet) public void export(Layer dataSet)
{ {
try try
{ {
List<IList<object>> data = new List<IList<object>>() { new List<object>() { dataSet.Name, dataSet.Number } }; List<IList<object>> data = new List<IList<object>>() { new List<object>() { dataSet.Name, dataSet.Number } };
foreach (DataRow dataRow in dataSet.DataRows) foreach (Record dataRow in dataSet.Records)
{ {
data.Add(new List<object> { dataRow.Code, dataRow.Value }); data.Add(new List<object> { dataRow.Code, dataRow.Value });
} }

4
WebAPI/Models/DataSet.cs → WebAPI/Models/Layer.cs
View File

@@ -2,7 +2,7 @@
namespace WebAPI.Models namespace WebAPI.Models
{ {
public class DataSet public class Layer
{ {
#region Properties #region Properties
[Key] [Key]
@@ -21,7 +21,7 @@ namespace WebAPI.Models
public bool IsDeleted { get; set; } public bool IsDeleted { get; set; }
#endregion #endregion
#region Relations #region Relations
public ICollection<DataRow>? DataRows { get; set; } public ICollection<Record>? Records { get; set; }
[Required] [Required]
public Guid CreatedById { get; set; } public Guid CreatedById { get; set; }
public User? CreatedBy { get; set; } public User? CreatedBy { get; set; }

2
WebAPI/Models/DataRow.cs → WebAPI/Models/Record.cs
View File

@@ -2,7 +2,7 @@
namespace WebAPI.Models namespace WebAPI.Models
{ {
public class DataRow public class Record
{ {
#region Properties #region Properties
[Key] [Key]

6
WebAPI/dataParsers/csv.parser.cs
View File

@@ -10,12 +10,12 @@ namespace WebAPI.dataParsers
{ {
public class csvParser public class csvParser
{ {
public List<DataRow> parse(IFormFile file) public List<Record> parse(IFormFile file)
{ {
var info = CultureInfo.CurrentCulture; var info = CultureInfo.CurrentCulture;
Console.WriteLine(info); Console.WriteLine(info);
List<DataRow> dataRows = new List<DataRow>(); List<Record> dataRows = new List<Record>();
var stream = new StreamReader(file.OpenReadStream()); var stream = new StreamReader(file.OpenReadStream());
string content = stream.ReadToEnd(); string content = stream.ReadToEnd();
@@ -35,7 +35,7 @@ namespace WebAPI.dataParsers
float value = float.Parse(data[j][i], CultureInfo.GetCultureInfo("pl-PL")); float value = float.Parse(data[j][i], CultureInfo.GetCultureInfo("pl-PL"));
if (value > 0) if (value > 0)
{ {
DataRow dataRow = new DataRow(); Record dataRow = new Record();
dataRow.Id = Guid.NewGuid(); dataRow.Id = Guid.NewGuid();
dataRow.Code = data[0][i]; dataRow.Code = data[0][i];
dataRow.Desc1 = data[j][0]; dataRow.Desc1 = data[j][0];

18
WebAPI/dataParsers/googleSheet.parser.cs
View File

@@ -21,7 +21,7 @@ namespace WebAPI.dataParsers
var response = request.Execute(); var response = request.Execute();
var data = response.Values; var data = response.Values;
List<DataRow> dataRows = new List<DataRow>(); List<Record> records = new List<Record>();
string date = (string)data[0][0]; 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")); float value = float.Parse(data[i][1].ToString(), CultureInfo.GetCultureInfo("pl-PL"));
if (value > 0) if (value > 0)
{ {
DataRow dataRow = new DataRow(); Record record = new Record();
dataRow.Id = Guid.NewGuid(); record.Id = Guid.NewGuid();
dataRow.Code = data[i][0].ToString(); record.Code = data[i][0].ToString();
dataRow.Value = value; record.Value = value;
dataRow.CreatedAt = DateTime.UtcNow; record.CreatedAt = DateTime.UtcNow;
dataRow.ModifiedAt = DateTime.UtcNow; record.ModifiedAt = DateTime.UtcNow;
dataRows.Add(dataRow); records.Add(record);
} }
} }
return new return new
{ {
dataRows = dataRows, records = records,
date = date date = date
}; };
} }