From fc4738a364abf98d5fdf1192585b1510439ad106 Mon Sep 17 00:00:00 2001
From: Jerrico Dela Cruz <94591636+jerricotandelacruz@users.noreply.github.com>
Date: Mon, 2 Sep 2024 21:57:17 +0800
Subject: [PATCH] refactor: Update Application tbl and item sps

Signed-off-by: Jerrico Dela Cruz <94591636+jerricotandelacruz@users.noreply.github.com>
---
 .../PR_Application_Select_ById.sql            | 18 +++++++----
 .../Stored Procedures/PR_Items_Select.sql     | 32 ++++++++++++++++---
 .../Stored Procedures/PR_Items_Total.sql      |  9 ++++--
 src/sqldb/Tables/Applications.sql             | 19 +++++------
 4 files changed, 55 insertions(+), 23 deletions(-)

diff --git a/src/sqldb/Stored Procedures/PR_Application_Select_ById.sql b/src/sqldb/Stored Procedures/PR_Application_Select_ById.sql
index e651acf..b41fd9c 100644
--- a/src/sqldb/Stored Procedures/PR_Application_Select_ById.sql	
+++ b/src/sqldb/Stored Procedures/PR_Application_Select_ById.sql	
@@ -3,10 +3,14 @@ CREATE PROCEDURE PR_Applications_Select_ById
 	@Id UNIQUEIDENTIFIER
 
 AS
-
-SELECT
-dbo.UidToString(Id) [Id], [Name]
-FROM Applications
-WHERE
-IsActive = 1
-AND Id = @Id
\ No newline at end of file
+BEGIN
+	SELECT
+		dbo.UidToString(Id) [Id],
+		[Name],
+		[ExportUrl],
+		[OrganizationTypeUrl]
+	FROM
+		Applications
+	WHERE
+		IsActive = 1 AND Id = @Id
+END
\ No newline at end of file
diff --git a/src/sqldb/Stored Procedures/PR_Items_Select.sql b/src/sqldb/Stored Procedures/PR_Items_Select.sql
index 46d74c4..f510365 100644
--- a/src/sqldb/Stored Procedures/PR_Items_Select.sql	
+++ b/src/sqldb/Stored Procedures/PR_Items_Select.sql	
@@ -6,12 +6,13 @@ CREATE PROCEDURE [dbo].[PR_Items_Select]
 	@ItemType bit = NULL, -- NULL - ALL / 0 - REQUESTOR / 1 - APPROVER
 	@User varchar(100) = NULL,
 	@IsApproved int = 4,
-	@RequestType varchar(100) = NULL
+	@RequestType varchar(100) = NULL,
+	@Organization varchar(100) = NULL
 )
 AS
 BEGIN
 	SELECT
-		DISTINCT dbo.UidToString(i.Id) AS ItemId
+		dbo.UidToString(i.Id) AS ItemId
 		, dbo.UidToString(a.Id) AS ApplicationId
 		, a.Name AS Application
 		, dbo.UidToString(am.Id) AS ApplicationModuleId
@@ -27,14 +28,14 @@ BEGIN
 		, T.ApproveText
 		, T.RejectText
 	    , isnull(AllowReassign,'') as AllowReassign
+		, COUNT(*) AS Score
 	  FROM [dbo].[Items] i
 		INNER JOIN ApplicationModules am ON i.ApplicationModuleId = am.Id
 		INNER JOIN Applications a ON am.ApplicationId = a.Id
 		INNER JOIN ApprovalTypes t ON t.Id = am.ApprovalTypeId
 		INNER JOIN ApprovalRequestApprovers ara ON i.Id = ara.ItemId
+		INNER JOIN STRING_SPLIT(@Search, ' ') AS ss ON (i.Subject LIKE '%'+ss.value+'%' OR i.CreatedBy LIKE '%'+ss.value+'%')
 	  WHERE
