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

R1 fixes

Browse Source
This commit is contained in:
Michał Zieliski
2024-05-22 18:40:10 +02:00
parent 54c8844854
commit 25cf75e883
10 changed files with 61 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.idea/.idea.DiunaBI/.idea/.gitignore generated vendored Normal file
View File

@@ -0,0 +1,13 @@
# Default ignored files
/shelf/
/workspace.xml
# Rider ignored files
/.idea.DiunaBI.iml
/contentModel.xml
/projectSettingsUpdater.xml
/modules.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

13
.idea/.idea.DiunaBI/.idea/dataSources.xml generated Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<data-source source="LOCAL" name="Microsoft SQL Server (JetBrains)" uuid="3a86bcaa-1fe4-4647-8c70-015e0d892db7">
<driver-ref>sqlserver.jb</driver-ref>
<synchronize>true</synchronize>
<configured-by-url>true</configured-by-url>
<jdbc-driver>com.jetbrains.jdbc.sqlserver.SqlServerDriver</jdbc-driver>
<jdbc-url>Server=tcp:127.0.0.1,1433;Initial Catalog=diunabi-morska;Persist Security Info=False;User ID=SA;Password=v](8Lc|RfG;MultipleActiveResultSets=False;Encrypt=False;TrustServerCertificate=False;Connection Timeout=30;</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
</component>
</project>

4
.idea/.idea.DiunaBI/.idea/encodings.xml generated Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
</project>

8
.idea/.idea.DiunaBI/.idea/indexLayout.xml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="UserContentModel">
<attachedFolders />
<explicitIncludes />
<explicitExcludes />
</component>
</project>

6
.idea/.idea.DiunaBI/.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

8
WebAPI/Controllers/LayersController.cs
View File

@@ -267,12 +267,10 @@ namespace WebAPI.Controllers
}
string[] processTypes = new string[] {
"T3-SingleSource",
"T3-MultiSourceSummary",
"T3-SingleSource",
"T3-SourceYearSummary",
"T3-MultiSourceYearSummary",
"T3-MultiSourceCopySelectedCodes",
"T3-MultiSourceCopySelectedCodesYearSummary",
"T3-MultiSourceSummary", // AA
"T3-MultiSourceYearSummary", // AA/13
"T3-R1"
};

14
WebAPI/Program.cs
View File

@@ -52,11 +52,6 @@ builder.Services.AddAuthentication(options =>
});
builder.Services.AddAuthentication();
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
builder.Services.AddEndpointsApiExplorer();
builder.Services.AddSwaggerGen();
builder.Services.AddSingleton(typeof(GoogleSheetsHelper));
builder.Services.AddSingleton(typeof(GoogleDriveHelper));
@@ -74,15 +69,6 @@ app.Use(async (context, next) =>
await next(context);
});
// Configure the HTTP request pipeline.
if (app.Environment.IsDevelopment())
{
app.UseSwagger();
app.UseSwaggerUI();
}
// app.UseHttpsRedirection();
app.UseCors("CORSPolicy");
app.UseAuthentication();

19
WebAPI/Properties/launchSettings.json
View File

@@ -1,31 +1,12 @@
{
"$schema": "https://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:12241",
"sslPort": 44358
}
},
"profiles": {
"WebAPI": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "https://localhost:7009;http://localhost:5183",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"dotnetRunMessages": true
},
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
}

10
WebAPI/dataProcessors/t1.r1.processor.cs
View File

@@ -170,8 +170,8 @@ namespace WebAPI.dataProcessors
public void updateReport()
{
string sheetId = "1pph-XowjlK5CIaCEV_A5buK4ceJ0Z0YoUlDI4VMkhhA";
string sheetName = "Raport_AB-AA_Eksport";
SpreadsheetsResource.ValuesResource.GetRequest request = googleSheetValues.Get(sheetId, "D4:EX4");
string sheetName = "Raport_R1_Eksport";
SpreadsheetsResource.ValuesResource.GetRequest request = googleSheetValues.Get(sheetId, "C4:EX4");
var response = request.Execute();
Layer? R1 = db.Layers
@@ -179,7 +179,7 @@ namespace WebAPI.dataProcessors
.Include(x => x.Records)
.FirstOrDefault();
int startRow = 16;
int startRow = 6;
var codesRow = response.Values[0];
for (int i = 1; i <= DateTime.UtcNow.Month; i++)
@@ -203,7 +203,7 @@ namespace WebAPI.dataProcessors
{
Values = new List<IList<object>> { values }
};
SpreadsheetsResource.ValuesResource.UpdateRequest update = googleSheetValues.Update(ValueRange, sheetId, $"{sheetName}!D{row}:XZ{row}");
SpreadsheetsResource.ValuesResource.UpdateRequest update = googleSheetValues.Update(ValueRange, sheetId, $"{sheetName}!C{row}:XZ{row}");
update.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
update.Execute();
}
@@ -227,7 +227,7 @@ namespace WebAPI.dataProcessors
{
Values = new List<IList<object>> { valuesSum }
};
SpreadsheetsResource.ValuesResource.UpdateRequest updateSum = googleSheetValues.Update(ValueRangeSum, sheetId, $"{sheetName}!D{rowSum}:XZ{rowSum}");
SpreadsheetsResource.ValuesResource.UpdateRequest updateSum = googleSheetValues.Update(ValueRangeSum, sheetId, $"{sheetName}!C{rowSum}:XZ{rowSum}");
updateSum.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateSum.Execute();
}

