fixed compose, app.yml and AQL order

setup/compose.yaml

@@ -50,7 +50,7 @@ services:
       - ehrbase
     image: ehrbase/ehrbase:next
     ports:
-      - 8090:8080
+      - 8080:8080
     networks:
       - ehrbase-net
     environment:

src/main/java/org/bih/eos/services/EhrService.java

@@ -120,7 +120,7 @@ private NativeQuery<Record2<String, Composition>> buildCompositionQueryEhr(long
             whereStatements.append(" e/ehr_id/value = '").append(ehrToPerson.getEhrId()).append("' OR");
         }
         whereStatements = new StringBuilder(whereStatements.substring(0, whereStatements.length() - 2));
-        return Query.buildNativeQuery("SELECT e/ehr_id/value, c from EHR e CONTAINS Composition c WHERE " + whereStatements + " LIMIT " + offsetLimit + " OFFSET " + offset + " ORDER BY e/ehr_id/value DESC", String.class, Composition.class);
+        return Query.buildNativeQuery("SELECT e/ehr_id/value, c from EHR e CONTAINS Composition c WHERE " + whereStatements + " ORDER BY e/ehr_id/value DESC" + " LIMIT " + offsetLimit + " OFFSET " + offset, String.class, Composition.class);
     }
 
     private List<Record2<String, Composition>> executeAqlQuery(long offset, List<EHRToPerson> ehrIds) {

src/main/resources/application.yml

@@ -35,7 +35,7 @@ spring:
   datasource:
     password: postgres
     username: postgres
-    url: jdbc:postgresql://localhost:5433/postgres
+    url: jdbc:postgresql://localhost:5432/postgres
 
 logging:
   file: