From d4b202413577f69f3fde5bd2aabd07a3ff67c26e Mon Sep 17 00:00:00 2001 From: voommen-livefront Date: Wed, 18 Jun 2025 11:59:21 -0500 Subject: [PATCH 1/5] PM-20574 add CreateDate to the update proc --- src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql | 1 + util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql index afe57649dc..9e56769cf5 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql @@ -3,6 +3,7 @@ CREATE PROCEDURE [dbo].[OrganizationReport_Update] @OrganizationId UNIQUEIDENTIFIER, @Date DATETIME2(7), @ReportData NVARCHAR(MAX), + @CreationDate DATETIME2(7), @RevisionDate DATETIME2(7) AS SET NOCOUNT ON; diff --git a/util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql b/util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql index fdbf403e5c..3b278da955 100644 --- a/util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql +++ b/util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql @@ -81,6 +81,7 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_Update] @OrganizationId UNIQUEIDENTIFIER, @Date DATETIME2(7), @ReportData NVARCHAR(MAX), + @CreationDate DATETIME2(7), @RevisionDate DATETIME2(7) AS SET NOCOUNT ON; From 6356e944479baa0fca2f82078ebd1080346d5fee Mon Sep 17 00:00:00 2001 From: voommen-livefront Date: Wed, 18 Jun 2025 12:00:30 -0500 Subject: [PATCH 2/5] PM-20574 amend update proc for OrganizationApplication by adding createDate --- .../Dirt/Stored Procedures/OrganizationApplication_Update.sql | 1 + .../Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql index ac7cf3b53b..979a10f095 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql @@ -2,6 +2,7 @@ CREATE PROCEDURE [dbo].[OrganizationApplication_Update] @Id UNIQUEIDENTIFIER OUTPUT, @OrganizationId UNIQUEIDENTIFIER, @Applications NVARCHAR(MAX), + @CreationDate DATETIME2(7), @RevisionDate DATETIME2(7) AS SET NOCOUNT ON; diff --git a/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql index ea149b1ff9..2983c03582 100644 --- a/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql +++ b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql @@ -86,6 +86,7 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_Update] @Id UNIQUEIDENTIFIER OUTPUT, @OrganizationId UNIQUEIDENTIFIER, @Applications NVARCHAR(MAX), + @CreationDate DATETIME2(7), @RevisionDate DATETIME2(7) AS SET NOCOUNT ON; From 76821788d7f882bef82723dad5c08f8702968222 Mon Sep 17 00:00:00 2001 From: voommen-livefront Date: Wed, 18 Jun 2025 16:32:41 -0500 Subject: [PATCH 3/5] PM-20574 formatted sql and updated as per PR comments --- .../OrganizationApplication_Create.sql | 16 +-- .../OrganizationApplication_DeleteById.sql | 9 +- .../OrganizationApplication_ReadById.sql | 5 +- ...zationApplication_ReadByOrganizationId.sql | 5 +- .../OrganizationReport_Create.sql | 18 ++- .../OrganizationReport_DeleteById.sql | 3 - .../OrganizationReport_ReadById.sql | 21 ++-- ...rganizationReport_ReadByOrganizationId.sql | 3 - .../OrganizationReport_Update.sql | 1 + .../Organization_DeleteById.sql | 4 +- .../2025-06-13-00_OrganizationReport.sql | 101 ++++++++++------- .../2025-06-13-01_OrganizationApplication.sql | 103 ++++++++---------- 12 files changed, 147 insertions(+), 142 deletions(-) diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Create.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Create.sql index b2bb8593ef..91273d4d3d 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Create.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Create.sql @@ -8,18 +8,18 @@ AS SET NOCOUNT ON; INSERT INTO [dbo].[OrganizationApplication] - ( + ( [Id], [OrganizationId], [Applications], [CreationDate], [RevisionDate] - ) + ) VALUES ( - @Id, - @OrganizationId, - @Applications, - @CreationDate, - @RevisionDate - ); + @Id, + @OrganizationId, + @Applications, + @CreationDate, + @RevisionDate + ); diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_DeleteById.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_DeleteById.sql index 6febe8ccd0..8a2e4c243c 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_DeleteById.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_DeleteById.sql @@ -3,8 +3,7 @@ CREATE PROCEDURE [dbo].[OrganizationApplication_DeleteById] AS SET NOCOUNT ON; - IF @Id IS NULL - THROW 50000, 'Id cannot be null', 1; - - DELETE FROM [dbo].[OrganizationApplication] - WHERE [Id] = @Id + DELETE FROM + [dbo].[OrganizationApplication] + WHERE + [Id] = @Id diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_ReadById.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_ReadById.sql index 6913c3e3fa..4421492973 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_ReadById.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_ReadById.sql @@ -3,14 +3,11 @@ CREATE PROCEDURE [dbo].[OrganizationApplication_ReadById] AS SET NOCOUNT ON; - IF @Id IS NULL - THROW 50000, 'Id cannot be null', 1; - SELECT [Id], [OrganizationId], [Applications], [CreationDate], [RevisionDate] - FROM [dbo].[OrganizationApplication] + FROM [dbo].[OrganizationApplicationView] WHERE [Id] = @Id; diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_ReadByOrganizationId.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_ReadByOrganizationId.sql index e5cb6c2219..a6cbad9abf 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_ReadByOrganizationId.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_ReadByOrganizationId.sql @@ -3,14 +3,11 @@ CREATE PROCEDURE [dbo].[OrganizationApplication_ReadByOrganizationId] AS SET NOCOUNT ON; - IF @OrganizationId IS NULL - THROW 50000, 'OrganizationId cannot be null', 1; - SELECT [Id], [OrganizationId], [Applications], [CreationDate], [RevisionDate] - FROM [dbo].[OrganizationApplication] + FROM [dbo].[OrganizationApplicationView] WHERE [OrganizationId] = @OrganizationId; diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Create.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Create.sql index 5f372ce249..26f92153ad 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Create.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Create.sql @@ -8,5 +8,19 @@ CREATE PROCEDURE [dbo].[OrganizationReport_Create] AS SET NOCOUNT ON; - INSERT INTO [dbo].[OrganizationReport]( [Id],[OrganizationId],[Date],[ReportData],[CreationDate],[RevisionDate] ) - VALUES ( @Id,@OrganizationId,@Date,@ReportData,@CreationDate,@RevisionDate); + INSERT INTO [dbo].[OrganizationReport]( + [Id], + [OrganizationId], + [Date], + [ReportData], + [CreationDate], + [RevisionDate] + ) + VALUES ( + @Id, + @OrganizationId, + @Date, + @ReportData, + @CreationDate, + @RevisionDate + ); diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_DeleteById.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_DeleteById.sql index 6b3ac2eedc..fa274424df 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_DeleteById.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_DeleteById.sql @@ -3,8 +3,5 @@ CREATE PROCEDURE [dbo].[OrganizationReport_DeleteById] AS SET NOCOUNT ON; - IF @Id IS NULL - THROW 50000, 'Id cannot be null', 1; - DELETE FROM [dbo].[OrganizationReport] WHERE [Id] = @Id diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_ReadById.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_ReadById.sql index d51392199f..92ac1ff14d 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_ReadById.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_ReadById.sql @@ -3,15 +3,12 @@ CREATE PROCEDURE [dbo].[OrganizationReport_ReadById] AS SET NOCOUNT ON; -IF @Id IS NULL - THROW 50000, 'Id cannot be null', 1; - -SELECT - [Id], - [OrganizationId], - [Date], - [ReportData], - [CreationDate], - [RevisionDate] -FROM [dbo].[OrganizationReport] -WHERE [Id] = @Id; + SELECT + [Id], + [OrganizationId], + [Date], + [ReportData], + [CreationDate], + [RevisionDate] + FROM [dbo].[OrganizationReport] + WHERE [Id] = @Id; diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_ReadByOrganizationId.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_ReadByOrganizationId.sql index 21f5464700..a0fd5a548f 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_ReadByOrganizationId.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_ReadByOrganizationId.sql @@ -3,9 +3,6 @@ CREATE PROCEDURE [dbo].[OrganizationReport_ReadByOrganizationId] AS SET NOCOUNT ON; - IF @OrganizationId IS NULL - THROW 50000, 'OrganizationId cannot be null', 1; - SELECT [Id], [OrganizationId], diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql index 9e56769cf5..14878eea59 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql @@ -7,6 +7,7 @@ CREATE PROCEDURE [dbo].[OrganizationReport_Update] @RevisionDate DATETIME2(7) AS SET NOCOUNT ON; + UPDATE [dbo].[OrganizationReport] SET [OrganizationId] = @OrganizationId, [Date] = @Date, diff --git a/src/Sql/dbo/Stored Procedures/Organization_DeleteById.sql b/src/Sql/dbo/Stored Procedures/Organization_DeleteById.sql index 007c6fc432..50ad247c1a 100644 --- a/src/Sql/dbo/Stored Procedures/Organization_DeleteById.sql +++ b/src/Sql/dbo/Stored Procedures/Organization_DeleteById.sql @@ -142,14 +142,14 @@ BEGIN FROM [dbo].[OrganizationApplication] WHERE - [Id] = @Id + [OrganizationId] = @Id -- Delete Organization Report DELETE FROM [dbo].[OrganizationReport] WHERE - [Id] = @Id + [OrganizationId] = @Id DELETE FROM diff --git a/util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql b/util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql index 3b278da955..13db3709b4 100644 --- a/util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql +++ b/util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql @@ -1,28 +1,30 @@ -IF OBJECT_ID('dbo.OrganizationReport') IS NULL +IF OBJECT_ID('dbo.OrganizationReport') IS NULL BEGIN CREATE TABLE [dbo].[OrganizationReport] ( - [Id] UNIQUEIDENTIFIER NOT NULL, - [OrganizationId] UNIQUEIDENTIFIER NOT NULL, - [Date] DATETIME2 (7) NOT NULL, - [ReportData] NVARCHAR(MAX) NOT NULL, - [CreationDate] DATETIME2 (7) NOT NULL, - [RevisionDate] DATETIME2 (7) NOT NULL, - CONSTRAINT [PK_OrganizationReport] PRIMARY KEY CLUSTERED ([Id] ASC), - CONSTRAINT [FK_OrganizationReport_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id]) + [Id] UNIQUEIDENTIFIER NOT NULL, + [OrganizationId] UNIQUEIDENTIFIER NOT NULL, + [Date] DATETIME2 (7) NOT NULL, + [ReportData] NVARCHAR(MAX) NOT NULL, + [CreationDate] DATETIME2 (7) NOT NULL, + [RevisionDate] DATETIME2 (7) NOT NULL, + CONSTRAINT [PK_OrganizationReport] PRIMARY KEY CLUSTERED ([Id] ASC), + CONSTRAINT [FK_OrganizationReport_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id]) ); - CREATE NONCLUSTERED INDEX [IX_OrganizationReport_OrganizationId] - ON [dbo].[OrganizationReport]([OrganizationId] ASC); + CREATE NONCLUSTERED INDEX [IX_OrganizationReport_OrganizationId] ON [dbo].[OrganizationReport]([OrganizationId] ASC); - CREATE NONCLUSTERED INDEX [IX_OrganizationReport_OrganizationId_Date] - ON [dbo].[OrganizationReport]([OrganizationId] ASC, [Date] DESC); + CREATE NONCLUSTERED INDEX [IX_OrganizationReport_OrganizationId_Date] ON [dbo].[OrganizationReport]([OrganizationId] ASC, [Date] DESC); END GO -CREATE OR ALTER VIEW [dbo].[OrganizationReportView] AS - SELECT * FROM [dbo].[OrganizationReport]; +CREATE OR ALTER VIEW [dbo].[OrganizationReportView] +AS + SELECT + * + FROM + [dbo].[OrganizationReport]; GO CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_Create] @@ -34,8 +36,27 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_Create] @RevisionDate DATETIME2(7) AS SET NOCOUNT ON; - INSERT INTO [dbo].[OrganizationReport]( [Id],[OrganizationId],[Date],[ReportData],[CreationDate],[RevisionDate] ) - VALUES ( @Id,@OrganizationId,@Date,@ReportData,@CreationDate,@RevisionDate); + + INSERT INTO + [dbo].[OrganizationReport] + ( + [Id], + [OrganizationId], + [Date], + [ReportData], + [CreationDate], + [RevisionDate] + ) + VALUES + ( + @Id, + @OrganizationId, + @Date, + @ReportData, + @CreationDate, + @RevisionDate + ); + GO CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_ReadByOrganizationId] @@ -43,9 +64,6 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_ReadByOrganizationId] AS SET NOCOUNT ON; - IF @OrganizationId IS NULL - THROW 50000, 'OrganizationId cannot be null', 1; - SELECT [Id], [OrganizationId], @@ -53,8 +71,11 @@ AS [ReportData], [CreationDate], [RevisionDate] - FROM [dbo].[OrganizationReport] - WHERE [OrganizationId] = @OrganizationId; + FROM + [dbo].[OrganizationReportView] + WHERE + [OrganizationId] = @OrganizationId; + GO CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_ReadById] @@ -62,9 +83,6 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_ReadById] AS SET NOCOUNT ON; - IF @Id IS NULL - THROW 50000, 'Id cannot be null', 1; - SELECT [Id], [OrganizationId], @@ -72,8 +90,11 @@ AS [ReportData], [CreationDate], [RevisionDate] - FROM [dbo].[OrganizationReport] - WHERE [Id] = @Id; + FROM + [dbo].[OrganizationReportView] + WHERE + [Id] = @Id; + GO CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_Update] @@ -85,26 +106,26 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_Update] @RevisionDate DATETIME2(7) AS SET NOCOUNT ON; - UPDATE [dbo].[OrganizationReport] - SET [OrganizationId] = @OrganizationId, + + UPDATE + [dbo].[OrganizationReport] + SET + [OrganizationId] = @OrganizationId, [Date] = @Date, [ReportData] = @ReportData, [RevisionDate] = @RevisionDate - WHERE [Id] = @Id; -GO + WHERE + [Id] = @Id; +GO CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_DeleteById] @Id UNIQUEIDENTIFIER AS SET NOCOUNT ON; - IF @Id IS NULL - THROW 50000, 'Id cannot be null', 1; - - DELETE FROM [dbo].[OrganizationReport] - WHERE [Id] = @Id; -GO - - - + DELETE FROM + [dbo].[OrganizationReport] + WHERE + [Id] = @Id; +GO \ No newline at end of file diff --git a/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql index 2983c03582..4c3ab83737 100644 --- a/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql +++ b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql @@ -1,22 +1,26 @@ IF OBJECT_ID('dbo.OrganizationApplication') IS NULL BEGIN - CREATE TABLE [dbo].[OrganizationApplication] ( - [Id] UNIQUEIDENTIFIER NOT NULL, - [OrganizationId] UNIQUEIDENTIFIER NOT NULL, - [Applications] NVARCHAR(MAX) NOT NULL, - [CreationDate] DATETIME2 (7) NOT NULL, - [RevisionDate] DATETIME2 (7) NOT NULL, + CREATE TABLE [dbo].[OrganizationApplication] + ( + [Id] UNIQUEIDENTIFIER NOT NULL, + [OrganizationId] UNIQUEIDENTIFIER NOT NULL, + [Applications] NVARCHAR(MAX) NOT NULL, + [CreationDate] DATETIME2 (7) NOT NULL, + [RevisionDate] DATETIME2 (7) NOT NULL, CONSTRAINT [PK_OrganizationApplication] PRIMARY KEY CLUSTERED ([Id] ASC), CONSTRAINT [FK_OrganizationApplication_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id]) - ); + ); CREATE NONCLUSTERED INDEX [IX_OrganizationApplication_OrganizationId] ON [dbo].[OrganizationApplication]([OrganizationId] ASC); + END GO -CREATE OR ALTER VIEW [dbo].[OrganizationApplicationView] AS - SELECT * FROM [dbo].[OrganizationApplication]; +CREATE OR ALTER VIEW [dbo].[OrganizationApplicationView] +AS + SELECT * + FROM [dbo].[OrganizationApplication]; GO CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_Create] @@ -26,18 +30,18 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_Create] @CreationDate DATETIME2(7), @RevisionDate DATETIME2(7) AS - SET NOCOUNT ON; +SET NOCOUNT ON; - INSERT INTO [dbo].[OrganizationApplication] +INSERT INTO [dbo].[OrganizationApplication] ( - [Id], - [OrganizationId], - [Applications], - [CreationDate], - [RevisionDate] + [Id], + [OrganizationId], + [Applications], + [CreationDate], + [RevisionDate] ) - VALUES - ( +VALUES + ( @Id, @OrganizationId, @Applications, @@ -49,37 +53,31 @@ GO CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadByOrganizationId] @OrganizationId UNIQUEIDENTIFIER AS - SET NOCOUNT ON; +SET NOCOUNT ON; - IF @OrganizationId IS NULL - THROW 50000, 'OrganizationId cannot be null', 1; - - SELECT - [Id], - [OrganizationId], - [Applications], - [CreationDate], - [RevisionDate] - FROM [dbo].[OrganizationApplication] - WHERE [OrganizationId] = @OrganizationId; +SELECT + [Id], + [OrganizationId], + [Applications], + [CreationDate], + [RevisionDate] +FROM [dbo].[OrganizationApplicationView] +WHERE [OrganizationId] = @OrganizationId; GO CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadById] @Id UNIQUEIDENTIFIER AS - SET NOCOUNT ON; +SET NOCOUNT ON; - IF @Id IS NULL - THROW 50000, 'Id cannot be null', 1; - - SELECT - [Id], - [OrganizationId], - [Applications], - [CreationDate], - [RevisionDate] - FROM [dbo].[OrganizationApplication] - WHERE [Id] = @Id; +SELECT + [Id], + [OrganizationId], + [Applications], + [CreationDate], + [RevisionDate] +FROM [dbo].[OrganizationApplicationView] +WHERE [Id] = @Id; GO CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_Update] @@ -89,8 +87,8 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_Update] @CreationDate DATETIME2(7), @RevisionDate DATETIME2(7) AS - SET NOCOUNT ON; - UPDATE [dbo].[OrganizationApplication] +SET NOCOUNT ON; +UPDATE [dbo].[OrganizationApplication] SET [OrganizationId] = @OrganizationId, [Applications] = @Applications, @@ -101,21 +99,8 @@ GO CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_DeleteById] @Id UNIQUEIDENTIFIER AS - SET NOCOUNT ON; +SET NOCOUNT ON; - IF @Id IS NULL - THROW 50000, 'Id cannot be null', 1; - - DELETE FROM [dbo].[OrganizationApplication] +DELETE FROM [dbo].[OrganizationApplication] WHERE [Id] = @Id; GO - - - - - - - - - - From f63bde0ec500462326c2f6f36f213def948b0eee Mon Sep 17 00:00:00 2001 From: voommen-livefront Date: Wed, 18 Jun 2025 16:53:09 -0500 Subject: [PATCH 4/5] PM-20574 updated script to fix build error --- .../OrganizationApplication_DeleteById.sql | 2 +- .../OrganizationReport_Update.sql | 2 +- .../2025-06-13-00_OrganizationReport.sql | 89 +++++++-------- .../2025-06-13-01_OrganizationApplication.sql | 101 ++++++++++-------- 4 files changed, 94 insertions(+), 100 deletions(-) diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_DeleteById.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_DeleteById.sql index 8a2e4c243c..665b472c38 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_DeleteById.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_DeleteById.sql @@ -6,4 +6,4 @@ AS DELETE FROM [dbo].[OrganizationApplication] WHERE - [Id] = @Id + [Id] = @Id; diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql index 14878eea59..f4494becdc 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql @@ -13,4 +13,4 @@ AS [Date] = @Date, [ReportData] = @ReportData, [RevisionDate] = @RevisionDate - WHERE [Id] = @Id + WHERE [Id] = @Id; diff --git a/util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql b/util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql index 13db3709b4..ef5ff9a726 100644 --- a/util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql +++ b/util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql @@ -27,7 +27,7 @@ AS [dbo].[OrganizationReport]; GO -CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_Create] +CREATE PROCEDURE [dbo].[OrganizationReport_Create] @Id UNIQUEIDENTIFIER OUTPUT, @OrganizationId UNIQUEIDENTIFIER, @Date DATETIME2(7), @@ -37,44 +37,31 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_Create] AS SET NOCOUNT ON; - INSERT INTO - [dbo].[OrganizationReport] - ( + INSERT INTO [dbo].[OrganizationReport]( [Id], [OrganizationId], [Date], [ReportData], [CreationDate], - [RevisionDate] - ) - VALUES - ( - @Id, - @OrganizationId, - @Date, - @ReportData, - @CreationDate, - @RevisionDate - ); - + [RevisionDate] + ) + VALUES ( + @Id, + @OrganizationId, + @Date, + @ReportData, + @CreationDate, + @RevisionDate + ); GO -CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_ReadByOrganizationId] - @OrganizationId UNIQUEIDENTIFIER +CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_DeleteById] + @Id UNIQUEIDENTIFIER AS SET NOCOUNT ON; - SELECT - [Id], - [OrganizationId], - [Date], - [ReportData], - [CreationDate], - [RevisionDate] - FROM - [dbo].[OrganizationReportView] - WHERE - [OrganizationId] = @OrganizationId; + DELETE FROM [dbo].[OrganizationReport] + WHERE [Id] = @Id; GO @@ -90,13 +77,27 @@ AS [ReportData], [CreationDate], [RevisionDate] - FROM - [dbo].[OrganizationReportView] - WHERE - [Id] = @Id; + FROM [dbo].[OrganizationReport] + WHERE [Id] = @Id; GO +CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_ReadByOrganizationId] + @OrganizationId UNIQUEIDENTIFIER +AS + SET NOCOUNT ON; + + SELECT + [Id], + [OrganizationId], + [Date], + [ReportData], + [CreationDate], + [RevisionDate] + FROM [dbo].[OrganizationReport] + WHERE [OrganizationId] = @OrganizationId; +GO + CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_Update] @Id UNIQUEIDENTIFIER OUTPUT, @OrganizationId UNIQUEIDENTIFIER, @@ -106,26 +107,12 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_Update] @RevisionDate DATETIME2(7) AS SET NOCOUNT ON; - - UPDATE - [dbo].[OrganizationReport] - SET - [OrganizationId] = @OrganizationId, + + UPDATE [dbo].[OrganizationReport] + SET [OrganizationId] = @OrganizationId, [Date] = @Date, [ReportData] = @ReportData, [RevisionDate] = @RevisionDate - WHERE - [Id] = @Id; + WHERE [Id] = @Id; GO -CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_DeleteById] - @Id UNIQUEIDENTIFIER -AS - SET NOCOUNT ON; - - DELETE FROM - [dbo].[OrganizationReport] - WHERE - [Id] = @Id; - -GO \ No newline at end of file diff --git a/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql index 4c3ab83737..28eee839b4 100644 --- a/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql +++ b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql @@ -30,54 +30,69 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_Create] @CreationDate DATETIME2(7), @RevisionDate DATETIME2(7) AS -SET NOCOUNT ON; + SET NOCOUNT ON; + + INSERT INTO [dbo].[OrganizationApplication] + ( + [Id], + [OrganizationId], + [Applications], + [CreationDate], + [RevisionDate] + ) + VALUES + ( + @Id, + @OrganizationId, + @Applications, + @CreationDate, + @RevisionDate + ); -INSERT INTO [dbo].[OrganizationApplication] - ( - [Id], - [OrganizationId], - [Applications], - [CreationDate], - [RevisionDate] - ) -VALUES - ( - @Id, - @OrganizationId, - @Applications, - @CreationDate, - @RevisionDate - ); GO -CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadByOrganizationId] - @OrganizationId UNIQUEIDENTIFIER +CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_DeleteById] + @Id UNIQUEIDENTIFIER AS -SET NOCOUNT ON; + SET NOCOUNT ON; + + DELETE FROM + [dbo].[OrganizationApplication] + WHERE + [Id] = @Id; -SELECT - [Id], - [OrganizationId], - [Applications], - [CreationDate], - [RevisionDate] -FROM [dbo].[OrganizationApplicationView] -WHERE [OrganizationId] = @OrganizationId; GO CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadById] @Id UNIQUEIDENTIFIER AS -SET NOCOUNT ON; + SET NOCOUNT ON; + + SELECT + [Id], + [OrganizationId], + [Applications], + [CreationDate], + [RevisionDate] + FROM [dbo].[OrganizationApplicationView] + WHERE [Id] = @Id; + +GO + +CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadByOrganizationId] + @OrganizationId UNIQUEIDENTIFIER +AS + SET NOCOUNT ON; + + SELECT + [Id], + [OrganizationId], + [Applications], + [CreationDate], + [RevisionDate] + FROM [dbo].[OrganizationApplicationView] + WHERE [OrganizationId] = @OrganizationId; -SELECT - [Id], - [OrganizationId], - [Applications], - [CreationDate], - [RevisionDate] -FROM [dbo].[OrganizationApplicationView] -WHERE [Id] = @Id; GO CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_Update] @@ -87,20 +102,12 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_Update] @CreationDate DATETIME2(7), @RevisionDate DATETIME2(7) AS -SET NOCOUNT ON; -UPDATE [dbo].[OrganizationApplication] + SET NOCOUNT ON; + UPDATE [dbo].[OrganizationApplication] SET [OrganizationId] = @OrganizationId, [Applications] = @Applications, [RevisionDate] = @RevisionDate WHERE [Id] = @Id; -GO -CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_DeleteById] - @Id UNIQUEIDENTIFIER -AS -SET NOCOUNT ON; - -DELETE FROM [dbo].[OrganizationApplication] - WHERE [Id] = @Id; GO From 360ee89d4eba5647ce0a6233fb6f3dc452f1a32b Mon Sep 17 00:00:00 2001 From: voommen-livefront Date: Wed, 18 Jun 2025 17:09:25 -0500 Subject: [PATCH 5/5] PM-20574 fixed inconsistency in db script --- .../DbScripts/2025-06-13_02_UpdateOrgDeleteByIdProc.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/Migrator/DbScripts/2025-06-13_02_UpdateOrgDeleteByIdProc.sql b/util/Migrator/DbScripts/2025-06-13_02_UpdateOrgDeleteByIdProc.sql index 9f311a53af..70e6e7a2c6 100644 --- a/util/Migrator/DbScripts/2025-06-13_02_UpdateOrgDeleteByIdProc.sql +++ b/util/Migrator/DbScripts/2025-06-13_02_UpdateOrgDeleteByIdProc.sql @@ -142,14 +142,14 @@ BEGIN FROM [dbo].[OrganizationApplication] WHERE - [Id] = @Id + [OrganizationId] = @Id -- Delete Organization Report DELETE FROM [dbo].[OrganizationReport] WHERE - [Id] = @Id + [OrganizationId] = @Id DELETE FROM