From bf20a5de8201e3c6ee8dfb27f62ef3adeb28045c Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Fri, 14 Jun 2024 03:40:47 +0200
Subject: [PATCH] Feature/improve date validation in activity endpoints (#3489)

* Improve date validation

* Update changelog
---
 CHANGELOG.md                                   |  1 +
 apps/api/src/app/order/create-order.dto.ts     |  6 +++++-
 apps/api/src/app/order/update-order.dto.ts     |  6 +++++-
 ...eate-or-update-activity-dialog.component.ts | 10 +++++++++-
 .../create-or-update-activity-dialog.html      |  7 ++++++-
 .../lib/validator-constraints/is-after-1970.ts | 16 ++++++++++++++++
 test/import/invalid-date-before-min.json       | 18 ++++++++++++++++++
 7 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 libs/common/src/lib/validator-constraints/is-after-1970.ts
 create mode 100644 test/import/invalid-date-before-min.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddd17a698..a1db2164f 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-11
diff --git a/apps/api/src/app/order/create-order.dto.ts b/apps/api/src/app/order/create-order.dto.ts
index 6d36f036a..72aba3a3b 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.ts
index be3c2b6e5..2fd33b743 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.ts
index 9d3bcc6c9..8ebf936a2 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.html
index f57d63559..a3b960d82 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-icon
             class="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.ts
new file mode 100644
index 000000000..3f5b7db0d
--- /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.json
new file mode 100644
index 000000000..3040581b2
--- /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
+    }
+  ]
+}