feat(searchLore): support baseUrl

xivapi · Apr 4, 2020 · 4807286 · 4807286
1 parent 9346bb2
commit 4807286
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/src/xivapi.service.ts b/src/xivapi.service.ts
@@ -47,13 +47,20 @@ export class XivapiService {
      * @param allLanguages should it include Text_*?
      * @param dataColumns Additional data you want to fetch.
      * @param page data page to get
+     * @param options Options of the request.
      */
     public searchLore(query: string, lang: string = 'en', allLanguages: boolean = false,
-                      dataColumns: string[] = [], page: number = 1): Observable<LoreSearchResult> {
-        let httpParams: HttpParams = new HttpParams()
-            .set('string', query)
-            .set('language', lang)
-            .set('page', page.toString());
+                      dataColumns: string[] = [], page: number = 1, options: XivapiOptions = {}): Observable<LoreSearchResult> {
+        if (!options.extraQueryParams) {
+            options.extraQueryParams = {};
+        }
+
+        Object.assign(options.extraQueryParams, {
+            string: query,
+            language: lang,
+            page: page.toString()
+        });
+
         if (dataColumns && dataColumns.length > 0) {
             const columns: string[] = [
                 'Context',
@@ -65,9 +72,10 @@ export class XivapiService {
             if (allLanguages) {
                 columns.push('Text_*');
             }
-            httpParams = httpParams.set('columns', columns.join(','));
+
+            options.extraQueryParams.columns = columns.join(',');
         }
-        return this.doGet<LoreSearchResult>(`${XivapiService.API_BASE_URL}/lore`, httpParams);
+        return this.request<LoreSearchResult>('/lore', options);
     }
 
     /**

diff --git a/test/xivapi.service.spec.ts b/test/xivapi.service.spec.ts
@@ -85,4 +85,16 @@ describe('Client tests', () => {
             .find(row => row.request.url === 'https://example.org/Item/12087');
         expect(req).not.toBeUndefined();
     });
+
+    it('Should search Lore with custom baseUrl', () => {
+        const service: XivapiService = new XivapiService(httpClient);
+        service.searchLore('legendary', 'en', false, [], 1, {
+            baseUrl: 'https://example.org',
+        }).subscribe();
+        const req: TestRequest = <TestRequest>httpMock.match({method: 'GET'})
+            .find(row => row.request.url === 'https://example.org/lore');
+        expect(req).not.toBeUndefined();
+        expect(req.request.params.has('string')).toBeTruthy();
+        expect(req.request.params.get('string')).toEqual('legendary');
+    });
 });