refactor: Ensure fixed options are not overriden by user provided opt…

…ions
bloomreach · Aug 31, 2024 · fd60b03 · fd60b03
1 parent cc7a6af
commit fd60b03
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/src/features/autosuggest/autosuggest.ts b/src/features/autosuggest/autosuggest.ts
@@ -24,7 +24,12 @@ export async function autoSuggest(
 ): Promise<SuggestResponse> {
   const { suggestEndpoint, ...config } = configuration;
   const defaults: Partial<SuggestRequestParameters> = {};
-  const queryParams = Object.assign(config, FIXED_OPTIONS, defaults, options);
+  const queryParams: SuggestRequestParameters = Object.assign(
+    config,
+    defaults,
+    options,
+    FIXED_OPTIONS,
+  );
   const url = buildApiUrl(suggestEndpoint || SUGGEST_ENDPOINT_PROD, queryParams);
 
   logAPICall('autoSuggest', configuration, options, FIXED_OPTIONS, defaults, queryParams, url);

diff --git a/src/features/search/bestseller/bestseller.ts b/src/features/search/bestseller/bestseller.ts
@@ -30,7 +30,12 @@ export async function bestseller(
     'facet.version': '3.0',
   };
 
-  const queryParams = Object.assign(config, FIXED_OPTIONS, defaults, options);
+  const queryParams: SearchRequestParameters = Object.assign(
+    config,
+    defaults,
+    options,
+    FIXED_OPTIONS,
+  );
   const url = buildApiUrl(searchEndpoint || SEARCH_ENDPOINT_PROD, queryParams);
 
   logAPICall('bestseller', configuration, options, FIXED_OPTIONS, defaults, queryParams, url);

diff --git a/src/features/search/category-search/category-search.ts b/src/features/search/category-search/category-search.ts
@@ -32,7 +32,12 @@ export async function categorySearch(
     'facet.version': '3.0',
   };
 
-  const queryParams = Object.assign(config, FIXED_OPTIONS, defaults, options);
+  const queryParams: SearchRequestParameters = Object.assign(
+    config,
+    defaults,
+    options,
+    FIXED_OPTIONS,
+  );
   const url = buildApiUrl(searchEndpoint || SEARCH_ENDPOINT_PROD, queryParams);
 
   logAPICall('categorySearch', configuration, options, FIXED_OPTIONS, defaults, queryParams, url);

diff --git a/src/features/search/content-search/content-search.ts b/src/features/search/content-search/content-search.ts
@@ -38,7 +38,12 @@ export async function contentSearch(
     'facet.version': '3.0',
   };
 
-  const queryParams = Object.assign(config, FIXED_OPTIONS, defaults, options);
+  const queryParams: ContentSearchRequestParameters = Object.assign(
+    config,
+    defaults,
+    options,
+    FIXED_OPTIONS,
+  );
   const url = buildApiUrl(searchEndpoint || SEARCH_ENDPOINT_PROD, queryParams);
 
   logAPICall('contentSearch', configuration, options, FIXED_OPTIONS, defaults, queryParams, url);

diff --git a/src/features/search/product-search/product-search.ts b/src/features/search/product-search/product-search.ts
@@ -34,9 +34,9 @@ export async function productSearch(
 
   const queryParams: SearchRequestParameters = Object.assign(
     config,
-    FIXED_OPTIONS,
     defaults,
     options,
+    FIXED_OPTIONS,
   );
   const url = buildApiUrl(searchEndpoint || SEARCH_ENDPOINT_PROD, queryParams);