Merge branch 'dirt/pm-20574/database_tables_and_scripts_riskinsights' into dirt/pm-20576/report-store-query-commands

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,
+            @Id,
-        @OrganizationId,
+            @OrganizationId,
-        @Applications,
+            @Applications,
-        @CreationDate,
+            @CreationDate,
-        @RevisionDate
+            @RevisionDate
-        );
+            );

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
+    DELETE FROM
-       THROW 50000, 'Id cannot be null', 1;
+        [dbo].[OrganizationApplication]
-
+    WHERE
-    DELETE FROM [dbo].[OrganizationApplication]
+        [Id] = @Id;
-    WHERE [Id] = @Id

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;

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;

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;

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] )
+    INSERT INTO [dbo].[OrganizationReport]( 
-    VALUES ( @Id,@OrganizationId,@Date,@ReportData,@CreationDate,@RevisionDate);
+        [Id],
+        [OrganizationId],
+        [Date],
+        [ReportData],
+        [CreationDate],
+        [RevisionDate] 
+    )
+    VALUES ( 
+        @Id,
+        @OrganizationId,
+        @Date,
+        @ReportData,
+        @CreationDate,
+        @RevisionDate
+    );

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

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
+    SELECT
-        THROW 50000, 'Id cannot be null', 1;
+        [Id],
-
+        [OrganizationId],
-SELECT
+        [Date],
-    [Id],
+        [ReportData],
-    [OrganizationId],
+        [CreationDate],
-    [Date],
+        [RevisionDate]
-    [ReportData],
+    FROM [dbo].[OrganizationReport]
-    [CreationDate],
+    WHERE [Id] = @Id;
-    [RevisionDate]
-FROM [dbo].[OrganizationReport]
-WHERE [Id] = @Id;

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],

src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql

@@ -3,12 +3,14 @@ CREATE PROCEDURE [dbo].[OrganizationReport_Update]
     @OrganizationId UNIQUEIDENTIFIER,
     @Date DATETIME2(7),
     @ReportData NVARCHAR(MAX),
+    @CreationDate DATETIME2(7),
     @RevisionDate DATETIME2(7)
 AS
     SET NOCOUNT ON;
+    
     UPDATE [dbo].[OrganizationReport]
     SET [OrganizationId] = @OrganizationId,
         [Date] = @Date,
         [ReportData] = @ReportData,
         [RevisionDate] = @RevisionDate
-    WHERE [Id] = @Id
+    WHERE [Id] = @Id;

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

util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql

@@ -2,30 +2,32 @@ IF OBJECT_ID('dbo.OrganizationReport') IS NULL
 BEGIN
     CREATE TABLE [dbo].[OrganizationReport]
     (
-    [Id]                       UNIQUEIDENTIFIER NOT NULL,
+        [Id] UNIQUEIDENTIFIER NOT NULL,
-    [OrganizationId]           UNIQUEIDENTIFIER NOT NULL,
+        [OrganizationId] UNIQUEIDENTIFIER NOT NULL,
-    [Date]                     DATETIME2 (7)    NOT NULL,
+        [Date] DATETIME2 (7) NOT NULL,
-    [ReportData]               NVARCHAR(MAX)    NOT NULL,
+        [ReportData] NVARCHAR(MAX) NOT NULL,
-    [CreationDate]             DATETIME2 (7)    NOT NULL,
+        [CreationDate] DATETIME2 (7) NOT NULL,
-    [RevisionDate]             DATETIME2 (7)    NOT NULL,
+        [RevisionDate] DATETIME2 (7) NOT NULL,
-    CONSTRAINT [PK_OrganizationReport] PRIMARY KEY CLUSTERED ([Id] ASC),
+        CONSTRAINT [PK_OrganizationReport] PRIMARY KEY CLUSTERED ([Id] ASC),
-    CONSTRAINT [FK_OrganizationReport_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id])
+        CONSTRAINT [FK_OrganizationReport_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id])
     );
 
-    CREATE NONCLUSTERED INDEX [IX_OrganizationReport_OrganizationId]
+    CREATE NONCLUSTERED INDEX [IX_OrganizationReport_OrganizationId] ON [dbo].[OrganizationReport]([OrganizationId] ASC);
-        ON [dbo].[OrganizationReport]([OrganizationId] ASC);
 
-    CREATE NONCLUSTERED INDEX [IX_OrganizationReport_OrganizationId_Date]
+    CREATE NONCLUSTERED INDEX [IX_OrganizationReport_OrganizationId_Date] ON [dbo].[OrganizationReport]([OrganizationId] ASC, [Date] DESC);
-        ON [dbo].[OrganizationReport]([OrganizationId] ASC, [Date] DESC);
 
 END
 GO
 
-CREATE OR ALTER VIEW [dbo].[OrganizationReportView] AS
+CREATE OR ALTER VIEW [dbo].[OrganizationReportView]
-    SELECT * FROM [dbo].[OrganizationReport];
+AS
+    SELECT
+        *
+    FROM
+        [dbo].[OrganizationReport];
 GO
 
-CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_Create]
+CREATE PROCEDURE [dbo].[OrganizationReport_Create]
     @Id UNIQUEIDENTIFIER OUTPUT,
     @OrganizationId UNIQUEIDENTIFIER,
     @Date DATETIME2(7),
@@ -34,8 +36,50 @@ 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_DeleteById]
+    @Id UNIQUEIDENTIFIER
+AS
+    SET NOCOUNT ON;
+
+    DELETE FROM [dbo].[OrganizationReport]
+    WHERE [Id] = @Id;
+
+GO
+
+CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_ReadById]
+    @Id UNIQUEIDENTIFIER
+AS
+    SET NOCOUNT ON;
+
+    SELECT
+        [Id],
+        [OrganizationId],
+        [Date],
+        [ReportData],
+        [CreationDate],
+        [RevisionDate]
+    FROM [dbo].[OrganizationReport]
+    WHERE [Id] = @Id;
+
 GO
 
 CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_ReadByOrganizationId]
@@ -43,9 +87,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],
@@ -57,53 +98,21 @@ AS
     WHERE [OrganizationId] = @OrganizationId;
 GO
 
-CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_ReadById]
-    @Id UNIQUEIDENTIFIER
-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;
-GO
-
 CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_Update]
     @Id UNIQUEIDENTIFIER OUTPUT,
     @OrganizationId UNIQUEIDENTIFIER,
     @Date DATETIME2(7),
     @ReportData NVARCHAR(MAX),
+    @CreationDate DATETIME2(7),
     @RevisionDate DATETIME2(7)
 AS
     SET NOCOUNT ON;
+    
     UPDATE [dbo].[OrganizationReport]
     SET [OrganizationId] = @OrganizationId,
         [Date] = @Date,
         [ReportData] = @ReportData,
         [RevisionDate] = @RevisionDate
     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
-
-
-
-

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] (
+    CREATE TABLE [dbo].[OrganizationApplication]
-        [Id]                       UNIQUEIDENTIFIER NOT NULL,
+    (
-        [OrganizationId]           UNIQUEIDENTIFIER NOT NULL,
+        [Id] UNIQUEIDENTIFIER NOT NULL,
-        [Applications]             NVARCHAR(MAX)    NOT NULL,
+        [OrganizationId] UNIQUEIDENTIFIER NOT NULL,
-        [CreationDate]             DATETIME2 (7)    NOT NULL,
+        [Applications] NVARCHAR(MAX) NOT NULL,
-        [RevisionDate]             DATETIME2 (7)    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
+CREATE OR ALTER VIEW [dbo].[OrganizationApplicationView]
-    SELECT * FROM [dbo].[OrganizationApplication];
+AS
+    SELECT *
+    FROM [dbo].[OrganizationApplication];
 GO
 
 CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_Create]
@@ -29,39 +33,34 @@ AS
     SET NOCOUNT ON;
 
     INSERT INTO [dbo].[OrganizationApplication]
-    (
+        (
         [Id],
         [OrganizationId],
         [Applications],
         [CreationDate],
         [RevisionDate]
-    )
+        )
     VALUES
         (
-        @Id,
+            @Id,
-        @OrganizationId,
+            @OrganizationId,
-        @Applications,
+            @Applications,
-        @CreationDate,
+            @CreationDate,
-        @RevisionDate
+            @RevisionDate
-        );
+            );
+
 GO
 
-CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadByOrganizationId]
+CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_DeleteById]
-    @OrganizationId UNIQUEIDENTIFIER
+    @Id UNIQUEIDENTIFIER
 AS
     SET NOCOUNT ON;
 
-    IF @OrganizationId IS NULL
+    DELETE FROM
-       THROW 50000, 'OrganizationId cannot be null', 1;
+        [dbo].[OrganizationApplication]
+    WHERE
+        [Id] = @Id;
 
-    SELECT
-        [Id],
-        [OrganizationId],
-        [Applications],
-        [CreationDate],
-        [RevisionDate]
-    FROM [dbo].[OrganizationApplication]
-    WHERE [OrganizationId] = @OrganizationId;
 GO
 
 CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadById]
@@ -69,8 +68,21 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadById]
 AS
     SET NOCOUNT ON;
 
-    IF @Id IS NULL
+    SELECT
-       THROW 50000, 'Id cannot be null', 1;
+        [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],
@@ -78,14 +90,16 @@ AS
         [Applications],
         [CreationDate],
         [RevisionDate]
-    FROM [dbo].[OrganizationApplication]
+    FROM [dbo].[OrganizationApplicationView]
-    WHERE [Id] = @Id;
+    WHERE [OrganizationId] = @OrganizationId;
+
 GO
 
 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;
@@ -95,26 +109,5 @@ AS
         [Applications] = @Applications,
         [RevisionDate] = @RevisionDate
     WHERE [Id] = @Id;
+
 GO
-
-CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_DeleteById]
-    @Id UNIQUEIDENTIFIER
-AS
-    SET NOCOUNT ON;
-
-    IF @Id IS NULL
-       THROW 50000, 'Id cannot be null', 1;
-
-    DELETE FROM [dbo].[OrganizationApplication]
-    WHERE [Id] = @Id;
-GO
-
-
-
-
-
-
-
-
-
-

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