mirror of
https://github.com/bitwarden/server.git
synced 2025-07-02 08:32:50 -05:00
Merge branch 'main' into ac/ac-1682/ef-migrations
This commit is contained in:
Rui Tome
134
util/Migrator/DbScripts/2024-01-04_00_Send_Add_CipherId.sql
Normal file
134
util/Migrator/DbScripts/2024-01-04_00_Send_Add_CipherId.sql
Normal file
@ -0,0 +1,134 @@
|
||||
-- Add CipherId column
|
||||
IF COL_LENGTH('[dbo].[Send]', 'CipherId') IS NULL
|
||||
BEGIN
|
||||
ALTER TABLE [dbo].[Send]
|
||||
ADD [CipherId] UNIQUEIDENTIFIER NULL,
|
||||
CONSTRAINT [FK_Send_Cipher] FOREIGN KEY ([CipherId]) REFERENCES [dbo].[Cipher]([Id]);
|
||||
END
|
||||
GO
|
||||
|
||||
-- Refresh View
|
||||
EXECUTE sp_refreshview N'[dbo].[SendView]'
|
||||
GO
|
||||
|
||||
CREATE OR ALTER PROCEDURE [dbo].[Send_Create]
|
||||
@Id UNIQUEIDENTIFIER OUTPUT,
|
||||
@UserId UNIQUEIDENTIFIER,
|
||||
@OrganizationId UNIQUEIDENTIFIER,
|
||||
@Type TINYINT,
|
||||
@Data VARCHAR(MAX),
|
||||
@Key VARCHAR(MAX),
|
||||
@Password NVARCHAR(300),
|
||||
@MaxAccessCount INT,
|
||||
@AccessCount INT,
|
||||
@CreationDate DATETIME2(7),
|
||||
@RevisionDate DATETIME2(7),
|
||||
@ExpirationDate DATETIME2(7),
|
||||
@DeletionDate DATETIME2(7),
|
||||
@Disabled BIT,
|
||||
@HideEmail BIT,
|
||||
@CipherId UNIQUEIDENTIFIER = NULL
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON
|
||||
|
||||
INSERT INTO [dbo].[Send]
|
||||
(
|
||||
[Id],
|
||||
[UserId],
|
||||
[OrganizationId],
|
||||
[Type],
|
||||
[Data],
|
||||
[Key],
|
||||
[Password],
|
||||
[MaxAccessCount],
|
||||
[AccessCount],
|
||||
[CreationDate],
|
||||
[RevisionDate],
|
||||
[ExpirationDate],
|
||||
[DeletionDate],
|
||||
[Disabled],
|
||||
[HideEmail],
|
||||
[CipherId]
|
||||
)
|
||||
VALUES
|
||||
(
|
||||
@Id,
|
||||
@UserId,
|
||||
@OrganizationId,
|
||||
@Type,
|
||||
@Data,
|
||||
@Key,
|
||||
@Password,
|
||||
@MaxAccessCount,
|
||||
@AccessCount,
|
||||
@CreationDate,
|
||||
@RevisionDate,
|
||||
@ExpirationDate,
|
||||
@DeletionDate,
|
||||
@Disabled,
|
||||
@HideEmail,
|
||||
@CipherId
|
||||
)
|
||||
|
||||
IF @UserId IS NOT NULL
|
||||
BEGIN
|
||||
IF @Type = 1 --File
|
||||
BEGIN
|
||||
EXEC [dbo].[User_UpdateStorage] @UserId
|
||||
END
|
||||
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
|
||||
END
|
||||
-- TODO: OrganizationId bump?
|
||||
END
|
||||
GO
|
||||
|
||||
CREATE OR ALTER PROCEDURE [dbo].[Send_Update]
|
||||
@Id UNIQUEIDENTIFIER,
|
||||
@UserId UNIQUEIDENTIFIER,
|
||||
@OrganizationId UNIQUEIDENTIFIER,
|
||||
@Type TINYINT,
|
||||
@Data VARCHAR(MAX),
|
||||
@Key VARCHAR(MAX),
|
||||
@Password NVARCHAR(300),
|
||||
@MaxAccessCount INT,
|
||||
@AccessCount INT,
|
||||
@CreationDate DATETIME2(7),
|
||||
@RevisionDate DATETIME2(7),
|
||||
@ExpirationDate DATETIME2(7),
|
||||
@DeletionDate DATETIME2(7),
|
||||
@Disabled BIT,
|
||||
@HideEmail BIT,
|
||||
@CipherId UNIQUEIDENTIFIER = NULL
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON
|
||||
|
||||
UPDATE
|
||||
[dbo].[Send]
|
||||
SET
|
||||
[UserId] = @UserId,
|
||||
[OrganizationId] = @OrganizationId,
|
||||
[Type] = @Type,
|
||||
[Data] = @Data,
|
||||
[Key] = @Key,
|
||||
[Password] = @Password,
|
||||
[MaxAccessCount] = @MaxAccessCount,
|
||||
[AccessCount] = @AccessCount,
|
||||
[CreationDate] = @CreationDate,
|
||||
[RevisionDate] = @RevisionDate,
|
||||
[ExpirationDate] = @ExpirationDate,
|
||||
[DeletionDate] = @DeletionDate,
|
||||
[Disabled] = @Disabled,
|
||||
[HideEmail] = @HideEmail,
|
||||
[CipherId] = @CipherId
|
||||
WHERE
|
||||
[Id] = @Id
|
||||
|
||||
IF @UserId IS NOT NULL
|
||||
BEGIN
|
||||
EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
|
||||
END
|
||||
-- TODO: OrganizationId bump?
|
||||
END
|
||||
GO
|
||||
513
util/Migrator/DbScripts/2024-03-07_00_SetupProviderBilling.sql
Normal file
513
util/Migrator/DbScripts/2024-03-07_00_SetupProviderBilling.sql
Normal file
@ -0,0 +1,513 @@
|
||||
-- Provider
|
||||
|
||||
-- Add 'Gateway' column to 'Provider' table.
|
||||
IF COL_LENGTH('[dbo].[Provider]', 'Gateway') IS NULL
|
||||
BEGIN
|
||||
ALTER TABLE
|
||||
[dbo].[Provider]
|
||||
ADD
|
||||
[Gateway] TINYINT NULL;
|
||||
END
|
||||
GO
|
||||
|
||||
-- Add 'GatewayCustomerId' column to 'Provider' table
|
||||
IF COL_LENGTH('[dbo].[Provider]', 'GatewayCustomerId') IS NULL
|
||||
BEGIN
|
||||
ALTER TABLE
|
||||
[dbo].[Provider]
|
||||
ADD
|
||||
[GatewayCustomerId] VARCHAR (50) NULL;
|
||||
END
|
||||
GO
|
||||
|
||||
-- Add 'GatewaySubscriptionId' column to 'Provider' table
|
||||
IF COL_LENGTH('[dbo].[Provider]', 'GatewaySubscriptionId') IS NULL
|
||||
BEGIN
|
||||
ALTER TABLE
|
||||
[dbo].[Provider]
|
||||
ADD
|
||||
[GatewaySubscriptionId] VARCHAR (50) NULL;
|
||||
END
|
||||
GO
|
||||
|
||||
-- Recreate 'ProviderView' so that it includes the 'Gateway', 'GatewayCustomerId' and 'GatewaySubscriptionId' columns.
|
||||
CREATE OR ALTER VIEW [dbo].[ProviderView]
|
||||
AS
|
||||
SELECT
|
||||
*
|
||||
FROM
|
||||
[dbo].[Provider]
|
||||
GO
|
||||
|
||||
-- Alter 'Provider_Create' SPROC to add 'Gateway', 'GatewayCustomerId' and 'GatewaySubscriptionId' columns.
|
||||
CREATE OR ALTER PROCEDURE [dbo].[Provider_Create]
|
||||
@Id UNIQUEIDENTIFIER OUTPUT,
|
||||
@Name NVARCHAR(50),
|
||||
@BusinessName NVARCHAR(50),
|
||||
@BusinessAddress1 NVARCHAR(50),
|
||||
@BusinessAddress2 NVARCHAR(50),
|
||||
@BusinessAddress3 NVARCHAR(50),
|
||||
@BusinessCountry VARCHAR(2),
|
||||
@BusinessTaxNumber NVARCHAR(30),
|
||||
@BillingEmail NVARCHAR(256),
|
||||
@BillingPhone NVARCHAR(50) = NULL,
|
||||
@Status TINYINT,
|
||||
@Type TINYINT = 0,
|
||||
@UseEvents BIT,
|
||||
@Enabled BIT,
|
||||
@CreationDate DATETIME2(7),
|
||||
@RevisionDate DATETIME2(7),
|
||||
@Gateway TINYINT = 0,
|
||||
@GatewayCustomerId VARCHAR(50) = NULL,
|
||||
@GatewaySubscriptionId VARCHAR(50) = NULL
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON
|
||||
|
||||
INSERT INTO [dbo].[Provider]
|
||||
(
|
||||
[Id],
|
||||
[Name],
|
||||
[BusinessName],
|
||||
[BusinessAddress1],
|
||||
[BusinessAddress2],
|
||||
[BusinessAddress3],
|
||||
[BusinessCountry],
|
||||
[BusinessTaxNumber],
|
||||
[BillingEmail],
|
||||
[BillingPhone],
|
||||
[Status],
|
||||
[Type],
|
||||
[UseEvents],
|
||||
[Enabled],
|
||||
[CreationDate],
|
||||
[RevisionDate],
|
||||
[Gateway],
|
||||
[GatewayCustomerId],
|
||||
[GatewaySubscriptionId]
|
||||
)
|
||||
VALUES
|
||||
(
|
||||
@Id,
|
||||
@Name,
|
||||
@BusinessName,
|
||||
@BusinessAddress1,
|
||||
@BusinessAddress2,
|
||||
@BusinessAddress3,
|
||||
@BusinessCountry,
|
||||
@BusinessTaxNumber,
|
||||
@BillingEmail,
|
||||
@BillingPhone,
|
||||
@Status,
|
||||
@Type,
|
||||
@UseEvents,
|
||||
@Enabled,
|
||||
@CreationDate,
|
||||
@RevisionDate,
|
||||
@Gateway,
|
||||
@GatewayCustomerId,
|
||||
@GatewaySubscriptionId
|
||||
)
|
||||
END
|
||||
GO
|
||||
|
||||
-- Alter 'Provider_Update' SPROC to add 'Gateway', 'GatewayCustomerId' and 'GatewaySubscriptionId' columns.
|
||||
CREATE OR ALTER PROCEDURE [dbo].[Provider_Update]
|
||||
@Id UNIQUEIDENTIFIER,
|
||||
@Name NVARCHAR(50),
|
||||
@BusinessName NVARCHAR(50),
|
||||
@BusinessAddress1 NVARCHAR(50),
|
||||
@BusinessAddress2 NVARCHAR(50),
|
||||
@BusinessAddress3 NVARCHAR(50),
|
||||
@BusinessCountry VARCHAR(2),
|
||||
@BusinessTaxNumber NVARCHAR(30),
|
||||
@BillingEmail NVARCHAR(256),
|
||||
@BillingPhone NVARCHAR(50) = NULL,
|
||||
@Status TINYINT,
|
||||
@Type TINYINT = 0,
|
||||
@UseEvents BIT,
|
||||
@Enabled BIT,
|
||||
@CreationDate DATETIME2(7),
|
||||
@RevisionDate DATETIME2(7),
|
||||
@Gateway TINYINT = 0,
|
||||
@GatewayCustomerId VARCHAR(50) = NULL,
|
||||
@GatewaySubscriptionId VARCHAR(50) = NULL
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON
|
||||
|
||||
UPDATE
|
||||
[dbo].[Provider]
|
||||
SET
|
||||
[Name] = @Name,
|
||||
[BusinessName] = @BusinessName,
|
||||
[BusinessAddress1] = @BusinessAddress1,
|
||||
[BusinessAddress2] = @BusinessAddress2,
|
||||
[BusinessAddress3] = @BusinessAddress3,
|
||||
[BusinessCountry] = @BusinessCountry,
|
||||
[BusinessTaxNumber] = @BusinessTaxNumber,
|
||||
[BillingEmail] = @BillingEmail,
|
||||
[BillingPhone] = @BillingPhone,
|
||||
[Status] = @Status,
|
||||
[Type] = @Type,
|
||||
[UseEvents] = @UseEvents,
|
||||
[Enabled] = @Enabled,
|
||||
[CreationDate] = @CreationDate,
|
||||
[RevisionDate] = @RevisionDate,
|
||||
[Gateway] = @Gateway,
|
||||
[GatewayCustomerId] = @GatewayCustomerId,
|
||||
[GatewaySubscriptionId] = @GatewaySubscriptionId
|
||||
WHERE
|
||||
[Id] = @Id
|
||||
END
|
||||
GO
|
||||
|
||||
-- Refresh modules for SPROCs reliant on 'Provider' table/view.
|
||||
IF OBJECT_ID('[dbo].[Provider_ReadAbilities]') IS NOT NULL
|
||||
BEGIN
|
||||
EXECUTE sp_refreshsqlmodule N'[dbo].[Provider_ReadAbilities]';
|
||||
END
|
||||
GO
|
||||
|
||||
IF OBJECT_ID('[dbo].[Provider_ReadById]') IS NOT NULL
|
||||
BEGIN
|
||||
EXECUTE sp_refreshsqlmodule N'[dbo].[Provider_ReadById]';
|
||||
END
|
||||
GO
|
||||
|
||||
IF OBJECT_ID('[dbo].[Provider_ReadByOrganizationId]') IS NOT NULL
|
||||
BEGIN
|
||||
EXECUTE sp_refreshsqlmodule N'[dbo].[Provider_ReadByOrganizationId]';
|
||||
END
|
||||
GO
|
||||
|
||||
IF OBJECT_ID('[dbo].[Provider_Search]') IS NOT NULL
|
||||
BEGIN
|
||||
EXECUTE sp_refreshsqlmodule N'[dbo].[Provider_Search]';
|
||||
END
|
||||
GO
|
||||
|
||||
-- Transaction
|
||||
|
||||
-- Add 'ProviderId' column to 'Transaction' table.
|
||||
IF COL_LENGTH('[dbo].[Transaction]', 'ProviderId') IS NULL
|
||||
BEGIN
|
||||
ALTER TABLE
|
||||
[dbo].[Transaction]
|
||||
ADD
|
||||
[ProviderId] UNIQUEIDENTIFIER NULL,
|
||||
CONSTRAINT
|
||||
[FK_Transaction_Provider] FOREIGN KEY ([ProviderId]) REFERENCES [dbo].[Provider] ([Id]) ON DELETE CASCADE;
|
||||
END
|
||||
GO
|
||||
|
||||
-- Recreate 'TransactionView' so that it includes the 'ProviderId' column.
|
||||
CREATE OR ALTER VIEW [dbo].[TransactionView]
|
||||
AS
|
||||
SELECT
|
||||
*
|
||||
FROM
|
||||
[dbo].[Transaction]
|
||||
GO
|
||||
|
||||
-- Alter 'Transaction_Create' SPROC to add 'ProviderId' column.
|
||||
CREATE OR ALTER PROCEDURE [dbo].[Transaction_Create]
|
||||
@Id UNIQUEIDENTIFIER OUTPUT,
|
||||
@UserId UNIQUEIDENTIFIER,
|
||||
@OrganizationId UNIQUEIDENTIFIER,
|
||||
@Type TINYINT,
|
||||
@Amount MONEY,
|
||||
@Refunded BIT,
|
||||
@RefundedAmount MONEY,
|
||||
@Details NVARCHAR(100),
|
||||
@PaymentMethodType TINYINT,
|
||||
@Gateway TINYINT,
|
||||
@GatewayId VARCHAR(50),
|
||||
@CreationDate DATETIME2(7),
|
||||
@ProviderId UNIQUEIDENTIFIER = NULL
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON
|
||||
|
||||
INSERT INTO [dbo].[Transaction]
|
||||
(
|
||||
[Id],
|
||||
[UserId],
|
||||
[OrganizationId],
|
||||
[Type],
|
||||
[Amount],
|
||||
[Refunded],
|
||||
[RefundedAmount],
|
||||
[Details],
|
||||
[PaymentMethodType],
|
||||
[Gateway],
|
||||
[GatewayId],
|
||||
[CreationDate],
|
||||
[ProviderId]
|
||||
)
|
||||
VALUES
|
||||
(
|
||||
@Id,
|
||||
@UserId,
|
||||
@OrganizationId,
|
||||
@Type,
|
||||
@Amount,
|
||||
@Refunded,
|
||||
@RefundedAmount,
|
||||
@Details,
|
||||
@PaymentMethodType,
|
||||
@Gateway,
|
||||
@GatewayId,
|
||||
@CreationDate,
|
||||
@ProviderId
|
||||
)
|
||||
END
|
||||
GO
|
||||
|
||||
-- Alter 'Transaction_Update' SPROC to add 'ProviderId' column.
|
||||
CREATE OR ALTER PROCEDURE [dbo].[Transaction_Update]
|
||||
@Id UNIQUEIDENTIFIER,
|
||||
@UserId UNIQUEIDENTIFIER,
|
||||
@OrganizationId UNIQUEIDENTIFIER,
|
||||
@Type TINYINT,
|
||||
@Amount MONEY,
|
||||
@Refunded BIT,
|
||||
@RefundedAmount MONEY,
|
||||
@Details NVARCHAR(100),
|
||||
@PaymentMethodType TINYINT,
|
||||
@Gateway TINYINT,
|
||||
@GatewayId VARCHAR(50),
|
||||
@CreationDate DATETIME2(7),
|
||||
@ProviderId UNIQUEIDENTIFIER = NULL
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON
|
||||
|
||||
UPDATE
|
||||
[dbo].[Transaction]
|
||||
SET
|
||||
[UserId] = @UserId,
|
||||
[OrganizationId] = @OrganizationId,
|
||||
[Type] = @Type,
|
||||
[Amount] = @Amount,
|
||||
[Refunded] = @Refunded,
|
||||
[RefundedAmount] = @RefundedAmount,
|
||||
[Details] = @Details,
|
||||
[PaymentMethodType] = @PaymentMethodType,
|
||||
[Gateway] = @Gateway,
|
||||
[GatewayId] = @GatewayId,
|
||||
[CreationDate] = @CreationDate,
|
||||
[ProviderId] = @ProviderId
|
||||
WHERE
|
||||
[Id] = @Id
|
||||
END
|
||||
GO
|
||||
|
||||
-- Add ReadByProviderId SPROC
|
||||
IF OBJECT_ID('[dbo].[Transaction_ReadByProviderId]') IS NOT NULL
|
||||
BEGIN
|
||||
DROP PROCEDURE [dbo].[Transaction_ReadByProviderId]
|
||||
END
|
||||
GO
|
||||
|
||||
CREATE PROCEDURE [dbo].[Transaction_ReadByProviderId]
|
||||
@ProviderId UNIQUEIDENTIFIER
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON
|
||||
|
||||
SELECT
|
||||
*
|
||||
FROM
|
||||
[dbo].[TransactionView]
|
||||
WHERE
|
||||
[ProviderId] = @ProviderId
|
||||
END
|
||||
GO
|
||||
|
||||
-- Refresh modules for SPROCs reliant on 'Transaction' table/view.
|
||||
IF OBJECT_ID('[dbo].[Transaction_ReadByGatewayId]') IS NOT NULL
|
||||
BEGIN
|
||||
EXECUTE sp_refreshsqlmodule N'[dbo].[Transaction_ReadByGatewayId]';
|
||||
END
|
||||
GO
|
||||
|
||||
IF OBJECT_ID('[dbo].[Transaction_ReadById]') IS NOT NULL
|
||||
BEGIN
|
||||
EXECUTE sp_refreshsqlmodule N'[dbo].[Transaction_ReadById]';
|
||||
END
|
||||
GO
|
||||
|
||||
IF OBJECT_ID('[dbo].[Transaction_ReadByOrganizationId]') IS NOT NULL
|
||||
BEGIN
|
||||
EXECUTE sp_refreshsqlmodule N'[dbo].[Transaction_ReadByOrganizationId]';
|
||||
END
|
||||
GO
|
||||
|
||||
IF OBJECT_ID('[dbo].[Transaction_ReadByUserId]') IS NOT NULL
|
||||
BEGIN
|
||||
EXECUTE sp_refreshsqlmodule N'[dbo].[Transaction_ReadByUserId]';
|
||||
END
|
||||
GO
|
||||
|
||||
-- Provider Plan
|
||||
|
||||
-- Table
|
||||
IF OBJECT_ID('[dbo].[ProviderPlan]') IS NULL
|
||||
BEGIN
|
||||
CREATE TABLE [dbo].[ProviderPlan] (
|
||||
[Id] UNIQUEIDENTIFIER NOT NULL,
|
||||
[ProviderId] UNIQUEIDENTIFIER NOT NULL,
|
||||
[PlanType] TINYINT NOT NULL,
|
||||
[SeatMinimum] INT NULL,
|
||||
[PurchasedSeats] INT NULL,
|
||||
[AllocatedSeats] INT NULL,
|
||||
CONSTRAINT [PK_ProviderPlan] PRIMARY KEY CLUSTERED ([Id] ASC),
|
||||
CONSTRAINT [FK_ProviderPlan_Provider] FOREIGN KEY ([ProviderId]) REFERENCES [dbo].[Provider] ([Id]) ON DELETE CASCADE,
|
||||
CONSTRAINT [PK_ProviderPlanType] UNIQUE ([ProviderId], [PlanType])
|
||||
);
|
||||
END
|
||||
GO
|
||||
|
||||
-- View
|
||||
IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'ProviderPlanView')
|
||||
BEGIN
|
||||
DROP VIEW [dbo].[ProviderPlanView]
|
||||
END
|
||||
GO
|
||||
|
||||
CREATE VIEW [dbo].[ProviderPlanView]
|
||||
AS
|
||||
SELECT
|
||||
*
|
||||
FROM
|
||||
[dbo].[ProviderPlan]
|
||||
GO
|
||||
|
||||
CREATE PROCEDURE [dbo].[ProviderPlan_Create]
|
||||
@Id UNIQUEIDENTIFIER OUTPUT,
|
||||
@ProviderId UNIQUEIDENTIFIER,
|
||||
@PlanType TINYINT,
|
||||
@SeatMinimum INT,
|
||||
@PurchasedSeats INT,
|
||||
@AllocatedSeats INT
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON
|
||||
|
||||
INSERT INTO [dbo].[ProviderPlan]
|
||||
(
|
||||
[Id],
|
||||
[ProviderId],
|
||||
[PlanType],
|
||||
[SeatMinimum],
|
||||
[PurchasedSeats],
|
||||
[AllocatedSeats]
|
||||
)
|
||||
VALUES
|
||||
(
|
||||
@Id,
|
||||
@ProviderId,
|
||||
@PlanType,
|
||||
@SeatMinimum,
|
||||
@PurchasedSeats,
|
||||
@AllocatedSeats
|
||||
)
|
||||
END
|
||||
GO
|
||||
|
||||
-- DeleteById SPROC
|
||||
IF OBJECT_ID('[dbo].[ProviderPlan_DeleteById]') IS NOT NULL
|
||||
BEGIN
|
||||
DROP PROCEDURE [dbo].[ProviderPlan_DeleteById]
|
||||
END
|
||||
GO
|
||||
|
||||
CREATE PROCEDURE [dbo].[ProviderPlan_DeleteById]
|
||||
@Id UNIQUEIDENTIFIER
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON
|
||||
|
||||
DELETE
|
||||
FROM
|
||||
[dbo].[ProviderPlan]
|
||||
WHERE
|
||||
[Id] = @Id
|
||||
END
|
||||
GO
|
||||
|
||||
-- ReadById SPROC
|
||||
IF OBJECT_ID('[dbo].[ProviderPlan_ReadById]') IS NOT NULL
|
||||
BEGIN
|
||||
DROP PROCEDURE [dbo].[ProviderPlan_ReadById]
|
||||
END
|
||||
GO
|
||||
|
||||
CREATE PROCEDURE [dbo].[ProviderPlan_ReadById]
|
||||
@Id UNIQUEIDENTIFIER
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON
|
||||
|
||||
SELECT
|
||||
*
|
||||
FROM
|
||||
[dbo].[ProviderPlanView]
|
||||
WHERE
|
||||
[Id] = @Id
|
||||
END
|
||||
GO
|
||||
|
||||
-- ReadByProviderId SPROC
|
||||
IF OBJECT_ID('[dbo].[ProviderPlan_ReadByProviderId]') IS NOT NULL
|
||||
BEGIN
|
||||
DROP PROCEDURE [dbo].[ProviderPlan_ReadByProviderId]
|
||||
END
|
||||
GO
|
||||
|
||||
CREATE PROCEDURE [dbo].[ProviderPlan_ReadByProviderId]
|
||||
@ProviderId UNIQUEIDENTIFIER
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON
|
||||
|
||||
SELECT
|
||||
*
|
||||
FROM
|
||||
[dbo].[ProviderPlanView]
|
||||
WHERE
|
||||
[ProviderId] = @ProviderId
|
||||
END
|
||||
GO
|
||||
|
||||
-- Update SPROC
|
||||
IF OBJECT_ID('[dbo].[ProviderPlan_Update]') IS NOT NULL
|
||||
BEGIN
|
||||
DROP PROCEDURE [dbo].[ProviderPlan_Update]
|
||||
END
|
||||
GO
|
||||
|
||||
CREATE PROCEDURE [dbo].[ProviderPlan_Update]
|
||||
@Id UNIQUEIDENTIFIER,
|
||||
@ProviderId UNIQUEIDENTIFIER,
|
||||
@PlanType TINYINT,
|
||||
@SeatMinimum INT,
|
||||
@PurchasedSeats INT,
|
||||
@AllocatedSeats INT
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON
|
||||
|
||||
UPDATE
|
||||
[dbo].[ProviderPlan]
|
||||
SET
|
||||
[ProviderId] = @ProviderId,
|
||||
[PlanType] = @PlanType,
|
||||
[SeatMinimum] = @SeatMinimum,
|
||||
[PurchasedSeats] = @PurchasedSeats,
|
||||
[AllocatedSeats] = @AllocatedSeats
|
||||
WHERE
|
||||
[Id] = @Id
|
||||
END
|
||||
GO
|
||||
@ -1,4 +1,4 @@
|
||||
FROM mcr.microsoft.com/mssql/server:2022-CU11-ubuntu-22.04
|
||||
FROM mcr.microsoft.com/mssql/server:2022-CU12-ubuntu-22.04
|
||||
|
||||
LABEL com.bitwarden.product="bitwarden"
|
||||
|
||||
|
||||
2337
util/MySqlMigrations/Migrations/20240104162658_AddCipherIdToSend.Designer.cs
generated
Normal file
2337
util/MySqlMigrations/Migrations/20240104162658_AddCipherIdToSend.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,28 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations;
|
||||
|
||||
/// <inheritdoc />
|
||||
public partial class AddCipherIdToSend : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "CipherId",
|
||||
table: "Send",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "CipherId",
|
||||
table: "Send");
|
||||
}
|
||||
}
|
||||
2580
util/MySqlMigrations/Migrations/20240308141726_SetupProviderBilling.Designer.cs
generated
Normal file
2580
util/MySqlMigrations/Migrations/20240308141726_SetupProviderBilling.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,117 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace Bit.MySqlMigrations.Migrations;
|
||||
|
||||
/// <inheritdoc />
|
||||
public partial class SetupProviderBilling : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "ProviderId",
|
||||
table: "Transaction",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci");
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "GatewayCustomerId",
|
||||
table: "Provider",
|
||||
type: "longtext",
|
||||
nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "GatewaySubscriptionId",
|
||||
table: "Provider",
|
||||
type: "longtext",
|
||||
nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.AddColumn<byte>(
|
||||
name: "GatewayType",
|
||||
table: "Provider",
|
||||
type: "tinyint unsigned",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "ProviderPlan",
|
||||
columns: table => new
|
||||
{
|
||||
Id = 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),
|
||||
SeatMinimum = table.Column<int>(type: "int", nullable: true),
|
||||
PurchasedSeats = table.Column<int>(type: "int", nullable: true),
|
||||
AllocatedSeats = table.Column<int>(type: "int", nullable: true)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_ProviderPlan", x => x.Id);
|
||||
table.ForeignKey(
|
||||
name: "FK_ProviderPlan_Provider_ProviderId",
|
||||
column: x => x.ProviderId,
|
||||
principalTable: "Provider",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
})
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_Transaction_ProviderId",
|
||||
table: "Transaction",
|
||||
column: "ProviderId");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ProviderPlan_Id_PlanType",
|
||||
table: "ProviderPlan",
|
||||
columns: new[] { "Id", "PlanType" },
|
||||
unique: true);
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ProviderPlan_ProviderId",
|
||||
table: "ProviderPlan",
|
||||
column: "ProviderId");
|
||||
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_Transaction_Provider_ProviderId",
|
||||
table: "Transaction",
|
||||
column: "ProviderId",
|
||||
principalTable: "Provider",
|
||||
principalColumn: "Id");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_Transaction_Provider_ProviderId",
|
||||
table: "Transaction");
|
||||
|
||||
migrationBuilder.DropTable(
|
||||
name: "ProviderPlan");
|
||||
|
||||
migrationBuilder.DropIndex(
|
||||
name: "IX_Transaction_ProviderId",
|
||||
table: "Transaction");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "ProviderId",
|
||||
table: "Transaction");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "GatewayCustomerId",
|
||||
table: "Provider");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "GatewaySubscriptionId",
|
||||
table: "Provider");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "GatewayType",
|
||||
table: "Provider");
|
||||
}
|
||||
}
|
||||
@ -4,7 +4,6 @@ using Bit.Infrastructure.EntityFramework.Repositories;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||
|
||||
#nullable disable
|
||||
|
||||
@ -17,7 +16,7 @@ namespace Bit.MySqlMigrations.Migrations
|
||||
{
|
||||
#pragma warning disable 612, 618
|
||||
modelBuilder
|
||||
.HasAnnotation("ProductVersion", "7.0.15")
|
||||
.HasAnnotation("ProductVersion", "7.0.16")
|
||||
.HasAnnotation("Relational:MaxIdentifierLength", 64);
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", b =>
|
||||
@ -277,6 +276,15 @@ namespace Bit.MySqlMigrations.Migrations
|
||||
b.Property<bool>("Enabled")
|
||||
.HasColumnType("tinyint(1)");
|
||||
|
||||
b.Property<string>("GatewayCustomerId")
|
||||
.HasColumnType("longtext");
|
||||
|
||||
b.Property<string>("GatewaySubscriptionId")
|
||||
.HasColumnType("longtext");
|
||||
|
||||
b.Property<byte?>("GatewayType")
|
||||
.HasColumnType("tinyint unsigned");
|
||||
|
||||
b.Property<string>("Name")
|
||||
.HasColumnType("longtext");
|
||||
|
||||
@ -486,8 +494,7 @@ namespace Bit.MySqlMigrations.Migrations
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int")
|
||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<string>("ClientId")
|
||||
.IsRequired()
|
||||
@ -666,6 +673,36 @@ namespace Bit.MySqlMigrations.Migrations
|
||||
b.ToTable("WebAuthnCredential", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Billing.Models.ProviderPlan", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<int?>("AllocatedSeats")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<byte>("PlanType")
|
||||
.HasColumnType("tinyint unsigned");
|
||||
|
||||
b.Property<Guid>("ProviderId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<int?>("PurchasedSeats")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<int?>("SeatMinimum")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("ProviderId");
|
||||
|
||||
b.HasIndex("Id", "PlanType")
|
||||
.IsUnique();
|
||||
|
||||
b.ToTable("ProviderPlan", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.Collection", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
@ -1157,6 +1194,9 @@ namespace Bit.MySqlMigrations.Migrations
|
||||
b.Property<int>("AccessCount")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<Guid?>("CipherId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("datetime(6)");
|
||||
|
||||
@ -1270,6 +1310,9 @@ namespace Bit.MySqlMigrations.Migrations
|
||||
b.Property<byte?>("PaymentMethodType")
|
||||
.HasColumnType("tinyint unsigned");
|
||||
|
||||
b.Property<Guid?>("ProviderId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<bool?>("Refunded")
|
||||
.HasColumnType("tinyint(1)");
|
||||
|
||||
@ -1286,6 +1329,8 @@ namespace Bit.MySqlMigrations.Migrations
|
||||
|
||||
b.HasIndex("OrganizationId");
|
||||
|
||||
b.HasIndex("ProviderId");
|
||||
|
||||
b.HasIndex("UserId")
|
||||
.HasAnnotation("SqlServer:Clustered", false);
|
||||
|
||||
@ -2005,6 +2050,17 @@ namespace Bit.MySqlMigrations.Migrations
|
||||
b.Navigation("User");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Billing.Models.ProviderPlan", b =>
|
||||
{
|
||||
b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider.Provider", "Provider")
|
||||
.WithMany()
|
||||
.HasForeignKey("ProviderId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.Navigation("Provider");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.Collection", b =>
|
||||
{
|
||||
b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization")
|
||||
@ -2200,12 +2256,18 @@ namespace Bit.MySqlMigrations.Migrations
|
||||
.WithMany("Transactions")
|
||||
.HasForeignKey("OrganizationId");
|
||||
|
||||
b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider.Provider", "Provider")
|
||||
.WithMany()
|
||||
.HasForeignKey("ProviderId");
|
||||
|
||||
b.HasOne("Bit.Infrastructure.EntityFramework.Models.User", "User")
|
||||
.WithMany("Transactions")
|
||||
.HasForeignKey("UserId");
|
||||
|
||||
b.Navigation("Organization");
|
||||
|
||||
b.Navigation("Provider");
|
||||
|
||||
b.Navigation("User");
|
||||
});
|
||||
|
||||
|
||||
2350
util/PostgresMigrations/Migrations/20240104162650_AddCipherIdToSend.Designer.cs
generated
Normal file
2350
util/PostgresMigrations/Migrations/20240104162650_AddCipherIdToSend.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,27 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace Bit.PostgresMigrations.Migrations;
|
||||
|
||||
/// <inheritdoc />
|
||||
public partial class AddCipherIdToSend : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "CipherId",
|
||||
table: "Send",
|
||||
type: "uuid",
|
||||
nullable: true);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "CipherId",
|
||||
table: "Send");
|
||||
}
|
||||
}
|
||||
2596
util/PostgresMigrations/Migrations/20240308141737_SetupProviderBilling.Designer.cs
generated
Normal file
2596
util/PostgresMigrations/Migrations/20240308141737_SetupProviderBilling.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,113 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace Bit.PostgresMigrations.Migrations;
|
||||
|
||||
/// <inheritdoc />
|
||||
public partial class SetupProviderBilling : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "ProviderId",
|
||||
table: "Transaction",
|
||||
type: "uuid",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "GatewayCustomerId",
|
||||
table: "Provider",
|
||||
type: "text",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "GatewaySubscriptionId",
|
||||
table: "Provider",
|
||||
type: "text",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<byte>(
|
||||
name: "GatewayType",
|
||||
table: "Provider",
|
||||
type: "smallint",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "ProviderPlan",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<Guid>(type: "uuid", nullable: false),
|
||||
ProviderId = table.Column<Guid>(type: "uuid", nullable: false),
|
||||
PlanType = table.Column<byte>(type: "smallint", nullable: false),
|
||||
SeatMinimum = table.Column<int>(type: "integer", nullable: true),
|
||||
PurchasedSeats = table.Column<int>(type: "integer", nullable: true),
|
||||
AllocatedSeats = table.Column<int>(type: "integer", nullable: true)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_ProviderPlan", x => x.Id);
|
||||
table.ForeignKey(
|
||||
name: "FK_ProviderPlan_Provider_ProviderId",
|
||||
column: x => x.ProviderId,
|
||||
principalTable: "Provider",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
});
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_Transaction_ProviderId",
|
||||
table: "Transaction",
|
||||
column: "ProviderId");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ProviderPlan_Id_PlanType",
|
||||
table: "ProviderPlan",
|
||||
columns: new[] { "Id", "PlanType" },
|
||||
unique: true);
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ProviderPlan_ProviderId",
|
||||
table: "ProviderPlan",
|
||||
column: "ProviderId");
|
||||
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_Transaction_Provider_ProviderId",
|
||||
table: "Transaction",
|
||||
column: "ProviderId",
|
||||
principalTable: "Provider",
|
||||
principalColumn: "Id");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_Transaction_Provider_ProviderId",
|
||||
table: "Transaction");
|
||||
|
||||
migrationBuilder.DropTable(
|
||||
name: "ProviderPlan");
|
||||
|
||||
migrationBuilder.DropIndex(
|
||||
name: "IX_Transaction_ProviderId",
|
||||
table: "Transaction");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "ProviderId",
|
||||
table: "Transaction");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "GatewayCustomerId",
|
||||
table: "Provider");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "GatewaySubscriptionId",
|
||||
table: "Provider");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "GatewayType",
|
||||
table: "Provider");
|
||||
}
|
||||
}
|
||||
@ -18,7 +18,7 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
#pragma warning disable 612, 618
|
||||
modelBuilder
|
||||
.HasAnnotation("Npgsql:CollationDefinition:postgresIndetermanisticCollation", "en-u-ks-primary,en-u-ks-primary,icu,False")
|
||||
.HasAnnotation("ProductVersion", "7.0.15")
|
||||
.HasAnnotation("ProductVersion", "7.0.16")
|
||||
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||
|
||||
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||
@ -282,6 +282,15 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
b.Property<bool>("Enabled")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<string>("GatewayCustomerId")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<string>("GatewaySubscriptionId")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<byte?>("GatewayType")
|
||||
.HasColumnType("smallint");
|
||||
|
||||
b.Property<string>("Name")
|
||||
.HasColumnType("text");
|
||||
|
||||
@ -678,6 +687,36 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
b.ToTable("WebAuthnCredential", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Billing.Models.ProviderPlan", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<int?>("AllocatedSeats")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<byte>("PlanType")
|
||||
.HasColumnType("smallint");
|
||||
|
||||
b.Property<Guid>("ProviderId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<int?>("PurchasedSeats")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int?>("SeatMinimum")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("ProviderId");
|
||||
|
||||
b.HasIndex("Id", "PlanType")
|
||||
.IsUnique();
|
||||
|
||||
b.ToTable("ProviderPlan", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.Collection", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
@ -1170,6 +1209,9 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
b.Property<int>("AccessCount")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<Guid?>("CipherId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
@ -1283,6 +1325,9 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
b.Property<byte?>("PaymentMethodType")
|
||||
.HasColumnType("smallint");
|
||||
|
||||
b.Property<Guid?>("ProviderId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<bool?>("Refunded")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
@ -1299,6 +1344,8 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
|
||||
b.HasIndex("OrganizationId");
|
||||
|
||||
b.HasIndex("ProviderId");
|
||||
|
||||
b.HasIndex("UserId")
|
||||
.HasAnnotation("SqlServer:Clustered", false);
|
||||
|
||||
@ -2019,6 +2066,17 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
b.Navigation("User");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Billing.Models.ProviderPlan", b =>
|
||||
{
|
||||
b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider.Provider", "Provider")
|
||||
.WithMany()
|
||||
.HasForeignKey("ProviderId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.Navigation("Provider");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.Collection", b =>
|
||||
{
|
||||
b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization")
|
||||
@ -2214,12 +2272,18 @@ namespace Bit.PostgresMigrations.Migrations
|
||||
.WithMany("Transactions")
|
||||
.HasForeignKey("OrganizationId");
|
||||
|
||||
b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider.Provider", "Provider")
|
||||
.WithMany()
|
||||
.HasForeignKey("ProviderId");
|
||||
|
||||
b.HasOne("Bit.Infrastructure.EntityFramework.Models.User", "User")
|
||||
.WithMany("Transactions")
|
||||
.HasForeignKey("UserId");
|
||||
|
||||
b.Navigation("Organization");
|
||||
|
||||
b.Navigation("Provider");
|
||||
|
||||
b.Navigation("User");
|
||||
});
|
||||
|
||||
|
||||
2335
util/SqliteMigrations/Migrations/20240104162642_AddCipherIdToSend.Designer.cs
generated
Normal file
2335
util/SqliteMigrations/Migrations/20240104162642_AddCipherIdToSend.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,27 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace Bit.SqliteMigrations.Migrations;
|
||||
|
||||
/// <inheritdoc />
|
||||
public partial class AddCipherIdToSend : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "CipherId",
|
||||
table: "Send",
|
||||
type: "TEXT",
|
||||
nullable: true);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "CipherId",
|
||||
table: "Send");
|
||||
}
|
||||
}
|
||||
2578
util/SqliteMigrations/Migrations/20240308141731_SetupProviderBilling.Designer.cs
generated
Normal file
2578
util/SqliteMigrations/Migrations/20240308141731_SetupProviderBilling.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,113 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace Bit.SqliteMigrations.Migrations;
|
||||
|
||||
/// <inheritdoc />
|
||||
public partial class SetupProviderBilling : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "ProviderId",
|
||||
table: "Transaction",
|
||||
type: "TEXT",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "GatewayCustomerId",
|
||||
table: "Provider",
|
||||
type: "TEXT",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "GatewaySubscriptionId",
|
||||
table: "Provider",
|
||||
type: "TEXT",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<byte>(
|
||||
name: "GatewayType",
|
||||
table: "Provider",
|
||||
type: "INTEGER",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "ProviderPlan",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<Guid>(type: "TEXT", nullable: false),
|
||||
ProviderId = table.Column<Guid>(type: "TEXT", nullable: false),
|
||||
PlanType = table.Column<byte>(type: "INTEGER", nullable: false),
|
||||
SeatMinimum = table.Column<int>(type: "INTEGER", nullable: true),
|
||||
PurchasedSeats = table.Column<int>(type: "INTEGER", nullable: true),
|
||||
AllocatedSeats = table.Column<int>(type: "INTEGER", nullable: true)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_ProviderPlan", x => x.Id);
|
||||
table.ForeignKey(
|
||||
name: "FK_ProviderPlan_Provider_ProviderId",
|
||||
column: x => x.ProviderId,
|
||||
principalTable: "Provider",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
});
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_Transaction_ProviderId",
|
||||
table: "Transaction",
|
||||
column: "ProviderId");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ProviderPlan_Id_PlanType",
|
||||
table: "ProviderPlan",
|
||||
columns: new[] { "Id", "PlanType" },
|
||||
unique: true);
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ProviderPlan_ProviderId",
|
||||
table: "ProviderPlan",
|
||||
column: "ProviderId");
|
||||
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_Transaction_Provider_ProviderId",
|
||||
table: "Transaction",
|
||||
column: "ProviderId",
|
||||
principalTable: "Provider",
|
||||
principalColumn: "Id");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_Transaction_Provider_ProviderId",
|
||||
table: "Transaction");
|
||||
|
||||
migrationBuilder.DropTable(
|
||||
name: "ProviderPlan");
|
||||
|
||||
migrationBuilder.DropIndex(
|
||||
name: "IX_Transaction_ProviderId",
|
||||
table: "Transaction");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "ProviderId",
|
||||
table: "Transaction");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "GatewayCustomerId",
|
||||
table: "Provider");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "GatewaySubscriptionId",
|
||||
table: "Provider");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "GatewayType",
|
||||
table: "Provider");
|
||||
}
|
||||
}
|
||||
@ -4,7 +4,6 @@ using Bit.Infrastructure.EntityFramework.Repositories;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||
|
||||
#nullable disable
|
||||
|
||||
@ -16,7 +15,7 @@ namespace Bit.SqliteMigrations.Migrations
|
||||
protected override void BuildModel(ModelBuilder modelBuilder)
|
||||
{
|
||||
#pragma warning disable 612, 618
|
||||
modelBuilder.HasAnnotation("ProductVersion", "7.0.15");
|
||||
modelBuilder.HasAnnotation("ProductVersion", "7.0.16");
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", b =>
|
||||
{
|
||||
@ -275,6 +274,15 @@ namespace Bit.SqliteMigrations.Migrations
|
||||
b.Property<bool>("Enabled")
|
||||
.HasColumnType("INTEGER");
|
||||
|
||||
b.Property<string>("GatewayCustomerId")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
b.Property<string>("GatewaySubscriptionId")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
b.Property<byte?>("GatewayType")
|
||||
.HasColumnType("INTEGER");
|
||||
|
||||
b.Property<string>("Name")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
@ -484,8 +492,7 @@ namespace Bit.SqliteMigrations.Migrations
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("INTEGER")
|
||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
||||
.HasColumnType("INTEGER");
|
||||
|
||||
b.Property<string>("ClientId")
|
||||
.IsRequired()
|
||||
@ -664,6 +671,36 @@ namespace Bit.SqliteMigrations.Migrations
|
||||
b.ToTable("WebAuthnCredential", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Billing.Models.ProviderPlan", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
b.Property<int?>("AllocatedSeats")
|
||||
.HasColumnType("INTEGER");
|
||||
|
||||
b.Property<byte>("PlanType")
|
||||
.HasColumnType("INTEGER");
|
||||
|
||||
b.Property<Guid>("ProviderId")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
b.Property<int?>("PurchasedSeats")
|
||||
.HasColumnType("INTEGER");
|
||||
|
||||
b.Property<int?>("SeatMinimum")
|
||||
.HasColumnType("INTEGER");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("ProviderId");
|
||||
|
||||
b.HasIndex("Id", "PlanType")
|
||||
.IsUnique();
|
||||
|
||||
b.ToTable("ProviderPlan", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.Collection", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
@ -1155,6 +1192,9 @@ namespace Bit.SqliteMigrations.Migrations
|
||||
b.Property<int>("AccessCount")
|
||||
.HasColumnType("INTEGER");
|
||||
|
||||
b.Property<Guid?>("CipherId")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
b.Property<DateTime>("CreationDate")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
@ -1268,6 +1308,9 @@ namespace Bit.SqliteMigrations.Migrations
|
||||
b.Property<byte?>("PaymentMethodType")
|
||||
.HasColumnType("INTEGER");
|
||||
|
||||
b.Property<Guid?>("ProviderId")
|
||||
.HasColumnType("TEXT");
|
||||
|
||||
b.Property<bool?>("Refunded")
|
||||
.HasColumnType("INTEGER");
|
||||
|
||||
@ -1284,6 +1327,8 @@ namespace Bit.SqliteMigrations.Migrations
|
||||
|
||||
b.HasIndex("OrganizationId");
|
||||
|
||||
b.HasIndex("ProviderId");
|
||||
|
||||
b.HasIndex("UserId")
|
||||
.HasAnnotation("SqlServer:Clustered", false);
|
||||
|
||||
@ -2003,6 +2048,17 @@ namespace Bit.SqliteMigrations.Migrations
|
||||
b.Navigation("User");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Billing.Models.ProviderPlan", b =>
|
||||
{
|
||||
b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider.Provider", "Provider")
|
||||
.WithMany()
|
||||
.HasForeignKey("ProviderId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.Navigation("Provider");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("Bit.Infrastructure.EntityFramework.Models.Collection", b =>
|
||||
{
|
||||
b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Organization", "Organization")
|
||||
@ -2198,12 +2254,18 @@ namespace Bit.SqliteMigrations.Migrations
|
||||
.WithMany("Transactions")
|
||||
.HasForeignKey("OrganizationId");
|
||||
|
||||
b.HasOne("Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider.Provider", "Provider")
|
||||
.WithMany()
|
||||
.HasForeignKey("ProviderId");
|
||||
|
||||
b.HasOne("Bit.Infrastructure.EntityFramework.Models.User", "User")
|
||||
.WithMany("Transactions")
|
||||
.HasForeignKey("UserId");
|
||||
|
||||
b.Navigation("Organization");
|
||||
|
||||
b.Navigation("Provider");
|
||||
|
||||
b.Navigation("User");
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user