Modify app release deleting functionality

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java

@@ -101,6 +101,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -1442,22 +1443,29 @@ public class ApplicationManagerImpl implements ApplicationManager {
     }
 
     @Override
-    public void deleteApplicationRelease(String releaseUuid)
+    public void deleteApplicationRelease(String releaseUuid) throws ApplicationManagementException {
-            throws ApplicationManagementException {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
         ApplicationStorageManager applicationStorageManager = APIUtil.getApplicationStorageManager();
+        AtomicBoolean isDeletingApp = new AtomicBoolean(false);
         try {
             ConnectionManagerUtil.beginDBTransaction();
-            ApplicationReleaseDTO applicationReleaseDTO = this.applicationReleaseDAO
+            ApplicationDTO applicationDTO = this.applicationDAO.getApplication(releaseUuid, tenantId);
-                    .getReleaseByUUID(releaseUuid, tenantId);
+            if (applicationDTO == null) {
-            if (applicationReleaseDTO == null) {
+                String msg = "Couldn't find an application which has application release UUID: " + releaseUuid;
-                String msg = "Couldn't find an application release for application release UUID: " + releaseUuid;
                 log.error(msg);
                 throw new NotFoundException(msg);
             }
 
+            List<ApplicationReleaseDTO> applicationReleaseDTOS = applicationDTO.getApplicationReleaseDTOs();
+            if (applicationReleaseDTOS.size() == 1) {
+                isDeletingApp.set(true);
+            }
+
+            for (ApplicationReleaseDTO applicationReleaseDTO : applicationReleaseDTOS) {
+                if (releaseUuid.equals(applicationReleaseDTO.getUuid())) {
                     if (!lifecycleStateManager.isDeletableState(applicationReleaseDTO.getCurrentState())) {
-                String msg = "Application state is not in the deletable state. Therefore you are not permitted to "
+                        String msg =
+                                "Application state is not in the deletable state. Therefore you are not permitted to "
                                         + "delete the application release.";
                         log.error(msg);
                         throw new ForbiddenException(msg);
@@ -1465,8 +1473,8 @@ public class ApplicationManagerImpl implements ApplicationManager {
                     List<DeviceSubscriptionDTO> deviceSubscriptionDTOS = subscriptionDAO
                             .getDeviceSubscriptions(applicationReleaseDTO.getId(), tenantId);
                     if (!deviceSubscriptionDTOS.isEmpty()) {
-                String msg = "Application release which has UUID: " + applicationReleaseDTO.getUuid() +
+                        String msg = "Application release which has UUID: " + applicationReleaseDTO.getUuid()
-                        " either subscribed to device/s or it had subscribed to device/s. Therefore you are not "
+                                + " either subscribed to device/s or it had subscribed to device/s. Therefore you are not "
                                 + "permitted to delete the application release.";
                         log.error(msg);
                         throw new ForbiddenException(msg);
@@ -1475,6 +1483,14 @@ public class ApplicationManagerImpl implements ApplicationManager {
                             Collections.singletonList(applicationReleaseDTO.getAppHashValue()), tenantId);
                     lifecycleStateDAO.deleteLifecycleStateByReleaseId(applicationReleaseDTO.getId());
                     applicationReleaseDAO.deleteRelease(applicationReleaseDTO.getId());
+                    break;
+                }
+            }
+            if (isDeletingApp.get()) {
+                this.applicationDAO.deleteApplicationTags(applicationDTO.getId(), tenantId);
+                this.applicationDAO.deleteAppCategories(applicationDTO.getId(), tenantId);
+                this.applicationDAO.deleteApplication(applicationDTO.getId(), tenantId);
+            }
             ConnectionManagerUtil.commitDBTransaction();
         } catch (DBConnectionException e) {
             String msg = "Error occurred while observing the database connection to delete application release which "