diff --git a/dmp-backend/.classpath b/dmp-backend/.classpath
index c9a85b970..a2c5e9fca 100644
--- a/dmp-backend/.classpath
+++ b/dmp-backend/.classpath
@@ -28,5 +28,10 @@
+
+
+
+
+
diff --git a/dmp-backend/.settings/org.eclipse.wst.common.component b/dmp-backend/.settings/org.eclipse.wst.common.component
index 9c7a1cfe1..676f4f5bc 100644
--- a/dmp-backend/.settings/org.eclipse.wst.common.component
+++ b/dmp-backend/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,7 @@
+
diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml
index 324adee61..e4adb35eb 100644
--- a/dmp-backend/pom.xml
+++ b/dmp-backend/pom.xml
@@ -271,7 +271,6 @@
-
org.apache.commons
diff --git a/dmp-backend/src/main/java/dao/entities/DMPDao.java b/dmp-backend/src/main/java/dao/entities/DMPDao.java
index d4223aadf..c3c2239c1 100644
--- a/dmp-backend/src/main/java/dao/entities/DMPDao.java
+++ b/dmp-backend/src/main/java/dao/entities/DMPDao.java
@@ -6,6 +6,7 @@ import java.util.UUID;
import dao.Dao;
import entities.DMP;
import entities.Organisation;
+import entities.Project;
import entities.responses.IDLabelPair;
public interface DMPDao extends Dao {
@@ -14,7 +15,7 @@ public interface DMPDao extends Dao {
List listAllIDsLabels();
- List listUserDMPs(String username);
+ List listUserDMPs(String userID);
// public boolean createFromForm();
diff --git a/dmp-backend/src/main/java/dao/entities/DMPDaoImpl.java b/dmp-backend/src/main/java/dao/entities/DMPDaoImpl.java
index 07e5f6e7a..4d432970e 100644
--- a/dmp-backend/src/main/java/dao/entities/DMPDaoImpl.java
+++ b/dmp-backend/src/main/java/dao/entities/DMPDaoImpl.java
@@ -11,6 +11,7 @@ import org.hibernate.query.Query;
import dao.JpaDao;
import entities.DMP;
+import entities.Project;
import entities.UserInfo;
import entities.responses.IDLabelPair;
@@ -41,10 +42,12 @@ public class DMPDaoImpl extends JpaDao implements DMPDao {
}
@Override
- public List listUserDMPs(String username) {
+ public List listUserDMPs(String userID) {
// String queryString = "select ui from UserInfo ui join UserAuth ui.authentication ua where ua.username=:username";
+ String queryString = "select ui from UserInfo ui join Project ui.pro.authentication ua where ua.username=:username";
+
// TypedQuery typedQuery = entityManager.createQuery(queryString, UserInfo.class);
// typedQuery.setParameter("username", username);
diff --git a/dmp-backend/src/main/java/dao/entities/DatasetDao.java b/dmp-backend/src/main/java/dao/entities/DatasetDao.java
index 3307aecda..cad178bbb 100644
--- a/dmp-backend/src/main/java/dao/entities/DatasetDao.java
+++ b/dmp-backend/src/main/java/dao/entities/DatasetDao.java
@@ -14,6 +14,5 @@ public interface DatasetDao extends Dao {
List listAllIDsLabels();
- int assignDMPToDataset(String datasetID, String dmpID);
}
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/dao/entities/DatasetDaoImpl.java b/dmp-backend/src/main/java/dao/entities/DatasetDaoImpl.java
index 1e903dc27..d2e3e41ca 100644
--- a/dmp-backend/src/main/java/dao/entities/DatasetDaoImpl.java
+++ b/dmp-backend/src/main/java/dao/entities/DatasetDaoImpl.java
@@ -37,16 +37,6 @@ public class DatasetDaoImpl extends JpaDao implements DatasetDao
})
.collect(Collectors.toList());
}
-
- @Override
- public int assignDMPToDataset(String datasetID , String dmpID) {
- System.out.println("Dataset -> "+datasetID +" switches to dmp -> "+dmpID);
-
- Query query = entityManager.createQuery("UPDATE Dataset dataset SET dataset.dmp=:dmpID where dataset.id=:datasetID ");
- query.setParameter("dmpID", dmpID);
- query.setParameter("datasetID", datasetID);
- return query.executeUpdate();
- }
-
+
}
diff --git a/dmp-backend/src/main/java/dao/entities/DatasetProfileDao.java b/dmp-backend/src/main/java/dao/entities/DatasetProfileDao.java
index 1baae3fe7..10e5c6e6e 100644
--- a/dmp-backend/src/main/java/dao/entities/DatasetProfileDao.java
+++ b/dmp-backend/src/main/java/dao/entities/DatasetProfileDao.java
@@ -1,10 +1,17 @@
package dao.entities;
+import java.util.List;
import java.util.UUID;
import dao.Dao;
import entities.DatasetProfile;
+import entities.responses.IDLabelPair;
public interface DatasetProfileDao extends Dao {
+ public List listAllIDs();
+
+ List listAllIDsLabels();
+
+
}
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/dao/entities/DatasetProfileDaoImpl.java b/dmp-backend/src/main/java/dao/entities/DatasetProfileDaoImpl.java
index 469ec8f48..303a8db91 100644
--- a/dmp-backend/src/main/java/dao/entities/DatasetProfileDaoImpl.java
+++ b/dmp-backend/src/main/java/dao/entities/DatasetProfileDaoImpl.java
@@ -1,10 +1,15 @@
package dao.entities;
+import java.util.List;
import java.util.UUID;
+import java.util.stream.Collectors;
+import javax.persistence.Query;
+import javax.persistence.TypedQuery;
import dao.JpaDao;
import entities.DatasetProfile;
+import entities.responses.IDLabelPair;
public class DatasetProfileDaoImpl extends JpaDao implements DatasetProfileDao {
@@ -13,6 +18,25 @@ public class DatasetProfileDaoImpl extends JpaDao implemen
// TODO Auto-generated method stub
return null;
}
+
+ @Override
+ public List listAllIDs() {
+ String queryString = "SELECT dp.id FROM DatasetProfile dp";
+ TypedQuery typedQuery = entityManager.createQuery(queryString, UUID.class);
+ return typedQuery.getResultList();
+ }
+
+
+ @Override
+ public List listAllIDsLabels() {
+ String queryString = "SELECT dp.id, dp.label FROM DatasetProfile dp";
+ Query query = (Query) entityManager.createQuery(queryString);
+ List