Merge branch 'release' into feature/ALS-5387

.github/workflows/label-checker.yml

@@ -16,6 +16,6 @@ jobs:
     steps:
       - uses: docker://agilepathway/pull-request-label-checker:latest
         with:
-          one_of: breaking-change,enhancement,bug,documentation,ignore-for-release
+          one_of: breaking-change,enhancement,bug,documentation,ignore-for-release,dependencies
           repo_token: ${{ secrets.GITHUB_TOKEN }}
 

README.md

@@ -11,6 +11,7 @@ This is the git repository for version 2+ of the PIC-SURE API.
 * Java 11
 * Before contributing code, please set up our git hook:
   `cp code-formatting/pre-commit.sh .git/hooks/pre-commit`
+    * To skip formatting on a block of code, wrap in `spotless:off`, `spotless:on` comments
 
 ## Build
 The build consists of the following top level maven modules:

pic-sure-api-data/pom.xml

@@ -40,7 +40,6 @@
 		<dependency>
 			<groupId>io.swagger.core.v3</groupId>
 			<artifactId>swagger-annotations</artifactId>
-			<version>2.2.8</version>
 		</dependency>
 	</dependencies>
 </project>

pic-sure-api-data/src/main/java/edu/harvard/dbmi/avillach/data/repository/QueryRepository.java

@@ -3,12 +3,25 @@
 import edu.harvard.dbmi.avillach.data.entity.Query;
 
 import javax.enterprise.context.ApplicationScoped;
+import javax.persistence.PersistenceException;
 import javax.transaction.Transactional;
 import java.util.UUID;
 
 @Transactional
 @ApplicationScoped
-public class QueryRepository extends BaseRepository<Query, UUID>{
+public class QueryRepository extends BaseRepository<Query, UUID> {
 
-    protected QueryRepository() {super(Query.class);}
+    protected QueryRepository() {
+        super(Query.class);
+    }
+
+    public Query getQueryUUIDFromCommonAreaUUID(UUID caID) {
+        String caIDRegex = "%commonAreaUUID\":\"" + caID + "\"%";
+        String query = "SELECT * FROM query WHERE CONVERT(metadata USING utf8) LIKE ?";
+        try {
+            return (Query) em().createNativeQuery(query, Query.class).setParameter(1, caIDRegex).getSingleResult();
+        } catch (PersistenceException ignored) {
+            return null;
+        }
+    }
 }

pic-sure-api-war/pom.xml

@@ -32,7 +32,6 @@
 		<dependency>
 			<groupId>com.github.tomakehurst</groupId>
 			<artifactId>wiremock-jre8</artifactId>
-			<version>2.27.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -69,7 +68,6 @@
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
-			<version>3.4.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>