rez_core 2.1.102 → 2.1.104

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.1.102",
+  "version": "2.1.104",
   "description": "",
   "author": "", 
   "private": false,

package/src/module/listmaster/repository/list-master-items.repository.ts

@@ -20,15 +20,40 @@ export class ListMasterItemsRepository {
     return this.repo.findOne({ where: { id } });
   }
 
-  async findItemsByType(type: string, organizationId?: number) {
+  async findItemsByType(type: string, sort_by, organizationId?: number) {
+    const listMasterItem = await this.repo.find({
+      where: {
+        id: sort_by,
+      },
+    });
+
+    let orderBy = {};
+
+    const listMasterSortBy = listMasterItem[0].value;
+
+    switch (listMasterSortBy) {
+      case 'az':
+        orderBy = { name: 'ASC' };
+        break;
+      case 'za':
+        orderBy = { name: 'DESC' };
+        break;
+      case 'custom':
+        orderBy = { sortindex: 'ASC' };
+        break;
+    }
+
     const items = await this.repo.find({
       where: {
         listtype: type,
         organization_id: organizationId,
         status: 'ACTIVE',
       },
-      order: { sortindex: 'ASC' },
+      order: {
+        ...orderBy,
+      },
     });
+
     return items.map((i) => ({ label: i.name, value: i.id }));
   }
 

package/src/module/listmaster/service/list-master.service.ts

@@ -73,6 +73,7 @@ export class ListMasterService {
       case 'master':
         return this.listItemsRepo.findItemsByType(
           type,
+          config.sort_by,
           loggedInUser?.organization_id,
         );
 
@@ -108,6 +109,7 @@ export class ListMasterService {
     const applyCommonFilters = (qb: any, status?: number) => {
       if (status) {
         qb.where(`${tableName}.status = :status`, { status });
+        qb.orWhere(`${tableName}.status = 'Active'`);
       }
 
       if (loggedInUser?.level_type && loggedInUser?.level_id) {