Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions backend/src/migrations/1791300000000-AddMaxSubscriptionsPerUser.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm';

export class AddMaxSubscriptionsPerUser1791300000000 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.addColumn(
'savings_products',
new TableColumn({
name: 'maxSubscriptionsPerUser',
type: 'int',
isNullable: true,
}),
);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.dropColumn('savings_products', 'maxSubscriptionsPerUser');
}
}
19 changes: 19 additions & 0 deletions backend/src/modules/admin/admin-savings.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,25 @@ export class AdminSavingsController {
return this.adminSavingsService.getSubscribers(id, opts);
}

@Post('products/:id/subscriptions/override')
@ApiOperation({
summary: 'Create a subscription with admin override for limit checks',
})
@ApiResponse({
status: 201,
description: 'Subscription created with admin override',
})
async createSubscriptionOverride(
@Param('id') id: string,
@Body() body: { userId: string; amount: number },
@CurrentUser() _admin: { id: string; email: string },
) {
return await this.savingsService.subscribe(
body.userId,
id,
body.amount,
true,
);
@Post('experiments')
@ApiOperation({ summary: 'Create a savings product experiment (admin)' })
@ApiResponse({ status: 201, description: 'Experiment created' })
Expand Down
3 changes: 3 additions & 0 deletions backend/src/modules/savings/dto/create-product.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,16 @@ export class CreateProductDto {
riskLevel?: RiskLevel;

@ApiPropertyOptional({
example: 3,
description: 'Maximum active subscriptions allowed per user',
example: 1,
description: 'Initial product version',
default: 1,
})
@IsOptional()
@IsNumber()
@Min(1)
maxSubscriptionsPerUser?: number;
version?: number;

@ApiPropertyOptional({ default: true })
Expand Down
4 changes: 4 additions & 0 deletions backend/src/modules/savings/dto/product-details.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ export class ProductDetailsDto {
@ApiProperty({ description: 'Whether product is active' })
isActive: boolean;

@ApiPropertyOptional({
description: 'Maximum active subscriptions allowed per user',
})
maxSubscriptionsPerUser: number | null;
@ApiProperty({ description: 'Current product version' })
version: number;

Expand Down
4 changes: 4 additions & 0 deletions backend/src/modules/savings/dto/savings-product.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ export class SavingsProductDto {
@ApiProperty({ description: 'Whether product is active' })
isActive: boolean;

@ApiPropertyOptional({
description: 'Maximum active subscriptions allowed per user',
})
maxSubscriptionsPerUser: number | null;
@ApiProperty({ description: 'Current product version' })
version: number;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ export class SavingsProduct {
@Column('int', { nullable: true })
capacity: number | null;

@Column('int', { nullable: true })
maxSubscriptionsPerUser: number | null;
@Column({ type: 'int', default: 1 })
version: number;

Expand Down
1 change: 1 addition & 0 deletions backend/src/modules/savings/savings.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ export class SavingsController {
minAmount: product.minAmount,
maxAmount: product.maxAmount,
tenureMonths: product.tenureMonths,
maxSubscriptionsPerUser: product.maxSubscriptionsPerUser,
version: product.version ?? 1,
isActive: product.isActive,
contractId: product.contractId,
Expand Down
40 changes: 40 additions & 0 deletions backend/src/modules/savings/savings.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ export class SavingsService {
tenureMonths: product.tenureMonths,
contractId: product.contractId,
isActive: product.isActive,
maxSubscriptionsPerUser: product.maxSubscriptionsPerUser,
version: product.version ?? 1,
riskLevel: product.riskLevel || RiskLevel.LOW,
tvlAmount,
Expand Down Expand Up @@ -382,6 +383,7 @@ export class SavingsService {
userId: string,
productId: string,
amount: number,
overrideLimits = false,
): Promise<UserSubscription> {
const product = await this.findOneProduct(productId);
await this.syncCapacityState(product);
Expand All @@ -399,6 +401,44 @@ export class SavingsService {
);
}

if (!overrideLimits) {
const activeSubscriptionsForUser =
await this.subscriptionRepository.count({
where: {
userId,
productId: product.id,
status: SubscriptionStatus.ACTIVE,
},
});

if (
product.maxSubscriptionsPerUser != null &&
activeSubscriptionsForUser >= product.maxSubscriptionsPerUser
) {
throw new ConflictException(
`Subscription limit reached. You can only hold ${product.maxSubscriptionsPerUser} active subscriptions for this product.`,
);
}

if (product.capacity != null) {
const activeSubscriptionsForProduct =
await this.subscriptionRepository.count({
where: {
productId: product.id,
status: SubscriptionStatus.ACTIVE,
},
});

if (activeSubscriptionsForProduct >= product.capacity) {
const { position } = await this.waitlistService.joinWaitlist(
userId,
product.id,
);
throw new ConflictException(
`This savings product is full. You have been added to the waitlist at position ${position}.`,
);
}
}
const capacity = await this.getProductCapacitySnapshot(productId);
if (
capacity.maxCapacity != null &&
Expand Down
Loading