From e39de7caabf8a4004a1277a2d740430409957ad1 Mon Sep 17 00:00:00 2001
From: Mike Peterson <mpeterson@spinsys.com>
Date: Mon, 23 Dec 2024 09:44:58 -0500
Subject: [PATCH] updated DynamicEntityGraph paths

---
 .../webapi/cohortcharacterization/CcServiceImpl.java   | 10 +++++-----
 .../ohdsi/webapi/feanalysis/FeAnalysisServiceImpl.java |  5 +----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/ohdsi/webapi/cohortcharacterization/CcServiceImpl.java b/src/main/java/org/ohdsi/webapi/cohortcharacterization/CcServiceImpl.java
index 2e4a4b0f3..553150dd7 100644
--- a/src/main/java/org/ohdsi/webapi/cohortcharacterization/CcServiceImpl.java
+++ b/src/main/java/org/ohdsi/webapi/cohortcharacterization/CcServiceImpl.java
@@ -163,11 +163,11 @@ public class CcServiceImpl extends AbstractDaoService implements CcService, Gene
     private Map<String, FeatureExtraction.PrespecAnalysis> prespecAnalysisMap = FeatureExtraction.getNameToPrespecAnalysis();
 
     private final EntityGraph defaultEntityGraph = DynamicEntityGraph.loading().addPath(
-            "cohortDefinitions",
-            "featureAnalyses",
-            "stratas",
-            "parameters",
-            "createdBy",
+            "cohortDefinitions").addPath(
+            "featureAnalyses").addPath(
+            "stratas").addPath(
+            "parameters").addPath(
+            "createdBy").addPath(
             "modifiedBy"
     ).build();
 
diff --git a/src/main/java/org/ohdsi/webapi/feanalysis/FeAnalysisServiceImpl.java b/src/main/java/org/ohdsi/webapi/feanalysis/FeAnalysisServiceImpl.java
index 45162b5de..1fcc1b30c 100644
--- a/src/main/java/org/ohdsi/webapi/feanalysis/FeAnalysisServiceImpl.java
+++ b/src/main/java/org/ohdsi/webapi/feanalysis/FeAnalysisServiceImpl.java
@@ -42,10 +42,7 @@ public class FeAnalysisServiceImpl extends AbstractDaoService implements FeAnaly
     private final ApplicationEventPublisher eventPublisher;
     private FeAnalysisAggregateRepository aggregateRepository;
 
-    private final EntityGraph defaultEntityGraph = DynamicEntityGraph.loading().addPath(
-            "createdBy",
-            "modifiedBy"
-    ).build();
+    private final EntityGraph defaultEntityGraph = DynamicEntityGraph.loading().addPath("createdBy").addPath("modifiedBy").build();
 
     public FeAnalysisServiceImpl(
             final FeAnalysisEntityRepository analysisRepository,