Merge pull request #34 from dandevaud/feature/tags-on-holdings

Feature/tags on holdings

apps/api/src/app/admin/admin.controller.ts

@@ -448,10 +448,23 @@ export class AdminController {
       );
     }
 
+    await this.adminService.patchAssetProfileData({
+      dataSource,
+      symbol,
+      tags: {
+        set: []
+      }
+    });
+
     return this.adminService.patchAssetProfileData({
       ...assetProfileData,
       dataSource,
-      symbol
+      symbol,
+      tags: {
+        connect: assetProfileData.tags?.map(({ id }) => {
+          return { id };
+        })
+      }
     });
   }
 

apps/api/src/app/admin/admin.service.ts

@@ -25,10 +25,11 @@ import { MarketDataPreset } from '@ghostfolio/common/types';
 import { BadRequestException, Injectable } from '@nestjs/common';
 import {
   AssetSubClass,
-  DataSource,
   Prisma,
   Property,
-  SymbolProfile
+  SymbolProfile,
+  DataSource,
+  Tag
 } from '@prisma/client';
 import { differenceInDays } from 'date-fns';
 import { groupBy } from 'lodash';
@@ -218,7 +219,8 @@ export class AdminService {
           },
           scraperConfiguration: true,
           sectors: true,
-          symbol: true
+          symbol: true,
+          tags: true
         }
       }),
       this.prismaService.symbolProfile.count({ where })
@@ -236,7 +238,8 @@ export class AdminService {
         name,
         Order,
         sectors,
-        symbol
+        symbol,
+        tags
       }) => {
         const countriesCount = countries ? Object.keys(countries).length : 0;
         const marketDataItemCount =
@@ -260,7 +263,8 @@ export class AdminService {
           marketDataItemCount,
           sectorsCount,
           activitiesCount: _count.Order,
-          date: Order?.[0]?.date
+          date: Order?.[0]?.date,
+          tags
         };
       }
     );
@@ -322,6 +326,7 @@ export class AdminService {
     comment,
     dataSource,
     name,
+    tags,
     scraperConfiguration,
     symbol,
     symbolMapping
@@ -332,6 +337,7 @@ export class AdminService {
       comment,
       dataSource,
       name,
+      tags,
       scraperConfiguration,
       symbol,
       symbolMapping
@@ -390,7 +396,8 @@ export class AdminService {
           countriesCount: 0,
           currency: symbol.replace(DEFAULT_CURRENCY, ''),
           name: symbol,
-          sectorsCount: 0
+          sectorsCount: 0,
+          tags: []
         };
       });
 

apps/api/src/app/admin/update-asset-profile.dto.ts

