From 1436332b32d641da6fa0cf946be9672ed8fbd5a4 Mon Sep 17 00:00:00 2001
From: osh <osh.silva@gmail.com>
Date: Tue, 21 Nov 2023 14:52:38 +0530
Subject: [PATCH] Fix app invisibility when retired

---
 .../mgt/core/application/mgt/common/Filter.java     | 13 +++++++++++++
 .../impl/application/GenericApplicationDAOImpl.java |  6 ++++++
 2 files changed, 19 insertions(+)

diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Filter.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Filter.java
index 97f9688b6df..272e9ba8a3c 100644
--- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Filter.java
+++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Filter.java
@@ -113,6 +113,11 @@ public class Filter {
      */
     private String favouredBy;
 
+    /**
+     * Checking if retired apps needs to be excluded
+     */
+    private boolean isNotRetired;
+
     public int getLimit() {
         return limit;
     }
@@ -208,4 +213,12 @@ public class Filter {
     public void setFavouredBy(String favouredBy) {
         this.favouredBy = favouredBy;
     }
+
+    public boolean isNotRetired() {
+        return isNotRetired;
+    }
+
+    public void setNotRetired(boolean notRetired) {
+        isNotRetired = notRetired;
+    }
 }
diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java
index 1e403e58486..09bea80fa54 100644
--- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java
+++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java
@@ -180,6 +180,9 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         if (deviceTypeId != -1) {
             sql += "AND AP_APP.DEVICE_TYPE_ID = ? ";
         }
+        if (filter.isNotRetired()) {
+            sql +=  "AND AP_APP.STATUS != 'RETIRED' ";
+        }
         sql += "GROUP BY AP_APP.ID ORDER BY AP_APP.ID ";
         if (StringUtils.isNotEmpty(filter.getSortBy())) {
             sql += filter.getSortBy() +" ";
@@ -308,6 +311,9 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         if (deviceTypeId != -1) {
             sql += " AND AP_APP.DEVICE_TYPE_ID = ?";
         }
+        if (filter.isNotRetired()) {
+            sql +=  " AND AP_APP.STATUS != 'RETIRED'";
+        }
 
         try {
             conn = this.getDBConnection();