[BEEEP][SM-1062] Add missing table indexes to EF config (#3628)

* Add missing EF indexes

* Add EF migrations

* move configs

* regenerate migrations

src/Infrastructure.EntityFramework/AdminConsole/Configurations/OrganizationEntityTypeConfiguration.cs

@@ -0,0 +1,29 @@
+using Bit.Infrastructure.EntityFramework.AdminConsole.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace Bit.Infrastructure.EntityFramework.AdminConsole.Configurations;
+
+public class OrganizationEntityTypeConfiguration : IEntityTypeConfiguration<Organization>
+{
+    public void Configure(EntityTypeBuilder<Organization> builder)
+    {
+        builder
+            .Property(o => o.Id)
+            .ValueGeneratedNever();
+
+        builder.Property(c => c.LimitCollectionCreationDeletion)
+            .ValueGeneratedNever()
+            .HasDefaultValue(true);
+
+        builder.Property(c => c.AllowAdminAccessToAllCollectionItems)
+            .ValueGeneratedNever()
+            .HasDefaultValue(true);
+
+        NpgsqlIndexBuilderExtensions.IncludeProperties(
+            builder.HasIndex(o => new { o.Id, o.Enabled }),
+            o => o.UseTotp);
+
+        builder.ToTable(nameof(Organization));
+    }
+}

src/Infrastructure.EntityFramework/AdminConsole/Configurations/PolicyEntityTypeConfiguration.cs

@@ -0,0 +1,26 @@
+using Bit.Infrastructure.EntityFramework.AdminConsole.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace Bit.Infrastructure.EntityFramework.AdminConsole.Configurations;
+
+public class PolicyEntityTypeConfiguration : IEntityTypeConfiguration<Policy>
+{
+    public void Configure(EntityTypeBuilder<Policy> builder)
+    {
+        builder
+            .Property(p => p.Id)
+            .ValueGeneratedNever();
+
+        builder
+            .HasIndex(p => p.OrganizationId)
+            .IsClustered(false);
+
+        builder
+            .HasIndex(p => new { p.OrganizationId, p.Type })
+            .IsUnique()
+            .IsClustered(false);
+
+        builder.ToTable(nameof(Policy));
+    }
+}

src/Infrastructure.EntityFramework/Configurations/DeviceEntityTypeConfiguration.cs

@@ -0,0 +1,26 @@
+using Bit.Infrastructure.EntityFramework.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace Bit.Infrastructure.EntityFramework.Configurations;
+
+public class DeviceEntityTypeConfiguration : IEntityTypeConfiguration<Device>
+{
+    public void Configure(EntityTypeBuilder<Device> builder)
+    {
+        builder
+            .HasIndex(d => d.UserId)
+            .IsClustered(false);
+
+        builder
+            .HasIndex(d => new { d.UserId, d.Identifier })
+            .IsUnique()
+            .IsClustered(false);
+
+        builder
+            .HasIndex(d => d.Identifier)
+            .IsClustered(false);
+
+        builder.ToTable(nameof(Device));
+    }
+}

src/Infrastructure.EntityFramework/Configurations/EventEntityTypeConfiguration.cs

@@ -0,0 +1,21 @@
+using Bit.Infrastructure.EntityFramework.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace Bit.Infrastructure.EntityFramework.Configurations;
+
+public class EventEntityTypeConfiguration : IEntityTypeConfiguration<Event>
+{
+    public void Configure(EntityTypeBuilder<Event> builder)
+    {
+        builder
+            .Property(e => e.Id)
+            .ValueGeneratedNever();
+
+        builder
+            .HasIndex(e => new { e.Date, e.OrganizationId, e.ActingUserId, e.CipherId })
+            .IsClustered(false);
+
+        builder.ToTable(nameof(Event));
+    }
+}

src/Infrastructure.EntityFramework/Configurations/OrganizationSponsorshipEntityTypeConfiguration.cs

@@ -0,0 +1,21 @@
+using Bit.Infrastructure.EntityFramework.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace Bit.Infrastructure.EntityFramework.Configurations;
+
+public class OrganizationSponsorshipEntityTypeConfiguration : IEntityTypeConfiguration<OrganizationSponsorship>
+{
+    public void Configure(EntityTypeBuilder<OrganizationSponsorship> builder)
+    {
+        builder
+            .Property(o => o.Id)
+            .ValueGeneratedNever();
+
+        builder
+            .HasIndex(o => o.SponsoringOrganizationUserId)
+            .IsClustered(false);
+
+        builder.ToTable(nameof(OrganizationSponsorship));
+    }
+}

src/Infrastructure.EntityFramework/Configurations/OrganizationUserEntityTypeConfiguration.cs

@@ -0,0 +1,29 @@
+using Bit.Infrastructure.EntityFramework.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace Bit.Infrastructure.EntityFramework.Configurations;
+
+public class OrganizationUserEntityTypeConfiguration : IEntityTypeConfiguration<OrganizationUser>
+{
+    public void Configure(EntityTypeBuilder<OrganizationUser> builder)
+    {
+        builder
+            .Property(ou => ou.Id)
+            .ValueGeneratedNever();
+
+        NpgsqlIndexBuilderExtensions.IncludeProperties(
+            builder.HasIndex(ou => new { ou.UserId, ou.OrganizationId, ou.Status }).IsClustered(false),
+            ou => ou.AccessAll);
+
+        builder
+            .HasIndex(ou => ou.OrganizationId)
+            .IsClustered(false);
+
+        builder
+            .HasIndex(ou => ou.UserId)
+            .IsClustered(false);
+
+        builder.ToTable(nameof(OrganizationUser));
+    }
+}

src/Infrastructure.EntityFramework/Configurations/TransactionEntityTypeConfiguration.cs

@@ -0,0 +1,25 @@
+using Bit.Infrastructure.EntityFramework.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace Bit.Infrastructure.EntityFramework.Configurations;
+
+public class TransactionEntityTypeConfiguration : IEntityTypeConfiguration<Transaction>
+{
+    public void Configure(EntityTypeBuilder<Transaction> builder)
+    {
+        builder
+            .Property(t => t.Id)
+            .ValueGeneratedNever();
+
+        builder
+            .HasIndex(t => t.UserId)
+            .IsClustered(false);
+
+        builder
+            .HasIndex(t => new { t.UserId, t.OrganizationId, t.CreationDate })
+            .IsClustered(false);
+
+        builder.ToTable(nameof(Transaction));
+    }
+}

src/Infrastructure.EntityFramework/Configurations/UserEntityTypeConfiguration.cs

@@ -0,0 +1,26 @@
+using Bit.Infrastructure.EntityFramework.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace Bit.Infrastructure.EntityFramework.Configurations;
+
+public class UserEntityTypeConfiguration : IEntityTypeConfiguration<User>
+{
+    public void Configure(EntityTypeBuilder<User> builder)
+    {
+        builder
+            .Property(u => u.Id)
+            .ValueGeneratedNever();
+
+        builder
+            .HasIndex(u => u.Email)
+            .IsUnique()
+            .IsClustered(false);
+
+        builder
+            .HasIndex(u => new { u.Premium, u.PremiumExpirationDate, u.RenewalReminderDate })
+            .IsClustered(false);
+
+        builder.ToTable(nameof(User));
+    }
+}

src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs

@@ -77,24 +77,17 @@ public class DatabaseContext : DbContext
         var eCollectionCipher = builder.Entity<CollectionCipher>();
         var eCollectionUser = builder.Entity<CollectionUser>();
         var eCollectionGroup = builder.Entity<CollectionGroup>();
-        var eDevice = builder.Entity<Device>();
         var eEmergencyAccess = builder.Entity<EmergencyAccess>();
-        var eEvent = builder.Entity<Event>();
         var eFolder = builder.Entity<Folder>();
         var eGroup = builder.Entity<Group>();
         var eGroupUser = builder.Entity<GroupUser>();
         var eInstallation = builder.Entity<Installation>();
-        var eOrganization = builder.Entity<Organization>();
-        var eOrganizationSponsorship = builder.Entity<OrganizationSponsorship>();
-        var eOrganizationUser = builder.Entity<OrganizationUser>();
-        var ePolicy = builder.Entity<Policy>();
         var eProvider = builder.Entity<Provider>();
         var eProviderUser = builder.Entity<ProviderUser>();
         var eProviderOrganization = builder.Entity<ProviderOrganization>();
         var eSsoConfig = builder.Entity<SsoConfig>();
         var eSsoUser = builder.Entity<SsoUser>();
         var eTaxRate = builder.Entity<TaxRate>();
-        var eTransaction = builder.Entity<Transaction>();
         var eUser = builder.Entity<User>();
         var eOrganizationApiKey = builder.Entity<OrganizationApiKey>();
         var eOrganizationConnection = builder.Entity<OrganizationConnection>();
@@ -104,25 +97,12 @@ public class DatabaseContext : DbContext
         eCipher.Property(c => c.Id).ValueGeneratedNever();
         eCollection.Property(c => c.Id).ValueGeneratedNever();
         eEmergencyAccess.Property(c => c.Id).ValueGeneratedNever();
-        eEvent.Property(c => c.Id).ValueGeneratedNever();
         eFolder.Property(c => c.Id).ValueGeneratedNever();
         eGroup.Property(c => c.Id).ValueGeneratedNever();
         eInstallation.Property(c => c.Id).ValueGeneratedNever();
-        eOrganization.Property(c => c.Id).ValueGeneratedNever();
-        eOrganization.Property(c => c.LimitCollectionCreationDeletion)
-            .ValueGeneratedNever()
-            .HasDefaultValue(true);
-        eOrganization.Property(c => c.AllowAdminAccessToAllCollectionItems)
-            .ValueGeneratedNever()
-            .HasDefaultValue(true);
-        eOrganizationSponsorship.Property(c => c.Id).ValueGeneratedNever();
-        eOrganizationUser.Property(c => c.Id).ValueGeneratedNever();
-        ePolicy.Property(c => c.Id).ValueGeneratedNever();
         eProvider.Property(c => c.Id).ValueGeneratedNever();
         eProviderUser.Property(c => c.Id).ValueGeneratedNever();
         eProviderOrganization.Property(c => c.Id).ValueGeneratedNever();
-        eTransaction.Property(c => c.Id).ValueGeneratedNever();
-        eUser.Property(c => c.Id).ValueGeneratedNever();
         eOrganizationApiKey.Property(c => c.Id).ValueGeneratedNever();
         eOrganizationConnection.Property(c => c.Id).ValueGeneratedNever();
         eOrganizationDomain.Property(ar => ar.Id).ValueGeneratedNever();
@@ -146,32 +126,24 @@ public class DatabaseContext : DbContext
             builder.HasCollation(postgresIndetermanisticCollation, locale: "en-u-ks-primary", provider: "icu", deterministic: false);
             eUser.Property(e => e.Email).UseCollation(postgresIndetermanisticCollation);
             eSsoUser.Property(e => e.ExternalId).UseCollation(postgresIndetermanisticCollation);
-            eOrganization.Property(e => e.Identifier).UseCollation(postgresIndetermanisticCollation);
+            builder.Entity<Organization>().Property(e => e.Identifier).UseCollation(postgresIndetermanisticCollation);
             //
         }
 
         eCipher.ToTable(nameof(Cipher));
         eCollection.ToTable(nameof(Collection));
         eCollectionCipher.ToTable(nameof(CollectionCipher));
