Merge pull request #32 from admin-ch/feature/antigen-recovery

admin-ch · Jan 21, 2022 · f3504ea · f3504ea
2 parents 9138b06 + fa95aa3
commit f3504ea
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 2 deletions.
diff --git a/...src/main/java/ch/admin/bag/covidcertificate/backend/transformation/model/TestResults.java b/...src/main/java/ch/admin/bag/covidcertificate/backend/transformation/model/TestResults.java
@@ -0,0 +1,5 @@
+package ch.admin.bag.covidcertificate.backend.transformation.model;
+
+public interface TestResults {
+    public static String TEST_RESULT_POSITIVE = "260373001";
+}
diff --git a/...l/src/main/java/ch/admin/bag/covidcertificate/backend/transformation/model/TestTypes.java b/...l/src/main/java/ch/admin/bag/covidcertificate/backend/transformation/model/TestTypes.java
@@ -3,4 +3,5 @@
 public interface TestTypes {
     public static String TEST_TYPE_ANTIBODY = "94504-8";
     public static String TEST_TYPE_EXEMPTION = "medical-exemption";
+    public static String TEST_TYPE_RAT = "LP217198-3";
 }
diff --git a/...c/main/java/ch/admin/bag/covidcertificate/backend/transformation/ws/client/PdfClient.java b/...c/main/java/ch/admin/bag/covidcertificate/backend/transformation/ws/client/PdfClient.java
@@ -1,5 +1,6 @@
 package ch.admin.bag.covidcertificate.backend.transformation.ws.client;
 
+import ch.admin.bag.covidcertificate.backend.transformation.model.TestResults;
 import ch.admin.bag.covidcertificate.backend.transformation.model.TestTypes;
 import ch.admin.bag.covidcertificate.backend.transformation.model.VaccinationCertificateTypes;
 import ch.admin.bag.covidcertificate.backend.transformation.model.pdf.BitPdfPayload;
@@ -30,7 +31,18 @@ public PdfResponse getPdf(BitPdfPayload payload) throws JsonProcessingException
                     .getTt()
                     .equals(TestTypes.TEST_TYPE_ANTIBODY)) {
                 endpoint = pdfConfig.getAntibodyEndpoint();
-            } else if(((DecodedTCert) decodedCert)
+            }else if(((DecodedTCert) decodedCert)
+                    .getT()
+                    .get(0)
+                    .getTt()
+                    .equals(TestTypes.TEST_TYPE_RAT) &&
+                    ((DecodedTCert) decodedCert)
+                            .getT()
+                            .get(0)
+                            .getTr()
+                            .equals(TestResults.TEST_RESULT_POSITIVE)){
+                endpoint = pdfConfig.getAntigenRecoveryEndpoint();
+            }else if(((DecodedTCert) decodedCert)
                     .getT()
                     .get(0)
                     .getTt()

diff --git a/.../java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/model/PdfConfig.java b/.../java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/model/PdfConfig.java
@@ -11,7 +11,7 @@ public class PdfConfig {
     private String vaccinationEndpoint;
     private String antibodyEndpoint;
     private String exemptionEndpoint;
-
+    private String antigenRecoveryEndpoint;
     private String vaccinationTouristEndpoint;
 
     public List<String> getChIssuers() {
@@ -67,4 +67,12 @@ public String getExemptionEndpoint() {
     public void setExemptionEndpoint(String exemptionEndpoint) {
         this.exemptionEndpoint = exemptionEndpoint;
     }
+
+    public String getAntigenRecoveryEndpoint() {
+        return antigenRecoveryEndpoint;
+    }
+
+    public void setAntigenRecoveryEndpoint(String antigenRecoveryEndpoint) {
+        this.antigenRecoveryEndpoint = antigenRecoveryEndpoint;
+    }
 }
diff --git a/...ovidcertificate-backend-transformation-ws/src/main/resources/application-local.properties b/...ovidcertificate-backend-transformation-ws/src/main/resources/application-local.properties
@@ -21,6 +21,7 @@ transform.pdf.vaccination-endpoint=http://localhost:8082/app/transform/v1/vaccin
 transform.pdf.vaccination-tourist-endpoint=http://localhost:8082/app/transform/v1/vaccination-tourist
 transform.pdf.antibody-endpoint=http://localhost:8082/app/transform/v1/antibody
 transform.pdf.exemption-endpoint=http://localhost:8082/app/transform/v1/exceptional
+transform.pdf.antigen-recovery-endpoint=http://localhost:8082/app/transform/v1/recover-rat
 
 transform.pdf.chIssuers[0]=CH
 transform.pdf.chIssuers[1]=CH BAG

diff --git a/...covidcertificate-backend-transformation-ws/src/test/resources/application-test.properties b/...covidcertificate-backend-transformation-ws/src/test/resources/application-test.properties
@@ -17,6 +17,7 @@ transform.pdf.vaccination-endpoint=/app/transform/v1/vaccination
 transform.pdf.vaccination-tourist-endpoint=/app/transform/v1/vaccination-tourist
 transform.pdf.antibody-endpoint=/app/transform/v1/antibody
 transform.pdf.exemption-endpoint=/app/transform/v1/exceptional
+transform.pdf.antigen-recovery-endpoint=/app/transform/v1/recovery-rat
 
 transform.pdf.chIssuers[0]=CH
 transform.pdf.chIssuers[1]=CH BAG