[CST-3088] changed buildHrefFromFindOptions in the way to use search params while building url

src/app/core/data/data.service.spec.ts

@@ -18,6 +18,7 @@ import { FindListOptions, PatchRequest } from './request.models';
 import { RequestService } from './request.service';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { RequestParam } from '../cache/models/request-param.model';
 
 const endpoint = 'https://rest.api/core';
 
@@ -150,7 +151,8 @@ describe('DataService', () => {
         currentPage: 6,
         elementsPerPage: 10,
         sort: sortOptions,
-        startsWith: 'ab'
+        startsWith: 'ab',
+
       };
       const expected = `${endpoint}?page=${options.currentPage - 1}&size=${options.elementsPerPage}` +
         `&sort=${sortOptions.field},${sortOptions.direction}&startsWith=${options.startsWith}`;
@@ -160,6 +162,26 @@ describe('DataService', () => {
       });
     });
 
+    it('should include all searchParams in href if any provided in options', () => {
+      options = { searchParams: [
+        new RequestParam('param1', 'test'),
+        new RequestParam('param2', 'test2'),
+        ] };
+      const expected = `${endpoint}?param1=test&param2=test2`;
+
+      (service as any).getFindAllHref(options).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should include linkPath in href if any provided', () => {
+      const expected = `${endpoint}/test/entries`;
+
+      (service as any).getFindAllHref({}, 'test/entries').subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
     it('should include single linksToFollow as embed', () => {
       const expected = `${endpoint}?embed=bundles`;
 

src/app/core/data/data.service.ts

@@ -86,13 +86,17 @@ export abstract class DataService<T extends CacheableObject> {
    *    Return an observable that emits created HREF
    * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  protected getFindAllHref(options: FindListOptions = {}, linkPath?: string, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<string> {
-    let result$: Observable<string>;
+  public getFindAllHref(options: FindListOptions = {}, linkPath?: string, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<string> {
+    let endpoint$: Observable<string>;
     const args = [];
 
-    result$ = this.getBrowseEndpoint(options, linkPath).pipe(distinctUntilChanged());
+    endpoint$ = this.getBrowseEndpoint(options).pipe(
+      filter((href: string) => isNotEmpty(href)),
+      map((href: string) => isNotEmpty(linkPath) ? `${href}/${linkPath}` : href),
+      distinctUntilChanged()
+    );
 
-    return result$.pipe(map((result: string) => this.buildHrefFromFindOptions(result, options, args, ...linksToFollow)));
+    return endpoint$.pipe(map((result: string) => this.buildHrefFromFindOptions(result, options, args, ...linksToFollow)));
   }
 
   /**
@@ -104,7 +108,7 @@ export abstract class DataService<T extends CacheableObject> {
    *    Return an observable that emits created HREF
    * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  protected getSearchByHref(searchMethod: string, options: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<string> {
+  public getSearchByHref(searchMethod: string, options: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<T>>): Observable<string> {
     let result$: Observable<string>;
     const args = [];
 
@@ -145,6 +149,11 @@ export abstract class DataService<T extends CacheableObject> {
     if (hasValue(options.startsWith)) {
       args = [...args, `startsWith=${options.startsWith}`];
     }
+    if (hasValue(options.searchParams)) {
+      options.searchParams.forEach((param: RequestParam) => {
+        args = [...args, `${param.fieldName}=${param.fieldValue}`];
+      })
+    }
     args = this.addEmbedParams(args, ...linksToFollow);
     if (isNotEmpty(args)) {
       return new URLCombiner(href, `?${args.join('&')}`).toString();