From d4309c467b02a1a78e246a32538641de79f59df3 Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Wed, 4 Sep 2024 11:52:57 +0100 Subject: [PATCH 1/3] TD-4450 : The problem with creating the subfolder has been resolved. --- .../Hierarchy/HierarchyEditFolderCreate.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/HierarchyEditFolderCreate.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/HierarchyEditFolderCreate.sql index 8c53bdf6c..d352e66b1 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/HierarchyEditFolderCreate.sql +++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/HierarchyEditFolderCreate.sql @@ -9,6 +9,7 @@ -- 22-04-2024 DB Included NULL NodeId and UserId in call to [hierarchy].[FolderNodeVersionCreate]. -- 15-05-2024 DB Accept @ParentNodePathId as input parameter, create NodePath and populate NodePathId and ParentNodePathId in HierarchyEditDetail. -- 10-07-2024 DB Added PrimaryCatalogueNodeId to the NodeVersion table. +-- 04-09-2024 SA The problem with creating the subfolder has been resolved. ------------------------------------------------------------------------------- CREATE PROCEDURE [hierarchy].[HierarchyEditFolderCreate] ( @@ -46,6 +47,22 @@ BEGIN AND HierarchyEditDetailTypeId = 4 -- Node Link AND Deleted = 0 + IF @ParentNodeId IS NULL + BEGIN + + SELECT @ParentNodeId = NodeId, + @ParentNodePath = NodePath + FROM hierarchy.NodePath + WHERE Id = @ParentNodePathId + AND Deleted = 0 + + SELECT TOP 1 + @PrimaryCatalogueNodeId = PrimaryCatalogueNodeId + FROM hierarchy.HierarchyEditDetail + WHERE HierarchyEditId = @HierarchyEditId + AND Deleted = 0 + END + EXECUTE [hierarchy].[FolderNodeVersionCreate] NULL, @Name, @Description, @PrimaryCatalogueNodeId, @UserId, @CreatedNodeVersionId OUTPUT SELECT @CreatedNodeId = NodeId FROM hierarchy.NodeVersion WHERE Id = @CreatedNodeVersionId From facb0decea7d6b199437f6af54428aa837bd3f74 Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Wed, 4 Sep 2024 12:00:20 +0100 Subject: [PATCH 2/3] Comments added --- .../Stored Procedures/Hierarchy/HierarchyEditFolderCreate.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/HierarchyEditFolderCreate.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/HierarchyEditFolderCreate.sql index d352e66b1..e2ac1a7a2 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/HierarchyEditFolderCreate.sql +++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/HierarchyEditFolderCreate.sql @@ -47,6 +47,8 @@ BEGIN AND HierarchyEditDetailTypeId = 4 -- Node Link AND Deleted = 0 + -- Sub folder node creation (HierachyDetail type 3) + IF @ParentNodeId IS NULL BEGIN From 26007a637bfafb621b5ebf99b219c9fbf6ddb37f Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Wed, 4 Sep 2024 12:02:31 +0100 Subject: [PATCH 3/3] Comments modified --- .../Stored Procedures/Hierarchy/HierarchyEditFolderCreate.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/HierarchyEditFolderCreate.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/HierarchyEditFolderCreate.sql index e2ac1a7a2..288e3da07 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/HierarchyEditFolderCreate.sql +++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/HierarchyEditFolderCreate.sql @@ -47,7 +47,7 @@ BEGIN AND HierarchyEditDetailTypeId = 4 -- Node Link AND Deleted = 0 - -- Sub folder node creation (HierachyDetail type 3) + -- Sub folder node creation (HierarchyEditDetailTypeId 3) IF @ParentNodeId IS NULL BEGIN