Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Task/improve type safety in access and account balance services (#7416)

Kenrick Tandrian10c01ec63029
diff --git a/apps/api/src/app/access/access.controller.ts b/apps/api/src/app/access/access.controller.ts
index d692f358df..3bad0e171e 100644
--- a/apps/api/src/app/access/access.controller.ts
+++ b/apps/api/src/app/access/access.controller.ts
@@ -78,7 +78,7 @@ export class AccessController {
): Promise<AccessModel> {
if (
this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
- this.request.user.subscription.type === SubscriptionType.Basic
+ this.request.user.subscription?.type === SubscriptionType.Basic
) {
throw new HttpException(
getReasonPhrase(StatusCodes.FORBIDDEN),
@@ -134,7 +134,7 @@ export class AccessController {
): Promise<AccessModel> {
if (
this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
- this.request.user.subscription.type === SubscriptionType.Basic
+ this.request.user.subscription?.type === SubscriptionType.Basic
) {
throw new HttpException(
getReasonPhrase(StatusCodes.FORBIDDEN),
diff --git a/apps/api/src/app/account-balance/account-balance.service.ts b/apps/api/src/app/account-balance/account-balance.service.ts
index 656fc2f630..84932f4295 100644
--- a/apps/api/src/app/account-balance/account-balance.service.ts
+++ b/apps/api/src/app/account-balance/account-balance.service.ts
@@ -178,7 +178,7 @@ export class AccountBalanceService {
accountId: balance.account.id,
valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
balance.value,
- balance.account.currency,
+ balance.account.currency ?? userCurrency,
userCurrency
)
};
diff --git a/libs/common/src/lib/interfaces/access.interface.ts b/libs/common/src/lib/interfaces/access.interface.ts
index f3e74e7565..6b361d0b94 100644
--- a/libs/common/src/lib/interfaces/access.interface.ts
+++ b/libs/common/src/lib/interfaces/access.interface.ts
@@ -5,7 +5,7 @@ import { AccessPermission } from '@prisma/client';
import { AccessSettings } from './access-settings.interface';
export interface Access {
- alias?: string;
+ alias: string | null;
grantee?: string;
id: string;
permissions: AccessPermission[];
diff --git a/libs/common/src/lib/types/access-with-grantee-user.type.ts b/libs/common/src/lib/types/access-with-grantee-user.type.ts
index 98551e0fdf..2fc2488eec 100644
--- a/libs/common/src/lib/types/access-with-grantee-user.type.ts
+++ b/libs/common/src/lib/types/access-with-grantee-user.type.ts
@@ -1,3 +1,3 @@
import { Access, User } from '@prisma/client';
-export type AccessWithGranteeUser = Access & { granteeUser?: User };
+export type AccessWithGranteeUser = Access & { granteeUser?: User | null };