@rolatech/angular-services 20.0.2-beta.3 → 20.0.3

package/fesm2022/rolatech-angular-services.mjs

@@ -5,7 +5,7 @@ import * as i1 from '@angular/material/button';
 import { MatButtonModule } from '@angular/material/button';
 import { switchMap, map, take, BehaviorSubject, Observable, Subject, firstValueFrom } from 'rxjs';
 import _ from 'lodash';
-import { HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { HttpClient, HttpParams, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { APP_CONFIG } from '@rolatech/angular-common';
 import { Location, isPlatformBrowser } from '@angular/common';
 import { Router, NavigationEnd, ActivatedRoute } from '@angular/router';
@@ -126,11 +126,6 @@ class BaseService {
             withCredentials: true,
         });
     }
-    search(word, withCredentials = true) {
-        return this.http.get(`${this.actionUrl}?search=${word}`, {
-            withCredentials,
-        });
-    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.0", ngImport: i0, type: BaseService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.2.0", ngImport: i0, type: BaseService, providedIn: 'root' });
 }
@@ -3009,9 +3004,43 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.2.0", ngImpor
 
 class PropertySearchService extends BaseService {
     init() {
-        this.endpoint = 'properties/search';
+        this.endpoint = 'properties';
         super.init();
     }
+    search1(options) {
+        return this.http.get(`${this.actionUrl}/search`, {
+            params: options,
+        });
+    }
+    search(rawParams) {
+        const params = this.stripUndefined(rawParams);
+        // Decide route: empty filter → DB list; else → Elasticsearch-backed search
+        const isEmpty = this.isEmptyFilter(params);
+        let httpParams = new HttpParams();
+        for (const [k, v] of Object.entries(params)) {
+            if (Array.isArray(v)) {
+                v.forEach((item) => (httpParams = httpParams.append(k, String(item))));
+            }
+            else {
+                httpParams = httpParams.set(k, String(v));
+            }
+        }
+        return isEmpty
+            ? this.http.get(`${this.actionUrl}`, { params: httpParams }) // DB list
+            : this.http.get(`${this.actionUrl}/search`, { params: httpParams }); // ES search
+    }
+    stripUndefined(obj) {
+        const out = {};
+        for (const [k, v] of Object.entries(obj)) {
+            if (v !== undefined && v !== null && !(Array.isArray(v) && v.length === 0) && v !== '') {
+                out[k] = v;
+            }
+        }
+        return out;
+    }
+    isEmptyFilter(params, ignoreKeys = ['page', 'limit', 'sort']) {
+        return Object.entries(params).every(([k, v]) => ignoreKeys.includes(k) || v === undefined || v === null || v === '' || (Array.isArray(v) && v.length === 0));
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.0", ngImport: i0, type: PropertySearchService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.2.0", ngImport: i0, type: PropertySearchService, providedIn: 'root' });
 }