diff --git a/src/Core/Dirt/Entities/OrganizationReport.cs b/src/Core/Dirt/Entities/OrganizationReport.cs index 69787b4667..0f327c5c8f 100644 --- a/src/Core/Dirt/Entities/OrganizationReport.cs +++ b/src/Core/Dirt/Entities/OrganizationReport.cs @@ -5,14 +5,13 @@ using Bit.Core.Utilities; namespace Bit.Core.Dirt.Entities; -public class OrganizationReport : ITableObject, IRevisable +public class OrganizationReport : ITableObject { 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 DateTime RevisionDate { get; set; } = DateTime.UtcNow; public void SetNewId() { diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Create.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Create.sql index 91273d4d3d..b2bb8593ef 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 665b472c38..5e00333287 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_DeleteById.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_DeleteById.sql @@ -3,7 +3,5 @@ CREATE PROCEDURE [dbo].[OrganizationApplication_DeleteById] AS SET NOCOUNT ON; - 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 4421492973..13f9667df6 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_ReadById.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_ReadById.sql @@ -4,10 +4,6 @@ AS SET NOCOUNT ON; SELECT - [Id], - [OrganizationId], - [Applications], - [CreationDate], - [RevisionDate] + * 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 a6cbad9abf..9872c72e8d 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_ReadByOrganizationId.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_ReadByOrganizationId.sql @@ -4,10 +4,6 @@ AS SET NOCOUNT ON; SELECT - [Id], - [OrganizationId], - [Applications], - [CreationDate], - [RevisionDate] + * FROM [dbo].[OrganizationApplicationView] WHERE [OrganizationId] = @OrganizationId; diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql index 979a10f095..5c24a307bd 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql @@ -6,9 +6,11 @@ CREATE PROCEDURE [dbo].[OrganizationApplication_Update] @RevisionDate DATETIME2(7) AS SET NOCOUNT ON; + UPDATE [dbo].[OrganizationApplication] SET [OrganizationId] = @OrganizationId, [Applications] = @Applications, + [CreationDate] = @CreationDate, [RevisionDate] = @RevisionDate WHERE [Id] = @Id; diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Create.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Create.sql index 26f92153ad..d0cea4d73b 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Create.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Create.sql @@ -3,8 +3,7 @@ CREATE PROCEDURE [dbo].[OrganizationReport_Create] @OrganizationId UNIQUEIDENTIFIER, @Date DATETIME2(7), @ReportData NVARCHAR(MAX), - @CreationDate DATETIME2(7), - @RevisionDate DATETIME2(7) + @CreationDate DATETIME2(7) AS SET NOCOUNT ON; @@ -13,14 +12,12 @@ AS [OrganizationId], [Date], [ReportData], - [CreationDate], - [RevisionDate] + [CreationDate] ) VALUES ( @Id, @OrganizationId, @Date, @ReportData, - @CreationDate, - @RevisionDate + @CreationDate ); diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_ReadById.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_ReadById.sql index 92ac1ff14d..046172a4c3 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_ReadById.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_ReadById.sql @@ -4,11 +4,6 @@ AS SET NOCOUNT ON; SELECT - [Id], - [OrganizationId], - [Date], - [ReportData], - [CreationDate], - [RevisionDate] - FROM [dbo].[OrganizationReport] + * + FROM [dbo].[OrganizationReportView] 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 a0fd5a548f..6bdcf51f70 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_ReadByOrganizationId.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_ReadByOrganizationId.sql @@ -4,11 +4,6 @@ AS SET NOCOUNT ON; SELECT - [Id], - [OrganizationId], - [Date], - [ReportData], - [CreationDate], - [RevisionDate] - FROM [dbo].[OrganizationReport] + * + FROM [dbo].[OrganizationReportView] WHERE [OrganizationId] = @OrganizationId; diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql deleted file mode 100644 index f4494becdc..0000000000 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql +++ /dev/null @@ -1,16 +0,0 @@ -CREATE 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; diff --git a/src/Sql/dbo/Dirt/Tables/OrganizationReport.sql b/src/Sql/dbo/Dirt/Tables/OrganizationReport.sql index f4aaef0f21..563877a340 100644 --- a/src/Sql/dbo/Dirt/Tables/OrganizationReport.sql +++ b/src/Sql/dbo/Dirt/Tables/OrganizationReport.sql @@ -4,7 +4,6 @@ CREATE TABLE [dbo].[OrganizationReport] ( [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]) ); @@ -16,4 +15,4 @@ GO CREATE NONCLUSTERED INDEX [IX_OrganizationReport_OrganizationId_Date] ON [dbo].[OrganizationReport]([OrganizationId] ASC, [Date] DESC); -GO \ No newline at end of file +GO diff --git a/util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql b/util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql index ef5ff9a726..ae3c42e6c4 100644 --- a/util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql +++ b/util/Migrator/DbScripts/2025-06-13-00_OrganizationReport.sql @@ -7,7 +7,6 @@ BEGIN [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]) ); @@ -32,8 +31,7 @@ CREATE PROCEDURE [dbo].[OrganizationReport_Create] @OrganizationId UNIQUEIDENTIFIER, @Date DATETIME2(7), @ReportData NVARCHAR(MAX), - @CreationDate DATETIME2(7), - @RevisionDate DATETIME2(7) + @CreationDate DATETIME2(7) AS SET NOCOUNT ON; @@ -42,16 +40,14 @@ AS [OrganizationId], [Date], [ReportData], - [CreationDate], - [RevisionDate] + [CreationDate] ) VALUES ( @Id, @OrganizationId, @Date, @ReportData, - @CreationDate, - @RevisionDate + @CreationDate ); GO @@ -71,13 +67,8 @@ AS SET NOCOUNT ON; SELECT - [Id], - [OrganizationId], - [Date], - [ReportData], - [CreationDate], - [RevisionDate] - FROM [dbo].[OrganizationReport] + * + FROM [dbo].[OrganizationReportView] WHERE [Id] = @Id; GO @@ -88,31 +79,7 @@ AS SET NOCOUNT ON; SELECT - [Id], - [OrganizationId], - [Date], - [ReportData], - [CreationDate], - [RevisionDate] - FROM [dbo].[OrganizationReport] + * + FROM [dbo].[OrganizationReportView] WHERE [OrganizationId] = @OrganizationId; 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 diff --git a/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql index 28eee839b4..2f2a357ad3 100644 --- a/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql +++ b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql @@ -1,26 +1,22 @@ 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] @@ -33,50 +29,21 @@ AS SET NOCOUNT ON; INSERT INTO [dbo].[OrganizationApplication] - ( + ( [Id], [OrganizationId], [Applications], [CreationDate], [RevisionDate] - ) + ) VALUES ( - @Id, - @OrganizationId, - @Applications, - @CreationDate, - @RevisionDate - ); - -GO - -CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_DeleteById] - @Id UNIQUEIDENTIFIER -AS - SET NOCOUNT ON; - - DELETE FROM - [dbo].[OrganizationApplication] - WHERE - [Id] = @Id; - -GO - -CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadById] - @Id UNIQUEIDENTIFIER -AS - SET NOCOUNT ON; - - SELECT - [Id], - [OrganizationId], - [Applications], - [CreationDate], - [RevisionDate] - FROM [dbo].[OrganizationApplicationView] - WHERE [Id] = @Id; - + @Id, + @OrganizationId, + @Applications, + @CreationDate, + @RevisionDate + ); GO CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadByOrganizationId] @@ -85,14 +52,20 @@ AS SET NOCOUNT ON; 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; + + SELECT + * + FROM [dbo].[OrganizationApplicationView] + WHERE [Id] = @Id; GO CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_Update] @@ -103,11 +76,22 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_Update] @RevisionDate DATETIME2(7) AS SET NOCOUNT ON; + UPDATE [dbo].[OrganizationApplication] SET [OrganizationId] = @OrganizationId, [Applications] = @Applications, + [CreationDate] = @CreationDate, [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 diff --git a/util/MySqlMigrations/Migrations/20250613215532_2025-06-13-00_OrganizationReport.sql.Designer.cs b/util/MySqlMigrations/Migrations/20250613215532_2025-06-13-00_OrganizationReport.sql.Designer.cs index 6c3e409d0f..0c8987658f 100644 --- a/util/MySqlMigrations/Migrations/20250613215532_2025-06-13-00_OrganizationReport.sql.Designer.cs +++ b/util/MySqlMigrations/Migrations/20250613215532_2025-06-13-00_OrganizationReport.sql.Designer.cs @@ -25,6 +25,53 @@ namespace Bit.MySqlMigrations.Migrations MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); + modelBuilder.Entity("Bit.Core.Dirt.Reports.Models.Data.OrganizationMemberBaseDetail", b => + { + b.Property("CipherId") + .HasColumnType("char(36)"); + + b.Property("CollectionId") + .HasColumnType("char(36)"); + + b.Property("CollectionName") + .HasColumnType("longtext"); + + b.Property("Email") + .HasColumnType("longtext"); + + b.Property("GroupId") + .HasColumnType("char(36)"); + + b.Property("GroupName") + .HasColumnType("longtext"); + + b.Property("HidePasswords") + .HasColumnType("tinyint(1)"); + + b.Property("Manage") + .HasColumnType("tinyint(1)"); + + b.Property("ReadOnly") + .HasColumnType("tinyint(1)"); + + b.Property("ResetPasswordKey") + .HasColumnType("longtext"); + + b.Property("TwoFactorProviders") + .HasColumnType("longtext"); + + b.Property("UserGuid") + .HasColumnType("char(36)"); + + b.Property("UserName") + .HasColumnType("longtext"); + + b.Property("UsesKeyConnector") + .HasColumnType("tinyint(1)"); + + b.ToTable("OrganizationMemberBaseDetails"); + }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", b => { b.Property("Id") @@ -970,9 +1017,6 @@ namespace Bit.MySqlMigrations.Migrations .IsRequired() .HasColumnType("longtext"); - b.Property("RevisionDate") - .HasColumnType("datetime(6)"); - b.HasKey("Id"); b.HasIndex("Id") diff --git a/util/MySqlMigrations/Migrations/20250613215532_2025-06-13-00_OrganizationReport.sql.cs b/util/MySqlMigrations/Migrations/20250613215532_2025-06-13-00_OrganizationReport.sql.cs index c0fb3b0791..13650faf47 100644 --- a/util/MySqlMigrations/Migrations/20250613215532_2025-06-13-00_OrganizationReport.sql.cs +++ b/util/MySqlMigrations/Migrations/20250613215532_2025-06-13-00_OrganizationReport.sql.cs @@ -42,8 +42,7 @@ public partial class _2025061300_OrganizationReportsql : Migration Date = table.Column(type: "datetime(6)", nullable: false), ReportData = table.Column(type: "longtext", nullable: false) .Annotation("MySql:CharSet", "utf8mb4"), - CreationDate = table.Column(type: "datetime(6)", nullable: false), - RevisionDate = table.Column(type: "datetime(6)", nullable: false) + CreationDate = table.Column(type: "datetime(6)", nullable: false) }, constraints: table => { diff --git a/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs b/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs index 7ff0516e2f..ed8f56f7e6 100644 --- a/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs +++ b/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs @@ -1014,9 +1014,6 @@ namespace Bit.MySqlMigrations.Migrations .IsRequired() .HasColumnType("longtext"); - b.Property("RevisionDate") - .HasColumnType("datetime(6)"); - b.HasKey("Id"); b.HasIndex("Id") diff --git a/util/PostgresMigrations/Migrations/20250613215536_2025-06-13-00_OrganizationReport.sql.Designer.cs b/util/PostgresMigrations/Migrations/20250613215536_2025-06-13-00_OrganizationReport.sql.Designer.cs index e0617c9eff..c8d49c17f8 100644 --- a/util/PostgresMigrations/Migrations/20250613215536_2025-06-13-00_OrganizationReport.sql.Designer.cs +++ b/util/PostgresMigrations/Migrations/20250613215536_2025-06-13-00_OrganizationReport.sql.Designer.cs @@ -26,6 +26,53 @@ namespace Bit.PostgresMigrations.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + modelBuilder.Entity("Bit.Core.Dirt.Reports.Models.Data.OrganizationMemberBaseDetail", b => + { + b.Property("CipherId") + .HasColumnType("uuid"); + + b.Property("CollectionId") + .HasColumnType("uuid"); + + b.Property("CollectionName") + .HasColumnType("text"); + + b.Property("Email") + .HasColumnType("text"); + + b.Property("GroupId") + .HasColumnType("uuid"); + + b.Property("GroupName") + .HasColumnType("text"); + + b.Property("HidePasswords") + .HasColumnType("boolean"); + + b.Property("Manage") + .HasColumnType("boolean"); + + b.Property("ReadOnly") + .HasColumnType("boolean"); + + b.Property("ResetPasswordKey") + .HasColumnType("text"); + + b.Property("TwoFactorProviders") + .HasColumnType("text"); + + b.Property("UserGuid") + .HasColumnType("uuid"); + + b.Property("UserName") + .HasColumnType("text"); + + b.Property("UsesKeyConnector") + .HasColumnType("boolean"); + + b.ToTable("OrganizationMemberBaseDetails"); + }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", b => { b.Property("Id") @@ -975,9 +1022,6 @@ namespace Bit.PostgresMigrations.Migrations .IsRequired() .HasColumnType("text"); - b.Property("RevisionDate") - .HasColumnType("timestamp with time zone"); - b.HasKey("Id"); b.HasIndex("Id") diff --git a/util/PostgresMigrations/Migrations/20250613215536_2025-06-13-00_OrganizationReport.sql.cs b/util/PostgresMigrations/Migrations/20250613215536_2025-06-13-00_OrganizationReport.sql.cs index 22900a4da6..55fe031009 100644 --- a/util/PostgresMigrations/Migrations/20250613215536_2025-06-13-00_OrganizationReport.sql.cs +++ b/util/PostgresMigrations/Migrations/20250613215536_2025-06-13-00_OrganizationReport.sql.cs @@ -39,8 +39,7 @@ public partial class _2025061300_OrganizationReportsql : Migration OrganizationId = table.Column(type: "uuid", nullable: false), Date = table.Column(type: "timestamp with time zone", nullable: false), ReportData = table.Column(type: "text", nullable: false), - CreationDate = table.Column(type: "timestamp with time zone", nullable: false), - RevisionDate = table.Column(type: "timestamp with time zone", nullable: false) + CreationDate = table.Column(type: "timestamp with time zone", nullable: false) }, constraints: table => { diff --git a/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs b/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs index 14bb66f107..aa283cf352 100644 --- a/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs +++ b/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs @@ -1019,9 +1019,6 @@ namespace Bit.PostgresMigrations.Migrations .IsRequired() .HasColumnType("text"); - b.Property("RevisionDate") - .HasColumnType("timestamp with time zone"); - b.HasKey("Id"); b.HasIndex("Id") diff --git a/util/SqliteMigrations/Migrations/20250613215539_2025-06-13-00_OrganizationReport.sql.Designer.cs b/util/SqliteMigrations/Migrations/20250613215539_2025-06-13-00_OrganizationReport.sql.Designer.cs index 3b1ccab96d..f6c241ff5e 100644 --- a/util/SqliteMigrations/Migrations/20250613215539_2025-06-13-00_OrganizationReport.sql.Designer.cs +++ b/util/SqliteMigrations/Migrations/20250613215539_2025-06-13-00_OrganizationReport.sql.Designer.cs @@ -20,6 +20,53 @@ namespace Bit.SqliteMigrations.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "8.0.8"); + modelBuilder.Entity("Bit.Core.Dirt.Reports.Models.Data.OrganizationMemberBaseDetail", b => + { + b.Property("CipherId") + .HasColumnType("TEXT"); + + b.Property("CollectionId") + .HasColumnType("TEXT"); + + b.Property("CollectionName") + .HasColumnType("TEXT"); + + b.Property("Email") + .HasColumnType("TEXT"); + + b.Property("GroupId") + .HasColumnType("TEXT"); + + b.Property("GroupName") + .HasColumnType("TEXT"); + + b.Property("HidePasswords") + .HasColumnType("INTEGER"); + + b.Property("Manage") + .HasColumnType("INTEGER"); + + b.Property("ReadOnly") + .HasColumnType("INTEGER"); + + b.Property("ResetPasswordKey") + .HasColumnType("TEXT"); + + b.Property("TwoFactorProviders") + .HasColumnType("TEXT"); + + b.Property("UserGuid") + .HasColumnType("TEXT"); + + b.Property("UserName") + .HasColumnType("TEXT"); + + b.Property("UsesKeyConnector") + .HasColumnType("INTEGER"); + + b.ToTable("OrganizationMemberBaseDetails"); + }); + modelBuilder.Entity("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", b => { b.Property("Id") @@ -959,9 +1006,6 @@ namespace Bit.SqliteMigrations.Migrations .IsRequired() .HasColumnType("TEXT"); - b.Property("RevisionDate") - .HasColumnType("TEXT"); - b.HasKey("Id"); b.HasIndex("Id") diff --git a/util/SqliteMigrations/Migrations/20250613215539_2025-06-13-00_OrganizationReport.sql.cs b/util/SqliteMigrations/Migrations/20250613215539_2025-06-13-00_OrganizationReport.sql.cs index c12dc08eda..c2e7afdc22 100644 --- a/util/SqliteMigrations/Migrations/20250613215539_2025-06-13-00_OrganizationReport.sql.cs +++ b/util/SqliteMigrations/Migrations/20250613215539_2025-06-13-00_OrganizationReport.sql.cs @@ -39,8 +39,7 @@ public partial class _2025061300_OrganizationReportsql : Migration OrganizationId = table.Column(type: "TEXT", nullable: false), Date = table.Column(type: "TEXT", nullable: false), ReportData = table.Column(type: "TEXT", nullable: false), - CreationDate = table.Column(type: "TEXT", nullable: false), - RevisionDate = table.Column(type: "TEXT", nullable: false) + CreationDate = table.Column(type: "TEXT", nullable: false) }, constraints: table => { diff --git a/util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs b/util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs index f5d4cdc147..ef9fb7cbfd 100644 --- a/util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs +++ b/util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs @@ -1003,9 +1003,6 @@ namespace Bit.SqliteMigrations.Migrations .IsRequired() .HasColumnType("TEXT"); - b.Property("RevisionDate") - .HasColumnType("TEXT"); - b.HasKey("Id"); b.HasIndex("Id")