Merge branch 'main' into billing/PM-7452/resolve-paypal-issue

bitwarden · Oct 4, 2024 · bcb408f · bcb408f
2 parents 379480b + c449886
commit bcb408f
Show file tree

Hide file tree

Showing 9 changed files with 147 additions and 69 deletions.
diff --git a/util/MySqlMigrations/Migrations/20241004140901_AddClientOrganizationMigrationRecordTable.cs b/util/MySqlMigrations/Migrations/20241004140901_AddClientOrganizationMigrationRecordTable.cs
diff --git a/...anizationMigrationRecordTable.Designer.cs → ...anizationMigrationRecordTable.Designer.cs b/...anizationMigrationRecordTable.Designer.cs → ...anizationMigrationRecordTable.Designer.cs
diff --git a/util/MySqlMigrations/Migrations/20241004154527_AddClientOrganizationMigrationRecordTable.cs b/util/MySqlMigrations/Migrations/20241004154527_AddClientOrganizationMigrationRecordTable.cs
@@ -0,0 +1,50 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Bit.MySqlMigrations.Migrations;
+
+/// <inheritdoc />
+public partial class AddClientOrganizationMigrationRecordTable : Migration
+{
+    /// <inheritdoc />
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.CreateTable(
+            name: "ClientOrganizationMigrationRecord",
+            columns: table => new
+            {
+                Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                OrganizationId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                ProviderId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                PlanType = table.Column<byte>(type: "tinyint unsigned", nullable: false),
+                Seats = table.Column<int>(type: "int", nullable: false),
+                MaxStorageGb = table.Column<short>(type: "smallint", nullable: true),
+                GatewayCustomerId = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false)
+                    .Annotation("MySql:CharSet", "utf8mb4"),
+                GatewaySubscriptionId = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false)
+                    .Annotation("MySql:CharSet", "utf8mb4"),
+                ExpirationDate = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                MaxAutoscaleSeats = table.Column<int>(type: "int", nullable: true),
+                Status = table.Column<byte>(type: "tinyint unsigned", nullable: false)
+            },
+            constraints: table =>
+            {
+                table.PrimaryKey("PK_ClientOrganizationMigrationRecord", x => x.Id);
+            })
+            .Annotation("MySql:CharSet", "utf8mb4");
+
+        migrationBuilder.CreateIndex(
+            name: "IX_ClientOrganizationMigrationRecord_ProviderId_OrganizationId",
+            table: "ClientOrganizationMigrationRecord",
+            columns: new[] { "ProviderId", "OrganizationId" },
+            unique: true);
+    }
+
+    /// <inheritdoc />
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropTable(
+            name: "ClientOrganizationMigrationRecord");
+    }
+}
diff --git a/...PostgresMigrations/Migrations/20241004140910_AddClientOrganizationMigrationRecordTable.cs b/...PostgresMigrations/Migrations/20241004140910_AddClientOrganizationMigrationRecordTable.cs
diff --git a/...anizationMigrationRecordTable.Designer.cs → ...anizationMigrationRecordTable.Designer.cs b/...anizationMigrationRecordTable.Designer.cs → ...anizationMigrationRecordTable.Designer.cs
diff --git a/...PostgresMigrations/Migrations/20241004154531_AddClientOrganizationMigrationRecordTable.cs b/...PostgresMigrations/Migrations/20241004154531_AddClientOrganizationMigrationRecordTable.cs
@@ -0,0 +1,47 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Bit.PostgresMigrations.Migrations;
+
+/// <inheritdoc />
+public partial class AddClientOrganizationMigrationRecordTable : Migration
+{
+    /// <inheritdoc />
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.CreateTable(
+            name: "ClientOrganizationMigrationRecord",
+            columns: table => new
+            {
+                Id = table.Column<Guid>(type: "uuid", nullable: false),
+                OrganizationId = table.Column<Guid>(type: "uuid", nullable: false),
+                ProviderId = table.Column<Guid>(type: "uuid", nullable: false),
+                PlanType = table.Column<byte>(type: "smallint", nullable: false),
+                Seats = table.Column<int>(type: "integer", nullable: false),
+                MaxStorageGb = table.Column<short>(type: "smallint", nullable: true),
+                GatewayCustomerId = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
+                GatewaySubscriptionId = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
+                ExpirationDate = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
+                MaxAutoscaleSeats = table.Column<int>(type: "integer", nullable: true),
+                Status = table.Column<byte>(type: "smallint", nullable: false)
+            },
+            constraints: table =>
+            {
+                table.PrimaryKey("PK_ClientOrganizationMigrationRecord", x => x.Id);
+            });
+
+        migrationBuilder.CreateIndex(
+            name: "IX_ClientOrganizationMigrationRecord_ProviderId_OrganizationId",
+            table: "ClientOrganizationMigrationRecord",
+            columns: new[] { "ProviderId", "OrganizationId" },
+            unique: true);
+    }
+
+    /// <inheritdoc />
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropTable(
+            name: "ClientOrganizationMigrationRecord");
+    }
+}
diff --git a/util/SqliteMigrations/Migrations/20241004140906_AddClientOrganizationMigrationRecordTable.cs b/util/SqliteMigrations/Migrations/20241004140906_AddClientOrganizationMigrationRecordTable.cs
diff --git a/...anizationMigrationRecordTable.Designer.cs → ...anizationMigrationRecordTable.Designer.cs b/...anizationMigrationRecordTable.Designer.cs → ...anizationMigrationRecordTable.Designer.cs
diff --git a/util/SqliteMigrations/Migrations/20241004154523_AddClientOrganizationMigrationRecordTable.cs b/util/SqliteMigrations/Migrations/20241004154523_AddClientOrganizationMigrationRecordTable.cs
@@ -0,0 +1,47 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Bit.SqliteMigrations.Migrations;
+
+/// <inheritdoc />
+public partial class AddClientOrganizationMigrationRecordTable : Migration
+{
+    /// <inheritdoc />
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.CreateTable(
+            name: "ClientOrganizationMigrationRecord",
+            columns: table => new
+            {
+                Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                OrganizationId = table.Column<Guid>(type: "TEXT", nullable: false),
+                ProviderId = table.Column<Guid>(type: "TEXT", nullable: false),
+                PlanType = table.Column<byte>(type: "INTEGER", nullable: false),
+                Seats = table.Column<int>(type: "INTEGER", nullable: false),
+                MaxStorageGb = table.Column<short>(type: "INTEGER", nullable: true),
+                GatewayCustomerId = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
+                GatewaySubscriptionId = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
+                ExpirationDate = table.Column<DateTime>(type: "TEXT", nullable: true),
+                MaxAutoscaleSeats = table.Column<int>(type: "INTEGER", nullable: true),
+                Status = table.Column<byte>(type: "INTEGER", nullable: false)
+            },
+            constraints: table =>
+            {
+                table.PrimaryKey("PK_ClientOrganizationMigrationRecord", x => x.Id);
+            });
+
+        migrationBuilder.CreateIndex(
+            name: "IX_ClientOrganizationMigrationRecord_ProviderId_OrganizationId",
+            table: "ClientOrganizationMigrationRecord",
+            columns: new[] { "ProviderId", "OrganizationId" },
+            unique: true);
+    }
+
+    /// <inheritdoc />
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropTable(
+            name: "ClientOrganizationMigrationRecord");
+    }
+}