Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Introduce renewal-early-bird (#2982)
Thomas Kaulef9d77312e8c
diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.tsindex b77d773550..2fe450c9d9 100644--- a/apps/api/src/app/admin/admin.service.ts+++ b/apps/api/src/app/admin/admin.service.ts@@ -455,7 +455,10 @@ export class AdminService {const subscription = this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')- ? this.subscriptionService.getSubscription(Subscription)+ ? this.subscriptionService.getSubscription({+ createdAt,+ subscriptions: Subscription+ }): undefined;return {diff --git a/apps/api/src/app/subscription/subscription.service.ts b/apps/api/src/app/subscription/subscription.service.tsindex 2e7c16a391..668cf35104 100644--- a/apps/api/src/app/subscription/subscription.service.ts+++ b/apps/api/src/app/subscription/subscription.service.ts@@ -1,7 +1,8 @@import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';-import { UserWithSettings } from '@ghostfolio/common/types';+import { parseDate } from '@ghostfolio/common/helper';+import { SubscriptionOffer, UserWithSettings } from '@ghostfolio/common/types';import { SubscriptionType } from '@ghostfolio/common/types/subscription-type.type';import { Injectable, Logger } from '@nestjs/common';import { Subscription } from '@prisma/client';@@ -107,17 +108,27 @@ export class SubscriptionService {}}- public getSubscription(- aSubscriptions: Subscription[]- ): UserWithSettings['subscription'] {- if (aSubscriptions.length > 0) {- const { expiresAt, price } = aSubscriptions.reduce((a, b) => {+ public getSubscription({+ createdAt,+ subscriptions+ }: {+ createdAt: UserWithSettings['createdAt'];+ subscriptions: Subscription[];+ }): UserWithSettings['subscription'] {+ if (subscriptions.length > 0) {+ const { expiresAt, price } = subscriptions.reduce((a, b) => {return new Date(a.expiresAt) > new Date(b.expiresAt) ? a : b;});+ let offer: SubscriptionOffer = price ? 'renewal' : 'default';++ if (isBefore(createdAt, parseDate('2023-01-01'))) {+ offer = 'renewal-early-bird';+ }+return {expiresAt,- offer: price ? 'renewal' : 'default',+ offer,type: isBefore(new Date(), expiresAt)? SubscriptionType.Premium: SubscriptionType.Basicdiff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.tsindex 734495474f..a6710b9a0c 100644--- a/apps/api/src/app/user/user.service.ts+++ b/apps/api/src/app/user/user.service.ts@@ -211,8 +211,10 @@ export class UserService {}if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {- user.subscription =- this.subscriptionService.getSubscription(Subscription);+ user.subscription = this.subscriptionService.getSubscription({+ createdAt: user.createdAt,+ subscriptions: Subscription+ });if (user.subscription?.type === 'Basic') {const daysSinceRegistration = differenceInDays(diff --git a/libs/common/src/lib/types/subscription-offer.type.ts b/libs/common/src/lib/types/subscription-offer.type.tsindex b7b2760ec4..180088b1ea 100644--- a/libs/common/src/lib/types/subscription-offer.type.ts+++ b/libs/common/src/lib/types/subscription-offer.type.ts@@ -1 +1 @@-export type SubscriptionOffer = 'default' | 'renewal';+export type SubscriptionOffer = 'default' | 'renewal' | 'renewal-early-bird';