Merge pull request #8 from ehrbase/release/v0.3.0

Release/v0.3.0

pom.xml

@@ -22,7 +22,7 @@
 
   <groupId>org.ehrbase.openehr</groupId>
   <artifactId>aql-editor-backend-spring-boot-starter</artifactId>
-  <version>0.2.0</version>
+  <version>0.3.0</version>
   <packaging>jar</packaging>
 
   <repositories>
@@ -36,7 +36,7 @@
     <maven.compiler.release>11</maven.compiler.release>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <ehrbase.sdk.version>1.2.0</ehrbase.sdk.version>
+    <ehrbase.sdk.version>v1.3.0</ehrbase.sdk.version>
     <commons.lang3.version>3.8</commons.lang3.version>
   </properties>
 

src/main/java/org/ehrbase/aqleditor/configuration/EhrConfig.java

@@ -0,0 +1,38 @@
+package org.ehrbase.aqleditor.configuration;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import lombok.RequiredArgsConstructor;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.ehrbase.aqleditor.properties.EhrProperties;
+import org.ehrbase.client.openehrclient.OpenEhrClientConfig;
+import org.ehrbase.client.openehrclient.defaultrestclient.DefaultRestClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@RequiredArgsConstructor
+public class EhrConfig {
+
+  private final EhrProperties ehrProperties;
+
+  @Bean
+  public DefaultRestClient createEhrRestClient() throws URISyntaxException {
+    CredentialsProvider provider = new BasicCredentialsProvider();
+    provider.setCredentials(
+        AuthScope.ANY,
+        new UsernamePasswordCredentials(
+            ehrProperties.getUsername(), ehrProperties.getPassword()));
+
+    CloseableHttpClient httpClient =
+        HttpClientBuilder.create().setDefaultCredentialsProvider(provider).build();
+
+    return new DefaultRestClient(
+        new OpenEhrClientConfig(new URI(ehrProperties.getRestApiUrl())), null, httpClient);
+  }
+}

src/main/java/org/ehrbase/aqleditor/dto/template/TemplateDto.java

@@ -19,8 +19,14 @@
 
 package org.ehrbase.aqleditor.dto.template;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 @Data
 public class TemplateDto {
 

src/main/java/org/ehrbase/aqleditor/properties/EhrProperties.java

@@ -0,0 +1,17 @@
+package org.ehrbase.aqleditor.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "ehrbase")
+public class EhrProperties {
+
+  private String restApiUrl;
+
+  private String username;
+
+  private String password;
+}

src/main/java/org/ehrbase/aqleditor/service/AqlEditorTemplateService.java

@@ -19,45 +19,36 @@
 package org.ehrbase.aqleditor.service;
 
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
 import org.ehrbase.aqleditor.dto.template.TemplateDto;
+import org.ehrbase.client.openehrclient.defaultrestclient.DefaultRestClient;
+import org.ehrbase.response.openehr.TemplatesResponseData;
 import org.ehrbase.webtemplate.filter.Filter;
 import org.ehrbase.webtemplate.model.WebTemplate;
 import org.ehrbase.webtemplate.parser.OPTParser;
-import org.openehr.schemas.v1.OPERATIONALTEMPLATE;
 import org.springframework.stereotype.Service;
 
 @Service
 @AllArgsConstructor
 public class AqlEditorTemplateService {
 
-  private static final TestDataTemplateProvider testDataTemplateProvider =
-      new TestDataTemplateProvider();
+  private final DefaultRestClient restClient;
 
   public List<TemplateDto> getAll() {
-    return testDataTemplateProvider.listTemplateIds().stream()
-        .map(testDataTemplateProvider::find)
-        .filter(Optional::isPresent)
-        .map(Optional::get)
-        .map(this::map)
+    TemplatesResponseData responseData = restClient.templateEndpoint().findAllTemplates();
+    return responseData.get().stream()
+        .map(templateMetaDataDto -> TemplateDto.builder()
+            .templateId(templateMetaDataDto.getTemplateId())
+            .description(templateMetaDataDto.getConcept()).build())
         .collect(Collectors.toList());
   }
 
   public WebTemplate getWebTemplate(String templateId) {
-    return testDataTemplateProvider
-        .find(templateId)
+    return restClient.templateEndpoint().findTemplate(templateId)
         .map(o -> new OPTParser(o).parse())
         .map(w -> new Filter().filter(w))
         .orElse(null);
   }
 
-  private TemplateDto map(OPERATIONALTEMPLATE operationaltemplate) {
-    TemplateDto templateDto = new TemplateDto();
-    templateDto.setTemplateId(operationaltemplate.getTemplateId().getValue());
-    templateDto.setDescription(
-        operationaltemplate.getDescription().getDetailsArray()[0].getPurpose());
-    return templateDto;
-  }
 }