add symbol-autocomplete-comp, change assetProfileForm coverage, refactor endpoint

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

@@ -338,11 +338,12 @@ export class AdminController {
     @Param('dataSource') dataSource: DataSource,
     @Param('symbol') symbol: string
   ): Promise<EnhancedSymbolProfile> {
-    return this.adminService.patchAssetProfileData({
+    return this.adminService.patchAssetProfileData(
-      ...assetProfileData,
+      { dataSource, symbol },
-      dataSource,
+      {
-      symbol
+        ...assetProfileData
-    });
+      }
+    );
   }
 
   @HasPermission(permissions.accessAdminControl)

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

@@ -463,7 +463,9 @@ export class AdminService {
     return { count, users };
   }
 
-  public async patchAssetProfileData({
+  public async patchAssetProfileData(
+    assetProfileIdentifier: AssetProfileIdentifier,
+    {
       assetClass,
       assetSubClass,
       comment,
@@ -477,7 +479,41 @@ export class AdminService {
       symbol,
       symbolMapping,
       url
-  }: AssetProfileIdentifier & Prisma.SymbolProfileUpdateInput) {
+    }: Prisma.SymbolProfileUpdateInput
+  ) {
+    if (
+      symbol &&
+      dataSource &&
+      assetProfileIdentifier.symbol !== symbol &&
+      assetProfileIdentifier.dataSource !== dataSource
+    ) {
+      await this.symbolProfileService.updateAssetProfileIdentifier(
+        assetProfileIdentifier,
+        {
+          dataSource: dataSource as DataSource, // TODO change
+          symbol: symbol as string
+        }
+      );
+
+      await this.marketDataService.updateAssetProfileIdentifier(
+        assetProfileIdentifier,
+        {
+          dataSource: dataSource as DataSource,
+          symbol: symbol as string
+        }
+      );
+
+      const [symbolProfile] = await this.symbolProfileService.getSymbolProfiles(
+        [
+          {
+            dataSource: dataSource as DataSource,
+            symbol: symbol as string
+          }
+        ]
+      );
+
+      return symbolProfile;
+    } else {
       const symbolProfileOverrides = {
         assetClass: assetClass as AssetClass,
         assetSubClass: assetSubClass as AssetSubClass,
@@ -485,8 +521,7 @@ export class AdminService {
         url: url as string
       };
 
-    const updatedSymbolProfile: AssetProfileIdentifier &
+      const updatedSymbolProfile: Prisma.SymbolProfileUpdateInput = {
-      Prisma.SymbolProfileUpdateInput = {
         comment,
         countries,
         currency,
@@ -508,17 +543,23 @@ export class AdminService {
             })
       };
 
-    await this.symbolProfileService.updateSymbolProfile(updatedSymbolProfile);
+      await this.symbolProfileService.updateSymbolProfile(
+        assetProfileIdentifier,
+        updatedSymbolProfile
+      );
 
-    const [symbolProfile] = await this.symbolProfileService.getSymbolProfiles([
+      const [symbolProfile] = await this.symbolProfileService.getSymbolProfiles(
+        [
           {
-        dataSource,
+            dataSource: dataSource as DataSource,
-        symbol
+            symbol: symbol as string
           }
-    ]);
+        ]
+      );
 
       return symbolProfile;
     }
+  }
 
   public async putSetting(key: string, value: string) {
     let response: Property;

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

@@ -1,6 +1,6 @@
 import { IsCurrencyCode } from '@ghostfolio/api/validators/is-currency-code';
 
-import { AssetClass, AssetSubClass, Prisma } from '@prisma/client';
+import { AssetClass, AssetSubClass, DataSource, Prisma } from '@prisma/client';
 import {
   IsArray,
   IsEnum,
@@ -35,6 +35,14 @@ export class UpdateAssetProfileDto {
   @IsOptional()
   name?: string;
 
+  @IsEnum(DataSource, { each: true })
+  @IsOptional()
+  dataSource?: DataSource;
+
+  @IsString()
+  @IsOptional()
+  symbol?: string;
+
   @IsObject()
   @IsOptional()
   scraperConfiguration?: Prisma.InputJsonObject;

apps/api/src/services/market-data/market-data.service.ts

@@ -110,6 +110,28 @@ export class MarketDataService {
     });
   }
 
+  public async updateAssetProfileIdentifier(
+    oldAssetProfileIdentifier: AssetProfileIdentifier,
+    newAssetProfileIdentifier: AssetProfileIdentifier
+  ) {
+    return this.prismaService.marketData.updateMany({
+      data: {
+        dataSource: newAssetProfileIdentifier.dataSource,
+        symbol: newAssetProfileIdentifier.symbol
+      },
+      where: {
+        AND: [
+          {
+            dataSource: oldAssetProfileIdentifier.dataSource
+          },
+          {
+            symbol: oldAssetProfileIdentifier.symbol
+          }
+        ]
+      }
+    });
+  }
+
   public async updateMarketData(params: {
     data: {
       state: MarketDataState;

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

@@ -126,23 +126,78 @@ export class SymbolProfileService {
       });
   }
 
-  public updateSymbolProfile({
+  public async getSymbolProfilesByUserSubscription({
+    withUserSubscription = false
+  }: {
+    withUserSubscription?: boolean;
+  }) {
+    return this.prismaService.symbolProfile.findMany({
+      include: {
+        Order: {
+          include: {
+            User: true
+          }
+        }
+      },
+      orderBy: [{ symbol: 'asc' }],
+      where: {
+        Order: withUserSubscription
+          ? {
+              some: {
+                User: {
+                  Subscription: { some: { expiresAt: { gt: new Date() } } }
+                }
+              }
+            }
+          : {
+              every: {
+                User: {
+                  Subscription: { none: { expiresAt: { gt: new Date() } } }
+                }
+              }
+            }
+      }
+    });
+  }
+
+  public updateAssetProfileIdentifier(
+    oldAssetProfileIdentifier: AssetProfileIdentifier,
+    newAssetProfileIdentifier: AssetProfileIdentifier
+  ) {
+    return this.prismaService.symbolProfile.update({
+      data: {
+        dataSource: newAssetProfileIdentifier.dataSource,
+        symbol: newAssetProfileIdentifier.symbol
+      },
+      where: {
+        dataSource_symbol: {
+          dataSource: oldAssetProfileIdentifier.dataSource,
+          symbol: oldAssetProfileIdentifier.symbol
+        }
+      }
+    });
+  }
+
+  public updateSymbolProfile(
+    { dataSource, symbol }: AssetProfileIdentifier,
+    {
       assetClass,
       assetSubClass,
       comment,
       countries,
       currency,
-    dataSource,
+      //dataSource,
       holdings,
       isActive,
       name,
       scraperConfiguration,
       sectors,
-    symbol,
+      //symbol,
       symbolMapping,
       SymbolProfileOverrides,
       url
-  }: AssetProfileIdentifier & Prisma.SymbolProfileUpdateInput) {
+    }: Prisma.SymbolProfileUpdateInput
+  ) {
     return this.prismaService.symbolProfile.update({
       data: {
         assetClass,

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

@@ -55,6 +55,7 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
     return { id: assetSubClass, label: translate(assetSubClass) };
   });
   public assetProfile: AdminMarketDataDetails['assetProfile'];
+  public assetProfileIdentifierForm;
   public assetProfileForm = this.formBuilder.group({
     assetClass: new FormControl<AssetClass>(undefined),
     assetSubClass: new FormControl<AssetSubClass>(undefined),
@@ -86,6 +87,7 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
   public ghostfolioScraperApiSymbolPrefix = ghostfolioScraperApiSymbolPrefix;
   public historicalDataItems: LineChartItem[];
   public isBenchmark = false;
+  public isEditSymbolMode = false;
   public marketDataItems: MarketData[] = [];
   public modeValues = [
     {
@@ -269,7 +271,23 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
       });
   }
 
-  public async onSubmit() {
+  public onSetEditSymboleMode() {
+    this.isEditSymbolMode = true;
+
+    this.assetProfileForm.disable();
+
+    this.changeDetectorRef.markForCheck();
+  }
+
+  public onCancelEditSymboleMode() {
+    this.isEditSymbolMode = false;
+
+    this.assetProfileForm.enable();
+
+    this.changeDetectorRef.markForCheck();
+  }
+
+  public async onSubmitAssetProfileForm() {
     let countries = [];
     let scraperConfiguration = {};
     let sectors = [];

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

@@ -1,9 +1,4 @@
-<form
+<div class="d-flex flex-column h-100">
-  class="d-flex flex-column h-100"
-  [formGroup]="assetProfileForm"
-  (keyup.enter)="assetProfileForm.valid && onSubmit()"
-  (ngSubmit)="onSubmit()"
->
   <div class="d-flex mb-3">
     <h1 class="flex-grow-1 m-0" mat-dialog-title>
       {{ assetProfile?.name ?? data.symbol }}
@@ -91,12 +86,34 @@
     />
 
     <div class="row">
+      @if (isEditSymbolMode) {
+        <div class="col-12 mb-3">
+          <mat-form-field appearance="outline">
+            <mat-label i18n>Name, symbol or ISIN</mat-label>
+            <gf-symbol-autocomplete
+              formControlName="searchSymbol"
+              [includeIndices]="true"
+            />
+          </mat-form-field>
+          <button class="mx-1 no-min-width px-2" mat-button type="button">
+            Apply
+          </button>
+          <button
+            class="mx-1 no-min-width px-2"
+            mat-button
+            type="button"
+            (click)="onCancelEditSymboleMode()"
+          >
+            Cancel
+          </button>
+        </div>
+      } @else {
         <div class="col-6 mb-3">
           <gf-value i18n size="medium" [value]="assetProfile?.symbol"
             >Symbol</gf-value
           >
         </div>
-      <div class="col-6 mb-3">
+        <div class="col-4 mb-3">
           <gf-value
             i18n
             size="medium"
@@ -106,6 +123,18 @@
             >Data Source</gf-value
           >
         </div>
+        <div class="col-1 mb-3">
+          <button
+            class="mx-1 no-min-width px-2"
+            mat-button
+            type="button"
+            [disabled]="assetProfileForm.dirty"
+            (click)="onSetEditSymboleMode()"
+          >
+            <ion-icon name="create-outline"></ion-icon>
+          </button>
+        </div>
+      }
       <div class="col-6 mb-3">
         <gf-value i18n size="medium" [value]="assetProfile?.currency"
           >Currency</gf-value
@@ -202,6 +231,11 @@
         }
       }
     </div>
+    <form
+      [formGroup]="assetProfileForm"
+      (keyup.enter)="assetProfileForm.valid && onSubmitAssetProfileForm()"
+      (ngSubmit)="onSubmitAssetProfileForm()"
+    >
       <div class="mt-3">
         <mat-form-field appearance="outline" class="w-100 without-hint">
           <mat-label i18n>Name</mat-label>
@@ -251,6 +285,7 @@
             color="primary"
             i18n
             [checked]="isBenchmark"
+            [disabled]="isEditSymbolMode"
             (change)="
               isBenchmark
                 ? onUnsetBenchmark({
@@ -296,7 +331,10 @@
               </mat-expansion-panel-header>
               <div formGroupName="scraperConfiguration">
                 <div class="mt-3">
-                <mat-form-field appearance="outline" class="w-100 without-hint">
+                  <mat-form-field
+                    appearance="outline"
+                    class="w-100 without-hint"
+                  >
                     <mat-label i18n>Default Market Price</mat-label>
                     <input
                       formControlName="defaultMarketPrice"
@@ -306,7 +344,10 @@
                   </mat-form-field>
                 </div>
                 <div class="mt-3">
-                <mat-form-field appearance="outline" class="w-100 without-hint">
+                  <mat-form-field
+                    appearance="outline"
+                    class="w-100 without-hint"
+                  >
                     <mat-label i18n>HTTP Request Headers</mat-label>
                     <textarea
                       cdkTextareaAutosize
@@ -318,13 +359,19 @@
                   </mat-form-field>
                 </div>
                 <div class="mt-3">
-                <mat-form-field appearance="outline" class="w-100 without-hint">
+                  <mat-form-field
+                    appearance="outline"
+                    class="w-100 without-hint"
+                  >
                     <mat-label i18n>Locale</mat-label>
                     <input formControlName="locale" matInput type="text" />
                   </mat-form-field>
                 </div>
                 <div class="mt-3">
-                <mat-form-field appearance="outline" class="w-100 without-hint">
+                  <mat-form-field
+                    appearance="outline"
+                    class="w-100 without-hint"
+                  >
                     <mat-label i18n>Mode</mat-label>
                     <mat-select formControlName="mode">
                       @for (modeValue of modeValues; track modeValue) {
@@ -336,7 +383,10 @@
                   </mat-form-field>
                 </div>
                 <div class="mt-3">
-                <mat-form-field appearance="outline" class="w-100 without-hint">
+                  <mat-form-field
+                    appearance="outline"
+                    class="w-100 without-hint"
+                  >
                     <mat-label>
                       <ng-container i18n>Selector</ng-container>*
                     </mat-label>
@@ -349,7 +399,10 @@
                   </mat-form-field>
                 </div>
                 <div class="mt-3">
-                <mat-form-field appearance="outline" class="w-100 without-hint">
+                  <mat-form-field
+                    appearance="outline"
+                    class="w-100 without-hint"
+                  >
                     <mat-label>
                       <ng-container i18n>Url</ng-container>*
                     </mat-label>
@@ -364,8 +417,8 @@
                     [disabled]="
                       assetProfileForm.controls.scraperConfiguration.controls
                         .selector.value === '' ||
-                    assetProfileForm.controls.scraperConfiguration.controls.url
+                      assetProfileForm.controls.scraperConfiguration.controls
-                      .value === ''
+                        .url.value === ''
                     "
                     (click)="onTestMarketData()"
                   >
@@ -426,6 +479,7 @@
           ></textarea>
         </mat-form-field>
       </div>
+    </form>
   </div>
 
   <div class="d-flex justify-content-end" mat-dialog-actions>
@@ -439,4 +493,4 @@
       <ng-container i18n>Save</ng-container>
     </button>
   </div>
-</form>
+</div>

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

@@ -4,6 +4,7 @@ import { GfCurrencySelectorComponent } from '@ghostfolio/ui/currency-selector';
 import { GfHistoricalMarketDataEditorComponent } from '@ghostfolio/ui/historical-market-data-editor';
 import { GfLineChartComponent } from '@ghostfolio/ui/line-chart';
 import { GfPortfolioProportionChartComponent } from '@ghostfolio/ui/portfolio-proportion-chart';
+import { GfSymbolAutocompleteComponent } from '@ghostfolio/ui/symbol-autocomplete';
 import { GfValueComponent } from '@ghostfolio/ui/value';
 
 import { TextFieldModule } from '@angular/cdk/text-field';
@@ -30,6 +31,7 @@ import { AssetProfileDialog } from './asset-profile-dialog.component';
     GfCurrencySelectorComponent,
     GfHistoricalMarketDataEditorComponent,
     GfLineChartComponent,
+    GfSymbolAutocompleteComponent,
     GfPortfolioProportionChartComponent,
     GfValueComponent,
     MatButtonModule,