From 7665235adc2dfd8a88eadb6bc333648bb75b6c27 Mon Sep 17 00:00:00 2001 From: Guillaume Chervet Date: Tue, 6 Sep 2022 11:56:27 +0200 Subject: [PATCH] fix(label): sql column size to small for many labels --- Scripts/Release/SQL/Azure_R1/005_alter_tables.sql | 6 ++++++ docker/initBase.sql | 2 +- .../Datasets/Database/DatasetsConvertRepository.cs | 14 ++++++-------- 3 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 Scripts/Release/SQL/Azure_R1/005_alter_tables.sql diff --git a/Scripts/Release/SQL/Azure_R1/005_alter_tables.sql b/Scripts/Release/SQL/Azure_R1/005_alter_tables.sql new file mode 100644 index 000000000..818fd2195 --- /dev/null +++ b/Scripts/Release/SQL/Azure_R1/005_alter_tables.sql @@ -0,0 +1,6 @@ +USE [ECOTAG] +GO + +/****** Object: Table [sch_ECOTAG].[T_Project] ******/ +ALTER TABLE [sch_ECOTAG].[T_Project] ALTER COLUMN [PRJ_LabelsJson] [NVARCHAR](max) NOT NULL; +GO diff --git a/docker/initBase.sql b/docker/initBase.sql index 76fcdc1e1..b5a43be8c 100644 --- a/docker/initBase.sql +++ b/docker/initBase.sql @@ -164,7 +164,7 @@ CREATE TABLE [sch_ECOTAG].[T_Project]( [PRJ_NumberCrossAnnotation] [int] NOT NULL CHECK (PRJ_NumberCrossAnnotation between 1 and 10), [PRJ_CreateDate] BIGINT NOT NULL, [PRJ_AnnotationType] int NOT NULL, - [PRJ_LabelsJson] [varchar](2048) NOT NULL, + [PRJ_LabelsJson] [NVARCHAR](max) NOT NULL, [PRJ_CreatorNameIdentifier] [varchar](64) NOT NULL, CONSTRAINT [PK_T_Project] PRIMARY KEY NONCLUSTERED ([PRJ_Id]), CONSTRAINT [FK_T_Project_GRP_Id] FOREIGN KEY (GRP_Id) REFERENCES [sch_ECOTAG].[T_Group] (GRP_Id), diff --git a/src/Ml.Cli.WebApp/Server/Datasets/Database/DatasetsConvertRepository.cs b/src/Ml.Cli.WebApp/Server/Datasets/Database/DatasetsConvertRepository.cs index 4208088dd..460404b41 100644 --- a/src/Ml.Cli.WebApp/Server/Datasets/Database/DatasetsConvertRepository.cs +++ b/src/Ml.Cli.WebApp/Server/Datasets/Database/DatasetsConvertRepository.cs @@ -97,11 +97,13 @@ private static async Task ConvertToPdfAsync(IServiceScopeFactory serviceScopeFac count = filenames.Count(); if (!DatasetsRepository.ExtentionsConvertedToPdf.Contains(Path.GetExtension(filename.Name))) continue; var fileNamePdf = $"{filename.Name}.pdf"; - var fileNamePdfError = $"{filename.Name}_pdf.error"; + var fileNamePdfLock = $"{filename.Name}_pdf.lock"; var isFileExist = await fileService.IsFileExistAsync($"{dataset.BlobUri}/{fileNamePdf}"); if (isFileExist) continue; - var isFileErrorExist = await fileService.IsFileExistAsync($"{dataset.BlobUri}/{fileNamePdfError}"); + var isFileErrorExist = await fileService.IsFileExistAsync($"{dataset.BlobUri}/{fileNamePdfLock}"); if (isFileErrorExist) continue; + var streamTxt = GenerateStreamFromString(DateTime.Now.Ticks.ToString()); + await fileService.UploadStreamAsync($"{dataset.BlobUri}/{fileNamePdfLock}", streamTxt); var file = await fileService.DownloadAsync($"{dataset.BlobUri}/{filename.Name}"); if (!file.IsSuccess) continue; var streamPdf = await documentConverterToPdf.ConvertAsync(filename.Name, file.Data.Stream); @@ -109,13 +111,9 @@ private static async Task ConvertToPdfAsync(IServiceScopeFactory serviceScopeFac { streamPdf.Position = 0; await fileService.UploadStreamAsync($"{dataset.BlobUri}/{fileNamePdf}", streamPdf); + await fileService.DeleteAsync($"{dataset.BlobUri}/{fileNamePdfLock}"); } - else - { - var streamTxt = GenerateStreamFromString("ko"); - await fileService.UploadStreamAsync($"{dataset.BlobUri}/{fileNamePdfError}", streamTxt); - } - + var reservations = await datasetContext.Reservations.Where(r => r.FileId == filename.Id).ToListAsync(); foreach (var reservationModel in reservations) {