From 88219279a54021cb561bc2492fe080f79809b2bc Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Mon, 25 Jul 2022 18:14:32 +0200
Subject: [PATCH] Add comment to activity

---
 apps/api/src/app/export/export.service.ts                   | 3 +++
 apps/api/src/app/import/import.service.ts                   | 2 ++
 apps/api/src/app/order/create-order.dto.ts                  | 4 ++++
 apps/api/src/app/order/update-order.dto.ts                  | 4 ++++
 .../create-or-update-transaction-dialog.component.ts        | 2 ++
 .../create-or-update-transaction-dialog.html                | 6 ++++++
 .../20220725155238_added_comment_to_order/migration.sql     | 2 ++
 prisma/schema.prisma                                        | 1 +
 8 files changed, 24 insertions(+)
 create mode 100644 prisma/migrations/20220725155238_added_comment_to_order/migration.sql

diff --git a/apps/api/src/app/export/export.service.ts b/apps/api/src/app/export/export.service.ts
index 74cdf14f1..c4655e7d8 100644
--- a/apps/api/src/app/export/export.service.ts
+++ b/apps/api/src/app/export/export.service.ts
@@ -18,6 +18,7 @@ export class ExportService {
       orderBy: { date: 'desc' },
       select: {
         accountId: true,
+        comment: true,
         date: true,
         fee: true,
         id: true,
@@ -40,6 +41,7 @@ export class ExportService {
       activities: activities.map(
         ({
           accountId,
+          comment,
           date,
           fee,
           id,
@@ -50,6 +52,7 @@ export class ExportService {
         }) => {
           return {
             accountId,
+            comment,
             fee,
             id,
             quantity,
diff --git a/apps/api/src/app/import/import.service.ts b/apps/api/src/app/import/import.service.ts
index 3eb424469..7617b8cb3 100644
--- a/apps/api/src/app/import/import.service.ts
+++ b/apps/api/src/app/import/import.service.ts
@@ -48,6 +48,7 @@ export class ImportService {
 
     for (const {
       accountId,
+      comment,
       currency,
       dataSource,
       date,
@@ -58,6 +59,7 @@ export class ImportService {
       unitPrice
     } of activities) {
       await this.orderService.createOrder({
+        comment,
         fee,
         quantity,
         type,
diff --git a/apps/api/src/app/order/create-order.dto.ts b/apps/api/src/app/order/create-order.dto.ts
index ab60248d5..888c6bacd 100644
--- a/apps/api/src/app/order/create-order.dto.ts
+++ b/apps/api/src/app/order/create-order.dto.ts
@@ -27,6 +27,10 @@ export class CreateOrderDto {
   @IsOptional()
   assetSubClass?: AssetSubClass;
 
+  @IsString()
+  @IsOptional()
+  comment?: string;
+
   @IsString()
   currency: string;
 
diff --git a/apps/api/src/app/order/update-order.dto.ts b/apps/api/src/app/order/update-order.dto.ts
index 5f79c63ba..f4c7ba0cd 100644
--- a/apps/api/src/app/order/update-order.dto.ts
+++ b/apps/api/src/app/order/update-order.dto.ts
@@ -27,6 +27,10 @@ export class UpdateOrderDto {
   @IsOptional()
   assetSubClass?: AssetSubClass;
 
+  @IsString()
+  @IsOptional()
+  comment?: string;
+
   @IsString()
   currency: string;
 
diff --git a/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts b/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts
index f9b0b68cf..ce2c5856f 100644
--- a/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts
+++ b/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts
@@ -76,6 +76,7 @@ export class CreateOrUpdateTransactionDialog implements OnDestroy {
       accountId: [this.data.activity?.accountId, Validators.required],
       assetClass: [this.data.activity?.SymbolProfile?.assetClass],
       assetSubClass: [this.data.activity?.SymbolProfile?.assetSubClass],
+      comment: [this.data.activity?.comment],
       currency: [
         this.data.activity?.SymbolProfile?.currency,
         Validators.required
@@ -245,6 +246,7 @@ export class CreateOrUpdateTransactionDialog implements OnDestroy {
       accountId: this.activityForm.controls['accountId'].value,
       assetClass: this.activityForm.controls['assetClass'].value,
       assetSubClass: this.activityForm.controls['assetSubClass'].value,
+      comment: this.activityForm.controls['comment'].value,
       currency: this.activityForm.controls['currency'].value,
       date: this.activityForm.controls['date'].value,
       dataSource: this.activityForm.controls['dataSource'].value,
diff --git a/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html b/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html
index ff7409753..4400f38e0 100644
--- a/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html
+++ b/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html
@@ -135,6 +135,12 @@
         >
       </mat-form-field>
     </div>
+    <div>
+      <mat-form-field appearance="outline" class="w-100">
+        <mat-label i18n>Comment</mat-label>
+        <textarea formControlName="comment" matInput></textarea>
+      </mat-form-field>
+    </div>
     <div
       [ngClass]="{ 'd-none': activityForm.controls['type']?.value !== 'ITEM' }"
     >
diff --git a/prisma/migrations/20220725155238_added_comment_to_order/migration.sql b/prisma/migrations/20220725155238_added_comment_to_order/migration.sql
new file mode 100644
index 000000000..592e2c143
--- /dev/null
+++ b/prisma/migrations/20220725155238_added_comment_to_order/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Order" ADD COLUMN "comment" TEXT;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index d11553cd4..9f93d6c38 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -71,6 +71,7 @@ model Order {
   Account         Account?      @relation(fields: [accountId, accountUserId], references: [id, userId])
   accountId       String?
   accountUserId   String?
+  comment         String?
   createdAt       DateTime      @default(now())
   date            DateTime
   fee             Float