From 0e659502131029c961e0ad728e44576e2713fd6d Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Mon, 28 Nov 2022 21:04:38 +0100
Subject: [PATCH] Improve asset profile management

* Add note
* Fix filter
---
 apps/api/src/app/admin/admin.service.ts       |  4 ++
 .../src/app/admin/update-asset-profile.dto.ts |  6 ++-
 .../src/services/symbol-profile.service.ts    |  3 +-
 .../admin-market-data.component.ts            |  8 ++--
 .../admin-market-data/admin-market-data.html  | 16 ++++++++
 .../asset-profile-dialog.component.ts         |  5 ++-
 .../asset-profile-dialog.html                 | 12 ++++++
 apps/client/src/app/services/admin.service.ts |  3 +-
 apps/client/src/app/services/data.service.ts  | 12 ++++++
 .../enhanced-symbol-profile.interface.ts      |  1 +
 .../activities-table.component.html           | 38 ++++++++++++++-----
 .../activities-table.component.ts             |  1 +
 .../migration.sql                             |  2 +
 prisma/schema.prisma                          |  1 +
 14 files changed, 96 insertions(+), 16 deletions(-)
 create mode 100644 prisma/migrations/20221128064317_added_comment_to_symbol_profile/migration.sql

diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.ts
index d7235e9e6..87b9b9cc6 100644
--- a/apps/api/src/app/admin/admin.service.ts
+++ b/apps/api/src/app/admin/admin.service.ts
@@ -116,6 +116,7 @@ export class AdminService {
           },
           assetClass: true,
           assetSubClass: true,
