Add new conditions and concatenation to FilterBuilder

[arvados-workbench2.git] / src / common / api / filter-builder.ts

diff --git a/src/common/api/filter-builder.ts b/src/common/api/filter-builder.ts
index 443c763913635c066ffb3f5426e424f997d68a09..1f2107f151cc9e374955ce8f0d40d8ab351c2843 100644 (file)
--- a/src/common/api/filter-builder.ts
+++ b/src/common/api/filter-builder.ts
@@ -2,34 +2,67 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-export enum FilterField {
-    UUID = "uuid",
-    OWNER_UUID = "owner_uuid"
-}
+import * as _ from "lodash";
+import { Resource } from "./common-resource-service";
 
-export default class FilterBuilder {
-    private filters = "";
+export default class FilterBuilder<T extends Resource = Resource> {
 
-    private addCondition(field: FilterField, cond: string, value?: string, prefix: string = "", postfix: string = "") {
-        if (value) {
-            this.filters += `["${field}","${cond}","${prefix}${value}${postfix}"]`;
-        }
-        return this;
+    static create<T extends Resource = Resource>(resourcePrefix = "") {
+        return new FilterBuilder<T>(resourcePrefix);
     }
 
-    public addEqual(field: FilterField, value?: string) {
+    constructor(
+        private resourcePrefix = "",
+        private filters = "") { }
+
+    public addEqual(field: keyof T, value?: string) {
         return this.addCondition(field, "=", value);
     }
 
-    public addLike(field: FilterField, value?: string) {
+    public addLike(field: keyof T, value?: string) {
         return this.addCondition(field, "like", value, "", "%");
     }
 
-    public addILike(field: FilterField, value?: string) {
+    public addILike(field: keyof T, value?: string) {
         return this.addCondition(field, "ilike", value, "", "%");
     }
 
-    public get() {
+    public addIsA(field: keyof T, value?: string | string[]) {
+        return this.addCondition(field, "is_a", value);
+    }
+
+    public addIn(field: keyof T, value?: string | string[]) {
+        return this.addCondition(field, "in", value);
+    }
+
+    public concat<O extends Resource>(filterBuilder: FilterBuilder<O>) {
+        return new FilterBuilder(this.resourcePrefix, this.filters + this.getSeparator() + filterBuilder.getFilters());
+    }
+
+    public getFilters() {
+        return this.filters;
+    }
+
+    public serialize() {
         return "[" + this.filters + "]";
     }
+
+    private addCondition(field: keyof T, cond: string, value?: string | string[], prefix: string = "", postfix: string = "") {
+        if (value) {
+            value = typeof value === "string"
+                ? `"${prefix}${value}${postfix}"`
+                : `["${value.join(`","`)}"]`;
+
+            const resourcePrefix = this.resourcePrefix
+                ? _.snakeCase(this.resourcePrefix) + "."
+                : "";
+
+            this.filters += `${this.getSeparator()}["${resourcePrefix}${_.snakeCase(field.toString())}","${cond}",${value}]`;
+        }
+        return this;
+    }
+
+    private getSeparator () {
+        return this.filters ? "," : "";
+    }
 }