-        eDevice.ToTable(nameof(Device));
         eEmergencyAccess.ToTable(nameof(EmergencyAccess));
-        eEvent.ToTable(nameof(Event));
         eFolder.ToTable(nameof(Folder));
         eGroup.ToTable(nameof(Group));
         eGroupUser.ToTable(nameof(GroupUser));
         eInstallation.ToTable(nameof(Installation));
-        eOrganization.ToTable(nameof(Organization));
-        eOrganizationSponsorship.ToTable(nameof(OrganizationSponsorship));
-        eOrganizationUser.ToTable(nameof(OrganizationUser));
-        ePolicy.ToTable(nameof(Policy));
         eProvider.ToTable(nameof(Provider));
         eProviderUser.ToTable(nameof(ProviderUser));
         eProviderOrganization.ToTable(nameof(ProviderOrganization));
         eSsoConfig.ToTable(nameof(SsoConfig));
         eSsoUser.ToTable(nameof(SsoUser));
         eTaxRate.ToTable(nameof(TaxRate));
-        eTransaction.ToTable(nameof(Transaction));
-        eUser.ToTable(nameof(User));
         eOrganizationApiKey.ToTable(nameof(OrganizationApiKey));
         eOrganizationConnection.ToTable(nameof(OrganizationConnection));
         eOrganizationDomain.ToTable(nameof(OrganizationDomain));

