From 9f497857177a7b5d679d52e64ca9ba219e4610d8 Mon Sep 17 00:00:00 2001 From: Sarathlal Sarangadharan Date: Mon, 15 Apr 2024 10:10:51 +0100 Subject: [PATCH 1/2] TD-2954: Missing logic added --- .../Scripts/Post-Deploy/Script.PostDeployment.sql | 2 +- .../Activity/GetUserLearningActivitiesCount.sql | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql index 466d99f7b..020d3781d 100644 --- a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql +++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql @@ -82,4 +82,4 @@ UPDATE [resources].[ResourceVersion] SET CertificateEnabled = 0 WHERE VersionSta :r .\Scripts\TD-2929_ActivityStatusUpdates.sql :r .\Scripts\InitialiseDataForEmailTemplates.sql :r .\Scripts\AttributeData.sql -:r .\Scripts\TD-4016_Alter_CatalogueNodeVersionTable.sql \ No newline at end of file +--:r .\Scripts\TD-4016_Alter_CatalogueNodeVersionTable.sql \ No newline at end of file diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql index cd9334886..329cbcfed 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql +++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql @@ -278,7 +278,7 @@ FROM ( AND ( (SELECT TOP(1) - ISNULL([AssessmentResourceActivity3].[Score],0) + [AssessmentResourceActivity3].[Score] FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity3] WHERE [AssessmentResourceActivity3].[Deleted] = 0 @@ -307,7 +307,7 @@ FROM ( AND ( - (SELECT TOP(1) ISNULL([AssessmentResourceActivity5].[Score],0) + (SELECT TOP(1) [AssessmentResourceActivity5].[Score] FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity5] WHERE [AssessmentResourceActivity5].[Deleted] = 0 AND [ResourceActivity].[Id] = [AssessmentResourceActivity5].[ResourceActivityId]) < Cast([AssessResVer].[PassMark] AS DECIMAL(18,2)) From c7f27c9b2e66e5c1da1b3fe33de782e9de59ea66 Mon Sep 17 00:00:00 2001 From: Sarathlal Sarangadharan Date: Mon, 15 Apr 2024 10:24:39 +0100 Subject: [PATCH 2/2] TD-2954: Deployment fail issue fix --- .../LearningHub.Nhs.Database.sqlproj | 1 - .../Scripts/Post-Deploy/Script.PostDeployment.sql | 3 +-- .../Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql | 8 -------- .../Tables/Hierarchy/CatalogueNodeVersion.sql | 2 +- 4 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql diff --git a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj index a9581774b..bc730fb58 100644 --- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj +++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj @@ -513,7 +513,6 @@ - diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql index 020d3781d..151c7c2c5 100644 --- a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql +++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql @@ -81,5 +81,4 @@ UPDATE [resources].[ResourceVersion] SET CertificateEnabled = 0 WHERE VersionSta :r .\Scripts\InitialiseDataForEmailTemplates.sql :r .\Scripts\TD-2929_ActivityStatusUpdates.sql :r .\Scripts\InitialiseDataForEmailTemplates.sql -:r .\Scripts\AttributeData.sql ---:r .\Scripts\TD-4016_Alter_CatalogueNodeVersionTable.sql \ No newline at end of file +:r .\Scripts\AttributeData.sql \ No newline at end of file diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql deleted file mode 100644 index 9132ee450..000000000 --- a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql +++ /dev/null @@ -1,8 +0,0 @@ ---TD-4016-Remove character limit from catalogue description - -IF EXISTS(SELECT 1 FROM sys.columns - WHERE Name = N'Description' - AND Object_ID = Object_ID(N'hierarchy.CatalogueNodeVersion')) -BEGIN - ALTER TABLE hierarchy.CatalogueNodeVersion ALTER COLUMN Description nvarchar(max) not null; -END \ No newline at end of file diff --git a/WebAPI/LearningHub.Nhs.Database/Tables/Hierarchy/CatalogueNodeVersion.sql b/WebAPI/LearningHub.Nhs.Database/Tables/Hierarchy/CatalogueNodeVersion.sql index ea9bc01d7..a9405c505 100644 --- a/WebAPI/LearningHub.Nhs.Database/Tables/Hierarchy/CatalogueNodeVersion.sql +++ b/WebAPI/LearningHub.Nhs.Database/Tables/Hierarchy/CatalogueNodeVersion.sql @@ -7,7 +7,7 @@ [CardImageUrl] NVARCHAR (128) NULL, [BannerUrl] NVARCHAR (128) NULL, [CertificateUrl] NVARCHAR (128) NULL, - [Description] NVARCHAR (4000) NOT NULL, + [Description] NVARCHAR (MAX) NOT NULL, [OwnerName] NVARCHAR (250) NULL, [OwnerEmailAddress] NVARCHAR (250) NULL, [Notes] NVARCHAR (MAX) NULL,