Subcodes

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>care.smith.top</groupId>
     <artifactId>top-backend</artifactId>
-    <version>0.7.7</version>
+    <version>0.8.0</version>
     <packaging>jar</packaging>
 
     <name>TOP Backend</name>

src/main/java/care/smith/top/backend/api/CodeApiDelegateImpl.java

@@ -6,6 +6,8 @@
 import care.smith.top.model.CodeScope;
 import care.smith.top.model.CodeSystemPage;
 import java.net.URI;
+import java.net.URLDecoder;
+import java.nio.charset.Charset;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -21,7 +23,11 @@ public class CodeApiDelegateImpl implements CodeApiDelegate {
 
   @Override
   public ResponseEntity<Code> getCode(URI uri, String codeSystemId, CodeScope scope) {
-    return ResponseEntity.ok(codeService.getCode(uri, codeSystemId, null));
+    return ResponseEntity.ok(
+        codeService.getCode(
+            URI.create(URLDecoder.decode(uri.toString(), Charset.defaultCharset())),
+            codeSystemId,
+            scope));
   }
 
   @Override

src/main/java/care/smith/top/backend/configuration/SecurityConfiguration.java

@@ -10,6 +10,8 @@
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.firewall.HttpFirewall;
+import org.springframework.security.web.firewall.StrictHttpFirewall;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
@@ -22,6 +24,15 @@ public class SecurityConfiguration {
 
   @Autowired private JwtAuthenticationProvider customAuthenticationProvider;
 
+  @Bean
+  public HttpFirewall allowUrlEncodedSlashHttpFirewall() {
+    StrictHttpFirewall firewall = new StrictHttpFirewall();
+    firewall.setAllowUrlEncodedSlash(true);
+    firewall.setAllowUrlEncodedDoubleSlash(true);
+    firewall.setAllowUrlEncodedPercent(true);
+    return firewall;
+  }
+
   @Bean
   SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
     http.sessionManagement()

src/main/java/care/smith/top/backend/model/jpa/CodeDao.java

@@ -3,12 +3,29 @@
 import care.smith.top.model.Code;
 import care.smith.top.model.CodeSystem;
 import java.net.URI;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
-@Embeddable
+@Entity(name = "code")
 public class CodeDao {
+
+  @Id @GeneratedValue private Long id;
+
+  @ManyToOne(optional = true)
+  @JoinColumn(name = "parent_id", referencedColumnName = "id")
+  private CodeDao parent;
+
+  @OrderColumn
+  @OneToMany(
+      cascade = {CascadeType.ALL},
+      orphanRemoval = true)
+  @JoinColumn(name = "parent_id")
+  private List<CodeDao> children;
+
   @Column(nullable = false)
   private String code;
 
@@ -39,47 +56,52 @@ public CodeDao(@NotNull Code code) {
     name = code.getName();
     if (code.getUri() != null) uri = code.getUri().toString();
     if (code.getCodeSystem() != null) codeSystemUri = code.getCodeSystem().getUri().toString();
+    this.children =
+        Optional.ofNullable(code.getChildren()).orElse(Collections.emptyList()).stream()
+            .map(this::deepTranslate)
+            .collect(Collectors.toList());
   }
 
   public Code toApiModel() {
     return new Code()
         .code(code)
         .uri(uri != null ? URI.create(uri) : null)
         .name(name)
-        .codeSystem(new CodeSystem().uri(URI.create(codeSystemUri)));
+        .codeSystem(new CodeSystem().uri(URI.create(codeSystemUri)))
+        .children(getChildren().stream().map(CodeDao::toApiModel).collect(Collectors.toList()))
+        .synonyms(Collections.emptyList());
   }
 
-  public String getCode() {
-    return code;
+  public CodeDao id(@NotNull Long id) {
+    this.id = id;
+    return this;
   }
 
-  public CodeDao code(@NotNull String code) {
-    this.code = code;
+  public CodeDao parent(@NotNull CodeDao parent) {
+    this.parent = parent;
     return this;
   }
 
-  public String getName() {
-    return name;
+  public CodeDao children(List<CodeDao> children) {
+    this.children = children;
+    return this;
   }
 
-  public CodeDao name(String name) {
-    this.name = name;
+  public CodeDao code(@NotNull String code) {
+    this.code = code;
     return this;
   }
 
-  public String getUri() {
-    return uri;
+  public CodeDao name(String name) {
+    this.name = name;
+    return this;
   }
 
   public CodeDao uri(String uri) {
     this.uri = uri;
     return this;
   }
 
-  public String getCodeSystemUri() {
-    return codeSystemUri;
-  }
-
   public CodeDao codeSystemUri(@NotNull String codeSystemUri) {
     this.codeSystemUri = codeSystemUri;
     return this;
@@ -108,4 +130,40 @@ public int hashCode() {
     result = 31 * result + getCodeSystemUri().hashCode();
     return result;
   }
+
+  public Long getId() {
+    return id;
+  }
+
+  public CodeDao getParent() {
+    return parent;
+  }
+
+  public List<CodeDao> getChildren() {
+    return children;
+  }
+
+  public String getCode() {
+    return code;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public String getUri() {
+    return uri;
+  }
+
+  public String getCodeSystemUri() {
+    return codeSystemUri;
+  }
+
+  private CodeDao deepTranslate(Code code) {
+    final CodeDao codeDao = new CodeDao(code);
+    return codeDao.children(
+        Optional.ofNullable(code.getChildren()).orElse(Collections.emptyList()).stream()
+            .map(childCode -> deepTranslate(childCode).parent(codeDao))
+            .collect(Collectors.toList()));
+  }
 }

src/main/java/care/smith/top/backend/model/jpa/EntityVersionDao.java

@@ -31,7 +31,9 @@ public class EntityVersionDao {
 
   @ElementCollection @OrderColumn private List<LocalisableTextDao> descriptions = null;
 
-  @ElementCollection @OrderColumn private List<CodeDao> codes = null;
+  @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
+  @OrderColumn
+  private List<CodeDao> codes = null;
 
   @OneToOne private EntityVersionDao previousVersion;