util/MySqlMigrations/Migrations/20240109215348_AddTableIndexes.cs

@@ -0,0 +1,110 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Bit.MySqlMigrations.Migrations;
+
+/// <inheritdoc />
+public partial class AddTableIndexes : Migration
+{
+    /// <inheritdoc />
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.CreateIndex(
+            name: "IX_User_Email",
+            table: "User",
+            column: "Email",
+            unique: true);
+
+        migrationBuilder.CreateIndex(
+            name: "IX_User_Premium_PremiumExpirationDate_RenewalReminderDate",
+            table: "User",
+            columns: new[] { "Premium", "PremiumExpirationDate", "RenewalReminderDate" });
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Transaction_UserId_OrganizationId_CreationDate",
+            table: "Transaction",
+            columns: new[] { "UserId", "OrganizationId", "CreationDate" });
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Policy_OrganizationId_Type",
+            table: "Policy",
+            columns: new[] { "OrganizationId", "Type" },
+            unique: true);
+
+        migrationBuilder.CreateIndex(
+            name: "IX_OrganizationUser_UserId_OrganizationId_Status",
+            table: "OrganizationUser",
+            columns: new[] { "UserId", "OrganizationId", "Status" });
+
+        migrationBuilder.CreateIndex(
+            name: "IX_OrganizationSponsorship_SponsoringOrganizationUserId",
+            table: "OrganizationSponsorship",
+            column: "SponsoringOrganizationUserId");
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Organization_Id_Enabled",
+            table: "Organization",
+            columns: new[] { "Id", "Enabled" });
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Event_Date_OrganizationId_ActingUserId_CipherId",
+            table: "Event",
+            columns: new[] { "Date", "OrganizationId", "ActingUserId", "CipherId" });
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Device_Identifier",
+            table: "Device",
+            column: "Identifier");
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Device_UserId_Identifier",
+            table: "Device",
+            columns: new[] { "UserId", "Identifier" },
+            unique: true);
+    }
+
+    /// <inheritdoc />
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropIndex(
+            name: "IX_User_Email",
+            table: "User");
+
+        migrationBuilder.DropIndex(
+            name: "IX_User_Premium_PremiumExpirationDate_RenewalReminderDate",
+            table: "User");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Transaction_UserId_OrganizationId_CreationDate",
+            table: "Transaction");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Policy_OrganizationId_Type",
+            table: "Policy");
+
+        migrationBuilder.DropIndex(
+            name: "IX_OrganizationUser_UserId_OrganizationId_Status",
+            table: "OrganizationUser");
+
+        migrationBuilder.DropIndex(
+            name: "IX_OrganizationSponsorship_SponsoringOrganizationUserId",
+            table: "OrganizationSponsorship");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Organization_Id_Enabled",
+            table: "Organization");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Event_Date_OrganizationId_ActingUserId_CipherId",
+            table: "Event");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Device_Identifier",
+            table: "Device");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Device_UserId_Identifier",
+            table: "Device");
+    }
+}

