From 881a06f6b68f2f23913ed3df2d2830675e0553bc Mon Sep 17 00:00:00 2001 From: pieterlukasse Date: Fri, 6 Sep 2024 20:34:16 +0200 Subject: [PATCH 1/3] fix: add Transactional annotation to method to fix "no session" error --- .../java/org/ohdsi/webapi/feanalysis/FeAnalysisController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/ohdsi/webapi/feanalysis/FeAnalysisController.java b/src/main/java/org/ohdsi/webapi/feanalysis/FeAnalysisController.java index e290875295..7b6320ff30 100644 --- a/src/main/java/org/ohdsi/webapi/feanalysis/FeAnalysisController.java +++ b/src/main/java/org/ohdsi/webapi/feanalysis/FeAnalysisController.java @@ -269,7 +269,7 @@ public List listAggregates() { private FeAnalysisShortDTO convertFeAnaysisToShortDto(final FeatureAnalysis entity) { return conversionService.convert(entity, FeAnalysisShortDTO.class); } - + @Transactional private FeAnalysisDTO convertFeAnalysisToDto(final FeatureAnalysis entity) { return conversionService.convert(entity, FeAnalysisDTO.class); } From 1e1f83dbb2b3bfc350c110c34504638966863601 Mon Sep 17 00:00:00 2001 From: pieterlukasse Date: Fri, 6 Sep 2024 20:51:39 +0200 Subject: [PATCH 2/3] fix: try to initialize session --- .../java/org/ohdsi/webapi/feanalysis/FeAnalysisController.java | 3 ++- .../converter/FeAnalysisEntityToFeAnalysisDTOConverter.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/ohdsi/webapi/feanalysis/FeAnalysisController.java b/src/main/java/org/ohdsi/webapi/feanalysis/FeAnalysisController.java index 7b6320ff30..a7456abfd6 100644 --- a/src/main/java/org/ohdsi/webapi/feanalysis/FeAnalysisController.java +++ b/src/main/java/org/ohdsi/webapi/feanalysis/FeAnalysisController.java @@ -153,6 +153,7 @@ public void deleteAnalysis(@PathParam("id") final Integer feAnalysisId) { * @return ID, type, name domain, description, etc of feature analysis */ @GET + @Transactional @Path("/{id}") @Produces(MediaType.APPLICATION_JSON) public FeAnalysisDTO getFeAnalysis(@PathParam("id") final Integer feAnalysisId) { @@ -269,7 +270,7 @@ public List listAggregates() { private FeAnalysisShortDTO convertFeAnaysisToShortDto(final FeatureAnalysis entity) { return conversionService.convert(entity, FeAnalysisShortDTO.class); } - @Transactional + private FeAnalysisDTO convertFeAnalysisToDto(final FeatureAnalysis entity) { return conversionService.convert(entity, FeAnalysisDTO.class); } diff --git a/src/main/java/org/ohdsi/webapi/feanalysis/converter/FeAnalysisEntityToFeAnalysisDTOConverter.java b/src/main/java/org/ohdsi/webapi/feanalysis/converter/FeAnalysisEntityToFeAnalysisDTOConverter.java index f39f12cd2f..f215237149 100644 --- a/src/main/java/org/ohdsi/webapi/feanalysis/converter/FeAnalysisEntityToFeAnalysisDTOConverter.java +++ b/src/main/java/org/ohdsi/webapi/feanalysis/converter/FeAnalysisEntityToFeAnalysisDTOConverter.java @@ -7,6 +7,7 @@ import org.ohdsi.webapi.feanalysis.dto.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.hibernate.Hibernate; import java.util.List; import java.util.Objects; @@ -46,6 +47,7 @@ private Object convertDesignToJson(final FeAnalysisEntity source) { switch (source.getType()) { case CRITERIA_SET: FeAnalysisWithCriteriaEntity sourceWithCriteria = (FeAnalysisWithCriteriaEntity) source; + Hibernate.initialize(sourceWithCriteria.getDesign()); // Explicitly initialize the collection return sourceWithCriteria.getDesign() .stream() .map(this::convertCriteria) From c5795b3dd6fc596f27fa0bc9c6cc9067d2561bb4 Mon Sep 17 00:00:00 2001 From: pieterlukasse Date: Thu, 26 Sep 2024 15:27:04 +0200 Subject: [PATCH 3/3] tmp: temporarily change rules to 3 --- .../shiro/filters/TeamProjectBasedAuthorizingFilter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/ohdsi/webapi/shiro/filters/TeamProjectBasedAuthorizingFilter.java b/src/main/java/org/ohdsi/webapi/shiro/filters/TeamProjectBasedAuthorizingFilter.java index 3b4503cae9..670ed717cf 100644 --- a/src/main/java/org/ohdsi/webapi/shiro/filters/TeamProjectBasedAuthorizingFilter.java +++ b/src/main/java/org/ohdsi/webapi/shiro/filters/TeamProjectBasedAuthorizingFilter.java @@ -146,8 +146,8 @@ private boolean checkGen3Authorization(String teamProjectRole, String login) thr JSONArray teamProjectAuthorizations = jsonObject.getJSONArray(teamProjectRole); logger.debug("Found authorizations={}", teamProjectAuthorizations); // We expect two authorization rules per teamproject: - if (teamProjectAuthorizations.length() != 2) { - logger.error("Two authorization rules expected for 'teamproject'={}, found={}", teamProjectRole, + if (teamProjectAuthorizations.length() != 3) { + logger.error("Three authorization rules expected for 'teamproject'={}, found={}", teamProjectRole, teamProjectAuthorizations.length()); return false; }