@itwin/grouping-mapping-widget 0.3.5 → 0.4.0

package/lib/cjs/widget/components/QueryBuilder.d.ts

@@ -1,8 +1,11 @@
 import type { PresentationPropertyDataProvider } from "@itwin/presentation-components";
-import type { PropertiesField } from "@itwin/presentation-common";
+import type { Descriptor, PropertiesField } from "@itwin/presentation-common";
 import type { Primitives, PropertyRecord } from "@itwin/appui-abstract";
 import "core-js/features/string/virtual";
 export interface Query {
+    unions: QueryUnion[];
+}
+export interface QueryUnion {
     classes: QueryClass[];
 }
 export interface QueryClass {
@@ -15,6 +18,7 @@ export interface QueryProperty {
     name: string;
     value: Primitives.Value;
     needsQuote: boolean;
+    isCategory: boolean;
 }
 export declare class QueryBuilder {
     static readonly MULTI_ASPECT_PRIMARY_CLASS = "BisCore:ElementOwnsMultiAspects";
@@ -26,13 +30,15 @@ export declare class QueryBuilder {
      *
      */
     constructor(provider: PresentationPropertyDataProvider | undefined);
+    isCategory(descriptor: Descriptor, propertyField: PropertiesField): boolean;
     addProperty(prop: PropertyRecord): Promise<boolean>;
     private _needsQuote;
-    addRelatedProperty(propertyField: PropertiesField, propertyName: string, propertyValue: Primitives.Value, isAspect: boolean): void;
-    addPropertyToQuery(className: string, propertyName: string, propertyValue: Primitives.Value, isAspect: boolean, needsQuote: boolean, isRelational?: boolean): void;
+    addRelatedProperty(unionIndex: number, propertyField: PropertiesField, propertyName: string, propertyValue: Primitives.Value, isAspect: boolean): void;
+    addPropertyToQuery(unionIndex: number, className: string, propertyName: string, propertyValue: Primitives.Value, isAspect: boolean, needsQuote: boolean, isCategory: boolean, isRelational?: boolean): void;
     removeProperty(prop: PropertyRecord): Promise<void>;
-    removeRelatedProperty(propertyField: PropertiesField, propertyName: string): void;
-    removePropertyFromQuery(className: string, propertyName: string): void;
+    removeRelatedProperty(unionIndex: number, propertyField: PropertiesField, propertyName: string): void;
+    removePropertyFromQuery(unionIndex: number, className: string, propertyName: string): void;
+    categoryQuery(codeValue: string): string;
     buildQueryString(): string;
     private _isFloat;
 }

package/lib/cjs/widget/components/QueryBuilder.js

@@ -12,8 +12,19 @@ class QueryBuilder {
     constructor(provider) {
         this.dataProvider = provider;
     }
+    isCategory(descriptor, propertyField) {
+        var _a;
+        const classInfo = (_a = propertyField.properties[0].property
+            .navigationPropertyInfo) === null || _a === void 0 ? void 0 : _a.classInfo;
+        return (descriptor.selectClasses.find((c) => {
+            var _a;
+            return (_a = c.navigationPropertyClasses) === null || _a === void 0 ? void 0 : _a.find((npc) => npc.relationshipInfo.id === classInfo &&
+                npc.relationshipInfo.name ===
+                    "BisCore:GeometricElement3dIsInCategory");
+        }) !== undefined);
+    }
     async addProperty(prop) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         // TODO: only handle primitive properties now
         if (((_a = prop.value) === null || _a === void 0 ? void 0 : _a.valueFormat) !== appui_abstract_1.PropertyValueFormat.Primitive) {
             itwinui_react_1.toaster.warning("Only primitive types are supported for now.");
@@ -31,35 +42,42 @@ class QueryBuilder {
             String(prop.value.value).indexOf("'") >= 0) {
             prop.value.value = replaceAll(prop.value.value.toString(), "'", "''");
         }
-        const propertyField = (await ((_b = this.dataProvider) === null || _b === void 0 ? void 0 : _b.getFieldByPropertyRecord(prop)));
-        if (propertyField === undefined) {
+        // get descriptor
+        const descriptor = await ((_b = this.dataProvider) === null || _b === void 0 ? void 0 : _b.getContentDescriptor());
+        const propertyField = (await ((_c = this.dataProvider) === null || _c === void 0 ? void 0 : _c.getFieldByPropertyRecord(prop)));
+        if (!descriptor || !propertyField) {
             itwinui_react_1.toaster.negative("Error. Failed to fetch field for this property record.");
             return false;
         }
         // get the special cases
         const isNavigation = prop.property.typename.toLowerCase() === "navigation";
-        const isAspect = ((_c = propertyField.parent) === null || _c === void 0 ? void 0 : _c.pathToPrimaryClass.find((a) => {
+        const isCategory = isNavigation && this.isCategory(descriptor, propertyField);
+        const isAspect = ((_d = propertyField.parent) === null || _d === void 0 ? void 0 : _d.pathToPrimaryClass.find((a) => {
             var _a, _b;
             return ((_a = a.relationshipInfo) === null || _a === void 0 ? void 0 : _a.name) ===
                 QueryBuilder.UNIQUE_ASPECT_PRIMARY_CLASS ||
                 ((_b = a.relationshipInfo) === null || _b === void 0 ? void 0 : _b.name) === QueryBuilder.MULTI_ASPECT_PRIMARY_CLASS;
         })) !== undefined;
-        const className = propertyField.properties[0].property.classInfo.name.replace(":", ".");
-        const propertyName = isNavigation
-            ? `${propertyField.properties[0].property.name}.id`
-            : propertyField.properties[0].property.name;
-        const propertyValue = isNavigation
-            ? prop.value.value.id
-            : prop.value.value;
-        // console.log(prop);
-        // console.log(propertyField);
-        if (!isAspect &&
-            ((_d = propertyField.parent) === null || _d === void 0 ? void 0 : _d.pathToPrimaryClass) &&
-            ((_e = propertyField.parent) === null || _e === void 0 ? void 0 : _e.pathToPrimaryClass.length) > 0) {
-            this.addRelatedProperty(propertyField, propertyName, propertyValue, isAspect);
-        }
-        else {
-            this.addPropertyToQuery(className, propertyName, propertyValue, isAspect, this._needsQuote(propertyField), false);
+        for (let i = 0; i < propertyField.properties.length; i++) {
+            const className = propertyField.properties[i].property.classInfo.name.replace(":", ".");
+            const propertyName = isNavigation
+                ? isCategory
+                    ? `${propertyField.properties[i].property.name}.CodeValue`
+                    : `${propertyField.properties[i].property.name}.id`
+                : propertyField.properties[i].property.name;
+            const propertyValue = isNavigation
+                ? isCategory
+                    ? (_e = prop.value.displayValue) !== null && _e !== void 0 ? _e : ""
+                    : prop.value.value.id
+                : prop.value.value;
+            if (!isAspect &&
+                ((_f = propertyField.parent) === null || _f === void 0 ? void 0 : _f.pathToPrimaryClass) &&
+                ((_g = propertyField.parent) === null || _g === void 0 ? void 0 : _g.pathToPrimaryClass.length) > 0) {
+                this.addRelatedProperty(i, propertyField, propertyName, propertyValue, isAspect);
+            }
+            else {
+                this.addPropertyToQuery(i, className, propertyName, propertyValue, isAspect, this._needsQuote(propertyField), false);
+            }
         }
         return true;
     }
@@ -73,7 +91,7 @@ class QueryBuilder {
         }
         return false;
     }
-    addRelatedProperty(propertyField, propertyName, propertyValue, isAspect) {
+    addRelatedProperty(unionIndex, propertyField, propertyName, propertyValue, isAspect) {
         var _a, _b;
         const paths = [...((_b = (_a = propertyField.parent) === null || _a === void 0 ? void 0 : _a.pathToPrimaryClass) !== null && _b !== void 0 ? _b : [])];
         paths.reverse().forEach((path) => {
@@ -82,32 +100,56 @@ class QueryBuilder {
             const targetClassName = (_b = path.targetClassInfo) === null || _b === void 0 ? void 0 : _b.name.replace(":", ".");
             const relClassName = (_c = path.relationshipInfo) === null || _c === void 0 ? void 0 : _c.name.replace(":", ".");
             if (!path.isForwardRelationship) {
-                this.addPropertyToQuery(targetClassName, `ECInstanceId`, `${relClassName}.SourceECInstanceId`, isAspect, false, true);
-                this.addPropertyToQuery(relClassName, `TargetECInstanceId`, `${sourceClassName}.ECInstanceId`, isAspect, false, true);
+                this.addPropertyToQuery(unionIndex, targetClassName, `ECInstanceId`, `${relClassName}.SourceECInstanceId`, isAspect, false, false, true);
+                this.addPropertyToQuery(unionIndex, relClassName, `TargetECInstanceId`, `${sourceClassName}.ECInstanceId`, isAspect, false, false, true);
                 if (((_d = path.sourceClassInfo) === null || _d === void 0 ? void 0 : _d.name) ===
                     ((_e = propertyField.parent) === null || _e === void 0 ? void 0 : _e.contentClassInfo.name)) {
-                    this.addPropertyToQuery(sourceClassName, propertyName, propertyValue, isAspect, this._needsQuote(propertyField), true);
+                    this.addPropertyToQuery(unionIndex, sourceClassName, propertyName, propertyValue, isAspect, this._needsQuote(propertyField), false, true);
                 }
                 else {
-                    this.addPropertyToQuery(sourceClassName, `ECInstanceId`, `${relClassName}.TargetECInstanceId`, isAspect, false, true);
+                    this.addPropertyToQuery(unionIndex, sourceClassName, `ECInstanceId`, `${relClassName}.TargetECInstanceId`, isAspect, false, false, true);
                 }
             }
             else {
-                this.addPropertyToQuery(targetClassName, `ECInstanceId`, `${relClassName}.TargetECInstanceId`, isAspect, false, true);
-                this.addPropertyToQuery(relClassName, `SourceECInstanceId`, `${sourceClassName}.ECInstanceId`, isAspect, false, true);
+                this.addPropertyToQuery(unionIndex, targetClassName, `ECInstanceId`, `${relClassName}.TargetECInstanceId`, isAspect, false, false, true);
+                this.addPropertyToQuery(unionIndex, relClassName, `SourceECInstanceId`, `${sourceClassName}.ECInstanceId`, isAspect, false, false, true);
                 if (((_f = path.sourceClassInfo) === null || _f === void 0 ? void 0 : _f.name) ===
                     ((_g = propertyField.parent) === null || _g === void 0 ? void 0 : _g.contentClassInfo.name)) {
-                    this.addPropertyToQuery(sourceClassName, propertyName, propertyValue, isAspect, this._needsQuote(propertyField), true);
+                    this.addPropertyToQuery(unionIndex, sourceClassName, propertyName, propertyValue, isAspect, this._needsQuote(propertyField), false, true);
                 }
                 else {
-                    this.addPropertyToQuery(sourceClassName, `ECInstanceId`, `${relClassName}.SourceECInstanceId`, isAspect, false, true);
+                    this.addPropertyToQuery(unionIndex, sourceClassName, `ECInstanceId`, `${relClassName}.SourceECInstanceId`, isAspect, false, false, true);
                 }
             }
         });
     }
-    addPropertyToQuery(className, propertyName, propertyValue, isAspect, needsQuote, isRelational) {
-        if (this.query === undefined || this.query.classes.length === 0) {
+    addPropertyToQuery(unionIndex, className, propertyName, propertyValue, isAspect, needsQuote, isCategory, isRelational) {
+        if (this.query === undefined || this.query.unions.length === 0) {
             this.query = {
+                unions: [
+                    {
+                        classes: [
+                            {
+                                className,
+                                isAspect,
+                                isRelational,
+                                properties: [
+                                    {
+                                        name: propertyName,
+                                        value: propertyValue,
+                                        needsQuote,
+                                        isCategory,
+                                    },
+                                ],
+                            },
+                        ],
+                    },
+                ],
+            };
+            return;
+        }
+        if (this.query.unions.length <= unionIndex) {
+            this.query.unions.push({
                 classes: [
                     {
                         className,
@@ -118,14 +160,15 @@ class QueryBuilder {
                                 name: propertyName,
                                 value: propertyValue,
                                 needsQuote,
+                                isCategory,
                             },
                         ],
                     },
                 ],
-            };
+            });
             return;
         }
-        const foundClass = this.query.classes.find((c) => c.className === className);
+        const foundClass = this.query.unions[unionIndex].classes.find((c) => c.className === className);
         if (foundClass) {
             foundClass.isRelational = isRelational;
             if (!foundClass.properties.find((x) => x.name === propertyName)) {
@@ -133,11 +176,12 @@ class QueryBuilder {
                     name: propertyName,
                     value: propertyValue,
                     needsQuote,
+                    isCategory,
                 });
             }
         }
         else {
-            this.query.classes.push({
+            this.query.unions[unionIndex].classes.push({
                 className,
                 isRelational,
                 properties: [
@@ -145,6 +189,7 @@ class QueryBuilder {
                         name: propertyName,
                         value: propertyValue,
                         needsQuote,
+                        isCategory,
                     },
                 ],
                 isAspect,
@@ -152,35 +197,45 @@ class QueryBuilder {
         }
     }
     async removeProperty(prop) {
-        var _a, _b, _c, _d;
-        if (this.query === undefined || this.query.classes.length === 0) {
+        var _a, _b, _c, _d, _e;
+        if (this.query === undefined || this.query.unions.length === 0) {
+            return;
+        }
+        if (this.query.unions.length === 1 &&
+            this.query.unions[0].classes.length === 0) {
             return;
         }
-        const propertyField = (await ((_a = this.dataProvider) === null || _a === void 0 ? void 0 : _a.getFieldByPropertyRecord(prop)));
-        if (propertyField === undefined) {
+        const descriptor = await ((_a = this.dataProvider) === null || _a === void 0 ? void 0 : _a.getContentDescriptor());
+        const propertyField = (await ((_b = this.dataProvider) === null || _b === void 0 ? void 0 : _b.getFieldByPropertyRecord(prop)));
+        if (!descriptor || !propertyField) {
             return;
         }
-        const isAspect = ((_b = propertyField.parent) === null || _b === void 0 ? void 0 : _b.pathToPrimaryClass.find((a) => {
+        const isAspect = ((_c = propertyField.parent) === null || _c === void 0 ? void 0 : _c.pathToPrimaryClass.find((a) => {
             var _a, _b;
             return ((_a = a.relationshipInfo) === null || _a === void 0 ? void 0 : _a.name) ===
                 QueryBuilder.UNIQUE_ASPECT_PRIMARY_CLASS ||
                 ((_b = a.relationshipInfo) === null || _b === void 0 ? void 0 : _b.name) === QueryBuilder.MULTI_ASPECT_PRIMARY_CLASS;
         })) !== undefined;
         const isNavigation = prop.property.typename.toLowerCase() === "navigation";
-        const propertyName = isNavigation
-            ? `${propertyField.properties[0].property.name}.id`
-            : propertyField.properties[0].property.name;
-        const className = propertyField.properties[0].property.classInfo.name.replace(":", ".");
-        if (!isAspect &&
-            ((_c = propertyField.parent) === null || _c === void 0 ? void 0 : _c.pathToPrimaryClass) &&
-            ((_d = propertyField.parent) === null || _d === void 0 ? void 0 : _d.pathToPrimaryClass.length) > 0) {
-            this.removeRelatedProperty(propertyField, propertyName);
-        }
-        else {
-            this.removePropertyFromQuery(className, propertyName);
+        const isCategory = isNavigation && this.isCategory(descriptor, propertyField);
+        for (let i = 0; i < propertyField.properties.length; i++) {
+            const propertyName = isNavigation
+                ? isCategory
+                    ? `${propertyField.properties[i].property.name}.CodeValue`
+                    : `${propertyField.properties[i].property.name}.id`
+                : propertyField.properties[i].property.name;
+            const className = propertyField.properties[i].property.classInfo.name.replace(":", ".");
+            if (!isAspect &&
+                ((_d = propertyField.parent) === null || _d === void 0 ? void 0 : _d.pathToPrimaryClass) &&
+                ((_e = propertyField.parent) === null || _e === void 0 ? void 0 : _e.pathToPrimaryClass.length) > 0) {
+                this.removeRelatedProperty(i, propertyField, propertyName);
+            }
+            else {
+                this.removePropertyFromQuery(i, className, propertyName);
+            }
         }
     }
-    removeRelatedProperty(propertyField, propertyName) {
+    removeRelatedProperty(unionIndex, propertyField, propertyName) {
         var _a, _b;
         const paths = [...((_b = (_a = propertyField.parent) === null || _a === void 0 ? void 0 : _a.pathToPrimaryClass) !== null && _b !== void 0 ? _b : [])];
         paths.reverse().forEach((path) => {
@@ -189,32 +244,32 @@ class QueryBuilder {
             const targetClassName = (_b = path.targetClassInfo) === null || _b === void 0 ? void 0 : _b.name.replace(":", ".");
             const relClassName = (_c = path.relationshipInfo) === null || _c === void 0 ? void 0 : _c.name.replace(":", ".");
             if (!path.isForwardRelationship) {
-                this.removePropertyFromQuery(targetClassName, `ECInstanceId`);
-                this.removePropertyFromQuery(relClassName, `TargetECInstanceId`);
+                this.removePropertyFromQuery(unionIndex, targetClassName, `ECInstanceId`);
+                this.removePropertyFromQuery(unionIndex, relClassName, `TargetECInstanceId`);
                 if (((_d = path.sourceClassInfo) === null || _d === void 0 ? void 0 : _d.name) ===
                     ((_e = propertyField.parent) === null || _e === void 0 ? void 0 : _e.contentClassInfo.name)) {
-                    this.removePropertyFromQuery(sourceClassName, propertyName);
+                    this.removePropertyFromQuery(unionIndex, sourceClassName, propertyName);
                 }
                 else {
-                    this.removePropertyFromQuery(sourceClassName, `ECInstanceId`);
+                    this.removePropertyFromQuery(unionIndex, sourceClassName, `ECInstanceId`);
                 }
             }
             else {
-                this.removePropertyFromQuery(targetClassName, `ECInstanceId`);
-                this.removePropertyFromQuery(relClassName, `SourceECInstanceId`);
+                this.removePropertyFromQuery(unionIndex, targetClassName, `ECInstanceId`);
+                this.removePropertyFromQuery(unionIndex, relClassName, `SourceECInstanceId`);
                 if (((_f = path.sourceClassInfo) === null || _f === void 0 ? void 0 : _f.name) ===
                     ((_g = propertyField.parent) === null || _g === void 0 ? void 0 : _g.contentClassInfo.name)) {
-                    this.removePropertyFromQuery(sourceClassName, propertyName);
+                    this.removePropertyFromQuery(unionIndex, sourceClassName, propertyName);
                 }
                 else {
-                    this.removePropertyFromQuery(sourceClassName, `ECInstanceId`);
+                    this.removePropertyFromQuery(unionIndex, sourceClassName, `ECInstanceId`);
                 }
             }
         });
     }
-    removePropertyFromQuery(className, propertyName) {
+    removePropertyFromQuery(unionIndex, className, propertyName) {
         var _a, _b, _c, _d;
-        const foundClass = (_a = this.query) === null || _a === void 0 ? void 0 : _a.classes.find((c) => c.className === className);
+        const foundClass = (_a = this.query) === null || _a === void 0 ? void 0 : _a.unions[unionIndex].classes.find((c) => c.className === className);
         if (foundClass) {
             const foundPropertyIndex = foundClass.properties.findIndex((p) => p.name === propertyName);
             if (foundPropertyIndex > -1) {
@@ -222,123 +277,156 @@ class QueryBuilder {
             }
             if (foundClass.properties.length === 0) {
                 // remove the entire class if all properties are removed
-                const foundClassIndex = (_c = (_b = this.query) === null || _b === void 0 ? void 0 : _b.classes.findIndex((c) => c.className === className)) !== null && _c !== void 0 ? _c : -1;
+                const foundClassIndex = (_c = (_b = this.query) === null || _b === void 0 ? void 0 : _b.unions[unionIndex].classes.findIndex((c) => c.className === className)) !== null && _c !== void 0 ? _c : -1;
                 if (foundClassIndex > -1) {
-                    (_d = this.query) === null || _d === void 0 ? void 0 : _d.classes.splice(foundClassIndex, 1);
+                    (_d = this.query) === null || _d === void 0 ? void 0 : _d.unions[unionIndex].classes.splice(foundClassIndex, 1);
                 }
             }
         }
     }
+    categoryQuery(codeValue) {
+        return ` JOIN bis.Category ON bis.Category.ECInstanceId = bis.GeometricElement3d.category.id AND ((bis.Category.CodeValue='${codeValue}') OR (bis.Category.UserLabel='${codeValue}'))`;
+    }
     buildQueryString() {
-        if (this.query === undefined || this.query.classes.length === 0) {
+        if (this.query === undefined ||
+            this.query.unions.length === 0 ||
+            this.query.unions[0].classes.length === 0) {
             return "";
         }
-        const baseClass = this.query.classes[0];
-        const baseClassName = baseClass.className;
-        const baseIdName = baseClass.isAspect
-            ? `${baseClassName}.Element.id`
-            : `${baseClassName}.ECInstanceId`;
-        let queryString = `SELECT ${baseIdName}${baseClass.isAspect ? " ECInstanceId" : ""} FROM ${baseClassName}`;
-        if (this.query.classes.length > 1) {
-            for (let i = 1; i < this.query.classes.length; i++) {
-                const joinClass = this.query.classes[i];
-                const joinClassName = joinClass.className;
-                const joinIdName = joinClass.isAspect
-                    ? `${joinClassName}.Element.id`
-                    : `${joinClassName}.ECInstanceId`;
-                if (joinClass.isRelational) {
-                    queryString += ` JOIN ${joinClassName}`;
-                    if (joinClass.properties.length > 0) {
-                        if (joinClass.properties[0].needsQuote) {
-                            queryString += ` ON ${joinClassName}.${joinClass.properties[0].name}='${joinClass.properties[0].value}'`;
-                        }
-                        else {
-                            if (this._isFloat(joinClass.properties[0].value)) {
-                                queryString += ` ON ROUND(${joinClassName}.${joinClass.properties[0].name}, `;
-                                queryString += `${QueryBuilder.DEFAULT_DOUBLE_PRECISION})=`;
-                                queryString += `${Number(joinClass.properties[0].value).toFixed(QueryBuilder.DEFAULT_DOUBLE_PRECISION)}`;
+        let unionQuery = "";
+        for (const union of this.query.unions) {
+            const baseClass = union.classes[0];
+            const baseClassName = baseClass.className;
+            const baseIdName = baseClass.isAspect
+                ? `${baseClassName}.Element.id`
+                : `${baseClassName}.ECInstanceId`;
+            let queryString = `SELECT ${baseIdName}${baseClass.isAspect ? " ECInstanceId" : ""} FROM ${baseClassName}`;
+            if (union.classes.length > 1) {
+                for (let i = 1; i < union.classes.length; i++) {
+                    const joinClass = union.classes[i];
+                    const joinClassName = joinClass.className;
+                    const joinIdName = joinClass.isAspect
+                        ? `${joinClassName}.Element.id`
+                        : `${joinClassName}.ECInstanceId`;
+                    if (joinClass.isRelational) {
+                        queryString += ` JOIN ${joinClassName}`;
+                        if (joinClass.properties.length > 0) {
+                            if (joinClass.properties[0].isCategory) {
+                                queryString += this.categoryQuery(joinClass.properties[0].value.toString());
                             }
                             else {
-                                queryString += ` ON ${joinClassName}.${joinClass.properties[0].name}=${joinClass.properties[0].value}`;
+                                if (joinClass.properties[0].needsQuote) {
+                                    queryString += ` ON ${joinClassName}.${joinClass.properties[0].name}='${joinClass.properties[0].value}'`;
+                                }
+                                else {
+                                    if (this._isFloat(joinClass.properties[0].value)) {
+                                        queryString += ` ON ROUND(${joinClassName}.${joinClass.properties[0].name}, `;
+                                        queryString += `${QueryBuilder.DEFAULT_DOUBLE_PRECISION})=`;
+                                        queryString += `${Number(joinClass.properties[0].value).toFixed(QueryBuilder.DEFAULT_DOUBLE_PRECISION)}`;
+                                    }
+                                    else {
+                                        queryString += ` ON ${joinClassName}.${joinClass.properties[0].name}=${joinClass.properties[0].value}`;
+                                    }
+                                }
                             }
                         }
-                    }
-                    // when base is regular property, link base to first joined relational property
-                    if (!baseClass.isRelational && i === 1) {
-                        queryString += ` AND ${joinIdName} = ${baseIdName}`;
-                    }
-                    for (const property of joinClass.properties) {
-                        if (property.needsQuote) {
-                            queryString += ` AND ${joinClassName}.${property.name}='${property.value}'`;
+                        // when base is regular property, link base to first joined relational property
+                        if (!baseClass.isRelational && i === 1) {
+                            queryString += ` AND ${joinIdName} = ${baseIdName}`;
                         }
-                        else {
-                            if (this._isFloat(property.value)) {
-                                queryString += ` AND ROUND(${joinClassName}.${property.name}, `;
-                                queryString += `${QueryBuilder.DEFAULT_DOUBLE_PRECISION})=`;
-                                queryString += `${Number(property.value).toFixed(QueryBuilder.DEFAULT_DOUBLE_PRECISION)}`;
+                        for (const property of joinClass.properties) {
+                            if (property.isCategory) {
+                                queryString += this.categoryQuery(property.value.toString());
                             }
                             else {
-                                queryString += ` AND ${joinClassName}.${property.name}=${property.value}`;
+                                if (property.needsQuote) {
+                                    queryString += ` AND ${joinClassName}.${property.name}='${property.value}'`;
+                                }
+                                else {
+                                    if (this._isFloat(property.value)) {
+                                        queryString += ` AND ROUND(${joinClassName}.${property.name}, `;
+                                        queryString += `${QueryBuilder.DEFAULT_DOUBLE_PRECISION})=`;
+                                        queryString += `${Number(property.value).toFixed(QueryBuilder.DEFAULT_DOUBLE_PRECISION)}`;
+                                    }
+                                    else {
+                                        queryString += ` AND ${joinClassName}.${property.name}=${property.value}`;
+                                    }
+                                }
                             }
                         }
                     }
-                }
-                else {
-                    queryString += ` JOIN ${joinClassName} ON ${joinIdName} = ${baseIdName}`;
-                    for (const property of joinClass.properties) {
-                        if (property.needsQuote) {
-                            queryString += ` AND ${joinClassName}.${property.name}='${property.value}'`;
-                        }
-                        else {
-                            if (this._isFloat(property.value)) {
-                                queryString += ` AND ROUND(${joinClassName}.${property.name}, `;
-                                queryString += `${QueryBuilder.DEFAULT_DOUBLE_PRECISION})=`;
-                                queryString += `${Number(property.value).toFixed(QueryBuilder.DEFAULT_DOUBLE_PRECISION)}`;
+                    else {
+                        queryString += ` JOIN ${joinClassName} ON ${joinIdName} = ${baseIdName}`;
+                        for (const property of joinClass.properties) {
+                            if (property.isCategory) {
+                                queryString += this.categoryQuery(property.value.toString());
                             }
                             else {
-                                queryString += ` AND ${joinClassName}.${property.name}=${property.value}`;
+                                if (property.needsQuote) {
+                                    queryString += ` AND ${joinClassName}.${property.name}='${property.value}'`;
+                                }
+                                else {
+                                    if (this._isFloat(property.value)) {
+                                        queryString += ` AND ROUND(${joinClassName}.${property.name}, `;
+                                        queryString += `${QueryBuilder.DEFAULT_DOUBLE_PRECISION})=`;
+                                        queryString += `${Number(property.value).toFixed(QueryBuilder.DEFAULT_DOUBLE_PRECISION)}`;
+                                    }
+                                    else {
+                                        queryString += ` AND ${joinClassName}.${property.name}=${property.value}`;
+                                    }
+                                }
                             }
                         }
                     }
                 }
             }
-        }
-        const properties = baseClass.properties;
-        if (properties.length > 0) {
-            if (properties[0].needsQuote) {
-                queryString += ` WHERE ${baseClassName}.${properties[0].name}='${properties[0].value}'`;
-            }
-            else {
-                if (this._isFloat(properties[0].value)) {
-                    queryString += ` WHERE ROUND(${baseClassName}.${properties[0].name}, `;
-                    queryString += `${QueryBuilder.DEFAULT_DOUBLE_PRECISION})=`;
-                    queryString += `${Number(properties[0].value).toFixed(QueryBuilder.DEFAULT_DOUBLE_PRECISION)}`;
+            const properties = baseClass.properties;
+            if (properties.length > 0) {
+                if (properties[0].isCategory) {
+                    queryString += this.categoryQuery(properties[0].value.toString());
                 }
                 else {
-                    queryString += ` WHERE ${baseClassName}.${properties[0].name}=${properties[0].value}`;
-                }
-            }
-            if (properties.length > 1) {
-                for (let i = 1; i < properties.length; i++) {
-                    if (properties[i].needsQuote) {
-                        queryString += ` AND ${baseClassName}.${properties[i].name}='${properties[i].value}'`;
+                    if (properties[0].needsQuote) {
+                        queryString += ` WHERE ${baseClassName}.${properties[0].name}='${properties[0].value}'`;
                     }
                     else {
-                        if (this._isFloat(properties[i].value)) {
-                            queryString += ` AND ROUND(${baseClassName}.${properties[i].name}, `;
+                        if (this._isFloat(properties[0].value)) {
+                            queryString += ` WHERE ROUND(${baseClassName}.${properties[0].name}, `;
                             queryString += `${QueryBuilder.DEFAULT_DOUBLE_PRECISION})=`;
-                            queryString += `${Number(properties[i].value).toFixed(QueryBuilder.DEFAULT_DOUBLE_PRECISION)}`;
+                            queryString += `${Number(properties[0].value).toFixed(QueryBuilder.DEFAULT_DOUBLE_PRECISION)}`;
                         }
                         else {
-                            queryString += ` AND ${baseClassName}.${properties[i].name}=${properties[i].value}`;
+                            queryString += ` WHERE ${baseClassName}.${properties[0].name}=${properties[0].value}`;
+                        }
+                    }
+                }
+                if (properties.length > 1) {
+                    for (let i = 1; i < properties.length; i++) {
+                        if (properties[i].isCategory) {
+                            queryString += this.categoryQuery(properties[i].value.toString());
+                        }
+                        else {
+                            if (properties[i].needsQuote) {
+                                queryString += ` AND ${baseClassName}.${properties[i].name}='${properties[i].value}'`;
+                            }
+                            else {
+                                if (this._isFloat(properties[i].value)) {
+                                    queryString += ` AND ROUND(${baseClassName}.${properties[i].name}, `;
+                                    queryString += `${QueryBuilder.DEFAULT_DOUBLE_PRECISION})=`;
+                                    queryString += `${Number(properties[i].value).toFixed(QueryBuilder.DEFAULT_DOUBLE_PRECISION)}`;
+                                }
+                                else {
+                                    queryString += ` AND ${baseClassName}.${properties[i].name}=${properties[i].value}`;
+                                }
+                            }
                         }
                     }
                 }
             }
+            unionQuery += `${queryString} UNION `;
         }
-        // console.log(queryString);
-        // console.log(this.query);
-        return queryString;
+        unionQuery = unionQuery.slice(0, unionQuery.length - 7);
+        return unionQuery;
     }
     _isFloat(n) {
         return Number(n) === n && n % 1 !== 0;