util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs

@@ -200,6 +200,9 @@ namespace Bit.MySqlMigrations.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("Id", "Enabled")
+                        .HasAnnotation("Npgsql:IndexInclude", new[] { "UseTotp" });
+
                     b.ToTable("Organization", (string)null);
                 });
 
@@ -228,7 +231,12 @@ namespace Bit.MySqlMigrations.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("OrganizationId");
+                    b.HasIndex("OrganizationId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    b.HasIndex("OrganizationId", "Type")
+                        .IsUnique()
+                        .HasAnnotation("SqlServer:Clustered", false);
 
                     b.ToTable("Policy", (string)null);
                 });
@@ -774,7 +782,15 @@ namespace Bit.MySqlMigrations.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("UserId");
+                    b.HasIndex("Identifier")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    b.HasIndex("UserId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    b.HasIndex("UserId", "Identifier")
+                        .IsUnique()
+                        .HasAnnotation("SqlServer:Clustered", false);
 
                     b.ToTable("Device", (string)null);
                 });
@@ -847,6 +863,9 @@ namespace Bit.MySqlMigrations.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("Date", "OrganizationId", "ActingUserId", "CipherId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
                     b.ToTable("Event", (string)null);
                 });
 
@@ -1047,6 +1066,9 @@ namespace Bit.MySqlMigrations.Migrations
 
                     b.HasIndex("SponsoringOrganizationId");
 
+                    b.HasIndex("SponsoringOrganizationUserId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
                     b.ToTable("OrganizationSponsorship", (string)null);
                 });
 
@@ -1098,9 +1120,15 @@ namespace Bit.MySqlMigrations.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("OrganizationId");
+                    b.HasIndex("OrganizationId")
+                        .HasAnnotation("SqlServer:Clustered", false);
 
