bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-05 01:53:17 +00:00
Code Issues Releases Wiki Activity

[AC-1900] Update Vault DB to support provider billing (#3875)

Browse Source 
* Add Gateway columns to Provider table

* Add ProviderId column to Transaction table

* Create ProviderPlan table

* Matt's feedback

* Rui's feedback

* Fixed Gateway parameter on Provider
This commit is contained in:
Alex Morask
2024-03-21 11:15:49 -04:00
committed by GitHub
parent 43ee5a24ec
commit 9f7e05869e
44 changed files with 9139 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Sql/Billing/Stored Procedures/ProviderPlan_Create.sql Normal file
View File

@@ -0,0 +1,30 @@
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

12
src/Sql/Billing/Stored Procedures/ProviderPlan_DeleteById.sql Normal file
View File

@@ -0,0 +1,12 @@
CREATE PROCEDURE [dbo].[ProviderPlan_DeleteById]
@Id UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON
DELETE
FROM
[dbo].[ProviderPlan]
WHERE
[Id] = @Id
END

13
src/Sql/Billing/Stored Procedures/ProviderPlan_ReadById.sql Normal file
View File

@@ -0,0 +1,13 @@
CREATE PROCEDURE [dbo].[ProviderPlan_ReadById]
@Id UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON
SELECT
*
FROM
[dbo].[ProviderPlanView]
WHERE
[Id] = @Id
END

13
src/Sql/Billing/Stored Procedures/ProviderPlan_ReadByProviderId.sql Normal file
View File

@@ -0,0 +1,13 @@
CREATE PROCEDURE [dbo].[ProviderPlan_ReadByProviderId]
@ProviderId UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON
SELECT
*
FROM
[dbo].[ProviderPlanView]
WHERE
[ProviderId] = @ProviderId
END

22
src/Sql/Billing/Stored Procedures/ProviderPlan_Update.sql Normal file
View File

@@ -0,0 +1,22 @@
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

11
src/Sql/Billing/Tables/ProviderPlan.sql Normal file
View File

@@ -0,0 +1,11 @@
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])
);

6
src/Sql/Billing/Views/ProviderPlanView.sql Normal file
View File

@@ -0,0 +1,6 @@
CREATE VIEW [dbo].[ProviderPlanView]
AS
SELECT
*
FROM
[dbo].[ProviderPlan]

15
src/Sql/dbo/Stored Procedures/Provider_Create.sql
View File

@@ -14,7 +14,10 @@
@UseEvents BIT,
@Enabled BIT,
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7)
@RevisionDate DATETIME2(7),
@Gateway TINYINT = 0,
@GatewayCustomerId VARCHAR(50) = NULL,
@GatewaySubscriptionId VARCHAR(50) = NULL
AS
BEGIN
SET NOCOUNT ON
@@ -36,7 +39,10 @@ BEGIN
[UseEvents],
[Enabled],
[CreationDate],
[RevisionDate]
[RevisionDate],
[Gateway],
[GatewayCustomerId],
[GatewaySubscriptionId]
)
VALUES
(
@@ -55,6 +61,9 @@ BEGIN
@UseEvents,
@Enabled,
@CreationDate,
@RevisionDate
@RevisionDate,
@Gateway,
@GatewayCustomerId,
@GatewaySubscriptionId
)
END

10
src/Sql/dbo/Stored Procedures/Provider_Update.sql
View File

@@ -14,7 +14,10 @@
@UseEvents BIT,
@Enabled BIT,
@CreationDate DATETIME2(7),
@RevisionDate DATETIME2(7)
@RevisionDate DATETIME2(7),
@Gateway TINYINT = 0,
@GatewayCustomerId VARCHAR(50) = NULL,
@GatewaySubscriptionId VARCHAR(50) = NULL
AS
BEGIN
SET NOCOUNT ON
@@ -36,7 +39,10 @@ BEGIN
[UseEvents] = @UseEvents,
[Enabled] = @Enabled,
[CreationDate] = @CreationDate,
[RevisionDate] = @RevisionDate
[RevisionDate] = @RevisionDate,
[Gateway] = @Gateway,
[GatewayCustomerId] = @GatewayCustomerId,
[GatewaySubscriptionId] = @GatewaySubscriptionId
WHERE
[Id] = @Id
END

9
src/Sql/dbo/Stored Procedures/Transaction_Create.sql
View File

@@ -10,7 +10,8 @@
@PaymentMethodType TINYINT,
@Gateway TINYINT,
@GatewayId VARCHAR(50),
@CreationDate DATETIME2(7)
@CreationDate DATETIME2(7),
@ProviderId UNIQUEIDENTIFIER = NULL
AS
BEGIN
SET NOCOUNT ON
@@ -28,7 +29,8 @@ BEGIN
[PaymentMethodType],
[Gateway],
[GatewayId],
[CreationDate]
[CreationDate],
[ProviderId]
)
VALUES
(
@@ -43,6 +45,7 @@ BEGIN
@PaymentMethodType,
@Gateway,
@GatewayId,
@CreationDate
@CreationDate,
@ProviderId
)
END

2
src/Sql/dbo/Stored Procedures/Transaction_DeleteById.sql
View File

@@ -9,4 +9,4 @@ BEGIN
[dbo].[Transaction]
WHERE
[Id] = @Id
END
END

2
src/Sql/dbo/Stored Procedures/Transaction_ReadByGatewayId.sql
View File

@@ -12,4 +12,4 @@ BEGIN
WHERE
[Gateway] = @Gateway
AND [GatewayId] = @GatewayId
END
END

2
src/Sql/dbo/Stored Procedures/Transaction_ReadById.sql
View File