267
WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodesYearSummary.processor.cs
View File

@@ -28,10 +28,10 @@ namespace WebAPI.dataProcessors
int year = int.Parse(processWorker!.Records?.SingleOrDefault(x => x.Code == "Year")?.Desc1!);
Layer? processedLayer = db.Layers
.Where(x => x.ParentId == processWorker!.Id
&& !x.IsDeleted)
.OrderByDescending(x => x.CreatedAt)
.FirstOrDefault();
.Where(x => x.ParentId == processWorker!.Id
&& !x.IsDeleted)
.OrderByDescending(x => x.CreatedAt)
.FirstOrDefault();
bool isNew = false;
if (processedLayer == null)
@@ -63,9 +63,9 @@ namespace WebAPI.dataProcessors
for (int i = 1; i < 13; i++)
{
Layer? dataSource = db.Layers.Where(x =>
x.Type == LayerType.processed
&& !x.IsDeleted
&& x.Name != null && x.Name.Contains($"{year}/{i}-AB-T3"))
x.Type == LayerType.processed
&& !x.IsDeleted
&& x.Name != null && x.Name.Contains($"{year}/{i}-AB-T3"))
.Include(x => x.Records)
.FirstOrDefault();
if (dataSource != null)
@@ -96,6 +96,7 @@ namespace WebAPI.dataProcessors
ProcessHelper.setValue(processedRecord, i,
codeRecords.Sum(x => ProcessHelper.getValue(x, i)));
}
newRecords.Add(processedRecord);
}
@@ -107,259 +108,9 @@ namespace WebAPI.dataProcessors
{
db.Layers.Update(processedLayer);
}
controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
db.SaveChanges();
updateReport();
}
public void updateReport()
{
string sheetId = "1pph-XowjlK5CIaCEV_A5buK4ceJ0Z0YoUlDI4VMkhhA";
string sheetName = "Raport_AB-AA_Eksport";
SpreadsheetsResource.ValuesResource.GetRequest request = googleSheetValues.Get(sheetId, "D4:EX4");
var response = request.Execute();
Layer? january = db.Layers
.Where(x => x.Number == 572)
.Include(x => x.Records)
.FirstOrDefault();
Layer? february = db.Layers
.Where(x => x.Number == 742)
.Include(x => x.Records)
.FirstOrDefault();
Layer? march = db.Layers
.Where(x => x.Number == 822)
.Include(x => x.Records)
.FirstOrDefault();
Layer? april = db.Layers
.Where(x => x.Number == 1018)
.Include(x => x.Records)
.FirstOrDefault();
Layer? may = db.Layers
.Where(x => x.Number == 1172)
.Include(x => x.Records)
.FirstOrDefault();
Layer? sum = db.Layers
.Where(x => x.Number == 955)
.Include(x => x.Records)
.FirstOrDefault();
//AA
Layer? januaryAA = db.Layers
.Where(x => x.Number == 568)
.Include(x => x.Records)
.FirstOrDefault();
Layer? februaryAA = db.Layers
.Where(x => x.Number == 741)
.Include(x => x.Records)
.FirstOrDefault();
Layer? marchAA = db.Layers
.Where(x => x.Number == 813)
.Include(x => x.Records)
.FirstOrDefault();
Layer? aprilAA = db.Layers
.Where(x => x.Number == 1017)
.Include(x => x.Records)
.FirstOrDefault();
Layer? mayAA = db.Layers
.Where(x => x.Number == 1171)
.Include(x => x.Records)
.FirstOrDefault();
Layer? sumAA = db.Layers
.Where(x => x.Number == 570)
.Include(x => x.Records)
.FirstOrDefault();
List<object> januaryValues = new List<object>();
List<object> februaryValues = new List<object>();
List<object> marchValues = new List<object>();
List<object> aprilValues = new List<object>();
List<object> mayValues = new List<object>();
List<object> sumValues = new List<object>();
var codesRow = response.Values[0];
foreach (string code in codesRow)
{
Record? januaryRecord = january!.Records?.SingleOrDefault(x => x.Code == code);
Record? februaryRecord = february!.Records?.SingleOrDefault(x => x.Code == code);
Record? marchRecord = march!.Records?.SingleOrDefault(x => x.Code == code);
Record? aprilRecord = april!.Records?.SingleOrDefault(x => x.Code == code);
Record? mayRecord = may!.Records?.SingleOrDefault(x => x.Code == code);
Record? sumRecord = sum!.Records?.SingleOrDefault(x => x.Code == code);
if (januaryRecord != null)
{
double? januaryValue = ProcessHelper.getValue(januaryRecord, 32);
januaryValues.Add(januaryValue!.Value);
}
else
{
januaryRecord = januaryAA!.Records?.SingleOrDefault(x => x.Code == code);
if (januaryRecord != null)
{
double? januaryValue = ProcessHelper.getValue(januaryRecord, 32);
januaryValues.Add(januaryValue!.Value);
}
else
{
januaryValues.Add("");
}
}
if (februaryRecord != null)
{
double? februaryValue = ProcessHelper.getValue(februaryRecord, 32);
februaryValues.Add(februaryValue!.Value);
}
else
{
februaryRecord = februaryAA!.Records?.SingleOrDefault(x => x.Code == code);
if (februaryRecord != null)
{
double? februaryValue = ProcessHelper.getValue(februaryRecord, 32);
februaryValues.Add(februaryValue!.Value);
}
else
{
februaryValues.Add("");
}
}
if (marchRecord != null)
{
double? marchValue = ProcessHelper.getValue(marchRecord, 32);
marchValues.Add(marchValue!.Value);
}
else
{
marchRecord = marchAA!.Records?.SingleOrDefault(x => x.Code == code);
if (marchRecord != null)
{
double? marchValue = ProcessHelper.getValue(marchRecord, 32);
marchValues.Add(marchValue!.Value);
}
else
{
marchValues.Add("");
}
}
if (aprilRecord != null)
{
double? aprilValue = ProcessHelper.getValue(aprilRecord, 32);
aprilValues.Add(aprilValue!.Value);
}
else
{
aprilRecord = aprilAA!.Records?.SingleOrDefault(x => x.Code == code);
if (aprilRecord != null)
{
double? aprilValue = ProcessHelper.getValue(aprilRecord, 32);
aprilValues.Add(aprilValue!.Value);
}
else
{
aprilValues.Add("");
}
}
if (mayRecord != null)
{
double? mayValue = ProcessHelper.getValue(mayRecord, 32);
mayValues.Add(mayValue!.Value);
}
else
{
mayRecord = mayAA!.Records?.SingleOrDefault(x => x.Code == code);
if (mayRecord != null)
{
double? mayValue = ProcessHelper.getValue(mayRecord, 32);
mayValues.Add(mayValue!.Value);
}
else
{
mayValues.Add("");
}
}
if (sumRecord != null)
{
double? sumValue = ProcessHelper.getValue(sumRecord, 32);
sumValues.Add(sumValue!.Value);
}
else
{
sumRecord = sumAA!.Records?.SingleOrDefault(x => x.Code == code);
if (sumRecord != null)
{
double? sumValue = ProcessHelper.getValue(sumRecord, 32);
sumValues.Add(sumValue!.Value);
}
else
{
sumValues.Add("");
}
}
}
ValueRange januaryValueRange = new ValueRange
{
Values = new List<IList<object>> { januaryValues }
};
SpreadsheetsResource.ValuesResource.UpdateRequest updateJanuary = googleSheetValues.Update(januaryValueRange, sheetId, $"{sheetName}!D7:EX7");
updateJanuary.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateJanuary.Execute();
ValueRange februaryValueRange = new ValueRange
{
Values = new List<IList<object>> { februaryValues }
};
SpreadsheetsResource.ValuesResource.UpdateRequest updateFebruary = googleSheetValues.Update(februaryValueRange, sheetId, $"{sheetName}!D8:EX8");
updateFebruary.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateFebruary.Execute();
ValueRange marchValueRange = new ValueRange
{
Values = new List<IList<object>> { marchValues }
};
SpreadsheetsResource.ValuesResource.UpdateRequest updateMarch = googleSheetValues.Update(marchValueRange, sheetId, $"{sheetName}!D9:EX9");
updateMarch.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateMarch.Execute();
ValueRange aprilValueRange = new ValueRange
{
Values = new List<IList<object>> { aprilValues }
};
SpreadsheetsResource.ValuesResource.UpdateRequest updateApril = googleSheetValues.Update(aprilValueRange, sheetId, $"{sheetName}!D10:EX10");
updateApril.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateApril.Execute();
ValueRange mayValueRange = new ValueRange
{
Values = new List<IList<object>> { mayValues }
};
SpreadsheetsResource.ValuesResource.UpdateRequest updateMay = googleSheetValues.Update(mayValueRange, sheetId, $"{sheetName}!D11:EX11");
updateMay.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateMay.Execute();
ValueRange sumValueRange = new ValueRange
{
Values = new List<IList<object>> { sumValues }
};
SpreadsheetsResource.ValuesResource.UpdateRequest updateSum = googleSheetValues.Update(sumValueRange, sheetId, $"{sheetName}!D13:XZ13");
updateSum.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateSum.Execute();
}
}
}