-                    b.HasIndex("UserId");
+                    b.HasIndex("UserId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    b.HasIndex("UserId", "OrganizationId", "Status")
+                        .HasAnnotation("Npgsql:IndexInclude", new[] { "AccessAll" })
+                        .HasAnnotation("SqlServer:Clustered", false);
 
                     b.ToTable("OrganizationUser", (string)null);
                 });
@@ -1242,7 +1270,11 @@ namespace Bit.MySqlMigrations.Migrations
 
                     b.HasIndex("OrganizationId");
 
-                    b.HasIndex("UserId");
+                    b.HasIndex("UserId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    b.HasIndex("UserId", "OrganizationId", "CreationDate")
+                        .HasAnnotation("SqlServer:Clustered", false);
 
                     b.ToTable("Transaction", (string)null);
                 });
@@ -1392,6 +1424,13 @@ namespace Bit.MySqlMigrations.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("Email")
+                        .IsUnique()
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    b.HasIndex("Premium", "PremiumExpirationDate", "RenewalReminderDate")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
                     b.ToTable("User", (string)null);
                 });
 

util/PostgresMigrations/Migrations/20240109215338_AddTableIndexes.cs

@@ -0,0 +1,112 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Bit.PostgresMigrations.Migrations;
+
+/// <inheritdoc />
+public partial class AddTableIndexes : Migration
+{
+    /// <inheritdoc />
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.CreateIndex(
+            name: "IX_User_Email",
+            table: "User",
+            column: "Email",
+            unique: true);
+
+        migrationBuilder.CreateIndex(
+            name: "IX_User_Premium_PremiumExpirationDate_RenewalReminderDate",
+            table: "User",
+            columns: new[] { "Premium", "PremiumExpirationDate", "RenewalReminderDate" });
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Transaction_UserId_OrganizationId_CreationDate",
+            table: "Transaction",
+            columns: new[] { "UserId", "OrganizationId", "CreationDate" });
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Policy_OrganizationId_Type",
+            table: "Policy",
+            columns: new[] { "OrganizationId", "Type" },
+            unique: true);
+
+        migrationBuilder.CreateIndex(
+            name: "IX_OrganizationUser_UserId_OrganizationId_Status",
+            table: "OrganizationUser",
+            columns: new[] { "UserId", "OrganizationId", "Status" })
+            .Annotation("Npgsql:IndexInclude", new[] { "AccessAll" });
+
+        migrationBuilder.CreateIndex(
+            name: "IX_OrganizationSponsorship_SponsoringOrganizationUserId",
+            table: "OrganizationSponsorship",
+            column: "SponsoringOrganizationUserId");
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Organization_Id_Enabled",
+            table: "Organization",
+            columns: new[] { "Id", "Enabled" })
+            .Annotation("Npgsql:IndexInclude", new[] { "UseTotp" });
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Event_Date_OrganizationId_ActingUserId_CipherId",
+            table: "Event",
+            columns: new[] { "Date", "OrganizationId", "ActingUserId", "CipherId" });
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Device_Identifier",
+            table: "Device",
+            column: "Identifier");
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Device_UserId_Identifier",
+            table: "Device",
+            columns: new[] { "UserId", "Identifier" },
+            unique: true);
+    }
+
+    /// <inheritdoc />
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropIndex(
+            name: "IX_User_Email",
+            table: "User");
+
+        migrationBuilder.DropIndex(
+            name: "IX_User_Premium_PremiumExpirationDate_RenewalReminderDate",
+            table: "User");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Transaction_UserId_OrganizationId_CreationDate",
+            table: "Transaction");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Policy_OrganizationId_Type",
+            table: "Policy");
+
+        migrationBuilder.DropIndex(
+            name: "IX_OrganizationUser_UserId_OrganizationId_Status",
+            table: "OrganizationUser");
+
+        migrationBuilder.DropIndex(
+            name: "IX_OrganizationSponsorship_SponsoringOrganizationUserId",
+            table: "OrganizationSponsorship");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Organization_Id_Enabled",
+            table: "Organization");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Event_Date_OrganizationId_ActingUserId_CipherId",
+            table: "Event");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Device_Identifier",
+            table: "Device");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Device_UserId_Identifier",
+            table: "Device");
+    }
+}

util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs

