cleaned up

src/app/services/api.service.ts

@@ -2,7 +2,8 @@ import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { Observable, timer } from 'rxjs';
 import { map, retry } from 'rxjs/operators';
-import { Category, DeliveryOption, Item, Subcategory } from '../models';
+import { Category, DeliveryOption, Item } from '../models';
+import { normalizeDeliveryOption, normalizeOptionalNumber } from '../utils/normalization.utils';
 import { environment } from '../../environments/environment';
 
 export interface QrCreateRequest {
@@ -69,7 +70,7 @@ export class ApiService {
 
   private readonly retryConfig = {
     count: 2,
-    delay: (error: unknown, retryCount: number) => timer(Math.pow(2, retryCount) * 500)
+    delay: (_error: unknown, retryCount: number) => timer(Math.pow(2, retryCount) * 500)
   };
 
   constructor(private http: HttpClient) {}
@@ -86,63 +87,6 @@ export class ApiService {
     return c.startsWith('0x') ? '#' + c.slice(2) : c;
   }
 
-  private normalizeOptionalNumber(value: unknown): number | undefined {
-    if (value === null || value === undefined || value === '') {
-      return undefined;
-    }
-
-    const normalized = typeof value === 'number'
-      ? value
-      : Number(String(value).replace(',', '.'));
-
-    return Number.isFinite(normalized) ? normalized : undefined;
-  }
-
-  private normalizeOptionalString(value: unknown): string {
-    if (typeof value === 'string') {
-      return value.trim();
-    }
-
-    if (typeof value === 'number' || typeof value === 'bigint') {
-      return String(value);
-    }
-
-    return '';
-  }
-
-  private asRecord(value: unknown): Record<string, unknown> | null {
-    return value !== null && typeof value === 'object' && !Array.isArray(value)
-      ? value as Record<string, unknown>
-      : null;
-  }
-
-  private normalizeDeliveryOption(value: unknown): DeliveryOption | null {
-    const source = this.asRecord(value);
-    if (!source) {
-      return null;
-    }
-
-    const deliveryPlace = this.normalizeOptionalString(
-      source['deliveryPlace'] ?? source['delivery_place'] ?? source['deliveryplace']
-    );
-    const deliveryTime = this.normalizeOptionalString(
-      source['deliveryTime'] ?? source['delivery_time'] ?? source['deliverytime']
-    );
-    const deliveryPrice = this.normalizeOptionalNumber(
-      source['deliveryPrice'] ?? source['delivery_price'] ?? source['deliveryprice']
-    );
-
-    if (deliveryPrice === undefined && !deliveryPlace && !deliveryTime) {
-      return null;
-    }
-
-    return {
-      deliveryPrice: deliveryPrice ?? 0,
-      deliveryPlace,
-      deliveryTime,
-    };
-  }
-
   private normalizeDeliveryData(
     raw: any,
     legacyDeliveryPrice?: number
@@ -159,7 +103,7 @@ export class ApiService {
         ? [rawDelivery]
         : [];
     const options = deliveryCandidates
-      .map(candidate => this.normalizeDeliveryOption(candidate))
+      .map(candidate => normalizeDeliveryOption(candidate))
       .filter((option): option is DeliveryOption => option !== null);
 
     if (options.length > 0) {
@@ -197,7 +141,7 @@ export class ApiService {
   private normalizeItem(raw: any): Item {
     const { partnerID, ...rest } = raw;
     const item: Item = { ...rest };
-    let legacyDeliveryPrice = this.normalizeOptionalNumber(
+    let legacyDeliveryPrice = normalizeOptionalNumber(
       raw.deliveryPrice ?? raw.delivery_price ?? raw.deliveryprice
     );
 
@@ -210,7 +154,7 @@ export class ApiService {
         ...d,
         colour: this.normalizeColor(d.colour || d.color || ''),
         color: undefined,
-        deliveryPrice: this.normalizeOptionalNumber(
+        deliveryPrice: normalizeOptionalNumber(
           d.deliveryPrice ?? d.delivery_price ?? d.deliveryprice
         ),
       }));
@@ -219,7 +163,7 @@ export class ApiService {
       if (!item.colour) item.colour = this.normalizeColor(detail.colour || detail.color || '');
       if (!item.size) item.size = detail.size || '';
       if (legacyDeliveryPrice === undefined) {
-        legacyDeliveryPrice = this.normalizeOptionalNumber(
+        legacyDeliveryPrice = normalizeOptionalNumber(
           detail.deliveryPrice ?? detail.delivery_price ?? detail.deliveryprice
         );
       }