getOverlayList moved to controller

rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayController.java

@@ -25,11 +25,14 @@ import org.springframework.web.bind.annotation.RestController;
 
 import lcsb.mapviewer.api.BaseController;
 import lcsb.mapviewer.api.SerializationUtils;
+import lcsb.mapviewer.model.Project;
 import lcsb.mapviewer.model.cache.FileEntry;
 import lcsb.mapviewer.model.overlay.DataOverlay;
 import lcsb.mapviewer.model.user.User;
 import lcsb.mapviewer.services.ObjectNotFoundException;
 import lcsb.mapviewer.services.QueryException;
+import lcsb.mapviewer.services.interfaces.IDataOverlayService;
+import lcsb.mapviewer.services.interfaces.IProjectService;
 import lcsb.mapviewer.services.interfaces.IUserService;
 
 @RestController
@@ -40,11 +43,17 @@ public class OverlayController extends BaseController {
 
   private OverlayRestImpl overlayRestImp;
   private IUserService userService;
+  private IProjectService projectService;
+  private IDataOverlayService dataOverlayService;
 
   public OverlayController(OverlayRestImpl overlayRestImp,
-      IUserService userService) {
+      IUserService userService,
+      IProjectService projectService,
+      IDataOverlayService dataOverlayService) {
     this.overlayRestImp = overlayRestImp;
     this.userService = userService;
+    this.projectService = projectService;
+    this.dataOverlayService = dataOverlayService;
   }
 
   @PreAuthorize("hasAnyAuthority('IS_ADMIN', 'READ_PROJECT:' + #projectId) "
@@ -58,7 +67,13 @@ public class OverlayController extends BaseController {
       @RequestParam(value = "creator", defaultValue = "") String creator,
       @RequestParam(value = "publicOverlay", defaultValue = "false") boolean publicOverlay)
       throws lcsb.mapviewer.services.ObjectNotFoundException {
-    return overlayRestImp.getOverlayList(projectId).stream()
+    Project project = projectService.getProjectByProjectId(projectId);
+    if (project == null) {
+      throw new ObjectNotFoundException("Project with given id doesn't exist");
+    }
+    List<DataOverlay> result = dataOverlayService.getDataOverlaysByProject(project, true);
+
+    return result.stream()
         .filter(overlay -> !publicOverlay || overlay.isPublic())
         .filter(
             overlay -> creator.isEmpty() || overlay.getCreator() != null && overlay.getCreator().getLogin().equals(creator))

rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java

@@ -61,14 +61,6 @@ public class OverlayRestImpl extends BaseRestImpl {
     this.dataOverlayService = dataOverlayService;
   }
 
-  public List<DataOverlay> getOverlayList(String projectId) throws ObjectNotFoundException {
-    Project project = getProjectService().getProjectByProjectId(projectId);
-    if (project == null) {
-      throw new ObjectNotFoundException("Project with given id doesn't exist");
-    }
-    return dataOverlayService.getDataOverlaysByProject(project, true);
-  }
-
   public List<Map<String, Object>> getOverlayElements(String projectId, int overlayId, String columns)
       throws QueryException {