+          comment: true,
           countries: true,
           dataSource: true,
           Order: {
@@ -150,6 +151,7 @@ export class AdminService {
         activitiesCount: symbolProfile._count.Order,
         assetClass: symbolProfile.assetClass,
         assetSubClass: symbolProfile.assetSubClass,
+        comment: symbolProfile.comment,
         dataSource: symbolProfile.dataSource,
         date: symbolProfile.Order?.[0]?.date,
         symbol: symbolProfile.symbol
@@ -190,11 +192,13 @@ export class AdminService {
   }
 
   public async patchAssetProfileData({
+    comment,
     dataSource,
     symbol,
     symbolMapping
   }: Prisma.SymbolProfileUpdateInput & UniqueAsset) {
     await this.symbolProfileService.updateSymbolProfile({
+      comment,
       dataSource,
       symbol,
       symbolMapping
diff --git a/apps/api/src/app/admin/update-asset-profile.dto.ts b/apps/api/src/app/admin/update-asset-profile.dto.ts
index f21785f5b..228aa6f2c 100644
--- a/apps/api/src/app/admin/update-asset-profile.dto.ts
+++ b/apps/api/src/app/admin/update-asset-profile.dto.ts
@@ -1,6 +1,10 @@
-import { IsObject, IsOptional } from 'class-validator';
+import { IsObject, IsOptional, IsString } from 'class-validator';
 
 export class UpdateAssetProfileDto {
+  @IsString()
+  @IsOptional()
+  comment?: string;
+
   @IsObject()
   @IsOptional()
   symbolMapping?: {
diff --git a/apps/api/src/services/symbol-profile.service.ts b/apps/api/src/services/symbol-profile.service.ts
index edf6528ba..6cbbd8a4e 100644
--- a/apps/api/src/services/symbol-profile.service.ts
+++ b/apps/api/src/services/symbol-profile.service.ts
@@ -104,12 +104,13 @@ export class SymbolProfileService {
   }
 
   public updateSymbolProfile({
+    comment,
     dataSource,
     symbol,
     symbolMapping
   }: Prisma.SymbolProfileUpdateInput & UniqueAsset) {
     return this.prismaService.symbolProfile.update({
-      data: { symbolMapping },
+      data: { comment, symbolMapping },
       where: { dataSource_symbol: { dataSource, symbol } }
     });
   }
diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts b/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
index 7ce9dda44..856382e5b 100644
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
@@ -16,6 +16,7 @@ import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { DATE_FORMAT, getDateFormatString } from '@ghostfolio/common/helper';
 import { Filter, UniqueAsset, User } from '@ghostfolio/common/interfaces';
 import { AdminMarketDataItem } from '@ghostfolio/common/interfaces/admin-market-data.interface';
+import { translate } from '@ghostfolio/ui/i18n';
 import { AssetSubClass, DataSource } from '@prisma/client';
 import { format, parseISO } from 'date-fns';
 import { DeviceDetectorService } from 'ngx-device-detector';
@@ -44,10 +45,10 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
     AssetSubClass.PRECIOUS_METAL,
     AssetSubClass.PRIVATE_EQUITY,
     AssetSubClass.STOCK
-  ].map((id) => {
+  ].map((assetSubClass) => {
     return {
-      id,
-      label: id,
+      id: assetSubClass,
+      label: translate(assetSubClass),
       type: 'ASSET_SUB_CLASS'
     };
   });
@@ -67,6 +68,7 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
     'marketDataItemCount',
     'sectorsCount',
     'countriesCount',
+    'comment',
     'actions'
   ];
   public filters$ = new Subject<Filter[]>();
diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.html b/apps/client/src/app/components/admin-market-data/admin-market-data.html
index f835b8af2..cea4bd684 100644
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.html
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.html
@@ -100,6 +100,22 @@
           </td>
         </ng-container>
 
+        <ng-container matColumnDef="comment">
+          <th
+            *matHeaderCellDef
+            class="px-1"
+            mat-header-cell
+            mat-sort-header
+          ></th>
+          <td *matCellDef="let element" class="px-1" mat-cell>
+            <ion-icon
+              *ngIf="element.comment"
+              class="d-block"
+              name="document-text-outline"
+            ></ion-icon>
+          </td>
+        </ng-container>
+
         <ng-container matColumnDef="actions">
           <th *matHeaderCellDef class="px-1 text-center" mat-header-cell>
             <button
diff --git a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts
index 622f5d3c7..3d7a539b3 100644
--- a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts
+++ b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts
@@ -30,6 +30,7 @@ import { AssetProfileDialogParams } from './interfaces/interfaces';
 export class AssetProfileDialog implements OnDestroy, OnInit {
   public assetProfile: EnhancedSymbolProfile;
   public assetProfileForm = this.formBuilder.group({
+    comment: '',
     symbolMapping: ''
   });
   public countries: {
@@ -86,6 +87,7 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
         }
 
         this.assetProfileForm.setValue({
+          comment: this.assetProfile?.comment,
           symbolMapping: JSON.stringify(this.assetProfile?.symbolMapping)
         });
 
@@ -129,7 +131,8 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
     } catch {}
 
     const assetProfileData: UpdateAssetProfileDto = {
-      symbolMapping
+      symbolMapping,
+      comment: this.assetProfileForm.controls['comment'].value ?? null
     };
 
     this.adminService
diff --git a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
index 63c49d76a..e4ada64d6 100644
--- a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
+++ b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
@@ -148,6 +148,18 @@
         ></textarea>
       </mat-form-field>
     </div>
+    <div>
+      <mat-form-field appearance="outline" class="w-100">
+        <mat-label i18n>Note</mat-label>
+        <textarea
+          cdkAutosizeMinRows="2"
+          cdkTextareaAutosize
+          formControlName="comment"
+          matInput
+          (keyup.enter)="$event.stopPropagation()"
+        ></textarea>
+      </mat-form-field>
+    </div>
   </div>
 
   <div class="d-flex justify-content-end" mat-dialog-actions>
diff --git a/apps/client/src/app/services/admin.service.ts b/apps/client/src/app/services/admin.service.ts
index a897df97f..07ed3a75c 100644
--- a/apps/client/src/app/services/admin.service.ts
+++ b/apps/client/src/app/services/admin.service.ts
@@ -127,13 +127,14 @@ export class AdminService {
   }
 
   public patchAssetProfile({
+    comment,
     dataSource,
     symbol,
     symbolMapping
   }: UniqueAsset & UpdateAssetProfileDto) {
     return this.http.patch<EnhancedSymbolProfile>(
       `/api/v1/admin/profile-data/${dataSource}/${symbol}`,
-      { symbolMapping }
+      { comment, symbolMapping }
     );
   }
 
diff --git a/apps/client/src/app/services/data.service.ts b/apps/client/src/app/services/data.service.ts
index b41daf2d8..6bb4b0dba 100644
--- a/apps/client/src/app/services/data.service.ts
+++ b/apps/client/src/app/services/data.service.ts
@@ -360,6 +360,7 @@ export class DataService {
       const {
         ACCOUNT: filtersByAccount,
         ASSET_CLASS: filtersByAssetClass,
+        ASSET_SUB_CLASS: filtersByAssetSubClass,
         TAG: filtersByTag
       } = groupBy(filters, (filter) => {
         return filter.type;
@@ -387,6 +388,17 @@ export class DataService {
         );
       }
 
+      if (filtersByAssetSubClass) {
+        params = params.append(
+          'assetSubClasses',
+          filtersByAssetSubClass
+            .map(({ id }) => {
+              return id;
+            })
+            .join(',')
+        );
+      }
+
       if (filtersByTag) {
         params = params.append(
           'tags',
diff --git a/libs/common/src/lib/interfaces/enhanced-symbol-profile.interface.ts b/libs/common/src/lib/interfaces/enhanced-symbol-profile.interface.ts
index a370f947e..499e638a4 100644
--- a/libs/common/src/lib/interfaces/enhanced-symbol-profile.interface.ts
+++ b/libs/common/src/lib/interfaces/enhanced-symbol-profile.interface.ts
@@ -8,6 +8,7 @@ export interface EnhancedSymbolProfile {
   activitiesCount: number;
   assetClass: AssetClass;
   assetSubClass: AssetSubClass;
+  comment?: string;
   countries: Country[];
   createdAt: Date;
   currency: string | null;
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html
index a650089eb..b5a7d11a5 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.html
+++ b/libs/ui/src/lib/activities-table/activities-table.component.html
@@ -299,6 +299,35 @@
       <td *matFooterCellDef class="px-1" mat-footer-cell></td>
     </ng-container>
 
+    <ng-container matColumnDef="comment">
+      <th
+        *matHeaderCellDef
+        class="d-none d-lg-table-cell px-1"
+        mat-header-cell
+        mat-sort-header
+      ></th>
+      <td
+        *matCellDef="let element"
+        class="d-none d-lg-table-cell px-1"
+        mat-cell
+      >
+        <button
+          *ngIf="element.comment"
+          class="mx-1 no-min-width px-2"
+          mat-button
+          title="Note"
+          (click)="onOpenComment(element.comment); $event.stopPropagation()"
+        >
+          <ion-icon name="document-text-outline"></ion-icon>
+        </button>
+      </td>
+      <td
+        *matFooterCellDef
+        class="d-none d-lg-table-cell px-1"
+        mat-footer-cell
+      ></td>
+    </ng-container>
+
     <ng-container matColumnDef="actions">
       <th *matHeaderCellDef class="px-1 text-center" mat-header-cell>
         <button
@@ -345,15 +374,6 @@
         </mat-menu>
       </th>
       <td *matCellDef="let element" class="px-1 text-center" mat-cell>
-        <button
-          *ngIf="element.comment && !this.showActions"
-          class="mx-1 no-min-width px-2"
-          mat-button
-          title="Note"
-          (click)="onOpenComment(element.comment)"
-        >
-          <ion-icon name="document-text-outline"></ion-icon>
-        </button>
         <button
           *ngIf="this.showActions"
           class="mx-1 no-min-width px-2"
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts
index c6099806e..b1ddc683a 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.ts
+++ b/libs/ui/src/lib/activities-table/activities-table.component.ts
@@ -94,6 +94,7 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
       'currency',
       'valueInBaseCurrency',
       'account',
+      'comment',
       'actions'
     ];
 
diff --git a/prisma/migrations/20221128064317_added_comment_to_symbol_profile/migration.sql b/prisma/migrations/20221128064317_added_comment_to_symbol_profile/migration.sql
new file mode 100644
index 000000000..d78222d04
--- /dev/null
+++ b/prisma/migrations/20221128064317_added_comment_to_symbol_profile/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "SymbolProfile" ADD COLUMN "comment" TEXT;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 062d59b06..2520172d1 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -112,6 +112,7 @@ model Settings {
 model SymbolProfile {
   assetClass             AssetClass?
   assetSubClass          AssetSubClass?
+  comment                String?
   countries              Json?
   createdAt              DateTime                @default(now())
   currency               String