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

ProcessorsFIX

Browse Source
This commit is contained in:
Michał Zieliński
2023-10-12 18:08:00 +02:00
parent f2ecfc7ad5
commit 759f55cc2f
4 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Utils/SQL_HELPERS.sql
View File

@@ -3,7 +3,7 @@
--[CreatedById], [ModifiedById], [Type]) --[CreatedById], [ModifiedById], [Type])
--VALUES ('2cadf61e-2653-4cda-aaef-d59e9e4c1c26', 84, 'Manual', 'L84-A-IW_PU-2023/10-202310031948', --VALUES ('2cadf61e-2653-4cda-aaef-d59e9e4c1c26', 84, 'Manual', 'L84-A-IW_PU-2023/10-202310031948',
--GETDATE(), GETDATE(), 0, '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 2); --GETDATE(), GETDATE(), 0, '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 2);
-- ----
--INSERT INTO [diunabi-morska].[dbo].[Records] --INSERT INTO [diunabi-morska].[dbo].[Records]
--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
--VALUES ('1e6b8736-5125-4c00-8da7-1bd7182ef49d', 'StartDate', '2023.09.30', --VALUES ('1e6b8736-5125-4c00-8da7-1bd7182ef49d', 'StartDate', '2023.09.30',
@@ -62,3 +62,22 @@
--DELETE FROM [diunabi-morska].[dbo].[Records] WHERE [LayerId] = 'bb4cc1ae-a94e-424d-9aa3-08dbba1c92b1'; --DELETE FROM [diunabi-morska].[dbo].[Records] WHERE [LayerId] = 'bb4cc1ae-a94e-424d-9aa3-08dbba1c92b1';
--DELETE FROM [diunabi-morska].[dbo].[Layers] WHERE [Id] = 'bb4cc1ae-a94e-424d-9aa3-08dbba1c92b1'; --DELETE FROM [diunabi-morska].[dbo].[Layers] WHERE [Id] = 'bb4cc1ae-a94e-424d-9aa3-08dbba1c92b1';
--DECLARE @LayerId UNIQUEIDENTIFIER;
--SET @LayerId = '306654d6-cdab-4fbb-b7f7-312093a0f178';
--
--INSERT INTO [diunabi-morska].[dbo].[Records]
--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
--VALUES ((SELECT NEWID()), 'Source', 'L83-A-IW_M7-2023/10-202310031937',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--
--INSERT INTO [diunabi-morska].[dbo].[Records]
--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
--VALUES ((SELECT NEWID()), 'Type', 'ProcessWorker',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--
--INSERT INTO [diunabi-morska].[dbo].[Records]
--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
--VALUES ((SELECT NEWID()), 'ProcessType', 'Copy',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));

10
WebAPI/DiunaBI-WebAPI.csproj
View File

@@ -9,13 +9,13 @@
<PropertyGroup Condition=" '$(RunConfiguration)' == 'WebAPI' " /> <PropertyGroup Condition=" '$(RunConfiguration)' == 'WebAPI' " />
<ItemGroup> <ItemGroup>
<PackageReference Include="CsvHelper" Version="30.0.1" /> <PackageReference Include="CsvHelper" Version="30.0.1" />
<PackageReference Include="Google.Apis.Auth" Version="1.62.0" /> <PackageReference Include="Google.Apis.Auth" Version="1.62.1" />
<PackageReference Include="Google.Apis.Drive.v3" Version="1.62.0.3155" /> <PackageReference Include="Google.Apis.Drive.v3" Version="1.62.0.3155" />
<PackageReference Include="Google.Apis.Sheets.v4" Version="1.62.0.3148" /> <PackageReference Include="Google.Apis.Sheets.v4" Version="1.62.0.3148" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.11" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.12" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.11" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.12" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.11" /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.12" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.11"> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.12">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>

10
WebAPI/dataProcessors/copy.processor.cs
View File

@@ -76,8 +76,10 @@ namespace WebAPI.dataProcessors
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.FirstOrDefault(); .FirstOrDefault();
bool isNew = false;
if (processedLayer == null) if (processedLayer == null)
{ {
isNew = true;
processedLayer = new Layer processedLayer = new Layer
{ {
Id = Guid.NewGuid(), Id = Guid.NewGuid(),
@@ -91,7 +93,6 @@ namespace WebAPI.dataProcessors
processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"); processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
processedLayer.CreatedAt = DateTime.UtcNow; processedLayer.CreatedAt = DateTime.UtcNow;
processedLayer.ModifiedAt = DateTime.UtcNow; processedLayer.ModifiedAt = DateTime.UtcNow;
db.Layers.Add(processedLayer);
} }
processedLayer.Records = new List<Record>(); processedLayer.Records = new List<Record>();
@@ -126,6 +127,13 @@ namespace WebAPI.dataProcessors
processedLayer.Records.Add(record); processedLayer.Records.Add(record);
} }
controller.SaveRecords(processedLayer.Id, processedLayer.Records, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D")); controller.SaveRecords(processedLayer.Id, processedLayer.Records, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
if (isNew)
{
db.Layers.Add(processedLayer);
} else
{
db.Layers.Update(processedLayer);
}
db.Layers.Update(processedLayer); db.Layers.Update(processedLayer);
db.SaveChanges(); db.SaveChanges();
} }

11
WebAPI/dataProcessors/deaggregation.processor.cs
View File

@@ -76,8 +76,10 @@ namespace WebAPI.dataProcessors
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.FirstOrDefault(); .FirstOrDefault();
bool isNew = false;
if (processedLayer == null) if (processedLayer == null)
{ {
isNew = true;
processedLayer = new Layer processedLayer = new Layer
{ {
Id = Guid.NewGuid(), Id = Guid.NewGuid(),
@@ -91,7 +93,6 @@ namespace WebAPI.dataProcessors
processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"); processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
processedLayer.CreatedAt = DateTime.UtcNow; processedLayer.CreatedAt = DateTime.UtcNow;
processedLayer.ModifiedAt = DateTime.UtcNow; processedLayer.ModifiedAt = DateTime.UtcNow;
db.Layers.Add(processedLayer);
} }
processedLayer.Sources = new List<ProcessSource>(); processedLayer.Sources = new List<ProcessSource>();
processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"); processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
@@ -177,7 +178,13 @@ namespace WebAPI.dataProcessors
newRecords.Add(processedRecord); newRecords.Add(processedRecord);
} }
controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D")); controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
db.Layers.Update(processedLayer); if (isNew)
{
db.Layers.Add(processedLayer);
} else
{
db.Layers.Update(processedLayer);
}
db.SaveChanges(); db.SaveChanges();
} }
private void setValue(Record record, int number, float? value) private void setValue(Record record, int number, float? value)