Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/add support to create account cash balances (#3260)
Bastien Jeannelledfacbed66d7b
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex c88ee481d5..06c7b37a95 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- Added the date range support to the portfolio holdings page+- Added support to create an account balance### Changeddiff --git a/apps/api/src/app/account-balance/account-balance.controller.ts b/apps/api/src/app/account-balance/account-balance.controller.tsindex 943d0aeb52..12f21753be 100644--- a/apps/api/src/app/account-balance/account-balance.controller.ts+++ b/apps/api/src/app/account-balance/account-balance.controller.ts@@ -1,3 +1,4 @@+import { AccountService } from '@ghostfolio/api/app/account/account.service';import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';import { permissions } from '@ghostfolio/common/permissions';@@ -5,6 +6,8 @@ import type { RequestWithUser } from '@ghostfolio/common/types';import {Controller,+ Body,+ Post,Delete,HttpException,Inject,@@ -17,14 +20,50 @@ import { AccountBalance } from '@prisma/client';import { StatusCodes, getReasonPhrase } from 'http-status-codes';import { AccountBalanceService } from './account-balance.service';+import { CreateAccountBalanceDto } from './create-account-balance.dto';@Controller('account-balance')export class AccountBalanceController {public constructor(private readonly accountBalanceService: AccountBalanceService,+ private readonly accountService: AccountService,@Inject(REQUEST) private readonly request: RequestWithUser) {}+ @HasPermission(permissions.createAccountBalance)+ @Post()+ @UseGuards(AuthGuard('jwt'), HasPermissionGuard)+ public async createAccountBalance(+ @Body() data: CreateAccountBalanceDto+ ): Promise<AccountBalance> {+ const account = await this.accountService.account({+ id_userId: {+ id: data.accountId,+ userId: this.request.user.id+ }+ });++ if (!account) {+ throw new HttpException(+ getReasonPhrase(StatusCodes.FORBIDDEN),+ StatusCodes.FORBIDDEN+ );+ }++ return this.accountBalanceService.createAccountBalance({+ Account: {+ connect: {+ id_userId: {+ id: account.id,+ userId: account.userId+ }+ }+ },+ date: data.date,+ value: data.balance+ });+ }+@HasPermission(permissions.deleteAccountBalance)@Delete(':id')@UseGuards(AuthGuard('jwt'), HasPermissionGuard)diff --git a/apps/api/src/app/account-balance/account-balance.module.ts b/apps/api/src/app/account-balance/account-balance.module.tsindex 1fba60fce8..02323acc9f 100644--- a/apps/api/src/app/account-balance/account-balance.module.ts+++ b/apps/api/src/app/account-balance/account-balance.module.ts@@ -1,3 +1,4 @@+import { AccountService } from '@ghostfolio/api/app/account/account.service';import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';@@ -10,6 +11,6 @@ import { AccountBalanceService } from './account-balance.service';controllers: [AccountBalanceController],exports: [AccountBalanceService],imports: [ExchangeRateDataModule, PrismaModule],- providers: [AccountBalanceService]+ providers: [AccountBalanceService, AccountService]})export class AccountBalanceModule {}diff --git a/apps/api/src/app/account-balance/create-account-balance.dto.ts b/apps/api/src/app/account-balance/create-account-balance.dto.tsnew file mode 100644index 0000000000..28e939b82e--- /dev/null+++ b/apps/api/src/app/account-balance/create-account-balance.dto.ts@@ -0,0 +1,12 @@+import { IsISO8601, IsNumber, IsUUID } from 'class-validator';++export class CreateAccountBalanceDto {+ @IsUUID()+ accountId: string;++ @IsNumber()+ balance: number;++ @IsISO8601()+ date: string;+}diff --git a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.tsindex 537adf1d13..2c2036b16f 100644--- a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts+++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts@@ -140,15 +140,33 @@ export class AccountDetailDialog implements OnDestroy, OnInit {this.dialogRef.close();}+ public onAddAccountBalance({+ balance,+ date+ }: {+ balance: number;+ date: Date;+ }) {+ this.dataService+ .postAccountBalance({+ balance,+ date,+ accountId: this.data.accountId+ })+ .pipe(takeUntil(this.unsubscribeSubject))+ .subscribe(() => {+ this.fetchAccountBalances();+ this.fetchPortfolioPerformance();+ });+ }+public onDeleteAccountBalance(aId: string) {this.dataService.deleteAccountBalance(aId).pipe(takeUntil(this.unsubscribeSubject))- .subscribe({- next: () => {- this.fetchAccountBalances();- this.fetchPortfolioPerformance();- }+ .subscribe(() => {+ this.fetchAccountBalances();+ this.fetchPortfolioPerformance();});}diff --git a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.htmlindex 041a779c4a..e092cce687 100644--- a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html+++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html@@ -115,6 +115,7 @@</ng-template><gf-account-balances[accountBalances]="accountBalances"+ [accountCurrency]="currency"[accountId]="data.accountId"[locale]="user?.settings?.locale"[showActions]="@@ -122,6 +123,7 @@hasPermissionToDeleteAccountBalance &&!user.settings.isRestrictedView"+ (accountBalanceCreated)="onAddAccountBalance($event)"(accountBalanceDeleted)="onDeleteAccountBalance($event)"/></mat-tab>diff --git a/apps/client/src/app/services/data.service.ts b/apps/client/src/app/services/data.service.tsindex a1d94c6469..16d1048342 100644--- a/apps/client/src/app/services/data.service.ts+++ b/apps/client/src/app/services/data.service.ts@@ -42,7 +42,11 @@ import { translate } from '@ghostfolio/ui/i18n';import { HttpClient, HttpParams } from '@angular/common/http';import { Injectable } from '@angular/core';import { SortDirection } from '@angular/material/sort';-import { DataSource, Order as OrderModel } from '@prisma/client';+import {+ AccountBalance,+ DataSource,+ Order as OrderModel+} from '@prisma/client';import { format, parseISO } from 'date-fns';import { cloneDeep, groupBy, isNumber } from 'lodash';import { Observable } from 'rxjs';@@ -611,6 +615,22 @@ export class DataService {return this.http.post<OrderModel>(`/api/v1/account`, aAccount);}+ public postAccountBalance({+ accountId,+ balance,+ date+ }: {+ accountId: string;+ balance: number;+ date: Date;+ }) {+ return this.http.post<AccountBalance>(`/api/v1/account-balance`, {+ accountId,+ balance,+ date+ });+ }+public postBenchmark(benchmark: UniqueAsset) {return this.http.post(`/api/v1/benchmark`, benchmark);}diff --git a/libs/common/src/lib/permissions.ts b/libs/common/src/lib/permissions.tsindex 09bbfa1bdb..890cb8b636 100644--- a/libs/common/src/lib/permissions.ts+++ b/libs/common/src/lib/permissions.ts@@ -7,6 +7,7 @@ export const permissions = {accessAssistant: 'accessAssistant',createAccess: 'createAccess',createAccount: 'createAccount',+ createAccountBalance: 'createAccountBalance',createOrder: 'createOrder',createPlatform: 'createPlatform',createTag: 'createTag',@@ -47,6 +48,7 @@ export function getPermissions(aRole: Role): string[] {permissions.accessAssistant,permissions.createAccess,permissions.createAccount,+ permissions.createAccountBalance,permissions.deleteAccountBalance,permissions.createOrder,permissions.createPlatform,@@ -75,6 +77,7 @@ export function getPermissions(aRole: Role): string[] {permissions.accessAssistant,permissions.createAccess,permissions.createAccount,+ permissions.createAccountBalance,permissions.createOrder,permissions.deleteAccess,permissions.deleteAccount,diff --git a/libs/ui/src/lib/account-balances/account-balances.component.html b/libs/ui/src/lib/account-balances/account-balances.component.htmlindex 0d1a79f410..0cfa4a5da6 100644--- a/libs/ui/src/lib/account-balances/account-balances.component.html+++ b/libs/ui/src/lib/account-balances/account-balances.component.html@@ -1,60 +1,106 @@-<table- class="gf-table w-100"- mat-table- matSort- matSortActive="date"- matSortDirection="desc"- [dataSource]="dataSource"->- <ng-container matColumnDef="date">- <th *matHeaderCellDef class="px-2" mat-header-cell mat-sort-header>- <ng-container i18n>Date</ng-container>- </th>- <td *matCellDef="let element" class="px-2" mat-cell>- <gf-value [isDate]="true" [locale]="locale" [value]="element?.date" />- </td>- </ng-container>+<form [formGroup]="accountBalanceForm" (ngSubmit)="onSubmitAccountBalance()">+ <table+ class="gf-table w-100"+ mat-table+ matSort+ matSortActive="date"+ matSortDirection="desc"+ [dataSource]="dataSource"+ >+ <ng-container matColumnDef="date">+ <th *matHeaderCellDef class="px-2" mat-header-cell mat-sort-header>+ <ng-container i18n>Date</ng-container>+ </th>+ <td *matCellDef="let element" class="px-2" mat-cell>+ <gf-value [isDate]="true" [locale]="locale" [value]="element?.date" />+ </td>+ <td *matFooterCellDef class="px-2" mat-footer-cell>+ <mat-form-field appearance="outline" class="py-1 without-hint">+ <input formControlName="date" matInput [matDatepicker]="date" />+ <mat-datepicker-toggle matSuffix [for]="date">+ <ion-icon+ class="text-muted"+ matDatepickerToggleIcon+ name="calendar-clear-outline"+ />+ </mat-datepicker-toggle>+ <mat-datepicker #date />+ </mat-form-field>+ </td>+ </ng-container>- <ng-container matColumnDef="value">- <th *matHeaderCellDef class="px-2 text-right" mat-header-cell>- <ng-container i18n>Value</ng-container>- </th>- <td *matCellDef="let element" class="px-2" mat-cell>- <div class="d-flex justify-content-end">- <gf-value- [isCurrency]="true"- [locale]="locale"- [unit]="element?.Account?.currency"- [value]="element?.value"- />- </div>- </td>- </ng-container>+ <ng-container matColumnDef="value">+ <th *matHeaderCellDef class="px-2 text-right" mat-header-cell>+ <ng-container i18n>Value</ng-container>+ </th>+ <td *matCellDef="let element" class="px-2" mat-cell>+ <div class="d-flex justify-content-end">+ <gf-value+ [isCurrency]="true"+ [locale]="locale"+ [unit]="element?.Account?.currency"+ [value]="element?.value"+ />+ </div>+ </td>+ <td *matFooterCellDef class="px-2" mat-footer-cell>+ <div class="d-flex justify-content-end">+ <mat-form-field appearance="outline" class="without-hint">+ <input formControlName="balance" matInput type="number" />+ <div class="ml-2" matTextSuffix>+ {{ accountCurrency }}+ </div>+ </mat-form-field>+ </div>+ </td>+ </ng-container>- <ng-container matColumnDef="actions" stickyEnd>- <th *matHeaderCellDef class="px-1 text-center" mat-header-cell></th>- <td *matCellDef="let element" class="px-1 text-center" mat-cell>- @if (showActions) {+ <ng-container matColumnDef="actions" stickyEnd>+ <th *matHeaderCellDef class="px-1 text-center" mat-header-cell></th>+ <td *matCellDef="let element" class="px-1 text-center" mat-cell>+ @if (showActions) {+ <button+ class="mx-1 no-min-width px-2"+ mat-button+ type="button"+ [matMenuTriggerFor]="accountBalanceMenu"+ (click)="$event.stopPropagation()"+ >+ <ion-icon name="ellipsis-horizontal" />+ </button>+ }+ <mat-menu #accountBalanceMenu="matMenu" xPosition="before">+ <button+ mat-menu-item+ type="button"+ (click)="onDeleteAccountBalance(element.id)"+ >+ <span class="align-items-center d-flex">+ <ion-icon class="mr-2" name="trash-outline" />+ <span i18n>Delete</span>+ </span>+ </button>+ </mat-menu>+ </td>+ <td *matFooterCellDef class="px-1 text-center" mat-footer-cell><buttonclass="mx-1 no-min-width px-2"- mat-button- [matMenuTriggerFor]="accountBalanceMenu"- (click)="$event.stopPropagation()"+ color="primary"+ mat-flat-button+ type="submit"+ [disabled]="accountBalanceForm.invalid">- <ion-icon name="ellipsis-horizontal" />+ <span i18n>Add</span></button>- }- <mat-menu #accountBalanceMenu="matMenu" xPosition="before">- <button mat-menu-item (click)="onDeleteAccountBalance(element.id)">- <span class="align-items-center d-flex">- <ion-icon class="mr-2" name="trash-outline" />- <span i18n>Delete</span>- </span>- </button>- </mat-menu>- </td>- </ng-container>+ </td>+ </ng-container>- <tr *matHeaderRowDef="displayedColumns" mat-header-row></tr>- <tr *matRowDef="let row; columns: displayedColumns" mat-row></tr>-</table>+ <tr *matHeaderRowDef="displayedColumns" mat-header-row></tr>+ <tr *matRowDef="let row; columns: displayedColumns" mat-row></tr>+ <tr+ *matFooterRowDef="displayedColumns"+ mat-footer-row+ [hidden]="!showActions"+ ></tr>+ </table>+</form>diff --git a/libs/ui/src/lib/account-balances/account-balances.component.scss b/libs/ui/src/lib/account-balances/account-balances.component.scssindex 5d4e87f30f..0bf48a9e74 100644--- a/libs/ui/src/lib/account-balances/account-balances.component.scss+++ b/libs/ui/src/lib/account-balances/account-balances.component.scss@@ -1,3 +1,10 @@:host {display: block;}++:host-context(.is-dark-theme) {+ input {+ color: rgb(var(--light-primary-text));+ background-color: rgb(var(--palette-foreground-text-light));+ }+}diff --git a/libs/ui/src/lib/account-balances/account-balances.component.ts b/libs/ui/src/lib/account-balances/account-balances.component.tsindex 9d9e8ab19b..c4fd379c8d 100644--- a/libs/ui/src/lib/account-balances/account-balances.component.ts+++ b/libs/ui/src/lib/account-balances/account-balances.component.ts@@ -14,7 +14,17 @@ import {Output,ViewChild} from '@angular/core';+import {+ FormGroup,+ FormControl,+ Validators,+ ReactiveFormsModule+} from '@angular/forms';import { MatButtonModule } from '@angular/material/button';+import { DateAdapter } from '@angular/material/core';+import { MatDatepickerModule } from '@angular/material/datepicker';+import { MatFormFieldModule } from '@angular/material/form-field';+import { MatInputModule } from '@angular/material/input';import { MatMenuModule } from '@angular/material/menu';import { MatSort, MatSortModule } from '@angular/material/sort';import { MatTableDataSource, MatTableModule } from '@angular/material/table';@@ -29,9 +39,13 @@ import { GfValueComponent } from '../value';CommonModule,GfValueComponent,MatButtonModule,+ MatDatepickerModule,+ MatFormFieldModule,+ MatInputModule,MatMenuModule,MatSortModule,- MatTableModule+ MatTableModule,+ ReactiveFormsModule],schemas: [CUSTOM_ELEMENTS_SCHEMA],selector: 'gf-account-balances',@@ -43,24 +57,38 @@ export class GfAccountBalancesComponentimplements OnChanges, OnDestroy, OnInit{@Input() accountBalances: AccountBalancesResponse['balances'];+ @Input() accountCurrency: string;@Input() accountId: string;@Input() locale = getLocale();@Input() showActions = true;+ @Output() accountBalanceCreated = new EventEmitter<{+ balance: number;+ date: Date;+ }>();@Output() accountBalanceDeleted = new EventEmitter<string>();@ViewChild(MatSort) sort: MatSort;+ public accountBalanceForm = new FormGroup({+ balance: new FormControl(0, Validators.required),+ date: new FormControl(new Date(), Validators.required)+ });+public dataSource: MatTableDataSource<AccountBalancesResponse['balances'][0]> = new MatTableDataSource();+public displayedColumns: string[] = ['date', 'value', 'actions'];+ public Validators = Validators;private unsubscribeSubject = new Subject<void>();- public constructor() {}+ public constructor(private dateAdapter: DateAdapter<any>) {}- public ngOnInit() {}+ public ngOnInit() {+ this.dateAdapter.setLocale(this.locale);+ }public ngOnChanges() {if (this.accountBalances) {@@ -81,6 +109,10 @@ export class GfAccountBalancesComponent}}+ public onSubmitAccountBalance() {+ this.accountBalanceCreated.emit(this.accountBalanceForm.getRawValue());+ }+public ngOnDestroy() {this.unsubscribeSubject.next();this.unsubscribeSubject.complete();