Components / COVID-19 Borgerstatus / 06c987b2a94

Commits

Tue Toft Carr Nørgaard authored 06c987b2a94 Merge 06 Jan 2022

Pull request #195: Bugfix/CR-357 wrong vaccination xdu values

Merge in COM/covid-19-borgerstatus from bugfix/cr-357_wrong_vaccination_xdu_values to develop

* commit '5ec9b5b78a1168fbc94f1a4f35431e5fc37aa9fb':
  DkPassportConfiguration docs: Added missing properties to toString() representation
  [CR-357] Refactoring
  [CR-357] Fix DKINFO vaccination entries having wrong value in 'xdu' property for: 1)people under 18 (new rule in CR-352) and for 2)additional vaccination entries ([CR-341], including revaccination entries [CR-349])

cbs-service/src/main/java/dk/sundhedsdatastyrelsen/cbs/service/config/DkPassportConfiguration.java

Modified


221 221	@DkRules @NonNull final RevaccinationPassportEvaluator dkRevaccinationPassportEvaluator,
222 222	@DkRules @NonNull final TestPassportEvaluator dkTestPassportEvaluator,
223 223	@DkRules @NonNull final RecoveryPassportEvaluator dkRecoveryPassportEvaluator) {
224 224	return new CombinedPassportEvaluatorImpl(dkVaccinationPassportEvaluator, dkRevaccinationPassportEvaluator, dkTestPassportEvaluator, dkRecoveryPassportEvaluator);
225 225	}
226 226
227 227	@Bean
228 228	DkInfoPassportFactory dkInfoPassportFactory(
229 229	VaccineMapper vaccineMapper,
230 230	DGCEncoder encoder,
231 +	@DkRules VaccinationPassportConfiguration vaccinationPassportConfiguration,
231 232	@DkRules RecoveryPassportEvaluator recoveryPassportEvaluator
232 233	) {
233 234	return new DkInfoPassportFactory(
234 235	vaccineMapper,
235 236	encoder,
236 237	recoveryPassportEvaluator,
237 -	maximumAmountAfterCompletedVaccinationSchedule,
238 -	maximumAmountAfterFirstVaccinationOfPartiallyCompletedVaccinationSchedule,
238 +	vaccinationPassportConfiguration,
239 +	maximumPeriodAfterRevaccination,
239 240	maximumPeriodAfterTestPcr,
240 241	maximumPeriodAfterTestAg,
241 242	cwtDkInfoLabResultMaxAge);
242 243	}
243 244
244 245	@Override
245 246	public String toString() {
246 247	return "DkPassportConfiguration{" +
247 248	"cwtDkMaximumValidity=" + cwtDkMaximumValidity +
248 249	", cwtDkInfoLabResultMaxAge=" + cwtDkInfoLabResultMaxAge +

252 253	", minimumAmountAfterCompletedMultiVaccinationSchedule=" + minimumAmountAfterCompletedMultiVaccinationSchedule +
253 254	", keepTimeOnMinimumAmountAfterCompletedMultiVaccinationSchedule=" + keepTimeOnMinimumAmountAfterCompletedMultiVaccinationSchedule +
254 255	", maximumAmountAfterCompletedVaccinationSchedule=" + maximumAmountAfterCompletedVaccinationSchedule +
255 256	", keepTimeOnMaximumAmountAfterCompletedVaccinationSchedule=" + keepTimeOnMaximumAmountAfterCompletedVaccinationSchedule +
256 257	", suspensionAmountAfterCompletedVaccinationSchedule=" + suspensionAmountAfterCompletedVaccinationSchedule +
257 258	", keepTimeOnSuspensionAmountAfterCompletedVaccinationSchedule=" + keepTimeOnSuspensionAmountAfterCompletedVaccinationSchedule +
258 259	", minimumAmountAfterFirstVaccinationOfPartiallyCompletedVaccinationSchedule=" + minimumAmountAfterFirstVaccinationOfPartiallyCompletedVaccinationSchedule +
259 260	", keepTimeOnMinimumAmountAfterFirstVaccinationOfPartiallyCompletedVaccinationSchedule=" + keepTimeOnMinimumAmountAfterFirstVaccinationOfPartiallyCompletedVaccinationSchedule +
260 261	", maximumAmountAfterFirstVaccinationOfPartiallyCompletedVaccinationSchedule=" + maximumAmountAfterFirstVaccinationOfPartiallyCompletedVaccinationSchedule +
261 262	", keepTimeOnMaximumAmountAfterFirstVaccinationOfPartiallyCompletedVaccinationSchedule=" + keepTimeOnMaximumAmountAfterFirstVaccinationOfPartiallyCompletedVaccinationSchedule +
263 +	", maximumAmountAfterCompletedVaccinationScheduleUnder18=" + maximumAmountAfterCompletedVaccinationScheduleUnder18 +
264 +	", keepTimeOnMaximumAmountAfterCompletedVaccinationScheduleUnder18=" + keepTimeOnMaximumAmountAfterCompletedVaccinationScheduleUnder18 +
262 265	", suspensionAmountAfterFirstVaccinationOfPartiallyCompletedVaccinationSchedule=" + suspensionAmountAfterFirstVaccinationOfPartiallyCompletedVaccinationSchedule +
263 266	", keepTimeOnSuspensionAmountAfterFirstVaccinationOfPartiallyCompletedVaccinationSchedule=" + keepTimeOnSuspensionAmountAfterFirstVaccinationOfPartiallyCompletedVaccinationSchedule +
267 +	", minimumPeriodAfterRevaccination=" + minimumPeriodAfterRevaccination +
268 +	", keepTimeOnMinimumPeriodAfterRevaccination=" + keepTimeOnMinimumPeriodAfterRevaccination +
269 +	", maximumPeriodAfterRevaccination=" + maximumPeriodAfterRevaccination +
270 +	", keepTimeOnMaximumPeriodAfterRevaccination=" + keepTimeOnMaximumPeriodAfterRevaccination +
271 +	", suspensionPeriodAfterRevaccination=" + suspensionPeriodAfterRevaccination +
272 +	", keepTimeOnSuspensionPeriodAfterRevaccination=" + keepTimeOnSuspensionPeriodAfterRevaccination +
264 273	", minimumPeriodAfterTest=" + minimumPeriodAfterTest +
265 274	", maximumPeriodAfterTestPcr=" + maximumPeriodAfterTestPcr +
266 275	", maximumPeriodAfterTestAg=" + maximumPeriodAfterTestAg +
267 276	", suspensionPeriodAfterTest=" + suspensionPeriodAfterTest +
268 277	", keepTimeOnMinimumPeriodAfterTest=" + keepTimeOnMinimumPeriodAfterTest +
269 278	", keepTimeOnMaximumPeriodAfterTest=" + keepTimeOnMaximumPeriodAfterTest +
270 279	", keepTimeOnSuspensionPeriodAfterTest=" + keepTimeOnSuspensionPeriodAfterTest +
271 280	", minimumPeriodAfterRecovery=" + minimumPeriodAfterRecovery +
272 281	", maximumPeriodAfterRecovery=" + maximumPeriodAfterRecovery +
273 282	", suspensionPeriodAfterRecovery=" + suspensionPeriodAfterRecovery +

COVID-19 Borgerstatus

Commits

Jira Issues

Add shortcut