Fix publication repository tests with workaround (ZFIN#1215)

rtaylorzfin · Nov 12, 2024 · ca6b5eb · ca6b5eb
1 parent a085156
commit ca6b5eb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/source/org/zfin/curation/service/CurationDTOConversionService.java b/source/org/zfin/curation/service/CurationDTOConversionService.java
@@ -213,10 +213,19 @@ public DashboardPublicationBean toDashboardPublicationBean(PublicationTrackingHi
 
     public void setRelatedLinks(DashboardPublicationList result) {
         List<String> ids = result.getPublications().stream().map(DashboardPublicationBean::getZdbId).toList();
-        Map<String, List<String>> relatedLinks = relatedDataService.getRelatedLinksForPubIDs(ids);
+        Map<String, List<String>> relatedLinks = getRelatedDataService().getRelatedLinksForPubIDs(ids);
 
         for (DashboardPublicationBean bean : result.getPublications()) {
             bean.setRelatedLinks(relatedLinks.get(bean.getZdbId()));
         }
     }
+
+    private RelatedDataService getRelatedDataService() {
+        //TODO: This method shouldn't be necessary, but for some reason
+        //      tests like PublicationRepositoryTest don't autowire multiple levels
+        if (relatedDataService == null) {
+            relatedDataService = new RelatedDataService();
+        }
+        return relatedDataService;
+    }
 }
diff --git a/source/org/zfin/search/service/RelatedDataService.java b/source/org/zfin/search/service/RelatedDataService.java
@@ -428,7 +428,7 @@ public List<String> getXrefLinks(SearchResult result) {
 
     public List<String> getXrefsLinks(String id, String category, String type) {
         List<String> links = new ArrayList<>();
-        QueryResponse response = solrService.getRelatedDataResponse(id);
+        QueryResponse response = getSolrService().getRelatedDataResponse(id);
 
         FacetField facetField = response.getFacetField("category");
 
@@ -603,4 +603,13 @@ public static String lookup(String resultCategory, String resultType, String rel
         }
     }
 
+    private SolrService getSolrService() {
+        //TODO: This method shouldn't be necessary, but for some reason
+        //      tests like PublicationRepositoryTest don't autowire multiple levels
+        if (solrService == null) {
+            solrService = new SolrService();
+        }
+        return solrService;
+    }
+
 }