PM-20574 & PM-20575 Adding Risk Insight Report tables, repositories, and migrations (#5839)

* PM-20574 fixing namespaces on reporting work that got moved over from tools

* PM-20574 adding tables, stored procedures, and migration files

* PM-20574 adding dapper and ef repos and migrations

* PM-20574 changing table and repo names as requested

* PM-20574 updating sql scripts to new names

* PM-20574 updating sql scripts

* PM-20574 updating migration script for org delete by id

* PM-20574 adding mysql migration

* PM-20574 updating sql migration to fix database test

* PM-20574 fixing migration script

* PM-20574 fixing migration script

* PM-20574 fixing table scripts

* PM-20574 fixing table scripts

* PM-20574 fixing migration script formatting

* PM-20574 fixing syntax in migration script

* PM-20574 fixing file names and extensions

* PM-20574 fixing sql file

* PM-20574 fixing sql

* PM-20574 fixing directory for entities and removing scripts from other databases

* PM-20574 generating new migration scripts

* PM-20574 fixed reference to a stored proc

* PM-20574 adding index in scripts and missing table

* PM-20574 fixing merge conflicts

* PM-20574 set OUTPUT param for Id property in create and update proc

* PM-20574 add CreateDate to the update proc

* PM-20574 amend update proc for OrganizationApplication by adding createDate

* PM-20574 formatted sql and updated as per PR comments

* PM-20574 updated script to fix build error

* PM-20574 fixed inconsistency in db script

* PM-20574 removed revisionDate, update procedures and used views

* PM-20574 removed RevisionDate from designer files

* PM-20574 removed revisionDate column that was missed previously

* PM-20574 added revision date back into the mix

* PM-20574 updated database script to fix build error

* PM-20574 fixed a procedure issue

* PM-20574 fix dB build error

* PM-020574 fixed additional PR comments - files cleaned up

* PM-20574 updated procedure was inconsistent

* Update 2025-06-13-00_OrganizationReport.sql

---------

Co-authored-by: voommen-livefront <voommen@livefront.com>

src/Api/Dirt/Controllers/ReportsController.cs

@@ -2,7 +2,7 @@
 using Bit.Api.Dirt.Models.Response;
 using Bit.Api.Tools.Models.Response;
 using Bit.Core.Context;
-using Bit.Core.Dirt.Reports.Entities;
+using Bit.Core.Dirt.Entities;
 using Bit.Core.Dirt.Reports.Models.Data;
 using Bit.Core.Dirt.Reports.ReportFeatures.Interfaces;
 using Bit.Core.Dirt.Reports.ReportFeatures.OrganizationReportMembers.Interfaces;

src/Api/Dirt/Models/Response/MemberAccessReportModel.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Dirt.Reports.Models.Data;
+using Bit.Core.Dirt.Models.Data;
 
 namespace Bit.Api.Dirt.Models.Response;
 

src/Api/Dirt/Models/Response/MemberCipherDetailsResponseModel.cs

@@ -1,5 +1,4 @@
 using Bit.Core.Dirt.Reports.Models.Data;
-
 namespace Bit.Api.Dirt.Models.Response;
 
 public class MemberCipherDetailsResponseModel

src/Core/Dirt/Entities/OrganizationApplication.cs

@@ -0,0 +1,20 @@
+#nullable enable
+
+using Bit.Core.Entities;
+using Bit.Core.Utilities;
+
+namespace Bit.Core.Dirt.Entities;
+
+public class OrganizationApplication : ITableObject<Guid>, IRevisable
+{
+    public Guid Id { get; set; }
+    public Guid OrganizationId { get; set; }
+    public string Applications { get; set; } = string.Empty;
+    public DateTime CreationDate { get; set; } = DateTime.UtcNow;
+    public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
+
+    public void SetNewId()
+    {
+        Id = CoreHelpers.GenerateComb();
+    }
+}

src/Core/Dirt/Entities/OrganizationReport.cs

@@ -0,0 +1,20 @@
+#nullable enable
+
+using Bit.Core.Entities;
+using Bit.Core.Utilities;
+
+namespace Bit.Core.Dirt.Entities;
+
+public class OrganizationReport : ITableObject<Guid>
+{
+    public Guid Id { get; set; }
+    public Guid OrganizationId { get; set; }
+    public DateTime Date { get; set; }
+    public string ReportData { get; set; } = string.Empty;
+    public DateTime CreationDate { get; set; } = DateTime.UtcNow;
+
+    public void SetNewId()
+    {
+        Id = CoreHelpers.GenerateComb();
+    }
+}

src/Core/Dirt/Entities/PasswordHealthReportApplication.cs

@@ -3,7 +3,7 @@
 using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Dirt.Reports.Entities;
+namespace Bit.Core.Dirt.Entities;
 
 public class PasswordHealthReportApplication : ITableObject<Guid>, IRevisable
 {

src/Core/Dirt/Models/Data/MemberAccessCipherDetails.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Dirt.Reports.Models.Data;
+namespace Bit.Core.Dirt.Models.Data;
 
 public class MemberAccessDetails
 {

src/Core/Dirt/Reports/ReportFeatures/AddPasswordHealthReportApplicationCommand.cs

@@ -1,7 +1,7 @@
-using Bit.Core.Dirt.Reports.Entities;
+using Bit.Core.Dirt.Entities;
 using Bit.Core.Dirt.Reports.ReportFeatures.Interfaces;
 using Bit.Core.Dirt.Reports.ReportFeatures.Requests;
-using Bit.Core.Dirt.Reports.Repositories;
+using Bit.Core.Dirt.Repositories;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
 

src/Core/Dirt/Reports/ReportFeatures/DropPasswordHealthReportApplicationCommand.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Dirt.Reports.ReportFeatures.Interfaces;
 using Bit.Core.Dirt.Reports.ReportFeatures.Requests;
-using Bit.Core.Dirt.Reports.Repositories;
+using Bit.Core.Dirt.Repositories;
 using Bit.Core.Exceptions;
 
 namespace Bit.Core.Dirt.Reports.ReportFeatures;

src/Core/Dirt/Reports/ReportFeatures/GetPasswordHealthReportApplicationQuery.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Dirt.Reports.Entities;
+using Bit.Core.Dirt.Entities;
 using Bit.Core.Dirt.Reports.ReportFeatures.Interfaces;
-using Bit.Core.Dirt.Reports.Repositories;
+using Bit.Core.Dirt.Repositories;
 using Bit.Core.Exceptions;
 
 namespace Bit.Core.Dirt.Reports.ReportFeatures;

src/Core/Dirt/Reports/ReportFeatures/Interfaces/IAddPasswordHealthReportApplicationCommand.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Dirt.Reports.Entities;
+using Bit.Core.Dirt.Entities;
 using Bit.Core.Dirt.Reports.ReportFeatures.Requests;
 
 namespace Bit.Core.Dirt.Reports.ReportFeatures.Interfaces;

src/Core/Dirt/Reports/ReportFeatures/Interfaces/IGetPasswordHealthReportApplicationQuery.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Dirt.Reports.Entities;
+using Bit.Core.Dirt.Entities;
 
 namespace Bit.Core.Dirt.Reports.ReportFeatures.Interfaces;
 

src/Core/Dirt/Reports/ReportFeatures/MemberAccessReportQuery.cs

@@ -10,8 +10,7 @@ namespace Bit.Core.Dirt.Reports.ReportFeatures;
 public class MemberAccessReportQuery(
     IOrganizationMemberBaseDetailRepository organizationMemberBaseDetailRepository,
     ITwoFactorIsEnabledQuery twoFactorIsEnabledQuery,
-    IApplicationCacheService applicationCacheService)
-    : IMemberAccessReportQuery
+    IApplicationCacheService applicationCacheService) : IMemberAccessReportQuery
 {
     public async Task<IEnumerable<MemberAccessReportDetail>> GetMemberAccessReportsAsync(
         MemberAccessReportRequest request)

src/Core/Dirt/Repositories/IOrganizationApplicationRepository.cs

@@ -0,0 +1,9 @@
+using Bit.Core.Dirt.Entities;
+using Bit.Core.Repositories;
+
+namespace Bit.Core.Dirt.Repositories;
+
+public interface IOrganizationApplicationRepository : IRepository<OrganizationApplication, Guid>
+{
+    Task<ICollection<OrganizationApplication>> GetByOrganizationIdAsync(Guid organizationId);
+}

src/Core/Dirt/Repositories/IOrganizationReportRepository.cs

@@ -0,0 +1,10 @@
+using Bit.Core.Dirt.Entities;
+using Bit.Core.Repositories;
+
+namespace Bit.Core.Dirt.Repositories;
+
+public interface IOrganizationReportRepository : IRepository<OrganizationReport, Guid>
+{
+    Task<ICollection<OrganizationReport>> GetByOrganizationIdAsync(Guid organizationId);
+}
+

src/Core/Dirt/Repositories/IPasswordHealthReportApplicationRepository.cs

@@ -1,7 +1,7 @@
-using Bit.Core.Dirt.Reports.Entities;
+using Bit.Core.Dirt.Entities;
 using Bit.Core.Repositories;
 
-namespace Bit.Core.Dirt.Reports.Repositories;
+namespace Bit.Core.Dirt.Repositories;
 
 public interface IPasswordHealthReportApplicationRepository : IRepository<PasswordHealthReportApplication, Guid>
 {

src/Infrastructure.Dapper/DapperServiceCollectionExtensions.cs

@@ -3,6 +3,7 @@ using Bit.Core.Auth.Repositories;
 using Bit.Core.Billing.Providers.Repositories;
 using Bit.Core.Billing.Repositories;
 using Bit.Core.Dirt.Reports.Repositories;
+using Bit.Core.Dirt.Repositories;
 using Bit.Core.KeyManagement.Repositories;
 using Bit.Core.NotificationCenter.Repositories;
 using Bit.Core.Platform.Installations;
@@ -70,6 +71,8 @@ public static class DapperServiceCollectionExtensions
         services.AddSingleton<ISecurityTaskRepository, SecurityTaskRepository>();
         services.AddSingleton<IUserAsymmetricKeysRepository, UserAsymmetricKeysRepository>();
         services.AddSingleton<IOrganizationInstallationRepository, OrganizationInstallationRepository>();
+        services.AddSingleton<IOrganizationReportRepository, OrganizationReportRepository>();
+        services.AddSingleton<IOrganizationApplicationRepository, OrganizationApplicationRepository>();
         services.AddSingleton<IOrganizationMemberBaseDetailRepository, OrganizationMemberBaseDetailRepository>();
 
         if (selfHosted)

src/Infrastructure.Dapper/Dirt/OrganizationApplicationRepository.cs

@@ -0,0 +1,35 @@
+using System.Data;
+using Bit.Core.Dirt.Entities;
+using Bit.Core.Dirt.Repositories;
+using Bit.Core.Settings;
+using Bit.Infrastructure.Dapper.Repositories;
+using Dapper;
+using Microsoft.Data.SqlClient;
+
+namespace Bit.Infrastructure.Dapper.Dirt;
+
+public class OrganizationApplicationRepository : Repository<OrganizationApplication, Guid>, IOrganizationApplicationRepository
+{
+    public OrganizationApplicationRepository(GlobalSettings globalSettings)
+        : this(globalSettings.SqlServer.ConnectionString, globalSettings.SqlServer.ReadOnlyConnectionString)
+    {
+    }
+
+    public OrganizationApplicationRepository(string connectionString, string readOnlyConnectionString)
+        : base(connectionString, readOnlyConnectionString)
+    {
+    }
+
+    public async Task<ICollection<OrganizationApplication>> GetByOrganizationIdAsync(Guid organizationId)
+    {
+        using (var connection = new SqlConnection(ReadOnlyConnectionString))
+        {
+            var results = await connection.QueryAsync<OrganizationApplication>(
+                $"[{Schema}].[OrganizationApplication_ReadByOrganizationId]",
+                new { OrganizationId = organizationId },
+                commandType: CommandType.StoredProcedure);
+
+            return results.ToList();
+        }
+    }
+}

src/Infrastructure.Dapper/Dirt/OrganizationReportRepository.cs

@@ -0,0 +1,35 @@
+using System.Data;
+using Bit.Core.Dirt.Entities;
+using Bit.Core.Dirt.Repositories;
+using Bit.Core.Settings;
+using Bit.Infrastructure.Dapper.Repositories;
+using Dapper;
+using Microsoft.Data.SqlClient;
+
+namespace Bit.Infrastructure.Dapper.Dirt;
+
+public class OrganizationReportRepository : Repository<OrganizationReport, Guid>, IOrganizationReportRepository
+{
+    public OrganizationReportRepository(GlobalSettings globalSettings)
+        : this(globalSettings.SqlServer.ConnectionString, globalSettings.SqlServer.ReadOnlyConnectionString)
+    {
+    }
+
+    public OrganizationReportRepository(string connectionString, string readOnlyConnectionString)
+        : base(connectionString, readOnlyConnectionString)
+    {
+    }
+
+    public async Task<ICollection<OrganizationReport>> GetByOrganizationIdAsync(Guid organizationId)
+    {
+        using (var connection = new SqlConnection(ReadOnlyConnectionString))
+        {
+            var results = await connection.QueryAsync<OrganizationReport>(
+                $"[{Schema}].[OrganizationReport_ReadByOrganizationId]",
+                new { OrganizationId = organizationId },
+                commandType: CommandType.StoredProcedure);
+
+            return results.ToList();
+        }
+    }
+}

src/Infrastructure.Dapper/Dirt/PasswordHealthReportApplicationRepository.cs

@@ -1,6 +1,6 @@
 using System.Data;
-using Bit.Core.Dirt.Reports.Entities;
-using Bit.Core.Dirt.Reports.Repositories;
+using Bit.Core.Dirt.Entities;
+using Bit.Core.Dirt.Repositories;
 using Bit.Core.Settings;
 using Bit.Infrastructure.Dapper.Repositories;
 using Dapper;

src/Infrastructure.EntityFramework/Dirt/Configurations/OrganizationApplicationEntityTypeConfiguration.cs

@@ -0,0 +1,30 @@
+using Bit.Infrastructure.EntityFramework.Dirt.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace Bit.Infrastructure.EntityFramework.Dirt.Configurations;
+
+public class OrganizationApplicationEntityTypeConfiguration : IEntityTypeConfiguration<OrganizationApplication>
+{
+    public void Configure(EntityTypeBuilder<OrganizationApplication> builder)
+    {
+        builder
+            .Property(s => s.Id)
+            .ValueGeneratedNever();
+
+        builder.HasIndex(s => s.Id)
+            .IsClustered(true);
+
+        builder
+            .HasIndex(s => s.OrganizationId)
+            .IsClustered(false);
+
+        builder
+            .HasOne(s => s.Organization)
+            .WithMany()
+            .HasForeignKey(s => s.OrganizationId)
+            .OnDelete(DeleteBehavior.Cascade);
+
+        builder.ToTable(nameof(OrganizationApplication));
+    }
+}

src/Infrastructure.EntityFramework/Dirt/Configurations/OrganizationReportEntityTypeConfiguration.cs

@@ -0,0 +1,30 @@
+using Bit.Infrastructure.EntityFramework.Dirt.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace Bit.Infrastructure.EntityFramework.Dirt.Configurations;
+
+public class OrganizationReportEntityTypeConfiguration : IEntityTypeConfiguration<OrganizationReport>
+{
+    public void Configure(EntityTypeBuilder<OrganizationReport> builder)
+    {
+        builder
+            .Property(s => s.Id)
+            .ValueGeneratedNever();
+
+        builder.HasIndex(s => s.Id)
+            .IsClustered(true);
+
+        builder
+            .HasIndex(s => s.OrganizationId)
+            .IsClustered(false);
+
+        builder
+            .HasOne(s => s.Organization)
+            .WithMany()
+            .HasForeignKey(s => s.OrganizationId)
+            .OnDelete(DeleteBehavior.Cascade);
+
+        builder.ToTable(nameof(OrganizationReport));
+    }
+}

src/Infrastructure.EntityFramework/Dirt/Models/OrganizationApplication.cs

@@ -0,0 +1,17 @@
+using AutoMapper;
+using Bit.Infrastructure.EntityFramework.AdminConsole.Models;
+
+namespace Bit.Infrastructure.EntityFramework.Dirt.Models;
+public class OrganizationApplication : Core.Dirt.Entities.OrganizationApplication
+{
+    public virtual Organization Organization { get; set; }
+}
+
+public class OrganizationApplicationProfile : Profile
+{
+    public OrganizationApplicationProfile()
+    {
+        CreateMap<Core.Dirt.Entities.OrganizationApplication, OrganizationApplication>()
+            .ReverseMap();
+    }
+}

src/Infrastructure.EntityFramework/Dirt/Models/OrganizationReport.cs

@@ -0,0 +1,17 @@
+using AutoMapper;
+using Bit.Infrastructure.EntityFramework.AdminConsole.Models;
+
+namespace Bit.Infrastructure.EntityFramework.Dirt.Models;
+public class OrganizationReport : Core.Dirt.Entities.OrganizationReport
+{
+    public virtual Organization Organization { get; set; }
+}
+
+public class OrganizationReportProfile : Profile
+{
+    public OrganizationReportProfile()
+    {
+        CreateMap<Core.Dirt.Entities.OrganizationReport, OrganizationReport>()
+            .ReverseMap();
+    }
+}

src/Infrastructure.EntityFramework/Dirt/Models/PasswordHealthReportApplication.cs

@@ -3,7 +3,7 @@ using Bit.Infrastructure.EntityFramework.AdminConsole.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Dirt.Models;
 
-public class PasswordHealthReportApplication : Core.Dirt.Reports.Entities.PasswordHealthReportApplication
+public class PasswordHealthReportApplication : Core.Dirt.Entities.PasswordHealthReportApplication
 {
     public virtual Organization Organization { get; set; }
 }
@@ -12,7 +12,7 @@ public class PasswordHealthReportApplicationProfile : Profile
 {
     public PasswordHealthReportApplicationProfile()
     {
-        CreateMap<Core.Dirt.Reports.Entities.PasswordHealthReportApplication, PasswordHealthReportApplication>()
+        CreateMap<Core.Dirt.Entities.PasswordHealthReportApplication, PasswordHealthReportApplication>()
             .ReverseMap();
     }
 }

src/Infrastructure.EntityFramework/Dirt/Repositories/OrganizationApplicationRepository.cs

@@ -0,0 +1,29 @@
+using AutoMapper;
+using Bit.Core.Dirt.Repositories;
+using Bit.Infrastructure.EntityFramework.Dirt.Models;
+using Bit.Infrastructure.EntityFramework.Repositories;
+using LinqToDB;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Bit.Infrastructure.EntityFramework.Dirt.Repositories;
+
+public class OrganizationApplicationRepository :
+    Repository<Core.Dirt.Entities.OrganizationApplication, OrganizationApplication, Guid>,
+    IOrganizationApplicationRepository
+{
+    public OrganizationApplicationRepository(IServiceScopeFactory serviceScopeFactory,
+        IMapper mapper) : base(serviceScopeFactory, mapper, (DatabaseContext context) => context.OrganizationApplications)
+    { }
+
+    public async Task<ICollection<Core.Dirt.Entities.OrganizationApplication>> GetByOrganizationIdAsync(Guid organizationId)
+    {
+        using (var scope = ServiceScopeFactory.CreateScope())
+        {
+            var dbContext = GetDatabaseContext(scope);
+            var results = await dbContext.OrganizationApplications
+                .Where(p => p.OrganizationId == organizationId)
+                .ToListAsync();
+            return Mapper.Map<ICollection<Core.Dirt.Entities.OrganizationApplication>>(results);
+        }
+    }
+}

src/Infrastructure.EntityFramework/Dirt/Repositories/OrganizationReportRepository.cs

@@ -0,0 +1,30 @@
+using AutoMapper;
+using Bit.Core.Dirt.Entities;
+using Bit.Core.Dirt.Repositories;
+using Bit.Infrastructure.EntityFramework.Repositories;
+using LinqToDB;
+using Microsoft.Extensions.DependencyInjection;
+
+
+namespace Bit.Infrastructure.EntityFramework.Dirt.Repositories;
+
+public class OrganizationReportRepository :
+    Repository<OrganizationReport, Models.OrganizationReport, Guid>,
+    IOrganizationReportRepository
+{
+    public OrganizationReportRepository(IServiceScopeFactory serviceScopeFactory,
+        IMapper mapper) : base(serviceScopeFactory, mapper, (DatabaseContext context) => context.OrganizationReports)
+    { }
+
+    public async Task<ICollection<OrganizationReport>> GetByOrganizationIdAsync(Guid organizationId)
+    {
+        using (var scope = ServiceScopeFactory.CreateScope())
+        {
+            var dbContext = GetDatabaseContext(scope);
+            var results = await dbContext.OrganizationReports
+                .Where(p => p.OrganizationId == organizationId)
+                .ToListAsync();
+            return Mapper.Map<ICollection<OrganizationReport>>(results);
+        }
+    }
+}

src/Infrastructure.EntityFramework/Dirt/Repositories/PasswordHealthReportApplicationRepository.cs

@@ -1,5 +1,5 @@
 using AutoMapper;
-using Bit.Core.Dirt.Reports.Repositories;
+using Bit.Core.Dirt.Repositories;
 using Bit.Infrastructure.EntityFramework.Dirt.Models;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using LinqToDB;
@@ -8,14 +8,14 @@ using Microsoft.Extensions.DependencyInjection;
 namespace Bit.Infrastructure.EntityFramework.Dirt.Repositories;
 
 public class PasswordHealthReportApplicationRepository :
-    Repository<Core.Dirt.Reports.Entities.PasswordHealthReportApplication, PasswordHealthReportApplication, Guid>,
+    Repository<Core.Dirt.Entities.PasswordHealthReportApplication, PasswordHealthReportApplication, Guid>,
     IPasswordHealthReportApplicationRepository
 {
     public PasswordHealthReportApplicationRepository(IServiceScopeFactory serviceScopeFactory,
         IMapper mapper) : base(serviceScopeFactory, mapper, (DatabaseContext context) => context.PasswordHealthReportApplications)
     { }
 
-    public async Task<ICollection<Core.Dirt.Reports.Entities.PasswordHealthReportApplication>> GetByOrganizationIdAsync(Guid organizationId)
+    public async Task<ICollection<Core.Dirt.Entities.PasswordHealthReportApplication>> GetByOrganizationIdAsync(Guid organizationId)
     {
         using (var scope = ServiceScopeFactory.CreateScope())
         {
@@ -23,7 +23,7 @@ public class PasswordHealthReportApplicationRepository :
             var results = await dbContext.PasswordHealthReportApplications
                 .Where(p => p.OrganizationId == organizationId)
                 .ToListAsync();
-            return Mapper.Map<ICollection<Core.Dirt.Reports.Entities.PasswordHealthReportApplication>>(results);
+            return Mapper.Map<ICollection<Core.Dirt.Entities.PasswordHealthReportApplication>>(results);
         }
     }
 }

src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs

@@ -3,6 +3,7 @@ using Bit.Core.Auth.Repositories;
 using Bit.Core.Billing.Providers.Repositories;
 using Bit.Core.Billing.Repositories;
 using Bit.Core.Dirt.Reports.Repositories;
+using Bit.Core.Dirt.Repositories;
 using Bit.Core.Enums;
 using Bit.Core.KeyManagement.Repositories;
 using Bit.Core.NotificationCenter.Repositories;
@@ -108,6 +109,8 @@ public static class EntityFrameworkServiceCollectionExtensions
         services.AddSingleton<ISecurityTaskRepository, SecurityTaskRepository>();
         services.AddSingleton<IUserAsymmetricKeysRepository, UserAsymmetricKeysRepository>();
         services.AddSingleton<IOrganizationInstallationRepository, OrganizationInstallationRepository>();
+        services.AddSingleton<IOrganizationReportRepository, OrganizationReportRepository>();
+        services.AddSingleton<IOrganizationApplicationRepository, OrganizationApplicationRepository>();
         services.AddSingleton<IOrganizationMemberBaseDetailRepository, OrganizationMemberBaseDetailRepository>();
 
         if (selfHosted)

src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs

@@ -16,6 +16,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using DP = Microsoft.AspNetCore.DataProtection;
 
+
 #nullable enable
 
 namespace Bit.Infrastructure.EntityFramework.Repositories;
@@ -84,6 +85,8 @@ public class DatabaseContext : DbContext
     public DbSet<OrganizationMemberBaseDetail> OrganizationMemberBaseDetails { get; set; }
     public DbSet<SecurityTask> SecurityTasks { get; set; }
     public DbSet<OrganizationInstallation> OrganizationInstallations { get; set; }
+    public DbSet<OrganizationReport> OrganizationReports { get; set; }
+    public DbSet<OrganizationApplication> OrganizationApplications { get; set; }
 
     protected override void OnModelCreating(ModelBuilder builder)
     {

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

@@ -0,0 +1,25 @@
+CREATE PROCEDURE [dbo].[OrganizationApplication_Create]
+    @Id UNIQUEIDENTIFIER OUTPUT,
+    @OrganizationId UNIQUEIDENTIFIER,
+    @Applications NVARCHAR(MAX),
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7)
+AS
+    SET NOCOUNT ON;
+
+    INSERT INTO [dbo].[OrganizationApplication]
+    (
+        [Id],
+        [OrganizationId],
+        [Applications],
+        [CreationDate],
+        [RevisionDate]
+    )
+    VALUES
+        (
+        @Id,
+        @OrganizationId,
+        @Applications,
+        @CreationDate,
+        @RevisionDate
+        );

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

@@ -0,0 +1,7 @@
+CREATE PROCEDURE [dbo].[OrganizationApplication_DeleteById]
+    @Id UNIQUEIDENTIFIER
+AS
+    SET NOCOUNT ON;
+
+    DELETE FROM [dbo].[OrganizationApplication]
+    WHERE [Id] = @Id;

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

@@ -0,0 +1,9 @@
+CREATE PROCEDURE [dbo].[OrganizationApplication_ReadById]
+    @Id UNIQUEIDENTIFIER
+AS
+    SET NOCOUNT ON;
+
+    SELECT
+        *
+    FROM [dbo].[OrganizationApplicationView]
+    WHERE [Id] = @Id;

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

@@ -0,0 +1,9 @@
+CREATE PROCEDURE [dbo].[OrganizationApplication_ReadByOrganizationId]
+    @OrganizationId UNIQUEIDENTIFIER
+AS
+    SET NOCOUNT ON;
+
+    SELECT
+        *
+    FROM [dbo].[OrganizationApplicationView]
+    WHERE [OrganizationId] = @OrganizationId;

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

@@ -0,0 +1,16 @@
+CREATE PROCEDURE [dbo].[OrganizationApplication_Update]
+    @Id UNIQUEIDENTIFIER OUTPUT,
+    @OrganizationId UNIQUEIDENTIFIER,
+    @Applications NVARCHAR(MAX),
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7)
+AS
+    SET NOCOUNT ON;
+    
+    UPDATE [dbo].[OrganizationApplication]
+    SET
+        [OrganizationId] = @OrganizationId,
+        [Applications] = @Applications,
+        [CreationDate] = @CreationDate,
+        [RevisionDate] = @RevisionDate
+    WHERE [Id] = @Id;

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

@@ -0,0 +1,23 @@
+CREATE PROCEDURE [dbo].[OrganizationReport_Create]
+    @Id UNIQUEIDENTIFIER OUTPUT,
+    @OrganizationId UNIQUEIDENTIFIER,
+    @Date DATETIME2(7),
+    @ReportData NVARCHAR(MAX),
+    @CreationDate DATETIME2(7)
+AS
+    SET NOCOUNT ON;
+
+    INSERT INTO [dbo].[OrganizationReport]( 
+        [Id],
+        [OrganizationId],
+        [Date],
+        [ReportData],
+        [CreationDate]
+    )
+    VALUES ( 
+        @Id,
+        @OrganizationId,
+        @Date,
+        @ReportData,
+        @CreationDate
+    );

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

@@ -0,0 +1,7 @@
+CREATE PROCEDURE [dbo].[OrganizationReport_DeleteById]
+    @Id UNIQUEIDENTIFIER
+AS
+    SET NOCOUNT ON;
+
+    DELETE FROM [dbo].[OrganizationReport]
+    WHERE [Id] = @Id

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

@@ -0,0 +1,9 @@
+CREATE PROCEDURE [dbo].[OrganizationReport_ReadById]
+    @Id UNIQUEIDENTIFIER
+AS
+    SET NOCOUNT ON;
+
+    SELECT
+        *
+    FROM [dbo].[OrganizationReportView]
+    WHERE [Id] = @Id;

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

@@ -0,0 +1,9 @@
+CREATE PROCEDURE [dbo].[OrganizationReport_ReadByOrganizationId]
+    @OrganizationId UNIQUEIDENTIFIER
+AS
+    SET NOCOUNT ON;
+
+    SELECT
+        *
+    FROM [dbo].[OrganizationReportView]
+    WHERE [OrganizationId] = @OrganizationId;

src/Sql/dbo/Dirt/Tables/OrganizationApplication.sql

@@ -0,0 +1,14 @@
+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])
+    );
+GO
+
+CREATE NONCLUSTERED INDEX [IX_OrganizationApplication_OrganizationId]
+    ON [dbo].[OrganizationApplication]([OrganizationId] ASC);
+GO