-		Subject LIKE '%'+@Search+'%'
-		AND
 		(
 			@ItemType IS NULL 
 			OR 
@@ -52,8 +53,29 @@ BEGIN
 		(
 			@RequestType IS NULL OR
 			(@RequestType IS NOT NULL AND i.ApplicationModuleId = @RequestType)
+		) AND
+		(
+			@Organization IS NULL OR
+			(@Organization IS NOT NULL AND i.Body LIKE '%'+@Organization+'%')
 		)
-	ORDER BY I.Created DESC
+	GROUP BY 
+		i.Id,
+		a.Id,
+		a.Name,
+		am.Id,
+		am.Name,
+		RespondedBy,
+		Subject,
+		Body,
+		DateSent,
+		DateResponded,
+		IsApproved,
+		ApproverRemarks,
+		I.Created,
+		T.ApproveText,
+		T.RejectText,
+		AllowReassign
+	ORDER BY Score, I.Created DESC
 	OFFSET @Offset ROWS 
 	FETCH NEXT @Filter ROWS ONLY
 END
\ No newline at end of file
diff --git a/src/sqldb/Stored Procedures/PR_Items_Total.sql b/src/sqldb/Stored Procedures/PR_Items_Total.sql
index 193d18e..1545803 100644
--- a/src/sqldb/Stored Procedures/PR_Items_Total.sql	
+++ b/src/sqldb/Stored Procedures/PR_Items_Total.sql	
@@ -4,7 +4,8 @@ CREATE PROCEDURE [dbo].[PR_Items_Total]
 	@ItemType bit = NULL, -- NULL - ALL / 0 - REQUESTOR / 1 - APPROVER,
 	@User varchar(100) = NULL,
 	@IsApproved int = 4,
-	@RequestType varchar(100) = NULL
+	@RequestType varchar(100) = NULL,
+	@Organization varchar(100) = NULL
 )
 AS
 BEGIN
@@ -18,8 +19,8 @@ BEGIN
 			INNER JOIN Applications a ON am.ApplicationId = a.Id
 			INNER JOIN ApprovalTypes t ON t.Id = am.ApprovalTypeId
 			INNER JOIN ApprovalRequestApprovers ara ON i.Id = ara.ItemId
+			INNER JOIN STRING_SPLIT(@Search, ' ') AS ss ON (i.Subject LIKE '%'+ss.value+'%' OR i.CreatedBy LIKE '%'+ss.value+'%')
 		WHERE
-			Subject LIKE '%'+@Search+'%' AND
 			(
 				@ItemType IS NULL 
 				OR 
@@ -43,6 +44,10 @@ BEGIN
 			(
 				@RequestType IS NULL OR
 				(@RequestType IS NOT NULL AND i.ApplicationModuleId = @RequestType)
+			) AND
+			(
+				@Organization IS NULL OR
+				(@Organization IS NOT NULL AND i.Body LIKE '%'+@Organization+'%')
 			)
 		) AS Items
 END
\ No newline at end of file
diff --git a/src/sqldb/Tables/Applications.sql b/src/sqldb/Tables/Applications.sql
index 21c4293..2d89918 100644
--- a/src/sqldb/Tables/Applications.sql
+++ b/src/sqldb/Tables/Applications.sql
@@ -1,11 +1,12 @@
 CREATE TABLE [dbo].[Applications] (
-    [Id]         UNIQUEIDENTIFIER CONSTRAINT [DF_Applications_Id] DEFAULT (newid()) NOT NULL,
-    [Name]       VARCHAR (100)    NOT NULL,
-    [IsActive]   BIT              CONSTRAINT [DF_Applications_IsActive] DEFAULT ((1)) NOT NULL,
-    [Created]    DATETIME         CONSTRAINT [DF_Applications_Created] DEFAULT (getdate()) NOT NULL,
-    [CreatedBy]  VARCHAR (255)    NULL,
-    [Modified]   DATETIME         CONSTRAINT [DF_Applications_Modified] DEFAULT (getdate()) NOT NULL,
-    [ModifiedBy] VARCHAR (255)    NULL,
+    [Id] UNIQUEIDENTIFIER CONSTRAINT [DF_Applications_Id] DEFAULT (newid()) NOT NULL,
+    [Name] VARCHAR (100) NOT NULL,
+    [IsActive] BIT CONSTRAINT [DF_Applications_IsActive] DEFAULT ((1)) NOT NULL,
+    [ExportUrl] VARCHAR (255) NULL,
+    [OrganizationTypeUrl] VARCHAR (255) NULL,
+    [Created] DATETIME CONSTRAINT [DF_Applications_Created] DEFAULT (getdate()) NOT NULL,
+    [CreatedBy] VARCHAR (255) NULL,
+    [Modified] DATETIME CONSTRAINT [DF_Applications_Modified] DEFAULT (getdate()) NOT NULL,
+    [ModifiedBy] VARCHAR (255) NULL,
     CONSTRAINT [PK_Applications] PRIMARY KEY CLUSTERED ([Id] ASC)
-);
-
+);
\ No newline at end of file