Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/improve date validation in activity endpoints (#3489)
Thomas Kaulbf20a5de8201
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex ddd17a6983..a1db2164f1 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0### Changed+- Improved the date validation in the create, import and update activities endpoints- Improved the language localization for German (`de`)## 2.88.0 - 2024-06-11diff --git a/apps/api/src/app/order/create-order.dto.ts b/apps/api/src/app/order/create-order.dto.tsindex 6d36f036a3..72aba3a3b5 100644--- a/apps/api/src/app/order/create-order.dto.ts+++ b/apps/api/src/app/order/create-order.dto.ts@@ -1,3 +1,5 @@+import { IsAfter1970Constraint } from '@ghostfolio/common/validator-constraints/is-after-1970';+import {AssetClass,AssetSubClass,@@ -15,7 +17,8 @@ import {IsNumber,IsOptional,IsString,- Min+ Min,+ Validate} from 'class-validator';import { isString } from 'lodash';@@ -51,6 +54,7 @@ export class CreateOrderDto {dataSource?: DataSource;@IsISO8601()+ @Validate(IsAfter1970Constraint)date: string;@IsNumber()diff --git a/apps/api/src/app/order/update-order.dto.ts b/apps/api/src/app/order/update-order.dto.tsindex be3c2b6e52..2fd33b743c 100644--- a/apps/api/src/app/order/update-order.dto.ts+++ b/apps/api/src/app/order/update-order.dto.ts@@ -1,3 +1,5 @@+import { IsAfter1970Constraint } from '@ghostfolio/common/validator-constraints/is-after-1970';+import {AssetClass,AssetSubClass,@@ -14,7 +16,8 @@ import {IsNumber,IsOptional,IsString,- Min+ Min,+ Validate} from 'class-validator';import { isString } from 'lodash';@@ -49,6 +52,7 @@ export class UpdateOrderDto {dataSource: DataSource;@IsISO8601()+ @Validate(IsAfter1970Constraint)date: string;@IsNumber()diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.tsindex 9d3bcc6c9c..8ebf936a2e 100644--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts@@ -21,7 +21,7 @@ import { DateAdapter, MAT_DATE_LOCALE } from '@angular/material/core';import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';import { AssetClass, AssetSubClass, Tag, Type } from '@prisma/client';import { isUUID } from 'class-validator';-import { isToday } from 'date-fns';+import { isAfter, isToday } from 'date-fns';import { EMPTY, Observable, Subject, lastValueFrom, of } from 'rxjs';import { catchError, delay, map, startWith, takeUntil } from 'rxjs/operators';@@ -426,6 +426,14 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {});}+ public dateFilter(aDate: Date) {+ if (!aDate) {+ return true;+ }++ return isAfter(aDate, new Date(0));+ }+public onAddTag(event: MatAutocompleteSelectedEvent) {this.activityForm.get('tags').setValue([...(this.activityForm.get('tags').value ?? []),diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.htmlindex f57d635598..a3b960d826 100644--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html@@ -157,7 +157,12 @@<div class="mb-3"><mat-form-field appearance="outline" class="w-100"><mat-label i18n>Date</mat-label>- <input formControlName="date" matInput [matDatepicker]="date" />+ <input+ formControlName="date"+ matInput+ [matDatepicker]="date"+ [matDatepickerFilter]="dateFilter"+ /><mat-datepicker-toggle class="mr-2" matSuffix [for]="date"><ion-iconclass="text-muted"diff --git a/libs/common/src/lib/validator-constraints/is-after-1970.ts b/libs/common/src/lib/validator-constraints/is-after-1970.tsnew file mode 100644index 0000000000..3f5b7db0d9--- /dev/null+++ b/libs/common/src/lib/validator-constraints/is-after-1970.ts@@ -0,0 +1,16 @@+import {+ ValidatorConstraint,+ ValidatorConstraintInterface+} from 'class-validator';+import { format, isAfter, parseISO } from 'date-fns';++@ValidatorConstraint({ name: 'isAfter1970' })+export class IsAfter1970Constraint implements ValidatorConstraintInterface {+ public defaultMessage() {+ return `date must be after ${format(new Date(0), 'yyyy')}`;+ }++ public validate(aDateString: string) {+ return isAfter(parseISO(aDateString), new Date(0));+ }+}diff --git a/test/import/invalid-date-before-min.json b/test/import/invalid-date-before-min.jsonnew file mode 100644index 0000000000..3040581b23--- /dev/null+++ b/test/import/invalid-date-before-min.json@@ -0,0 +1,18 @@+{+ "meta": {+ "date": "2021-01-01T00:00:00.000Z",+ "version": "dev"+ },+ "activities": [+ {+ "currency": "USD",+ "dataSource": "YAHOO",+ "date": "1960-01-01T00:00:00.000Z",+ "fee": 0,+ "quantity": 20,+ "symbol": "AAPL",+ "type": "BUY",+ "unitPrice": 100.0+ }+ ]+}