@@ -1,5 +1,11 @@
-import { AssetClass, AssetSubClass, Prisma } from '@prisma/client';
+import { AssetClass, AssetSubClass, Prisma, Tag } from '@prisma/client';
-import { IsEnum, IsObject, IsOptional, IsString } from 'class-validator';
+import {
+  IsArray,
+  IsEnum,
+  IsObject,
+  IsOptional,
+  IsString
+} from 'class-validator';
 
 export class UpdateAssetProfileDto {
   @IsEnum(AssetClass, { each: true })
@@ -18,6 +24,10 @@ export class UpdateAssetProfileDto {
   @IsOptional()
   name?: string;
 
+  @IsArray()
+  @IsOptional()
+  tags?: Tag[];
+
   @IsObject()
   @IsOptional()
   scraperConfiguration?: Prisma.InputJsonObject;

apps/api/src/app/order/order.service.ts

@@ -298,13 +298,34 @@ export class OrderService {
     }
 
     if (filtersByTag?.length > 0) {
-      where.tags = {
+      where.AND = [
+        {
+          OR: [
+            {
+              tags: {
+                some: {
+                  OR: filtersByTag.map(({ id }) => {
+                    return {
+                      id: id
+                    };
+                  })
+                }
+              }
+            },
+            {
+              SymbolProfile: {
+                tags: {
                   some: {
                     OR: filtersByTag.map(({ id }) => {
                       return { id };
                     })
                   }
-      };
+                }
+              }
+            }
+          ]
+        }
+      ];
     }
 
     if (types) {
@@ -330,7 +351,11 @@ export class OrderService {
             }
           },
           // eslint-disable-next-line @typescript-eslint/naming-convention
-          SymbolProfile: true,
+          SymbolProfile: {
+            include: {
+              tags: true
+            }
+          },
           tags: true
         },
         orderBy: { date: 'asc' }

apps/api/src/app/portfolio/portfolio.service.ts

@@ -1190,6 +1190,7 @@ export class PortfolioService {
             dataProviderResponses[position.symbol]?.marketState ?? 'delayed',
           name: symbolProfileMap[position.symbol].name,
           netPerformance: position.netPerformance?.toNumber() ?? null,
+          tags: symbolProfileMap[position.symbol].tags,
           netPerformancePercentage:
             position.netPerformancePercentage?.toNumber() ?? null,
           quantity: new Big(position.quantity).toNumber()

apps/api/src/app/tag/tag.service.ts

@@ -50,7 +50,7 @@ export class TagService {
     const tagsWithOrderCount = await this.prismaService.tag.findMany({
       include: {
         _count: {
-          select: { orders: true }
+          select: { orders: true, symbolProfile: true }
         }
       }
     });
@@ -59,7 +59,8 @@ export class TagService {
       return {
         id,
         name,
-        activityCount: _count.orders
+        activityCount: _count.orders,
+        holdingCount: _count.symbolProfile
       };
     });
   }

apps/api/src/services/symbol-profile/symbol-profile.service.ts

@@ -8,7 +8,12 @@ import {
 import { Country } from '@ghostfolio/common/interfaces/country.interface';
 import { Sector } from '@ghostfolio/common/interfaces/sector.interface';
 import { Injectable } from '@nestjs/common';
-import { Prisma, SymbolProfile, SymbolProfileOverrides } from '@prisma/client';
+import {
+  Prisma,
+  SymbolProfile,
+  SymbolProfileOverrides,
+  Tag
+} from '@prisma/client';
 import { continents, countries } from 'countries-list';
 
 @Injectable()
@@ -49,6 +54,7 @@ export class SymbolProfileService {
             select: { date: true },
             take: 1
           },
+          tags: true,
           SymbolProfileOverrides: true
         },
         where: {
@@ -72,7 +78,8 @@ export class SymbolProfileService {
           _count: {
             select: { Order: true }
           },
-          SymbolProfileOverrides: true
+          SymbolProfileOverrides: true,
+          tags: true
         },
         where: {
           id: {
@@ -91,6 +98,7 @@ export class SymbolProfileService {
     comment,
     dataSource,
     name,
+    tags,
     scraperConfiguration,
     symbol,
     symbolMapping
@@ -101,6 +109,7 @@ export class SymbolProfileService {
         assetSubClass,
         comment,
         name,
+        tags,
         scraperConfiguration,
         symbolMapping
       },
@@ -114,6 +123,7 @@ export class SymbolProfileService {
       Order?: {
         date: Date;
       }[];
+      tags?: Tag[];
       SymbolProfileOverrides: SymbolProfileOverrides;
     })[]
   ): EnhancedSymbolProfile[] {
@@ -127,7 +137,8 @@ export class SymbolProfileService {
         dateOfFirstActivity: <Date>undefined,
         scraperConfiguration: this.getScraperConfiguration(symbolProfile),
         sectors: this.getSectors(symbolProfile),
-        symbolMapping: this.getSymbolMapping(symbolProfile)
+        symbolMapping: this.getSymbolMapping(symbolProfile),
+        tags: symbolProfile?.tags
       };
 
       item.activitiesCount = symbolProfile._count.Order;

apps/api/src/services/tag/tag.service.ts

@@ -19,11 +19,20 @@ export class TagService {
         name: 'asc'
       },
       where: {
+        OR: [
+          {
             orders: {
               some: {
                 userId
               }
             }
+          },
+          {
+            symbolProfile: {
+              some: {}
+            }
+          }
+        ]
       }
     });
   }

apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts

@@ -2,9 +2,11 @@ import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
+  ElementRef,
   Inject,
   OnDestroy,
-  OnInit
+  OnInit,
+  ViewChild
 } from '@angular/core';
 import { FormBuilder, FormControl, Validators } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
@@ -21,7 +23,8 @@ import {
   AssetClass,
   AssetSubClass,
   MarketData,
-  SymbolProfile
+  SymbolProfile,
+  Tag
 } from '@prisma/client';
 import { format } from 'date-fns';
 import { parse as csvToJson } from 'papaparse';
@@ -29,6 +32,8 @@ import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 
 import { AssetProfileDialogParams } from './interfaces/interfaces';
+import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
+import { COMMA, ENTER } from '@angular/cdk/keycodes';
 
 @Component({
   host: { class: 'd-flex flex-column h-100' },
@@ -38,6 +43,8 @@ import { AssetProfileDialogParams } from './interfaces/interfaces';
   styleUrls: ['./asset-profile-dialog.component.scss']
 })
 export class AssetProfileDialog implements OnDestroy, OnInit {
+  @ViewChild('tagInput') tagInput: ElementRef<HTMLInputElement>;
+  public separatorKeysCodes: number[] = [ENTER, COMMA];
   public assetProfileClass: string;
   public assetClasses = Object.keys(AssetClass).map((assetClass) => {
     return { id: assetClass, label: translate(assetClass) };
@@ -51,6 +58,7 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
     assetSubClass: new FormControl<AssetSubClass>(undefined),
     comment: '',
     name: ['', Validators.required],
+    tags: new FormControl<Tag[]>(undefined),
     scraperConfiguration: '',
     symbolMapping: ''
   });
@@ -66,6 +74,8 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
     [name: string]: { name: string; value: number };
   };
 
