Skip to content

Commit b78aee6

Browse files
jvitriforkjvitrifork
committed
Added example model
1 parent f7e1e01 commit b78aee6

File tree

4 files changed

+248
-16
lines changed

4 files changed

+248
-16
lines changed

‎src/test/java/ehn/techiop/hcert/CWT.java ‎src/main/java/ehn/techiop/hcert/model/CertificatePayload.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package ehn.techiop.hcert;
1+
package ehn.techiop.hcert.model;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44

5-
public class CWT {
5+
public class CertificatePayload {
66

77
@JsonProperty("1")
88
private String iss;
@@ -48,4 +48,5 @@ public Hcert getHcert() {
4848
public void setHcert(Hcert hcert) {
4949
this.hcert = hcert;
5050
}
51+
5152
}

‎src/test/java/ehn/techiop/hcert/Hcert.java ‎src/main/java/ehn/techiop/hcert/model/Hcert.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ehn.techiop.hcert;
1+
package ehn.techiop.hcert.model;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import ehn.techiop.hcert.schema.EuHcertV1Schema;

‎src/test/java/ehn/techiop/hcert/CertificateDSL.java

+159
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
package ehn.techiop.hcert;
2+
3+
import ehn.techiop.hcert.model.CertificatePayload;
4+
import ehn.techiop.hcert.model.Hcert;
5+
import ehn.techiop.hcert.schema.*;
6+
7+
import java.time.*;
8+
import java.time.format.DateTimeFormatter;
9+
import java.util.ArrayList;
10+
import java.util.Date;
11+
import java.util.List;
12+
13+
public class CertificateDSL {
14+
15+
private final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
16+
17+
private final EuHcertV1Schema euHcertV1Schema;
18+
19+
public CertificateDSL() {
20+
euHcertV1Schema = new EuHcertV1Schema();
21+
}
22+
23+
public CertificateDSL withVaccine() {
24+
25+
List<Vac> vacs = new ArrayList<>();
26+
vacs.add(new Vac()
27+
.withDis("840539006")
28+
.withVap("1119305005")
29+
.withMep("EU/1/20/1528")
30+
.withAut("ORG-100030215")
31+
.withSeq(1)
32+
.withTot(2)
33+
.withDat(dateFormatter.format(LocalDate.now().minusDays(35)))
34+
.withCou("DK"));
35+
vacs.add(new Vac()
36+
.withDis("840539006")
37+
.withVap("1119305005")
38+
.withMep("EU/1/20/1528")
39+
.withAut("ORG-100030215")
40+
.withSeq(2)
41+
.withTot(2)
42+
.withDat(dateFormatter.format(LocalDate.now().minusDays(7)))
43+
.withCou("DK"));
44+
euHcertV1Schema.withVac(vacs);
45+
return this;
46+
}
47+
48+
private static Date convert(LocalDateTime dateToConvert) {
49+
return java.sql.Timestamp.valueOf(dateToConvert);
50+
}
51+
52+
public CertificateDSL withTestResult() {
53+
54+
Date sampleDate = convert(LocalDateTime.now().minusDays(1));
55+
Date testResult = convert(LocalDateTime.now().minusHours(4));
56+
57+
Tst test = new Tst()
58+
.withDis("840539006")
59+
.withTyp("LP6464-4")
60+
.withTna("Nucleic acid amplification with probe detection")
61+
.withTma("BIOSYNEX SWISS SA BIOSYNEX COVID-19 Ag BSS")
62+
.withOri("258500001")
63+
.withDtr(sampleDate)
64+
.withDts(testResult)
65+
.withRes("1240591000000102")
66+
.withFac("Region Midtjylland")
67+
.withCou("DK");
68+
euHcertV1Schema.withTst(test);
69+
return this;
70+
}
71+
72+
public CertificateDSL withRecovery() {
73+
74+
Rec recovery = new Rec()
75+
.withDis("840539006")
76+
.withDat(dateFormatter.format(LocalDate.now().minusDays(21)))
77+
.withCou("DK");
78+
79+
euHcertV1Schema.withRec(recovery);
80+
return this;
81+
}
82+
83+
public CertificateDSL withSubject(String givenName, String familyName) {
84+
85+
euHcertV1Schema.withSub(new Sub()
86+
.withGn(givenName)
87+
.withFn(familyName)
88+
.withGen("female")
89+
.withDob(dateFormatter.format(LocalDate.now().minusYears(35))));
90+
return this;
91+
}
92+
93+
public CertificatePayload build() {
94+
CertificatePayload certificatePayload = getCertificatePayload(LocalDateTime.now(), LocalDateTime.now().plusDays(3));
95+
return certificatePayload;
96+
}
97+
98+
private CertificatePayload getCertificatePayload(LocalDateTime issuedAt, LocalDateTime expires) {
99+
CertificatePayload certificatePayload = new CertificatePayload();
100+
certificatePayload.setIss("DK");
101+
102+
certificatePayload.setIat(issuedAt.toEpochSecond(ZoneOffset.UTC));
103+
certificatePayload.setExp(expires.toEpochSecond(ZoneOffset.UTC));
104+
105+
Hcert hcert = new Hcert();
106+
hcert.setEuHcertV1Schema(euHcertV1Schema);
107+
certificatePayload.setHcert(hcert);
108+
return certificatePayload;
109+
}
110+
111+
public CertificateDSL withExpiredRecovery() {
112+
withRecovery();
113+
euHcertV1Schema.getRec().setDat(dateFormatter.format(LocalDate.now().minusYears(1)));
114+
return this;
115+
}
116+
117+
public CertificateDSL withExpiredTestResult() {
118+
withTestResult();
119+
120+
Date sampleDate = convert(LocalDateTime.now().minusDays(5));
121+
Date testResult = convert(LocalDateTime.now().minusDays(4));
122+
123+
euHcertV1Schema.getTst().setDtr(sampleDate);
124+
euHcertV1Schema.getTst().setDts(testResult);
125+
126+
return this;
127+
}
128+
129+
public CertificateDSL withExpiredVaccine() {
130+
131+
List<Vac> vacs = new ArrayList<>();
132+
vacs.add(new Vac()
133+
.withDis("840539006")
134+
.withVap("1119305005")
135+
.withMep("EU/1/20/1528")
136+
.withAut("ORG-100030215")
137+
.withSeq(1)
138+
.withTot(2)
139+
.withDat(dateFormatter.format(LocalDate.now().minusDays(300)))
140+
.withCou("DK"));
141+
vacs.add(new Vac()
142+
.withDis("840539006")
143+
.withVap("1119305005")
144+
.withMep("EU/1/20/1528")
145+
.withAut("ORG-100030215")
146+
.withSeq(2)
147+
.withTot(2)
148+
.withDat(dateFormatter.format(LocalDate.now().minusDays(272)))
149+
.withCou("DK"));
150+
euHcertV1Schema.withVac(vacs);
151+
return this;
152+
}
153+
154+
public CertificatePayload expiredBuild() {
155+
156+
CertificatePayload certificatePayload = getCertificatePayload(LocalDateTime.now().minusDays(6), LocalDateTime.now().minusDays(3));
157+
return certificatePayload;
158+
}
159+
}

‎src/test/java/ehn/techiop/hcert/CertificateTest.java

+85-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
package ehn.techiop.hcert;
22

3-
import static org.junit.jupiter.api.Assertions.assertEquals;
4-
import static org.junit.jupiter.api.Assertions.assertThrows;
5-
63
import COSE.AlgorithmID;
74
import COSE.CoseException;
85
import COSE.OneKey;
96
import com.fasterxml.jackson.databind.ObjectMapper;
7+
import ehn.techiop.hcert.model.CertificatePayload;
8+
import ehn.techiop.hcert.model.Hcert;
109
import ehn.techiop.hcert.schema.EuHcertV1Schema;
1110
import ehn.techiop.hcert.schema.Sub;
1211
import ehn.techiop.hcert.schema.Tst;
1312
import ehn.techiop.hcert.schema.Vac;
13+
import org.apache.commons.compress.compressors.CompressorException;
14+
import org.bouncycastle.jce.provider.BouncyCastleProvider;
15+
import org.junit.jupiter.api.BeforeAll;
16+
import org.junit.jupiter.api.Test;
1417

1518
import java.io.IOException;
1619
import java.security.KeyPair;
@@ -22,10 +25,8 @@
2225
import java.util.List;
2326
import java.util.UUID;
2427

25-
import org.apache.commons.compress.compressors.CompressorException;
26-
import org.bouncycastle.jce.provider.BouncyCastleProvider;
27-
import org.junit.jupiter.api.BeforeAll;
28-
import org.junit.jupiter.api.Test;
28+
import static org.junit.jupiter.api.Assertions.assertEquals;
29+
import static org.junit.jupiter.api.Assertions.assertThrows;
2930

3031
public class CertificateTest {
3132

@@ -66,14 +67,15 @@ static void beforeAll() throws Exception {
6667
.withTst(tests)
6768
.withVac(vacs);
6869

69-
CWT cwt = new CWT();
70+
71+
CertificatePayload certificatePayload = new CertificatePayload();
7072
Hcert hcert = new Hcert();
7173
hcert.setEuHcertV1Schema(euvac);
72-
cwt.setHcert(hcert);
73-
cwt.setExp(new Date().getTime() / 1000);
74-
cwt.setIat(new Date().getTime() / 1000);
75-
cwt.setIss("DNK");
76-
json = new ObjectMapper().writeValueAsString(cwt);
74+
certificatePayload.setHcert(hcert);
75+
certificatePayload.setExp(new Date().getTime() / 1000);
76+
certificatePayload.setIat(new Date().getTime() / 1000);
77+
certificatePayload.setIss("DNK");
78+
json = new ObjectMapper().writeValueAsString(certificatePayload);
7779
}
7880

7981
@Test
@@ -115,4 +117,74 @@ void rsaKeys() throws CompressorException, CoseException, IOException, NoSuchAlg
115117
ObjectMapper mapper = new ObjectMapper();
116118
assertEquals(mapper.readTree(json), mapper.readTree(result));
117119
}
120+
121+
@Test
122+
void testSet()
123+
{
124+
125+
CertificatePayload one = new CertificateDSL()
126+
.withSubject("Judy", "Jensen")
127+
.withVaccine()
128+
.withTestResult()
129+
.withRecovery()
130+
.build();
131+
132+
CertificatePayload two = new CertificateDSL()
133+
.withSubject("Judy", "Jensen")
134+
.withVaccine()
135+
.withTestResult()
136+
.withExpiredRecovery()
137+
.build();
138+
139+
CertificatePayload three = new CertificateDSL()
140+
.withSubject("Judy", "Jensen")
141+
.withVaccine()
142+
.withExpiredTestResult()
143+
.withExpiredRecovery()
144+
.build();
145+
146+
CertificatePayload four = new CertificateDSL()
147+
.withSubject("Judy", "Jensen")
148+
.withExpiredVaccine()
149+
.withExpiredTestResult()
150+
.withExpiredRecovery()
151+
.build();
152+
153+
CertificatePayload five = new CertificateDSL()
154+
.withSubject("Judy", "Jensen")
155+
.withExpiredVaccine()
156+
.withTestResult()
157+
.withExpiredRecovery()
158+
.build();
159+
160+
CertificatePayload six = new CertificateDSL()
161+
.withSubject("Judy", "Jensen")
162+
.withExpiredVaccine()
163+
.withTestResult()
164+
.withRecovery()
165+
.build();
166+
167+
CertificatePayload seven = new CertificateDSL()
168+
.withSubject("Judy", "Jensen")
169+
.withVaccine()
170+
.withExpiredTestResult()
171+
.withRecovery()
172+
.build();
173+
174+
CertificatePayload eight = new CertificateDSL()
175+
.withSubject("Judy", "Jensen")
176+
.withExpiredVaccine()
177+
.withExpiredTestResult()
178+
.withRecovery()
179+
.build();
180+
181+
CertificatePayload nine = new CertificateDSL()
182+
.withSubject("Judy", "Jensen")
183+
.withExpiredVaccine()
184+
.withExpiredTestResult()
185+
.withRecovery()
186+
.expiredBuild();
187+
188+
}
189+
118190
}

0 commit comments

Comments
 (0)