From 015b93a1ea150294c2d41921c144d879f862b3aa Mon Sep 17 00:00:00 2001
From: Peter Hoffmann <954078+p-hoffmann@users.noreply.github.com>
Date: Fri, 27 Mar 2026 13:40:24 +0800
Subject: [PATCH] fix SpEL syntax errors

---
 .../webapi/cohortdefinition/CohortDefinitionService.java    | 6 +++---
 .../java/org/ohdsi/webapi/conceptset/ConceptSetService.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/ohdsi/webapi/cohortdefinition/CohortDefinitionService.java b/src/main/java/org/ohdsi/webapi/cohortdefinition/CohortDefinitionService.java
index 7b0378e0c..f5a82b7e4 100644
--- a/src/main/java/org/ohdsi/webapi/cohortdefinition/CohortDefinitionService.java
+++ b/src/main/java/org/ohdsi/webapi/cohortdefinition/CohortDefinitionService.java
@@ -612,7 +612,7 @@ public CohortDTO saveCohortDefinition(@PathVariable("id") final int id, @Request
 	@GetMapping(value = "/{id}/generate/{sourceKey}", produces = MediaType.APPLICATION_JSON_VALUE)
 	@PreAuthorize("""
 		(isOwner(#id, COHORT_DEFINITION) or isPermitted('write:cohort-definition') or isPermitted('read:cohort-definition') or hasEntityAccess(#id, COHORT_DEFINITION, READ))
-		and (isPermitted('read:write') or hasSourceAccess(#sourceKey, WRITE)
+		and (isPermitted('write:source') or hasSourceAccess(#sourceKey, WRITE))
 	""")
 	public JobExecutionResource generateCohort(@PathVariable("id") final int id,
 			@PathVariable("sourceKey") final String sourceKey,
@@ -667,8 +667,8 @@ public JobExecutionResource generateCohort(@PathVariable("id") final int id,
 	@GetMapping(value = "/{id}/cancel/{sourceKey}", produces = MediaType.APPLICATION_JSON_VALUE)
 	@PreAuthorize("""
 		(isOwner(#id, COHORT_DEFINITION) or isPermitted('write:cohort-definition') or isPermitted('read:cohort-definition') or hasEntityAccess(#id, COHORT_DEFINITION, READ))
-		and (isPermitted('write:source') or hasSourceAccess(#sourceKey, WRITE)
-	""")	
+		and (isPermitted('write:source') or hasSourceAccess(#sourceKey, WRITE))
+	""")
 	public ResponseEntity cancelGenerateCohort(@PathVariable("id") final int id, @PathVariable("sourceKey") final String sourceKey) {
 
 		final Source source = Optional.ofNullable(getSourceRepository().findBySourceKey(sourceKey))
diff --git a/src/main/java/org/ohdsi/webapi/conceptset/ConceptSetService.java b/src/main/java/org/ohdsi/webapi/conceptset/ConceptSetService.java
index fbfc7fc98..9542e2dcb 100644
--- a/src/main/java/org/ohdsi/webapi/conceptset/ConceptSetService.java
+++ b/src/main/java/org/ohdsi/webapi/conceptset/ConceptSetService.java
@@ -978,7 +978,7 @@ or hasEntityAccess(#copyAnnotationsRequest.sourceConceptSetId, CONCEPT_SET, READ
         (
             isPermitted('write:conceptset') 
             or isOwner(#copyAnnotationsRequest.targetConceptSetId, CONCEPT_SET)
-            or hasEntityAccess(#copyAnnotationsRequest.targetConceptSetId, CONCEPT_SET, WRITE))"
+            or hasEntityAccess(#copyAnnotationsRequest.targetConceptSetId, CONCEPT_SET, WRITE)
         )
     """)
     public void copyAnnotations(@RequestBody CopyAnnotationsRequest copyAnnotationsRequest) {