Merge branch 'alpha' into SCRUM-2726

alliance-genome · Jan 7, 2025 · a304f75 · a304f75
2 parents 0ba06f7 + 65ccb38
commit a304f75
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/org/alliancegenome/curation_api/jobs/JobScheduler.java b/src/main/java/org/alliancegenome/curation_api/jobs/JobScheduler.java
@@ -238,7 +238,7 @@ public void cleanUpFileHistories() {
 		}
 	}
 
-	@Scheduled(cron = "0 0 0 ? * SUN")
+	//@Scheduled(cron = "0 0 0 ? * SUN")
 	public void runMassIndexerEverything() {
 		// Not sure what is going to happen when this time's out but should run anyway
 		// Defaults taken from the API endpoint

diff --git a/src/main/java/org/alliancegenome/curation_api/model/entities/Reference.java b/src/main/java/org/alliancegenome/curation_api/model/entities/Reference.java
@@ -48,7 +48,7 @@ public class Reference extends InformationContentEntity {
 	@EqualsAndHashCode.Include
 	private List<CrossReference> crossReferences;
 
-	@JsonView({View.FieldsOnly.class})
+	@JsonView({View.FieldsOnly.class, View.ForPublic.class})
 	@FullTextField(analyzer = "autocompleteAnalyzer", searchAnalyzer = "autocompleteSearchAnalyzer")
 	@KeywordField(name = "shortCitation_keyword", aggregable = Aggregable.YES, sortable = Sortable.YES, searchable = Searchable.YES, normalizer = "sortNormalizer")
 	@Column(columnDefinition = "TEXT")
@@ -82,7 +82,7 @@ private String getReferenceID(boolean pubmedIdFirst) {
 		if (!pubmedIdFirst) {
 			String pmid = "PMID";
 			primaryXrefOrder = ReferenceConstants.primaryXrefOrder.stream()
-				.filter(s -> s.equals(pmid)).toList();
+				.filter(s -> !s.equals(pmid)).toList();
 			boolean success = primaryXrefOrder.size() < ReferenceConstants.primaryXrefOrder.size();
 			if (!success) {
 				throw new RuntimeException("Could not find " + pmid + " in ReferenceConstants.primaryXrefOrder");