PM-20574 & PM-20575 Adding Risk Insight Report tables, repositories, and migrations

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/Reports/Entities/PasswordHealthReportApplication.cs → 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/Reports/Models/Data/MemberAccessCipherDetails.cs → 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,11 +10,10 @@
 public class MemberAccessReportQuery(
     IOrganizationMemberBaseDetailRepository organizationMemberBaseDetailRepository,
     ITwoFactorIsEnabledQuery twoFactorIsEnabledQuery,
-    IApplicationCacheService applicationCacheService)
-    : IMemberAccessReportQuery
+    IApplicationCacheService applicationCacheService) : IMemberAccessReportQuery
 {
     public async Task<IEnumerable<MemberAccessReportDetail>> GetMemberAccessReportsAsync(
         MemberAccessReportRequest request)
     {
         var baseDetails =
             await organizationMemberBaseDetailRepository.GetOrganizationMemberBaseDetailsByOrganizationId(

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/Reports/Repositories/IPasswordHealthReportApplicationRepository.cs → 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.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 void AddDapperRepositories(this IServiceCollection services, bool
         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 @@
 
 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();
     }
 }