Merge pull request #111 from souravbhowmik1999/issue_fix_new

search field api changes
tekdi · Dec 9, 2024 · eb1e2a0 · eb1e2a0
2 parents 9275b6b + 56aa04f
commit eb1e2a0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/adapters/postgres/fields-adapter.ts b/src/adapters/postgres/fields-adapter.ts
@@ -790,7 +790,8 @@ export class PostgresFieldsService implements IServicelocatorfields {
       const fieldKeys = this.fieldsRepository.metadata.columns.map(
         (column) => column.propertyName
       );
-      let whereClause = `"tenantId" = '${tenantId}'`;
+      let tenantCond = tenantId? `"tenantId" = ${tenantId}` :`"tenantId" IS NULL`
+      let whereClause = tenantCond;
       if (filters && Object.keys(filters).length > 0) {
         Object.entries(filters).forEach(([key, value]) => {
           if (fieldKeys.includes(key)) {
@@ -813,6 +814,7 @@ export class PostgresFieldsService implements IServicelocatorfields {
           }
         });
       }
+
       const fieldData = await this.getFieldData(whereClause);
       if (!fieldData.length) {
         return APIResponse.error(