src/Sql/dbo/Dirt/Tables/OrganizationReport.sql

@@ -0,0 +1,18 @@
+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,
+    CONSTRAINT [PK_OrganizationReport] PRIMARY KEY CLUSTERED ([Id] ASC),
+    CONSTRAINT [FK_OrganizationReport_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id])
+    );
+GO
+
+CREATE NONCLUSTERED INDEX [IX_OrganizationReport_OrganizationId]
+    ON [dbo].[OrganizationReport]([OrganizationId] ASC);
+GO
+
+CREATE NONCLUSTERED INDEX [IX_OrganizationReport_OrganizationId_Date]
+    ON [dbo].[OrganizationReport]([OrganizationId] ASC, [Date] DESC);
+GO

src/Sql/dbo/Dirt/Views/OrganizationApplicationView.sql

@@ -0,0 +1,5 @@
+CREATE VIEW [dbo].[OrganizationApplicationView]
+AS
+SELECT
+    *
+FROM [dbo].[OrganizationApplication];

src/Sql/dbo/Dirt/Views/OrganizationReportView.sql

@@ -0,0 +1,2 @@
+CREATE VIEW [dbo].[OrganizationReportView] AS
+SELECT * FROM [dbo].[OrganizationReport];

src/Sql/dbo/Stored Procedures/Organization_DeleteById.sql

@@ -137,6 +137,20 @@ BEGIN
     WHERE
         [OrganizationId] = @Id
 
+    -- Delete Organization Application
+    DELETE
+    FROM
+        [dbo].[OrganizationApplication]
+    WHERE
+        [OrganizationId] = @Id
+
+    -- Delete Organization Report
+    DELETE
+    FROM
+        [dbo].[OrganizationReport]
+    WHERE
+        [OrganizationId] = @Id
+
     DELETE
     FROM
         [dbo].[Organization]