This is an automated email from the ASF dual-hosted git repository. dyankiv pushed a commit to branch DATALAB-2995 in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit a6302166efc9ba1eeb6bec9e51c592089662678f Author: Denys Yankiv <[email protected]> AuthorDate: Fri Sep 9 12:11:59 2022 +0300 refactoring --- .../resources/ImageExploratoryResource.java | 8 ++-- .../service/ImageExploratoryService.java | 4 +- .../service/impl/ImageExploratoryServiceImpl.java | 55 ++++------------------ 3 files changed, 15 insertions(+), 52 deletions(-) diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ImageExploratoryResource.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ImageExploratoryResource.java index f0dedb41c..1080a1c26 100644 --- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ImageExploratoryResource.java +++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ImageExploratoryResource.java @@ -97,7 +97,7 @@ public class ImageExploratoryResource { @Path("user") public Response getImagesForUser(@Auth UserInfo ui) { log.debug("Getting images for user {}", ui.getName()); - final ImagesPageInfo images = imageExploratoryService.getImagesOfUser(ui); + final ImagesPageInfo images = imageExploratoryService.getImagesOfUser(ui,null); return Response.ok(images).build(); } @@ -105,7 +105,7 @@ public class ImageExploratoryResource { @Path("user") public Response getImagesForUser(@Auth UserInfo ui, @Valid @NotNull ImageFilter imageFilter) { log.debug("Getting images for user {} with filter {}", ui.getName(), imageFilter); - final ImagesPageInfo images = imageExploratoryService.getImagesOfUserWithFilter(ui, imageFilter); + final ImagesPageInfo images = imageExploratoryService.getImagesOfUser(ui, imageFilter); return Response.ok(images).build(); } @@ -125,7 +125,7 @@ public class ImageExploratoryResource { public Response shareImage(@Auth UserInfo ui, @Valid @NotNull ImageShareDTO dto) { log.debug("Sharing user image {} with project {} groups", dto.getImageName(), dto.getProjectName()); imageExploratoryService.shareImage(ui, dto.getImageName(), dto.getProjectName(), dto.getEndpoint(), dto.getSharedWith()); - return Response.ok(imageExploratoryService.getImagesOfUser(ui)).build(); + return Response.ok(imageExploratoryService.getImagesOfUser(ui,null)).build(); } @RolesAllowed("/api/image/terminate") @@ -137,7 +137,7 @@ public class ImageExploratoryResource { @PathParam("endpoint") String endpoint) { log.debug("Terminating image {} of user {} groups", imageName, ui.getName()); imageExploratoryService.terminateImage(ui,projectName,endpoint,imageName); - return Response.ok(imageExploratoryService.getImagesOfUser(ui)).build(); + return Response.ok(imageExploratoryService.getImagesOfUser(ui,null)).build(); } @GET diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/ImageExploratoryService.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/ImageExploratoryService.java index 8a01f2daf..f2fd52b4e 100644 --- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/ImageExploratoryService.java +++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/ImageExploratoryService.java @@ -42,9 +42,7 @@ public interface ImageExploratoryService { ImageInfoRecord getImage(String user, String name, String project, String endpoint); List<ImageInfoRecord> getImagesForProject(String project); - - ImagesPageInfo getImagesOfUser(UserInfo user); - ImagesPageInfo getImagesOfUserWithFilter(UserInfo user, ImageFilter imageFilter); + ImagesPageInfo getImagesOfUser(UserInfo user, ImageFilter imageFilter); void shareImage(UserInfo user, String imageName, String projectName, String endpoint, Set<SharedWithDTO> sharedWithDTOS); diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java index 9c8466a01..ffdf3bde9 100644 --- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java @@ -205,60 +205,25 @@ public class ImageExploratoryServiceImpl implements ImageExploratoryService { } @Override - public ImagesPageInfo getImagesOfUser(UserInfo user) { + public ImagesPageInfo getImagesOfUser(UserInfo user, ImageFilter imageFilter) { log.debug("Loading list of images for user {}", user.getName()); - List<ImageInfoRecord> images = imageExploratoryDao.getImagesOfUser(user.getName()); images.forEach(img -> img.setSharingStatus(getImageSharingStatus(user.getName(),img))); images.addAll(getSharedImages(user)); - ImageFilterFormData filterData = getDataForFilter(images); - ImageFilter imageFilter = new ImageFilter(); - if(userSettingsDAO.getImageFilter(user.getName()).isPresent()){ - imageFilter = userSettingsDAO.getImageFilter(user.getName()).get(); + + if(imageFilter == null){ + if(userSettingsDAO.getImageFilter(user.getName()).isPresent()){ + imageFilter = userSettingsDAO.getImageFilter(user.getName()).get(); + images = filterImages(images, imageFilter); + } + } else{ images = filterImages(images, imageFilter); + userSettingsDAO.setUserImageFilter(user.getName(),imageFilter); } - userSettingsDAO.setUserImageFilter(user.getName(),imageFilter); - images.forEach(img -> img.setImageUserPermissions(getUserImagePermissions(user,img))); - - - final List<ImageInfoRecord> finalImages = images; - - List<ProjectImagesInfo> projectImagesInfoList = projectService.getUserProjects(user, Boolean.FALSE) - .stream() - .map(p -> { - List<ImageInfoRecord> im = finalImages.stream().filter(img -> img.getProject().equals(p.getName())).collect(Collectors.toList()); - return ProjectImagesInfo.builder() - .project(p.getName()) - .images(im) - .build(); - }) - .collect(Collectors.toList()); - - return ImagesPageInfo.builder() - .projectImagesInfos(projectImagesInfoList) - .imageFilter(userSettingsDAO.getImageFilter(user.getName()).get()) - .filterData(filterData).build(); - } - - @Override - public ImagesPageInfo getImagesOfUserWithFilter(UserInfo user, ImageFilter imageFilter) { - log.debug("Loading list of images for user {}", user.getName()); - - List<ImageInfoRecord> images = imageExploratoryDao.getImagesOfUser(user.getName()); - images.forEach(img -> img.setSharingStatus(getImageSharingStatus(user.getName(),img))); - images.addAll(getSharedImages(user)); - - ImageFilterFormData filterData = getDataForFilter(images); - images = filterImages(images, imageFilter); - - userSettingsDAO.setUserImageFilter(user.getName(),imageFilter); images.forEach(img -> img.setImageUserPermissions(getUserImagePermissions(user,img))); - - - List<ImageInfoRecord> finalImages = images; - + final List<ImageInfoRecord> finalImages = images; List<ProjectImagesInfo> projectImagesInfoList = projectService.getUserProjects(user, Boolean.FALSE) .stream() .map(p -> { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
