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/03 10:36:18 UTC
[incubator-datalab] branch DATALAB-3068 updated: fix delete platform
This is an automated email from the ASF dual-hosted git repository.
dyankiv pushed a commit to branch DATALAB-3068
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-3068 by this push:
new 403622250 fix delete platform
403622250 is described below
commit 403622250da2fddcd6dc5e84dbc0146f14297c9e
Author: Denys Yankiv <de...@gmail.com>
AuthorDate: Mon Oct 3 13:36:00 2022 +0300
fix delete platform
---
.../com/epam/datalab/backendapi/dao/ConnectedPlatformsDAO.java | 2 +-
.../epam/datalab/backendapi/dao/ConnectedPlatformsDAOImpl.java | 9 ++++++---
.../backendapi/service/impl/ConnectedPlatformsServiceImpl.java | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
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 42070b3d6..a48b808f5 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
@@ -32,5 +32,5 @@ public interface ConnectedPlatformsDAO {
List<ConnectedPlatformDTO> getUserPlatforms(String userName);
- void delete(String name);
+ void delete(String user, 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 8c25dcb1e..04383a745 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
@@ -22,12 +22,15 @@ package com.epam.datalab.backendapi.dao;
import com.epam.datalab.backendapi.resources.dto.ConnectedPlatformDTO;
import java.util.List;
+
+import static com.mongodb.client.model.Filters.and;
import static com.mongodb.client.model.Filters.eq;
public class ConnectedPlatformsDAOImpl extends BaseDAO implements ConnectedPlatformsDAO {
private static final String CONNECTED_PLATFORMS = "connectedPlatforms";
private static final String NAME = "name";
+ private static final String USER = "user";
@Override
public boolean exist(String name) {
@@ -46,11 +49,11 @@ public class ConnectedPlatformsDAOImpl extends BaseDAO implements ConnectedPlatf
@Override
public List<ConnectedPlatformDTO> getUserPlatforms(String userName) {
- return find(CONNECTED_PLATFORMS, eq("user", userName), ConnectedPlatformDTO.class);
+ return find(CONNECTED_PLATFORMS, eq(USER, userName), ConnectedPlatformDTO.class);
}
@Override
- public void delete(String name) {
- deleteOne(CONNECTED_PLATFORMS, eq(NAME,name));
+ public void delete(String user, String name) {
+ deleteOne(CONNECTED_PLATFORMS, and(eq(USER,user),eq(NAME,name)));
}
}
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 baf7f64f6..e53dec7f8 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
@@ -80,6 +80,6 @@ public class ConnectedPlatformsServiceImpl implements ConnectedPlatformsService
@Override
public void disconnect(UserInfo user, String name) {
- connectedPlatformsDAO.delete(name);
+ connectedPlatformsDAO.delete(user.getName(), name);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org