Fix to add userID for selected queries; add queries for owners withou…

…t queryID to allow acting on behalf of Biobank;
BBMRI-ERIC · Feb 1, 2023 · 1363a29 · 1363a29
1 parent 3e421de
commit 1363a29
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/src/main/java/de/samply/bbmri/negotiator/control/owner/OwnerQueriesDetailBean.java b/src/main/java/de/samply/bbmri/negotiator/control/owner/OwnerQueriesDetailBean.java
@@ -265,19 +265,22 @@ public String initialize() {
 			 * Get the selected(clicked on) query from the list of queries for the owner
 			 */
 			// TODO: implement loading of the selected query and setting the comments
-			selectedQuery = DbUtil.getSelectedQuery( config, queryId);
+			selectedQuery = DbUtil.getSelectedQueryForUserId( config, queryId, userBean.getUserId());
+			//selectedQuery = DbUtil.getSelectedQuery( config, queryId);
+
 			// TODO: Get the query for type ownerQueryStatsDTO
 			//setCommentCountAndUreadCommentCount(ownerQueryStatsDTO);
-			/**
-			 * Get the selected(clicked on) query from the list of queries for the owner
+
+			// Get the selected(clicked on) query from the list of queries for the owner
+			// Needs to be optimized!
 
 			for(OwnerQueryStatsDTO ownerQueryStatsDTO : getQueries()) {
 				if(ownerQueryStatsDTO.getQuery().getId() == queryId) {
 					selectedQuery = ownerQueryStatsDTO.getQuery();
 					setCommentCountAndUreadCommentCount(ownerQueryStatsDTO);
 				}
 			}
-			 */
+
 
 			if(selectedQuery != null) {
 				try {

diff --git a/src/main/java/de/samply/bbmri/negotiator/control/researcher/ResearcherQueriesDetailBean.java b/src/main/java/de/samply/bbmri/negotiator/control/researcher/ResearcherQueriesDetailBean.java
@@ -304,7 +304,8 @@ public String loadSelectedQueryDetails() {
              * Get the selected(clicked on) query from the list of queries for the owner
              */
             // TODO: implement loading of the selected query and setting the comments
-            selectedQuery = DbUtil.getSelectedQuery( config, queryId);
+            selectedQuery = DbUtil.getSelectedQueryForUserId( config, queryId, userBean.getUserId());
+            //selectedQuery = DbUtil.getSelectedQuery( config, queryId);
             logger.debug("loadSelectedQueryDetails-17: " + LocalDateTime.now());
             /*
             for (QueryStatsDTO query : getQueries()) {

diff --git a/src/main/java/de/samply/bbmri/negotiator/db/util/DbUtil.java b/src/main/java/de/samply/bbmri/negotiator/db/util/DbUtil.java
@@ -580,6 +580,22 @@ public static de.samply.bbmri.negotiator.jooq.tables.pojos.Query getSelectedQuer
                 //.fetchOne( Tables.QUERY.as(fetchedQuery));
                 //.getResult();
     }
+
+    /**
+     * Get the JSON query from the database for a specific userID.
+     * @param config JOOQ configuration
+     * @param queryId the query ID
+     * @param userId the user ID for this query
+     * @return JSON string
+     */    
+    public static de.samply.bbmri.negotiator.jooq.tables.pojos.Query getSelectedQueryForUserId( Config config, Integer queryId, int userId) {
+        Condition condition = Tables.QUERY.RESEARCHER_ID.eq(userId);
+
+        return (de.samply.bbmri.negotiator.jooq.tables.pojos.Query) config.dsl().selectFrom(Tables.QUERY)
+                    .where(condition).and(Tables.QUERY.ID.eq(queryId))
+                    .fetchOneInto( de.samply.bbmri.negotiator.jooq.tables.pojos.Query.class);
+    }
+
     /**
      * Get the JSON query from the database.
      * @param config JOOQ configuration