You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dy...@apache.org on 2022/10/11 12:32:02 UTC

[incubator-datalab] 03/06: show user his platforms

This is an automated email from the ASF dual-hosted git repository.

dyankiv pushed a commit to branch epm-v2.5.2.1
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git

commit 4e3a980d42a2c29fbab31755a9c7437d262eb369
Author: Denys Yankiv <de...@gmail.com>
AuthorDate: Mon Oct 3 11:47:22 2022 +0300

    show user his platforms
---
 .../java/com/epam/datalab/backendapi/dao/ConnectedPlatformsDAO.java  | 2 ++
 .../com/epam/datalab/backendapi/dao/ConnectedPlatformsDAOImpl.java   | 5 +++++
 .../epam/datalab/backendapi/resources/ConnectedPlatformResource.java | 3 ++-
 .../epam/datalab/backendapi/service/ConnectedPlatformsService.java   | 1 +
 .../backendapi/service/impl/ConnectedPlatformsServiceImpl.java       | 5 +++++
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ConnectedPlatformsDAO.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ConnectedPlatformsDAO.java
index bac441d9f..42070b3d6 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ConnectedPlatformsDAO.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ConnectedPlatformsDAO.java
@@ -30,5 +30,7 @@ public interface ConnectedPlatformsDAO {
 
     List<ConnectedPlatformDTO> getAll();
 
+    List<ConnectedPlatformDTO> getUserPlatforms(String userName);
+
     void delete(String name);
 }
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ConnectedPlatformsDAOImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ConnectedPlatformsDAOImpl.java
index d77b51406..8c25dcb1e 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ConnectedPlatformsDAOImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ConnectedPlatformsDAOImpl.java
@@ -44,6 +44,11 @@ public class ConnectedPlatformsDAOImpl extends BaseDAO implements ConnectedPlatf
         return find(CONNECTED_PLATFORMS, ConnectedPlatformDTO.class);
     }
 
+    @Override
+    public List<ConnectedPlatformDTO> getUserPlatforms(String userName) {
+        return find(CONNECTED_PLATFORMS, eq("user", userName), ConnectedPlatformDTO.class);
+    }
+
     @Override
     public void delete(String name) {
         deleteOne(CONNECTED_PLATFORMS, eq(NAME,name));
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ConnectedPlatformResource.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ConnectedPlatformResource.java
index 5ec70f3d7..9c46e1c8b 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ConnectedPlatformResource.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ConnectedPlatformResource.java
@@ -48,8 +48,9 @@ public class ConnectedPlatformResource {
 
     @RolesAllowed("/api/connected_platforms/view")
     @GET
+    @Path("/user")
     public Response getConnectedPlatforms(@Auth UserInfo ui) {
-        return Response.ok(connectedPlatformsService.getAll()).build();
+        return Response.ok(connectedPlatformsService.getUserPlatforms(ui.getName())).build();
     }
 
     @RolesAllowed("/api/connected_platforms/view")
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/ConnectedPlatformsService.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/ConnectedPlatformsService.java
index 8eccd8048..5042be304 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/ConnectedPlatformsService.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/ConnectedPlatformsService.java
@@ -26,6 +26,7 @@ import com.epam.datalab.backendapi.resources.dto.ConnectedPlatformType;
 import java.util.List;
 
 public interface ConnectedPlatformsService {
+    List<ConnectedPlatformDTO> getUserPlatforms(String userName);
     List<ConnectedPlatformDTO> getAll();
 
     void addPlatform(UserInfo user, String name, ConnectedPlatformType type, String url);
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ConnectedPlatformsServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ConnectedPlatformsServiceImpl.java
index 34a6d21de..f4ee7a3d1 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ConnectedPlatformsServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ConnectedPlatformsServiceImpl.java
@@ -44,6 +44,11 @@ public class ConnectedPlatformsServiceImpl implements ConnectedPlatformsService
     }
 
 
+    @Override
+    public List<ConnectedPlatformDTO> getUserPlatforms(String userName) {
+        return connectedPlatformsDAO.getUserPlatforms(userName);
+    }
+
     @Override
     public List<ConnectedPlatformDTO> getAll() {
         return connectedPlatformsDAO.getAll();


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org