From 22a89cc8dab9694c0e415d175609b02598054f7d Mon Sep 17 00:00:00 2001 From: voommen-livefront Date: Fri, 20 Jun 2025 13:56:10 -0500 Subject: [PATCH 1/9] PM-20574 removed revisionDate, update procedures and used views --- .../Dirt/Entities/OrganizationApplication.cs | 3 +- src/Core/Dirt/Entities/OrganizationReport.cs | 3 +- .../OrganizationApplication_Create.sql | 11 ++--- .../OrganizationApplication_ReadById.sql | 6 +-- ...zationApplication_ReadByOrganizationId.sql | 6 +-- .../OrganizationApplication_Update.sql | 14 ------ .../OrganizationReport_Create.sql | 9 ++-- .../OrganizationReport_ReadById.sql | 9 +--- ...rganizationReport_ReadByOrganizationId.sql | 9 +--- .../OrganizationReport_Update.sql | 16 ------- .../2025-06-13-00_OrganizationReport.sql | 47 +++---------------- .../2025-06-13-01_OrganizationApplication.sql | 40 +++------------- ...32_2025-06-13-00_OrganizationReport.sql.cs | 6 +-- ...36_2025-06-13-00_OrganizationReport.sql.cs | 6 +-- ...39_2025-06-13-00_OrganizationReport.sql.cs | 6 +-- 15 files changed, 34 insertions(+), 157 deletions(-) delete mode 100644 src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql delete mode 100644 src/Sql/dbo/Dirt/Stored Procedures/OrganizationReport_Update.sql diff --git a/src/Core/Dirt/Entities/OrganizationApplication.cs b/src/Core/Dirt/Entities/OrganizationApplication.cs index 259dbd60dd..6d8ed2e92f 100644 --- a/src/Core/Dirt/Entities/OrganizationApplication.cs +++ b/src/Core/Dirt/Entities/OrganizationApplication.cs @@ -5,13 +5,12 @@ using Bit.Core.Utilities; namespace Bit.Core.Dirt.Entities; -public class OrganizationApplication : ITableObject, IRevisable +public class OrganizationApplication : ITableObject { 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() { 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..c8c58eea27 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Create.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Create.sql @@ -2,8 +2,7 @@ CREATE PROCEDURE [dbo].[OrganizationApplication_Create] @Id UNIQUEIDENTIFIER OUTPUT, @OrganizationId UNIQUEIDENTIFIER, @Applications NVARCHAR(MAX), - @CreationDate DATETIME2(7), - @RevisionDate DATETIME2(7) + @CreationDate DATETIME2(7) AS SET NOCOUNT ON; @@ -12,14 +11,12 @@ AS [Id], [OrganizationId], [Applications], - [CreationDate], - [RevisionDate] + [CreationDate] ) VALUES ( @Id, @OrganizationId, @Applications, - @CreationDate, - @RevisionDate - ); + @CreationDate + ); 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 deleted file mode 100644 index 979a10f095..0000000000 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql +++ /dev/null @@ -1,14 +0,0 @@ -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, - [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/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..54c68c870d 100644 --- a/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql +++ b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql @@ -6,7 +6,6 @@ BEGIN [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]) ); @@ -27,8 +26,7 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_Create] @Id UNIQUEIDENTIFIER OUTPUT, @OrganizationId UNIQUEIDENTIFIER, @Applications NVARCHAR(MAX), - @CreationDate DATETIME2(7), - @RevisionDate DATETIME2(7) + @CreationDate DATETIME2(7) AS SET NOCOUNT ON; @@ -37,17 +35,15 @@ AS [Id], [OrganizationId], [Applications], - [CreationDate], - [RevisionDate] + [CreationDate] ) VALUES ( @Id, @OrganizationId, @Applications, - @CreationDate, - @RevisionDate - ); + @CreationDate + ); GO @@ -69,11 +65,7 @@ AS SET NOCOUNT ON; SELECT - [Id], - [OrganizationId], - [Applications], - [CreationDate], - [RevisionDate] + * FROM [dbo].[OrganizationApplicationView] WHERE [Id] = @Id; @@ -85,29 +77,9 @@ AS SET NOCOUNT ON; SELECT - [Id], - [OrganizationId], - [Applications], - [CreationDate], - [RevisionDate] + * FROM [dbo].[OrganizationApplicationView] 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; - UPDATE [dbo].[OrganizationApplication] - SET - [OrganizationId] = @OrganizationId, - [Applications] = @Applications, - [RevisionDate] = @RevisionDate - WHERE [Id] = @Id; - -GO 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..ac8661efed 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 @@ -18,8 +18,7 @@ public partial class _2025061300_OrganizationReportsql : Migration OrganizationId = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"), Applications = 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 => { @@ -42,8 +41,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/PostgresMigrations/Migrations/20250613215536_2025-06-13-00_OrganizationReport.sql.cs b/util/PostgresMigrations/Migrations/20250613215536_2025-06-13-00_OrganizationReport.sql.cs index 22900a4da6..370b17a7c1 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 @@ -17,8 +17,7 @@ public partial class _2025061300_OrganizationReportsql : Migration Id = table.Column(type: "uuid", nullable: false), OrganizationId = table.Column(type: "uuid", nullable: false), Applications = 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 => { @@ -39,8 +38,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/SqliteMigrations/Migrations/20250613215539_2025-06-13-00_OrganizationReport.sql.cs b/util/SqliteMigrations/Migrations/20250613215539_2025-06-13-00_OrganizationReport.sql.cs index c12dc08eda..8e5db7170f 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 @@ -17,8 +17,7 @@ public partial class _2025061300_OrganizationReportsql : Migration Id = table.Column(type: "TEXT", nullable: false), OrganizationId = table.Column(type: "TEXT", nullable: false), Applications = 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 => { @@ -39,8 +38,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 => { From 57c01c3298829bf44b5e47fdb83dd1ece4f70a7e Mon Sep 17 00:00:00 2001 From: voommen-livefront Date: Fri, 20 Jun 2025 14:12:23 -0500 Subject: [PATCH 2/9] PM-20574 removed RevisionDate from designer files --- ...6-13-00_OrganizationReport.sql.Designer.cs | 53 ++++++++++++++++--- .../DatabaseContextModelSnapshot.cs | 6 --- ...6-13-00_OrganizationReport.sql.Designer.cs | 53 ++++++++++++++++--- .../DatabaseContextModelSnapshot.cs | 6 --- ...6-13-00_OrganizationReport.sql.Designer.cs | 53 ++++++++++++++++--- .../DatabaseContextModelSnapshot.cs | 6 --- 6 files changed, 141 insertions(+), 36 deletions(-) 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..3441fd1d92 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") @@ -938,9 +985,6 @@ namespace Bit.MySqlMigrations.Migrations b.Property("OrganizationId") .HasColumnType("char(36)"); - b.Property("RevisionDate") - .HasColumnType("datetime(6)"); - b.HasKey("Id"); b.HasIndex("Id") @@ -970,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/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs b/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs index 7ff0516e2f..55e4680847 100644 --- a/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs +++ b/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs @@ -982,9 +982,6 @@ namespace Bit.MySqlMigrations.Migrations b.Property("OrganizationId") .HasColumnType("char(36)"); - b.Property("RevisionDate") - .HasColumnType("datetime(6)"); - b.HasKey("Id"); b.HasIndex("Id") @@ -1014,9 +1011,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..0a11f7a939 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") @@ -943,9 +990,6 @@ namespace Bit.PostgresMigrations.Migrations b.Property("OrganizationId") .HasColumnType("uuid"); - b.Property("RevisionDate") - .HasColumnType("timestamp with time zone"); - b.HasKey("Id"); b.HasIndex("Id") @@ -975,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/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs b/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs index 14bb66f107..88695fc5a7 100644 --- a/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs +++ b/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs @@ -987,9 +987,6 @@ namespace Bit.PostgresMigrations.Migrations b.Property("OrganizationId") .HasColumnType("uuid"); - b.Property("RevisionDate") - .HasColumnType("timestamp with time zone"); - b.HasKey("Id"); b.HasIndex("Id") @@ -1019,9 +1016,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..8d7fb5f2cc 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") @@ -927,9 +974,6 @@ namespace Bit.SqliteMigrations.Migrations b.Property("OrganizationId") .HasColumnType("TEXT"); - b.Property("RevisionDate") - .HasColumnType("TEXT"); - b.HasKey("Id"); b.HasIndex("Id") @@ -959,9 +1003,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/DatabaseContextModelSnapshot.cs b/util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs index f5d4cdc147..2d18d58dbe 100644 --- a/util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs +++ b/util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs @@ -971,9 +971,6 @@ namespace Bit.SqliteMigrations.Migrations b.Property("OrganizationId") .HasColumnType("TEXT"); - b.Property("RevisionDate") - .HasColumnType("TEXT"); - b.HasKey("Id"); b.HasIndex("Id") @@ -1003,9 +1000,6 @@ namespace Bit.SqliteMigrations.Migrations .IsRequired() .HasColumnType("TEXT"); - b.Property("RevisionDate") - .HasColumnType("TEXT"); - b.HasKey("Id"); b.HasIndex("Id") From bfeb5721470000b268b14e687b64dfbebbb5479e Mon Sep 17 00:00:00 2001 From: voommen-livefront Date: Fri, 20 Jun 2025 14:26:26 -0500 Subject: [PATCH 3/9] PM-20574 removed revisionDate column that was missed previously --- src/Sql/dbo/Dirt/Tables/OrganizationApplication.sql | 1 - src/Sql/dbo/Dirt/Tables/OrganizationReport.sql | 1 - 2 files changed, 2 deletions(-) diff --git a/src/Sql/dbo/Dirt/Tables/OrganizationApplication.sql b/src/Sql/dbo/Dirt/Tables/OrganizationApplication.sql index 58c8080e23..d063b3b648 100644 --- a/src/Sql/dbo/Dirt/Tables/OrganizationApplication.sql +++ b/src/Sql/dbo/Dirt/Tables/OrganizationApplication.sql @@ -3,7 +3,6 @@ CREATE TABLE [dbo].[OrganizationApplication] ( [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]) ); diff --git a/src/Sql/dbo/Dirt/Tables/OrganizationReport.sql b/src/Sql/dbo/Dirt/Tables/OrganizationReport.sql index f4aaef0f21..77b4b10e2d 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]) ); From d6f4b85de9267ceb00b729e012a2c369f10ea15c Mon Sep 17 00:00:00 2001 From: voommen-livefront Date: Fri, 20 Jun 2025 15:01:32 -0500 Subject: [PATCH 4/9] PM-20574 added revision date back into the mix --- .../Dirt/Entities/OrganizationApplication.cs | 3 +- .../OrganizationApplication_Update.sql | 13 ++ .../Dirt/Tables/OrganizationApplication.sql | 1 + .../2025-06-13-01_OrganizationApplication.sql | 120 +++++++++++------- ...6-13-00_OrganizationReport.sql.Designer.cs | 3 + ...32_2025-06-13-00_OrganizationReport.sql.cs | 3 +- .../DatabaseContextModelSnapshot.cs | 3 + ...6-13-00_OrganizationReport.sql.Designer.cs | 3 + ...36_2025-06-13-00_OrganizationReport.sql.cs | 3 +- .../DatabaseContextModelSnapshot.cs | 3 + ...6-13-00_OrganizationReport.sql.Designer.cs | 3 + ...39_2025-06-13-00_OrganizationReport.sql.cs | 3 +- .../DatabaseContextModelSnapshot.cs | 3 + 13 files changed, 114 insertions(+), 50 deletions(-) create mode 100644 src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql diff --git a/src/Core/Dirt/Entities/OrganizationApplication.cs b/src/Core/Dirt/Entities/OrganizationApplication.cs index 6d8ed2e92f..259dbd60dd 100644 --- a/src/Core/Dirt/Entities/OrganizationApplication.cs +++ b/src/Core/Dirt/Entities/OrganizationApplication.cs @@ -5,12 +5,13 @@ using Bit.Core.Utilities; namespace Bit.Core.Dirt.Entities; -public class OrganizationApplication : ITableObject +public class OrganizationApplication : ITableObject, 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() { diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql new file mode 100644 index 0000000000..481e9597af --- /dev/null +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql @@ -0,0 +1,13 @@ +CREATE PROCEDURE [dbo].[OrganizationApplication_Update] + @Id UNIQUEIDENTIFIER, + @OrganizationId UNIQUEIDENTIFIER, + @Applications NVARCHAR(MAX), + @RevisionDate DATETIME2(7) +AS + SET NOCOUNT ON; + UPDATE [dbo].[OrganizationApplication] + SET + [OrganizationId] = @OrganizationId, + [Applications] = @Applications, + [RevisionDate] = @RevisionDate + WHERE [Id] = @Id; diff --git a/src/Sql/dbo/Dirt/Tables/OrganizationApplication.sql b/src/Sql/dbo/Dirt/Tables/OrganizationApplication.sql index d063b3b648..58c8080e23 100644 --- a/src/Sql/dbo/Dirt/Tables/OrganizationApplication.sql +++ b/src/Sql/dbo/Dirt/Tables/OrganizationApplication.sql @@ -3,6 +3,7 @@ CREATE TABLE [dbo].[OrganizationApplication] ( [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]) ); diff --git a/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql index 54c68c870d..f68d17c517 100644 --- a/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql +++ b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql @@ -1,74 +1,49 @@ 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, + 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] @Id UNIQUEIDENTIFIER OUTPUT, @OrganizationId UNIQUEIDENTIFIER, @Applications NVARCHAR(MAX), - @CreationDate DATETIME2(7) + @CreationDate DATETIME2(7), + @RevisionDate DATETIME2(7) AS SET NOCOUNT ON; INSERT INTO [dbo].[OrganizationApplication] - ( + ( [Id], [OrganizationId], [Applications], - [CreationDate] - ) + [CreationDate], + [RevisionDate] + ) VALUES ( - @Id, - @OrganizationId, - @Applications, - @CreationDate + @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 - * - FROM [dbo].[OrganizationApplicationView] - WHERE [Id] = @Id; - GO CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadByOrganizationId] @@ -76,10 +51,63 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadByOrganizationId] AS SET NOCOUNT ON; + IF @OrganizationId IS NULL + THROW 50000, 'OrganizationId cannot be null', 1; + SELECT * FROM [dbo].[OrganizationApplicationView] WHERE [OrganizationId] = @OrganizationId; - GO +CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadById] + @Id UNIQUEIDENTIFIER +AS + SET NOCOUNT ON; + + IF @Id IS NULL + THROW 50000, 'Id cannot be null', 1; + + SELECT + * + FROM [dbo].[OrganizationApplicationView] + WHERE [Id] = @Id; +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; + UPDATE [dbo].[OrganizationApplication] + SET + [OrganizationId] = @OrganizationId, + [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 + + + + + + + + + + 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 3441fd1d92..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 @@ -985,6 +985,9 @@ namespace Bit.MySqlMigrations.Migrations b.Property("OrganizationId") .HasColumnType("char(36)"); + 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 ac8661efed..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 @@ -18,7 +18,8 @@ public partial class _2025061300_OrganizationReportsql : Migration OrganizationId = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"), Applications = table.Column(type: "longtext", nullable: false) .Annotation("MySql:CharSet", "utf8mb4"), - CreationDate = table.Column(type: "datetime(6)", nullable: false) + CreationDate = table.Column(type: "datetime(6)", nullable: false), + RevisionDate = table.Column(type: "datetime(6)", nullable: false) }, constraints: table => { diff --git a/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs b/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs index 55e4680847..ed8f56f7e6 100644 --- a/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs +++ b/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs @@ -982,6 +982,9 @@ namespace Bit.MySqlMigrations.Migrations b.Property("OrganizationId") .HasColumnType("char(36)"); + 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 0a11f7a939..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 @@ -990,6 +990,9 @@ namespace Bit.PostgresMigrations.Migrations b.Property("OrganizationId") .HasColumnType("uuid"); + 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 370b17a7c1..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 @@ -17,7 +17,8 @@ public partial class _2025061300_OrganizationReportsql : Migration Id = table.Column(type: "uuid", nullable: false), OrganizationId = table.Column(type: "uuid", nullable: false), Applications = table.Column(type: "text", nullable: false), - CreationDate = table.Column(type: "timestamp with time zone", nullable: false) + CreationDate = table.Column(type: "timestamp with time zone", nullable: false), + RevisionDate = 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 88695fc5a7..aa283cf352 100644 --- a/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs +++ b/util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs @@ -987,6 +987,9 @@ namespace Bit.PostgresMigrations.Migrations b.Property("OrganizationId") .HasColumnType("uuid"); + 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 8d7fb5f2cc..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 @@ -974,6 +974,9 @@ namespace Bit.SqliteMigrations.Migrations b.Property("OrganizationId") .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 8e5db7170f..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 @@ -17,7 +17,8 @@ public partial class _2025061300_OrganizationReportsql : Migration Id = table.Column(type: "TEXT", nullable: false), OrganizationId = table.Column(type: "TEXT", nullable: false), Applications = table.Column(type: "TEXT", nullable: false), - CreationDate = table.Column(type: "TEXT", nullable: false) + CreationDate = table.Column(type: "TEXT", nullable: false), + RevisionDate = table.Column(type: "TEXT", nullable: false) }, constraints: table => { diff --git a/util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs b/util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs index 2d18d58dbe..ef9fb7cbfd 100644 --- a/util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs +++ b/util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs @@ -971,6 +971,9 @@ namespace Bit.SqliteMigrations.Migrations b.Property("OrganizationId") .HasColumnType("TEXT"); + b.Property("RevisionDate") + .HasColumnType("TEXT"); + b.HasKey("Id"); b.HasIndex("Id") From a9553aecbd0460ba11dfc3953f44017b73a1d2d8 Mon Sep 17 00:00:00 2001 From: voommen-livefront Date: Fri, 20 Jun 2025 15:17:16 -0500 Subject: [PATCH 5/9] PM-20574 updated database script to fix build error --- .../OrganizationApplication_Create.sql | 19 +++++++++++-------- .../OrganizationApplication_DeleteById.sql | 6 ++---- .../OrganizationApplication_Update.sql | 1 + .../2025-06-13-01_OrganizationApplication.sql | 10 +--------- 4 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Create.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Create.sql index c8c58eea27..b2bb8593ef 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Create.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Create.sql @@ -2,21 +2,24 @@ CREATE PROCEDURE [dbo].[OrganizationApplication_Create] @Id UNIQUEIDENTIFIER OUTPUT, @OrganizationId UNIQUEIDENTIFIER, @Applications NVARCHAR(MAX), - @CreationDate DATETIME2(7) + @CreationDate DATETIME2(7), + @RevisionDate DATETIME2(7) AS SET NOCOUNT ON; INSERT INTO [dbo].[OrganizationApplication] - ( + ( [Id], [OrganizationId], [Applications], - [CreationDate] - ) + [CreationDate], + [RevisionDate] + ) VALUES ( - @Id, - @OrganizationId, - @Applications, - @CreationDate + @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_Update.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql index 481e9597af..86a94e709f 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql @@ -5,6 +5,7 @@ CREATE PROCEDURE [dbo].[OrganizationApplication_Update] @RevisionDate DATETIME2(7) AS SET NOCOUNT ON; + UPDATE [dbo].[OrganizationApplication] SET [OrganizationId] = @OrganizationId, diff --git a/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql index f68d17c517..4e9f1822ed 100644 --- a/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql +++ b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql @@ -51,9 +51,6 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadByOrganizationId] AS SET NOCOUNT ON; - IF @OrganizationId IS NULL - THROW 50000, 'OrganizationId cannot be null', 1; - SELECT * FROM [dbo].[OrganizationApplicationView] @@ -65,9 +62,6 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_ReadById] AS SET NOCOUNT ON; - IF @Id IS NULL - THROW 50000, 'Id cannot be null', 1; - SELECT * FROM [dbo].[OrganizationApplicationView] @@ -82,6 +76,7 @@ CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_Update] @RevisionDate DATETIME2(7) AS SET NOCOUNT ON; + UPDATE [dbo].[OrganizationApplication] SET [OrganizationId] = @OrganizationId, @@ -95,9 +90,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 From 8d61aebfe4cad2697e42af8b4ce5ea44d7efe8fb Mon Sep 17 00:00:00 2001 From: voommen-livefront Date: Fri, 20 Jun 2025 15:28:48 -0500 Subject: [PATCH 6/9] PM-20574 fixed a procedure issue --- .../Dirt/Stored Procedures/OrganizationApplication_Update.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql index 86a94e709f..eab807f0ca 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql @@ -1,5 +1,5 @@ CREATE PROCEDURE [dbo].[OrganizationApplication_Update] - @Id UNIQUEIDENTIFIER, + @Id UNIQUEIDENTIFIER OUTPUT, @OrganizationId UNIQUEIDENTIFIER, @Applications NVARCHAR(MAX), @RevisionDate DATETIME2(7) From 4e0caf840cf01900da53099175af6dd5f83688a8 Mon Sep 17 00:00:00 2001 From: voommen-livefront Date: Fri, 20 Jun 2025 15:59:34 -0500 Subject: [PATCH 7/9] PM-20574 fix dB build error --- .../Dirt/Stored Procedures/OrganizationApplication_Update.sql | 1 + .../Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql index eab807f0ca..6790e15a78 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql +++ b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql @@ -12,3 +12,4 @@ AS [Applications] = @Applications, [RevisionDate] = @RevisionDate WHERE [Id] = @Id; + \ No newline at end of file diff --git a/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql index 4e9f1822ed..b48ca8eab1 100644 --- a/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql +++ b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql @@ -72,7 +72,6 @@ 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; From d9a7d2a4731c20eeda1e8dc79a71c879e1dcf363 Mon Sep 17 00:00:00 2001 From: voommen-livefront Date: Fri, 20 Jun 2025 16:02:46 -0500 Subject: [PATCH 8/9] PM-020574 fixed additional PR comments - files cleaned up --- .../OrganizationApplication_Update.sql | 3 ++- src/Sql/dbo/Dirt/Tables/OrganizationReport.sql | 2 +- .../2025-06-13-01_OrganizationApplication.sql | 10 ---------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql b/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql index 6790e15a78..5c24a307bd 100644 --- a/src/Sql/dbo/Dirt/Stored Procedures/OrganizationApplication_Update.sql +++ b/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; @@ -10,6 +11,6 @@ AS SET [OrganizationId] = @OrganizationId, [Applications] = @Applications, + [CreationDate] = @CreationDate, [RevisionDate] = @RevisionDate WHERE [Id] = @Id; - \ No newline at end of file diff --git a/src/Sql/dbo/Dirt/Tables/OrganizationReport.sql b/src/Sql/dbo/Dirt/Tables/OrganizationReport.sql index 77b4b10e2d..563877a340 100644 --- a/src/Sql/dbo/Dirt/Tables/OrganizationReport.sql +++ b/src/Sql/dbo/Dirt/Tables/OrganizationReport.sql @@ -15,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-01_OrganizationApplication.sql b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql index b48ca8eab1..41afb98949 100644 --- a/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql +++ b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql @@ -92,13 +92,3 @@ AS DELETE FROM [dbo].[OrganizationApplication] WHERE [Id] = @Id; GO - - - - - - - - - - From e132e1db10be195e28d3ae1fa1c46c86d0b0be04 Mon Sep 17 00:00:00 2001 From: voommen-livefront Date: Fri, 20 Jun 2025 16:09:24 -0500 Subject: [PATCH 9/9] PM-20574 updated procedure was inconsistent --- .../DbScripts/2025-06-13-01_OrganizationApplication.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql index 41afb98949..2f2a357ad3 100644 --- a/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql +++ b/util/Migrator/DbScripts/2025-06-13-01_OrganizationApplication.sql @@ -72,6 +72,7 @@ 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; @@ -80,8 +81,10 @@ AS SET [OrganizationId] = @OrganizationId, [Applications] = @Applications, + [CreationDate] = @CreationDate, [RevisionDate] = @RevisionDate WHERE [Id] = @Id; + GO CREATE OR ALTER PROCEDURE [dbo].[OrganizationApplication_DeleteById]