@@ -205,6 +205,10 @@ namespace Bit.PostgresMigrations.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("Id", "Enabled");
+
+                    NpgsqlIndexBuilderExtensions.IncludeProperties(b.HasIndex("Id", "Enabled"), new[] { "UseTotp" });
+
                     b.ToTable("Organization", (string)null);
                 });
 
@@ -233,7 +237,12 @@ namespace Bit.PostgresMigrations.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("OrganizationId");
+                    b.HasIndex("OrganizationId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    b.HasIndex("OrganizationId", "Type")
+                        .IsUnique()
+                        .HasAnnotation("SqlServer:Clustered", false);
 
                     b.ToTable("Policy", (string)null);
                 });
@@ -786,7 +795,15 @@ namespace Bit.PostgresMigrations.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("UserId");
+                    b.HasIndex("Identifier")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    b.HasIndex("UserId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    b.HasIndex("UserId", "Identifier")
+                        .IsUnique()
+                        .HasAnnotation("SqlServer:Clustered", false);
 
                     b.ToTable("Device", (string)null);
                 });
@@ -859,6 +876,9 @@ namespace Bit.PostgresMigrations.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("Date", "OrganizationId", "ActingUserId", "CipherId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
                     b.ToTable("Event", (string)null);
                 });
 
@@ -1059,6 +1079,9 @@ namespace Bit.PostgresMigrations.Migrations
 
                     b.HasIndex("SponsoringOrganizationId");
 
+                    b.HasIndex("SponsoringOrganizationUserId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
                     b.ToTable("OrganizationSponsorship", (string)null);
                 });
 
@@ -1110,9 +1133,16 @@ namespace Bit.PostgresMigrations.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("OrganizationId");
+                    b.HasIndex("OrganizationId")
+                        .HasAnnotation("SqlServer:Clustered", false);
 
-                    b.HasIndex("UserId");
+                    b.HasIndex("UserId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    b.HasIndex("UserId", "OrganizationId", "Status")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    NpgsqlIndexBuilderExtensions.IncludeProperties(b.HasIndex("UserId", "OrganizationId", "Status"), new[] { "AccessAll" });
 
                     b.ToTable("OrganizationUser", (string)null);
                 });
@@ -1254,7 +1284,11 @@ namespace Bit.PostgresMigrations.Migrations
 
                     b.HasIndex("OrganizationId");
 
-                    b.HasIndex("UserId");
+                    b.HasIndex("UserId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    b.HasIndex("UserId", "OrganizationId", "CreationDate")
+                        .HasAnnotation("SqlServer:Clustered", false);
 
                     b.ToTable("Transaction", (string)null);
                 });
@@ -1405,6 +1439,13 @@ namespace Bit.PostgresMigrations.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("Email")
+                        .IsUnique()
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    b.HasIndex("Premium", "PremiumExpirationDate", "RenewalReminderDate")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
                     b.ToTable("User", (string)null);
                 });
 

util/SqliteMigrations/Migrations/20240109215333_AddTableIndexes.cs

@@ -0,0 +1,110 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Bit.SqliteMigrations.Migrations;
+
+/// <inheritdoc />
+public partial class AddTableIndexes : Migration
+{
+    /// <inheritdoc />
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.CreateIndex(
+            name: "IX_User_Email",
+            table: "User",
+            column: "Email",
+            unique: true);
+
+        migrationBuilder.CreateIndex(
+            name: "IX_User_Premium_PremiumExpirationDate_RenewalReminderDate",
+            table: "User",
+            columns: new[] { "Premium", "PremiumExpirationDate", "RenewalReminderDate" });
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Transaction_UserId_OrganizationId_CreationDate",
+            table: "Transaction",
+            columns: new[] { "UserId", "OrganizationId", "CreationDate" });
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Policy_OrganizationId_Type",
+            table: "Policy",
+            columns: new[] { "OrganizationId", "Type" },
+            unique: true);
+
+        migrationBuilder.CreateIndex(
+            name: "IX_OrganizationUser_UserId_OrganizationId_Status",
+            table: "OrganizationUser",
+            columns: new[] { "UserId", "OrganizationId", "Status" });
+
+        migrationBuilder.CreateIndex(
+            name: "IX_OrganizationSponsorship_SponsoringOrganizationUserId",
+            table: "OrganizationSponsorship",
+            column: "SponsoringOrganizationUserId");
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Organization_Id_Enabled",
+            table: "Organization",
+            columns: new[] { "Id", "Enabled" });
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Event_Date_OrganizationId_ActingUserId_CipherId",
+            table: "Event",
+            columns: new[] { "Date", "OrganizationId", "ActingUserId", "CipherId" });
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Device_Identifier",
+            table: "Device",
+            column: "Identifier");
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Device_UserId_Identifier",
+            table: "Device",
+            columns: new[] { "UserId", "Identifier" },
+            unique: true);
+    }
+
+    /// <inheritdoc />
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropIndex(
+            name: "IX_User_Email",
+            table: "User");
+
+        migrationBuilder.DropIndex(
+            name: "IX_User_Premium_PremiumExpirationDate_RenewalReminderDate",
+            table: "User");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Transaction_UserId_OrganizationId_CreationDate",
+            table: "Transaction");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Policy_OrganizationId_Type",
+            table: "Policy");
+
+        migrationBuilder.DropIndex(
+            name: "IX_OrganizationUser_UserId_OrganizationId_Status",
+            table: "OrganizationUser");
+
+        migrationBuilder.DropIndex(
+            name: "IX_OrganizationSponsorship_SponsoringOrganizationUserId",
+            table: "OrganizationSponsorship");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Organization_Id_Enabled",
+            table: "Organization");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Event_Date_OrganizationId_ActingUserId_CipherId",
+            table: "Event");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Device_Identifier",
+            table: "Device");
+
+        migrationBuilder.DropIndex(
+            name: "IX_Device_UserId_Identifier",
+            table: "Device");
+    }
+}

