Merge pull request #148 from KPMP/develop

Release v2.5

changelog.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## Release 2.6 (unreleased)
+Brief summary of what's in this release:
+
+### Breaking changes
+
+
+### Non-breaking changes
+
+
+## Release 2.5 (10/3/2024)
+- Java upgrade
+
+
+### Breaking changes
+None
+
+### Non-breaking changes
+None
+
+----
+
 ## Release 2.5 (10/3/2024)
 - Java upgrade
 

src/main/java/org/kpmp/participant/ParticipantRepoDataRepository.java

@@ -12,8 +12,9 @@ public interface ParticipantRepoDataRepository extends CrudRepository<Participan
 
     @Query(value = "select a.experimental_strategy, a.data_type, a.data_category, coalesce(count,0) as count "
         + "from (select distinct experimental_strategy, data_type, data_category from repo_file_v) as a "
-        + "left join (select count(*) as count, experimental_strategy, data_type, data_category from repo_file_v where redcap_id= :redcap_id "
-        + "group by experimental_strategy) as b on a.experimental_strategy=b.experimental_strategy", nativeQuery = true)
+        + "left join (select count(*) as count, c.experimental_strategy, c.data_type, c.data_category from "
+        + "(select distinct(dl_file_id), experimental_strategy, data_type, data_category from repo_file_v where redcap_id= :redcap_id) as c "
+        + "group by c.experimental_strategy) as b on a.experimental_strategy=b.experimental_strategy", nativeQuery = true)
     public List<ParticipantRepoData> findFileCountsByParticipant(@Param("redcap_id") String redcapId);
 
 }