Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/add activities count to GET user endpoint (#4351)
Shaunak Das7577a452f0b5
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex eac5249079..7fd3aaf6b7 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0### Added- Extended the export functionality by the tags+- Extended the user endpoint `GET api/v1/user` by the activities count### Changeddiff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.tsindex dcf9d9404d..40bc1b2b5f 100644--- a/apps/api/src/app/user/user.service.ts+++ b/apps/api/src/app/user/user.service.ts@@ -86,6 +86,9 @@ export class UserService {orderBy: { alias: 'asc' },where: { GranteeUser: { id } }}),+ this.prismaService.order.count({+ where: { userId: id }+ }),this.prismaService.order.findFirst({orderBy: {date: 'asc'@@ -96,8 +99,9 @@ export class UserService {]);const access = userData[0];- const firstActivity = userData[1];- let tags = userData[2];+ const activitiesCount = userData[1];+ const firstActivity = userData[2];+ let tags = userData[3];let systemMessage: SystemMessage;@@ -117,6 +121,7 @@ export class UserService {}return {+ activitiesCount,id,permissions,subscription,diff --git a/libs/common/src/lib/interfaces/user.interface.ts b/libs/common/src/lib/interfaces/user.interface.tsindex 667e59fd8b..84f48d1dcb 100644--- a/libs/common/src/lib/interfaces/user.interface.ts+++ b/libs/common/src/lib/interfaces/user.interface.ts@@ -10,6 +10,7 @@ import { UserSettings } from './user-settings.interface';export interface User {access: Pick<Access, 'alias' | 'id' | 'permissions'>[];accounts: Account[];+ activitiesCount: number;dateOfFirstActivity: Date;id: string;permissions: string[];