Merge branch 'application-mgt-new' into 'application-mgt-new'

Improve app retrieving method in publisher

See merge request entgra/carbon-device-mgt!141

components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/response/Review.java

@@ -32,12 +32,6 @@ public class Review {
     @ApiModelProperty(name = "content", value = "Review message.")
     private String content;
 
-    @ApiModelProperty(name = "rootParentId", value = "Root Parent id of the review")
-    private int rootParentId;
-
-    @ApiModelProperty(name = "immediateParentId", value = "Immediate Parent id of the review")
-    private int immediateParentId;
-
     @ApiModelProperty(name = "username", value = "Username odf the Review creator")
     private String username;
 
@@ -50,6 +44,12 @@ public class Review {
     @ApiModelProperty(name = "rating", value = "Rating value of the application release")
     private int rating;
 
+    @ApiModelProperty(name = "releaseUuid", value = "UUID of the review associated application")
+    private String releaseUuid;
+
+    @ApiModelProperty(name = "releaseVersion", value = "Version of the review associated application")
+    private String releaseVersion;
+
     @ApiModelProperty(name = "replies", value = "Replying reviews")
     private List<Review> replies;
 
@@ -69,22 +69,6 @@ public class Review {
         this.content = content;
     }
 
-    public int getRootParentId() {
-        return rootParentId;
-    }
-
-    public void setRootParentId(int rootParentId) {
-        this.rootParentId = rootParentId;
-    }
-
-    public int getImmediateParentId() {
-        return immediateParentId;
-    }
-
-    public void setImmediateParentId(int immediateParentId) {
-        this.immediateParentId = immediateParentId;
-    }
-
     public String getUsername() {
         return username;
     }
@@ -120,4 +104,12 @@ public class Review {
     public List<Review> getReplies() { return replies; }
 
     public void setReplies(List<Review> replies) { this.replies = replies; }
+
+    public String getReleaseUuid() { return releaseUuid; }
+
+    public void setReleaseUuid(String releaseUuid) { this.releaseUuid = releaseUuid; }
+
+    public String getReleaseVersion() { return releaseVersion; }
+
+    public void setReleaseVersion(String releaseVersion) { this.releaseVersion = releaseVersion; }
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ApplicationManager.java

@@ -122,7 +122,7 @@ public interface ApplicationManager {
      * @return the Application Release identified by the UUID
      * @throws ApplicationManagementException Application Management Exception.
      */
-    ApplicationRelease getApplicationReleaseByUUID(String uuid) throws ApplicationManagementException;
+    Application getApplicationByUuid(String uuid) throws ApplicationManagementException;
 
     /**
      * To get the ApplicationDTO for given application relase UUID.

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/ReviewDAO.java

@@ -90,7 +90,7 @@ import java.util.List;
      * @return {@link List}List of all reviews for the application release
      * @throws ReviewManagementDAOException      Review management DAO exception
      **/
-    List<ReviewDTO> getAllActiveReleaseReviews(int releaseId, PaginationRequest request, int tenantId)
+    List<ReviewDTO> getAllReleaseReviews(int releaseId, PaginationRequest request, int tenantId)
             throws ReviewManagementDAOException;
 
     List<ReviewDTO> getAllActiveAppReviews(List<Integer> releaseIds, PaginationRequest request, int tenantId)

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/review/ReviewDAOImpl.java

@@ -110,7 +110,7 @@ public class ReviewDAOImpl extends AbstractDAOImpl implements ReviewDAO {
         try {
             conn = this.getDBConnection();
             StringJoiner joiner = new StringJoiner(",",
-                    "SELECT rv.ID FROM AP_APP_REVIEW rv " + "WHERE rv.AP_APP_RELEASE_ID IN (",
+                    "SELECT rv.ID FROM AP_APP_REVIEW rv WHERE rv.AP_APP_RELEASE_ID IN (",
                     ") AND rv.USERNAME = ? AND rv.TENANT_ID = ?");
             appReleaseIds.stream().map(ignored -> "?").forEach(joiner::add);
             String query = joiner.toString();
@@ -118,7 +118,7 @@ public class ReviewDAOImpl extends AbstractDAOImpl implements ReviewDAO {
                 for (Integer deviceId : appReleaseIds) {
                     ps.setObject(index++, deviceId);
                 }
-                ps.setInt(index++, tenantId);
+                ps.setString(index++, username);
                 ps.setInt(index, tenantId);
                 try (ResultSet rs = ps.executeQuery()) {
                     return rs.next();
@@ -258,7 +258,7 @@ public class ReviewDAOImpl extends AbstractDAOImpl implements ReviewDAO {
 
 
     @Override
-    public List<ReviewDTO> getAllActiveReleaseReviews(int releaseId, PaginationRequest request, int tenantId)
+    public List<ReviewDTO> getAllReleaseReviews(int releaseId, PaginationRequest request, int tenantId)
             throws ReviewManagementDAOException {
 
         if (log.isDebugEnabled()) {
@@ -283,7 +283,6 @@ public class ReviewDAOImpl extends AbstractDAOImpl implements ReviewDAO {
                     + "AP_APP_REVIEW.AP_APP_RELEASE_ID = AP_APP_RELEASE.ID "
                     + "WHERE AP_APP_REVIEW.AP_APP_RELEASE_ID = ? AND "
                     + "AP_APP_REVIEW.ROOT_PARENT_ID = ? AND "
-                    + "AP_APP_REVIEW.ACTIVE_REVIEW = true AND "
                     + "AP_APP_REVIEW.TENANT_ID = ? "
                     + "LIMIT ? OFFSET ?";
             try (PreparedStatement statement = conn.prepareStatement(sql)) {

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

@@ -896,49 +896,50 @@ public class ApplicationManagerImpl implements ApplicationManager {
     }
 
     @Override
-    public ApplicationRelease getApplicationReleaseByUUID(String uuid) throws ApplicationManagementException{
+    public Application getApplicationByUuid(String uuid) throws ApplicationManagementException{
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
         String userName = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
-        boolean isVisibleAppRelease = false;
+        boolean isVisibleApp = false;
+
         try {
             ConnectionManagerUtil.openDBConnection();
-            ApplicationReleaseDTO applicationReleaseDTO = applicationReleaseDAO.getReleaseByUUID(uuid, tenantId);
-            if (applicationReleaseDTO == null) {
-                String msg = "Couldn't find an application release for the UUID: " + uuid;
+            ApplicationDTO applicationDTO = applicationDAO.getApplicationByUUID(uuid, tenantId);
+
+            if (applicationDTO == null) {
+                String msg = "Couldn't found an application for application release UUID: " + uuid;
                 log.error(msg);
                 throw new NotFoundException(msg);
             }
-            if (applicationReleaseDTO.getCurrentState().equals(lifecycleStateManager.getEndState())) {
-                return null;
-            }
 
-            List<String> unrestrictedRoles = this.visibilityDAO.getUnrestrictedRolesByUUID(uuid, tenantId);
+            List<String> tags = this.applicationDAO.getAppTags(applicationDTO.getId(), tenantId);
+            List<String> categories = this.applicationDAO.getAppCategories(applicationDTO.getId(), tenantId);
+            applicationDTO.setTags(tags);
+            applicationDTO.setAppCategories(categories);
+
+            List<String> unrestrictedRoles = this.visibilityDAO.getUnrestrictedRoles(applicationDTO.getId(), tenantId);
             if (!unrestrictedRoles.isEmpty()) {
                 if (hasUserRole(unrestrictedRoles, userName)) {
-                    isVisibleAppRelease = true;
+                    isVisibleApp = true;
                 }
             } else {
-                isVisibleAppRelease = true;
+                isVisibleApp = true;
             }
 
-            if (!isVisibleAppRelease) {
-                String msg = "You are trying to access release of visibility restricted application. You don't have "
-                        + "required roles to view this application,";
+            if (!isVisibleApp) {
+                String msg = "You are trying to access visibility restricted application. You don't have required "
+                        + "roles to view this application,";
                 log.error(msg);
                 throw new ForbiddenException(msg);
             }
-            return APIUtil.releaseDtoToRelease(applicationReleaseDTO);
-        } catch (LifecycleManagementException e) {
-            String msg = "Error occurred when getting the end state of the application lifecycle flow";
-            log.error(msg);
-            throw new ApplicationManagementException(msg, e);
+            return APIUtil.appDtoToAppResponse(applicationDTO);
         } catch (UserStoreException e) {
-            String msg = "User-store exception while getting application with the application release UUID: " + uuid;
+            String msg = "User-store exception occurred while getting application for application release UUID " + uuid;
             log.error(msg);
             throw new ApplicationManagementException(msg, e);
         } catch (ApplicationManagementDAOException e) {
-            //todo
-            throw new ApplicationManagementException("");
+            String msg = "Error occurred while getting dta which are related to Application.";
+            log.error(msg);
+            throw new ApplicationManagementException(msg);
         } finally {
             ConnectionManagerUtil.closeDBConnection();
         }

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

@@ -238,8 +238,8 @@ public class ReviewManagerImpl implements ReviewManager {
         Review review = new Review();
         review.setId(reviewDTO.getId());
         review.setContent(reviewDTO.getContent());
-        review.setRootParentId(reviewDTO.getRootParentId());
-        review.setImmediateParentId(reviewDTO.getImmediateParentId());
+        review.setReleaseUuid(reviewDTO.getReleaseUuid());
+        review.setReleaseVersion(reviewDTO.getReleaseVersion());
         review.setCreatedAt(reviewDTO.getCreatedAt());
         review.setModifiedAt(reviewDTO.getModifiedAt());
         review.setRating(reviewDTO.getRating());
@@ -353,7 +353,7 @@ public class ReviewManagerImpl implements ReviewManager {
                 log.error(msg);
                 throw new NotFoundException(msg);
             }
-            return getReviewTree(this.reviewDAO.getAllActiveReleaseReviews(releaseDTO.getId(), request, tenantId));
+            return getReviewTree(this.reviewDAO.getAllReleaseReviews(releaseDTO.getId(), request, tenantId));
         } catch (ReviewManagementDAOException e) {
             throw new ReviewManagementException("Error occured while getting all reviews for application uuid: " + uuid,
                     e);

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/application/mgt/publisher/api/services/ApplicationManagementPublisherAPI.java

@@ -217,7 +217,7 @@ public interface ApplicationManagementPublisherAPI {
                             message = "Internal Server Error. \n Error occurred while getting relevant application release.",
                             response = ErrorResponse.class)
             })
-    Response getApplicationRelease(
+    Response getApplicationByUUID(
             @ApiParam(
                     name = "uuid",
                     value = "application release uuid",

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/application/mgt/publisher/api/services/impl/ApplicationManagementPublisherAPIImpl.java

@@ -135,18 +135,17 @@ public class ApplicationManagementPublisherAPIImpl implements ApplicationManagem
     @GET
     @Consumes("application/json")
     @Path("/release/{uuid}")
-    public Response getApplicationRelease(
+    public Response getApplicationByUUID(
             @PathParam("uuid") String uuid) {
         ApplicationManager applicationManager = APIUtil.getApplicationManager();
         try {
-            //todo return application
-            ApplicationRelease applicationRelease = applicationManager.getApplicationReleaseByUUID(uuid);
-            if (applicationRelease == null){
+            Application application = applicationManager.getApplicationByUuid(uuid);
+            if (application == null){
                 String msg = "Application release is in the end state of the application lifecycle flow.";
                 log.error(msg);
                 return Response.status(Response.Status.OK).entity(msg).build();
             }
-            return Response.status(Response.Status.OK).entity(applicationRelease).build();
+            return Response.status(Response.Status.OK).entity(application).build();
         } catch (NotFoundException e) {
             String msg = "Application Release with UUID: " + uuid + " is not found";
             log.error(msg, e);