Transform value to corresponding dropdown item's key #758

Author: hupf

src/app/import/services/subscription-details/import-upload-subscription-details.service.spec.ts

@@ -117,6 +117,25 @@ describe("ImportUploadSubscriptionDetailsService", () => {
         total: 3,
       });
     });
+
+    it("sends `Key` of corresponding dropdown item as value", async () => {
+      const entry = buildEntry(
+        { eventId: 11, subscriptionDetailId: 1001, value: "Apple" },
+        { validationStatus: "valid", importStatus: null },
+      );
+      entry.data.subscriptionDetail!.DropdownItems = [
+        { Key: 10, Value: "Apple", IsActive: true },
+        { Key: 11, Value: "Pear", IsActive: true },
+      ];
+
+      await service.upload([entry]);
+
+      expect(subscriptionDetailsServiceMock.update).toHaveBeenCalledTimes(1);
+
+      const value =
+        subscriptionDetailsServiceMock.update.calls.mostRecent().args[1];
+      expect(value).toBe(10);
+    });
   });
 
   function buildEntry(

src/app/import/services/subscription-details/import-upload-subscription-details.service.ts

@@ -92,7 +92,9 @@ export class ImportUploadSubscriptionDetailsService {
   private persistEntry(
     entry: SubscriptionDetailImportEntry,
   ): Observable<SubscriptionDetailImportEntry> {
-    if (entry.entry.value === entry.data.subscriptionDetail?.Value) {
+    if (
+      this.getNormalizedValue(entry) == entry.data.subscriptionDetail?.Value
+    ) {
       // Ignore entry with an unchanged value
       this.markSuccessEntry(entry);
       return of(entry);
@@ -114,15 +116,14 @@ export class ImportUploadSubscriptionDetailsService {
     );
   }
 
-  private updateSubscriptionDetail({
-    entry,
-    data: { subscriptionDetail },
-  }: SubscriptionDetailImportEntry): Observable<void> {
-    if (!subscriptionDetail)
+  private updateSubscriptionDetail(
+    entry: SubscriptionDetailImportEntry,
+  ): Observable<void> {
+    if (!entry.data.subscriptionDetail)
       return throwError(
         () =>
           new Error(
-            `Subscription not present for entry: ${JSON.stringify(entry)}`,
+            `Subscription not present for entry: ${JSON.stringify(entry.entry)}`,
           ),
       );
 
@@ -136,15 +137,30 @@ export class ImportUploadSubscriptionDetailsService {
     // return of(undefined).pipe(delay(500 + (Math.random() - 0.5) * 300));
 
     return this.subscriptionDetailsService.update(
-      subscriptionDetail,
+      entry.data.subscriptionDetail,
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      entry.value as any,
+      this.getNormalizedValue(entry) as any,
       new HttpContext().set(RestErrorInterceptorOptions, {
         disableErrorHandling: true,
       }),
     );
   }
 
+  private getNormalizedValue({
+    entry,
+    data: { subscriptionDetail },
+  }: SubscriptionDetailImportEntry): unknown {
+    if (Array.isArray(subscriptionDetail?.DropdownItems)) {
+      const item = subscriptionDetail.DropdownItems.find(
+        (item) => item.Value === entry.value,
+      );
+      if (item) {
+        return item.Key;
+      }
+    }
+    return entry.value;
+  }
+
   private markSuccessEntry(entry: SubscriptionDetailImportEntry): void {
     entry.importStatus = "success";
     entry.importError = null;