util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs

@@ -198,6 +198,9 @@ namespace Bit.SqliteMigrations.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("Id", "Enabled")
+                        .HasAnnotation("Npgsql:IndexInclude", new[] { "UseTotp" });
+
                     b.ToTable("Organization", (string)null);
                 });
 
@@ -226,7 +229,12 @@ namespace Bit.SqliteMigrations.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("OrganizationId");
+                    b.HasIndex("OrganizationId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    b.HasIndex("OrganizationId", "Type")
+                        .IsUnique()
+                        .HasAnnotation("SqlServer:Clustered", false);
 
                     b.ToTable("Policy", (string)null);
                 });
@@ -772,7 +780,15 @@ namespace Bit.SqliteMigrations.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("UserId");
+                    b.HasIndex("Identifier")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    b.HasIndex("UserId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    b.HasIndex("UserId", "Identifier")
+                        .IsUnique()
+                        .HasAnnotation("SqlServer:Clustered", false);
 
                     b.ToTable("Device", (string)null);
                 });
@@ -845,6 +861,9 @@ namespace Bit.SqliteMigrations.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("Date", "OrganizationId", "ActingUserId", "CipherId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
                     b.ToTable("Event", (string)null);
                 });
 
@@ -1045,6 +1064,9 @@ namespace Bit.SqliteMigrations.Migrations
 
                     b.HasIndex("SponsoringOrganizationId");
 
+                    b.HasIndex("SponsoringOrganizationUserId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
                     b.ToTable("OrganizationSponsorship", (string)null);
                 });
 
@@ -1096,9 +1118,15 @@ namespace Bit.SqliteMigrations.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("OrganizationId");
+                    b.HasIndex("OrganizationId")
+                        .HasAnnotation("SqlServer:Clustered", false);
 
-                    b.HasIndex("UserId");
+                    b.HasIndex("UserId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    b.HasIndex("UserId", "OrganizationId", "Status")
+                        .HasAnnotation("Npgsql:IndexInclude", new[] { "AccessAll" })
+                        .HasAnnotation("SqlServer:Clustered", false);
 
                     b.ToTable("OrganizationUser", (string)null);
                 });
@@ -1240,7 +1268,11 @@ namespace Bit.SqliteMigrations.Migrations
 
                     b.HasIndex("OrganizationId");
 
-                    b.HasIndex("UserId");
+                    b.HasIndex("UserId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    b.HasIndex("UserId", "OrganizationId", "CreationDate")
+                        .HasAnnotation("SqlServer:Clustered", false);
 
                     b.ToTable("Transaction", (string)null);
                 });
@@ -1390,6 +1422,13 @@ namespace Bit.SqliteMigrations.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("Email")
+                        .IsUnique()
+                        .HasAnnotation("SqlServer:Clustered", false);
+
+                    b.HasIndex("Premium", "PremiumExpirationDate", "RenewalReminderDate")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
                     b.ToTable("User", (string)null);
                 });