PM-20574 formatted sql and updated as per PR comments

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/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,9 +3,6 @@ CREATE PROCEDURE [dbo].[OrganizationReport_ReadById]
 AS
     SET NOCOUNT ON;
 
-IF @Id IS NULL
-        THROW 50000, 'Id cannot be null', 1;
-
     SELECT
         [Id],
         [OrganizationId],

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

@@ -7,6 +7,7 @@ CREATE PROCEDURE [dbo].[OrganizationReport_Update]
     @RevisionDate DATETIME2(7)
 AS
     SET NOCOUNT ON;
+    
     UPDATE [dbo].[OrganizationReport]
     SET [OrganizationId] = @OrganizationId,
         [Date] = @Date,

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

@@ -12,17 +12,19 @@ BEGIN
         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]
@@ -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]
+    FROM
-    WHERE [OrganizationId] = @OrganizationId;
+        [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]
+    FROM
-    WHERE [Id] = @Id;
+        [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;
+    WHERE
-GO
+        [Id] = @Id;
 
+GO
 CREATE OR ALTER PROCEDURE [dbo].[OrganizationReport_DeleteById]
     @Id UNIQUEIDENTIFIER
 AS
     SET NOCOUNT ON;
 
-    IF @Id IS NULL
+    DELETE FROM
-            THROW 50000, 'Id cannot be null', 1;
+        [dbo].[OrganizationReport]
+    WHERE
+        [Id] = @Id;
 
-    DELETE FROM [dbo].[OrganizationReport]
-    WHERE [Id] = @Id;
 GO
-
-
-
-

util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql

@@ -1,6 +1,7 @@
 IF OBJECT_ID('dbo.OrganizationApplication') IS NULL
 BEGIN
-    CREATE TABLE [dbo].[OrganizationApplication] (
+    CREATE TABLE [dbo].[OrganizationApplication]
+    (
         [Id] UNIQUEIDENTIFIER NOT NULL,
         [OrganizationId] UNIQUEIDENTIFIER NOT NULL,
         [Applications] NVARCHAR(MAX) NOT NULL,
@@ -12,11 +13,14 @@ BEGIN
 
     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]
@@ -51,16 +55,13 @@ CREATE OR ALTER 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;
 GO
 
@@ -69,16 +70,13 @@ CREATE OR ALTER 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;
 GO
 
@@ -103,19 +101,6 @@ CREATE OR ALTER 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;
 GO
-
-
-
-
-
-
-
-
-
-