@almatar/branding 1.0.0-beta.3.6 → 1.0.0-beta.3.7

package/lib/lib/TenantModel/TypeORM/TenantRepository.d.ts

@@ -53,6 +53,7 @@ export declare class TenantRepository<T extends ObjectLiteral> extends Repositor
      * Apply brand filter to query builder
      * Handles both cases: brand as JSON array and brand as string
      * Uses $in equivalent for multiple brands from x-employee-brands
+     * When column is varchar/string, only IN clause is used (JSON_CONTAINS would fail on non-JSON).
      */
     private applyBrandFilter;
 }

package/lib/lib/TenantModel/TypeORM/TenantRepository.js

@@ -251,29 +251,33 @@ class TenantRepository extends typeorm_1.Repository {
      * Apply brand filter to query builder
      * Handles both cases: brand as JSON array and brand as string
      * Uses $in equivalent for multiple brands from x-employee-brands
+     * When column is varchar/string, only IN clause is used (JSON_CONTAINS would fail on non-JSON).
      */
     applyBrandFilter(query, tableAlias) {
         const brands = this.getBrandsFromContext();
         if (brands && brands.length > 0) {
-            // Handle both cases for multiple brands (x-employee-brands can have many):
-            // 1. Brand column is JSON array: Check if ANY of the user's brands exist in the entity's brand array
-            //    Using JSON_CONTAINS for each brand (equivalent to $in for arrays)
-            // 2. Brand column is string: Check if entity's brand is IN the user's brands array
-            //    Using IN clause (equivalent to $in for strings)
-            // For JSON array: Check if any user brand is contained in entity's brand array
-            const jsonArrayConditions = brands.map((brandItem, index) => {
-                return `JSON_CONTAINS(${tableAlias}.${this.brandColumn}, :brand${index})`;
-            }).join(' OR ');
-            // For string: Check if entity's brand is in user's brands (IN clause)
-            const stringInPlaceholders = brands.map((brandItem, index) => `:brandStr${index}`).join(', ');
-            // Combine both conditions: (JSON array match) OR (string IN match)
-            const brandConditions = `(${jsonArrayConditions}) OR (${tableAlias}.${this.brandColumn} IN (${stringInPlaceholders}))`;
+            const stringInPlaceholders = brands.map((_, index) => `:brandStr${index}`).join(', ');
             const brandParams = {};
             brands.forEach((brand, index) => {
-                brandParams[`brand${index}`] = JSON.stringify(brand);
                 brandParams[`brandStr${index}`] = brand;
             });
-            query.andWhere(`(${brandConditions})`, brandParams);
+            const brandColumnMeta = this.metadata.columns.find((c) => c.propertyName === this.brandColumn);
+            const isJsonColumn = brandColumnMeta && String(brandColumnMeta.type).toLowerCase() === 'json';
+            if (isJsonColumn) {
+                // JSON column: JSON_CONTAINS OR string IN (both for flexibility)
+                const jsonArrayConditions = brands.map((_, index) => {
+                    return `JSON_CONTAINS(${tableAlias}.${this.brandColumn}, :brand${index})`;
+                }).join(' OR ');
+                brands.forEach((brand, index) => {
+                    brandParams[`brand${index}`] = JSON.stringify(brand);
+                });
+                const brandConditions = `(${jsonArrayConditions}) OR (${tableAlias}.${this.brandColumn} IN (${stringInPlaceholders}))`;
+                query.andWhere(`(${brandConditions})`, brandParams);
+            }
+            else {
+                // String/varchar column: only IN clause (JSON_CONTAINS would fail)
+                query.andWhere(`${tableAlias}.${this.brandColumn} IN (${stringInPlaceholders})`, brandParams);
+            }
         }
         return query;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almatar/branding",
-  "version": "1.0.0-beta.3.6",
+  "version": "1.0.0-beta.3.7",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/readme.md

@@ -10,8 +10,7 @@ this package make microservice able to handle different brands
 import { AlmatarBranding } from '@almatar/branding';
 
 AlmatarBranding.setup({
-  dictionaryService: config.DICTIONARY_SERVICE,
-  debug: false  // set to false to disable all package console logs (default: true)
+  employeeAuthService: config.EMPLOYEE_AUTH_SERVICE
 });
 
 ```