From c07841bd9821a2ae0842dea6d3eebde1a5cd1769 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Wed, 17 Jan 2024 11:07:05 +0100
Subject: [PATCH] Clean up

---
 apps/api/src/app/admin/admin.service.ts       | 12 +++---
 .../symbol-profile/symbol-profile.service.ts  | 12 +++---
 .../asset-profile-dialog.component.ts         | 41 +++++++++----------
 apps/client/src/app/services/admin.service.ts |  6 +--
 4 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.ts
index 943923fcc..b77d77355 100644
--- a/apps/api/src/app/admin/admin.service.ts
+++ b/apps/api/src/app/admin/admin.service.ts
@@ -321,27 +321,27 @@ export class AdminService {
     assetClass,
     assetSubClass,
     comment,
+    countries,
     currency,
     dataSource,
     name,
     scraperConfiguration,
+    sectors,
     symbol,
-    symbolMapping,
-    countries,
-    sectors
+    symbolMapping
   }: Prisma.SymbolProfileUpdateInput & UniqueAsset) {
     await this.symbolProfileService.updateSymbolProfile({
       assetClass,
       assetSubClass,
       comment,
+      countries,
       currency,
       dataSource,
       name,
       scraperConfiguration,
+      sectors,
       symbol,
-      symbolMapping,
-      countries,
-      sectors
+      symbolMapping
     });
 
     const [symbolProfile] = await this.symbolProfileService.getSymbolProfiles([
diff --git a/apps/api/src/services/symbol-profile/symbol-profile.service.ts b/apps/api/src/services/symbol-profile/symbol-profile.service.ts
index 47c1fee40..1cab9b061 100644
--- a/apps/api/src/services/symbol-profile/symbol-profile.service.ts
+++ b/apps/api/src/services/symbol-profile/symbol-profile.service.ts
@@ -89,26 +89,26 @@ export class SymbolProfileService {
     assetClass,
     assetSubClass,
     comment,
+    countries,
     currency,
     dataSource,
     name,
     scraperConfiguration,
+    sectors,
     symbol,
-    symbolMapping,
-    countries,
-    sectors
+    symbolMapping
   }: Prisma.SymbolProfileUpdateInput & UniqueAsset) {
     return this.prismaService.symbolProfile.update({
       data: {
         assetClass,
         assetSubClass,
         comment,
+        countries,
         currency,
         name,
         scraperConfiguration,
-        symbolMapping,
-        countries,
-        sectors
+        sectors,
+        symbolMapping
       },
       where: { dataSource_symbol: { dataSource, symbol } }
     });
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 435e88e84..200e2a826 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
@@ -52,15 +52,15 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
     assetClass: new FormControl<AssetClass>(undefined),
     assetSubClass: new FormControl<AssetSubClass>(undefined),
     comment: '',
+    countries: '',
     currency: '',
     historicalData: this.formBuilder.group({
       csvString: ''
     }),
     name: ['', Validators.required],
     scraperConfiguration: '',
-    symbolMapping: '',
-    countries: '',
-    sectors: ''
+    sectors: '',
+    symbolMapping: ''
   });
   public assetProfileSubClass: string;
   public benchmarks: Partial<SymbolProfile>[];
@@ -143,6 +143,11 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
           assetClass: this.assetProfile.assetClass ?? null,
           assetSubClass: this.assetProfile.assetSubClass ?? null,
           comment: this.assetProfile?.comment ?? '',
+          countries: JSON.stringify(
+            assetProfile.countries.map(({ code, weight }) => {
+              return { code, weight };
+            }) ?? []
+          ),
           currency: this.assetProfile?.currency,
           historicalData: {
             csvString: AssetProfileDialog.HISTORICAL_DATA_TEMPLATE
@@ -151,13 +156,8 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
           scraperConfiguration: JSON.stringify(
             this.assetProfile?.scraperConfiguration ?? {}
           ),
-          symbolMapping: JSON.stringify(this.assetProfile?.symbolMapping ?? {}),
-          countries: JSON.stringify(
-            assetProfile.countries.map(({code, weight}) => {
-              return { code, weight};
-            }) ?? []
-          ),
-          sectors: JSON.stringify(assetProfile.sectors ?? [])
+          sectors: JSON.stringify(assetProfile.sectors ?? []),
+          symbolMapping: JSON.stringify(this.assetProfile?.symbolMapping ?? {})
         });
 
         this.assetProfileForm.markAsPristine();
@@ -253,39 +253,38 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
     let symbolMapping = {};
 
     try {
-      scraperConfiguration = JSON.parse(
-        this.assetProfileForm.controls['scraperConfiguration'].value
-      );
+      countries = JSON.parse(this.assetProfileForm.controls['countries'].value);
     } catch {}
 
     try {
-      symbolMapping = JSON.parse(
-        this.assetProfileForm.controls['symbolMapping'].value
+      scraperConfiguration = JSON.parse(
+        this.assetProfileForm.controls['scraperConfiguration'].value
       );
     } catch {}
 
     try {
-      countries = JSON.parse(this.assetProfileForm.controls['countries'].value);
+      sectors = JSON.parse(this.assetProfileForm.controls['sectors'].value);
     } catch {}
 
     try {
-      sectors = JSON.parse(this.assetProfileForm.controls['sectors'].value);
+      symbolMapping = JSON.parse(
+        this.assetProfileForm.controls['symbolMapping'].value
+      );
     } catch {}
 
     const assetProfileData: UpdateAssetProfileDto = {
+      countries,
       scraperConfiguration,
+      sectors,
       symbolMapping,
       assetClass: this.assetProfileForm.controls['assetClass'].value,
       assetSubClass: this.assetProfileForm.controls['assetSubClass'].value,
-      countries,
       comment: this.assetProfileForm.controls['comment'].value ?? null,
       currency: (<Currency>(
         (<unknown>this.assetProfileForm.controls['currency'].value)
       ))?.value,
-      name: this.assetProfileForm.controls['name'].value,
-      sectors
+      name: this.assetProfileForm.controls['name'].value
     };
-    console.log(assetProfileData);
 
     this.adminService
       .patchAssetProfile({
diff --git a/apps/client/src/app/services/admin.service.ts b/apps/client/src/app/services/admin.service.ts
index 22c1878e6..cb1799dbb 100644
--- a/apps/client/src/app/services/admin.service.ts
+++ b/apps/client/src/app/services/admin.service.ts
@@ -206,14 +206,14 @@ export class AdminService {
     assetClass,
     assetSubClass,
     comment,
+    countries,
     currency,
     dataSource,
     name,
     scraperConfiguration,
-    symbol,
-    symbolMapping,
     sectors,
-    countries
+    symbol,
+    symbolMapping
   }: UniqueAsset & UpdateAssetProfileDto) {
     return this.http.patch<EnhancedSymbolProfile>(
       `/api/v1/admin/profile-data/${dataSource}/${symbol}`,