+  public HoldingTags: { id: string; name: string }[];
+
   private static readonly HISTORICAL_DATA_TEMPLATE = `date;marketPrice\n${format(
     new Date(),
     DATE_FORMAT
@@ -91,6 +101,18 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
     this.historicalDataAsCsvString =
       AssetProfileDialog.HISTORICAL_DATA_TEMPLATE;
 
+    this.adminService
+      .fetchTags()
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe((tags) => {
+        this.HoldingTags = tags.map(({ id, name }) => {
+          return { id, name };
+        });
+        this.dataService.updateInfo();
+
+        this.changeDetectorRef.markForCheck();
+      });
+
     this.adminService
       .fetchAdminMarketDataBySymbol({
         dataSource: this.data.dataSource,
@@ -131,6 +153,7 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
           assetClass: this.assetProfile.assetClass ?? null,
           assetSubClass: this.assetProfile.assetSubClass ?? null,
           comment: this.assetProfile?.comment ?? '',
+          tags: this.assetProfile?.tags,
           name: this.assetProfile.name ?? this.assetProfile.symbol,
           scraperConfiguration: JSON.stringify(
             this.assetProfile?.scraperConfiguration ?? {}
@@ -225,6 +248,7 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
       assetSubClass: this.assetProfileForm.controls['assetSubClass'].value,
       comment: this.assetProfileForm.controls['comment'].value ?? null,
       name: this.assetProfileForm.controls['name'].value,
+      tags: this.assetProfileForm.controls['tags'].value,
       scraperConfiguration,
       symbolMapping
     };
@@ -253,6 +277,24 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
       });
   }
 
+  public onRemoveTag(aTag: Tag) {
+    this.assetProfileForm.controls['tags'].setValue(
+      this.assetProfileForm.controls['tags'].value.filter(({ id }) => {
+        return id !== aTag.id;
+      })
+    );
+  }
+
+  public onAddTag(event: MatAutocompleteSelectedEvent) {
+    this.assetProfileForm.controls['tags'].setValue([
+      ...(this.assetProfileForm.controls['tags'].value ?? []),
+      this.HoldingTags.find(({ id }) => {
+        return id === event.option.value;
+      })
+    ]);
+    this.tagInput.nativeElement.value = '';
+  }
+
   public ngOnDestroy() {
     this.unsubscribeSubject.next();
     this.unsubscribeSubject.complete();

apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html

@@ -210,6 +210,37 @@
         </mat-select>
       </mat-form-field>
     </div>
+    <div class="mt-3">
+      <mat-form-field appearance="outline" class="w-100">
+        <mat-label i18n>Tags</mat-label>
+        <mat-chip-grid #tagsChipList>
+          <mat-chip-row
+            *ngFor="let tag of assetProfileForm.controls['tags']?.value"
+            matChipRemove
+            [removable]="true"
+            (removed)="onRemoveTag(tag)"
+          >
+            {{ tag.name }}
+            <ion-icon class="ml-2" matPrefix name="close-outline"></ion-icon>
+          </mat-chip-row>
+          <input
+            #tagInput
+            name="close-outline"
+            [matAutocomplete]="autocompleteTags"
+            [matChipInputFor]="tagsChipList"
+            [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+          />
+        </mat-chip-grid>
+        <mat-autocomplete
+          #autocompleteTags="matAutocomplete"
+          (optionSelected)="onAddTag($event)"
+        >
+          <mat-option *ngFor="let tag of HoldingTags" [value]="tag.id">
+            {{ tag.name }}
+          </mat-option>
+        </mat-autocomplete>
+      </mat-form-field>
+    </div>
     <div class="d-flex my-3">
       <div class="w-50">
         <mat-checkbox

apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.module.ts

@@ -13,6 +13,8 @@ import { GfPortfolioProportionChartModule } from '@ghostfolio/ui/portfolio-propo
 import { GfValueModule } from '@ghostfolio/ui/value';
 
 import { AssetProfileDialog } from './asset-profile-dialog.component';
+import { MatAutocompleteModule } from '@angular/material/autocomplete';
+import { MatChipsModule } from '@angular/material/chips';
 
 @NgModule({
   declarations: [AssetProfileDialog],
@@ -21,6 +23,8 @@ import { AssetProfileDialog } from './asset-profile-dialog.component';
     FormsModule,
     GfAdminMarketDataDetailModule,
     GfPortfolioProportionChartModule,
+    MatAutocompleteModule,
+    MatChipsModule,
     GfValueModule,
     MatButtonModule,
     MatCheckboxModule,

apps/client/src/app/components/admin-tag/admin-tag.component.html

@@ -48,6 +48,20 @@
           </td>
         </ng-container>
 
+        <ng-container matColumnDef="holdings">
+          <th
+            *matHeaderCellDef
+            class="px-1"
+            mat-header-cell
+            mat-sort-header="holdingCount"
+          >
+            <ng-container i18n>Holdings</ng-container>
+          </th>
+          <td *matCellDef="let element" class="px-1" mat-cell>
+            {{ element.holdingCount }}
+          </td>
+        </ng-container>
+
         <ng-container matColumnDef="actions">
           <th
             *matHeaderCellDef

apps/client/src/app/components/admin-tag/admin-tag.component.ts

@@ -33,7 +33,7 @@ export class AdminTagComponent implements OnInit, OnDestroy {
 
   public dataSource: MatTableDataSource<Tag> = new MatTableDataSource();
   public deviceType: string;
-  public displayedColumns = ['name', 'activities', 'actions'];
+  public displayedColumns = ['name', 'activities', 'holdings', 'actions'];
   public tags: Tag[];
 
   private unsubscribeSubject = new Subject<void>();

apps/client/src/app/services/admin.service.ts

@@ -209,7 +209,8 @@ export class AdminService {
     name,
     scraperConfiguration,
     symbol,
-    symbolMapping
+    symbolMapping,
+    tags
   }: UniqueAsset & UpdateAssetProfileDto) {
     return this.http.patch<EnhancedSymbolProfile>(
       `/api/v1/admin/profile-data/${dataSource}/${symbol}`,
@@ -219,7 +220,8 @@ export class AdminService {
         comment,
         name,
         scraperConfiguration,
-        symbolMapping
+        symbolMapping,
+        tags
       }
     );
   }

libs/common/src/lib/interfaces/admin-market-data.interface.ts

@@ -1,4 +1,4 @@
-import { AssetClass, AssetSubClass, DataSource } from '@prisma/client';
+import { AssetClass, AssetSubClass, DataSource, Tag } from '@prisma/client';
 
 export interface AdminMarketData {
   count: number;
@@ -16,4 +16,5 @@ export interface AdminMarketDataItem {
   name: string;
   sectorsCount: number;
   symbol: string;
+  tags: Tag[];
 }

libs/common/src/lib/interfaces/enhanced-symbol-profile.interface.ts

@@ -1,4 +1,4 @@
-import { AssetClass, AssetSubClass, DataSource } from '@prisma/client';
+import { AssetClass, AssetSubClass, DataSource, Tag } from '@prisma/client';
 
 import { Country } from './country.interface';
 import { ScraperConfiguration } from './scraper-configuration.interface';
@@ -23,4 +23,5 @@ export interface EnhancedSymbolProfile {
   symbolMapping?: { [key: string]: string };
   updatedAt: Date;
   url?: string;
+  tags?: Tag[];
 }

prisma/migrations/20231106132716_added_tag_to_symbol_profile/migration.sql

@@ -0,0 +1,20 @@
+-- AlterEnum
+ALTER TYPE "Type" ADD VALUE 'STAKE';
+
+-- CreateTable
+CREATE TABLE "_SymbolProfileToTag" (
+    "A" TEXT NOT NULL,
+    "B" TEXT NOT NULL
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "_SymbolProfileToTag_AB_unique" ON "_SymbolProfileToTag"("A", "B");
+
+-- CreateIndex
+CREATE INDEX "_SymbolProfileToTag_B_index" ON "_SymbolProfileToTag"("B");
+
+-- AddForeignKey
+ALTER TABLE "_SymbolProfileToTag" ADD CONSTRAINT "_SymbolProfileToTag_A_fkey" FOREIGN KEY ("A") REFERENCES "SymbolProfile"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "_SymbolProfileToTag" ADD CONSTRAINT "_SymbolProfileToTag_B_fkey" FOREIGN KEY ("B") REFERENCES "Tag"("id") ON DELETE CASCADE ON UPDATE CASCADE;

prisma/schema.prisma

@@ -145,6 +145,7 @@ model SymbolProfile {
   symbolMapping          Json?
   url                    String?
   Order                  Order[]
+  tags                   Tag[]
   SymbolProfileOverrides SymbolProfileOverrides?
 
   @@unique([dataSource, symbol])
@@ -176,6 +177,7 @@ model Tag {
   id     String  @id @default(uuid())
   name   String  @unique
   orders Order[]
+  symbolProfile SymbolProfile[]
 }
 
 model User {