@@ -10,4 +10,4 @@ BEGIN
[dbo].[TransactionView]
WHERE
[Id] = @Id
END
END

2
src/Sql/dbo/Stored Procedures/Transaction_ReadByOrganizationId.sql
View File

@@ -11,4 +11,4 @@ BEGIN
WHERE
[UserId] IS NULL
AND [OrganizationId] = @OrganizationId
END
END

13
src/Sql/dbo/Stored Procedures/Transaction_ReadByProviderId.sql Normal file
View File

@@ -0,0 +1,13 @@
CREATE PROCEDURE [dbo].[Transaction_ReadByProviderId]
@ProviderId UNIQUEIDENTIFIER
AS
BEGIN
SET NOCOUNT ON
SELECT
*
FROM
[dbo].[TransactionView]
WHERE
[ProviderId] = @ProviderId
END

2
src/Sql/dbo/Stored Procedures/Transaction_ReadByUserId.sql
View File

@@ -10,4 +10,4 @@ BEGIN
[dbo].[TransactionView]
WHERE
[UserId] = @UserId
END
END

8
src/Sql/dbo/Stored Procedures/Transaction_Update.sql
View File

@@ -10,7 +10,8 @@
@PaymentMethodType TINYINT,
@Gateway TINYINT,
@GatewayId VARCHAR(50),
@CreationDate DATETIME2(7)
@CreationDate DATETIME2(7),
@ProviderId UNIQUEIDENTIFIER = NULL
AS
BEGIN
SET NOCOUNT ON
@@ -28,7 +29,8 @@ BEGIN
[PaymentMethodType] = @PaymentMethodType,
[Gateway] = @Gateway,
[GatewayId] = @GatewayId,
[CreationDate] = @CreationDate
[CreationDate] = @CreationDate,
[ProviderId] = @ProviderId
WHERE
[Id] = @Id
END
END

35
src/Sql/dbo/Tables/Provider.sql
View File

@@ -1,19 +1,22 @@
CREATE TABLE [dbo].[Provider] (
[Id] UNIQUEIDENTIFIER NOT NULL,
[Name] NVARCHAR (50) NULL,
[BusinessName] NVARCHAR (50) NULL,
[BusinessAddress1] NVARCHAR (50) NULL,
[BusinessAddress2] NVARCHAR (50) NULL,
[BusinessAddress3] NVARCHAR (50) NULL,
[BusinessCountry] VARCHAR (2) NULL,
[BusinessTaxNumber] NVARCHAR (30) NULL,
[BillingEmail] NVARCHAR (256) NULL,
[BillingPhone] NVARCHAR (50) NULL,
[Status] TINYINT NOT NULL,
[UseEvents] BIT NOT NULL,
[Type] TINYINT NOT NULL CONSTRAINT DF_Provider_Type DEFAULT (0),
[Enabled] BIT NOT NULL,
[CreationDate] DATETIME2 (7) NOT NULL,
[RevisionDate] DATETIME2 (7) NOT NULL,
[Id] UNIQUEIDENTIFIER NOT NULL,
[Name] NVARCHAR (50) NULL,
[BusinessName] NVARCHAR (50) NULL,
[BusinessAddress1] NVARCHAR (50) NULL,
[BusinessAddress2] NVARCHAR (50) NULL,
[BusinessAddress3] NVARCHAR (50) NULL,
[BusinessCountry] VARCHAR (2) NULL,
[BusinessTaxNumber] NVARCHAR (30) NULL,
[BillingEmail] NVARCHAR (256) NULL,
[BillingPhone] NVARCHAR (50) NULL,
[Status] TINYINT NOT NULL,
[UseEvents] BIT NOT NULL,
[Type] TINYINT NOT NULL CONSTRAINT DF_Provider_Type DEFAULT (0),
[Enabled] BIT NOT NULL,
[CreationDate] DATETIME2 (7) NOT NULL,
[RevisionDate] DATETIME2 (7) NOT NULL,
[Gateway] TINYINT NULL,
[GatewayCustomerId] VARCHAR (50) NULL,
[GatewaySubscriptionId] VARCHAR (50) NULL,
CONSTRAINT [PK_Provider] PRIMARY KEY CLUSTERED ([Id] ASC)
);

7
src/Sql/dbo/Tables/Transaction.sql
View File

@@ -11,19 +11,18 @@
[Gateway] TINYINT NULL,
[GatewayId] VARCHAR(50) NULL,
[CreationDate] DATETIME2 (7) NOT NULL,
[ProviderId] UNIQUEIDENTIFIER NULL,
CONSTRAINT [PK_Transaction] PRIMARY KEY CLUSTERED ([Id] ASC),
CONSTRAINT [FK_Transaction_User] FOREIGN KEY ([UserId]) REFERENCES [dbo].[User] ([Id]) ON DELETE CASCADE,
CONSTRAINT [FK_Transaction_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id]) ON DELETE CASCADE
CONSTRAINT [FK_Transaction_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id]) ON DELETE CASCADE,
CONSTRAINT [FK_Transaction_Provider] FOREIGN KEY ([ProviderId]) REFERENCES [dbo].[Provider] ([Id]) ON DELETE CASCADE
);
GO
CREATE UNIQUE NONCLUSTERED INDEX [IX_Transaction_Gateway_GatewayId]
ON [dbo].[Transaction]([Gateway] ASC, [GatewayId] ASC)
WHERE [Gateway] IS NOT NULL AND [GatewayId] IS NOT NULL;
GO
CREATE NONCLUSTERED INDEX [IX_Transaction_UserId_OrganizationId_CreationDate]
ON [dbo].[Transaction]([UserId] ASC, [OrganizationId] ASC, [CreationDate] ASC);