SORMAS-Foundation#3599 update data dictionary, user rights, External Journal test

Author: [email protected]

sormas-api/src/main/resources/doc/SORMAS_Data_Dictionary.xlsx

@@ -301,7 +301,7 @@ public Optional<PatientDiaryPersonDto> getPatientDiaryPerson(String personUuid)
 	 *            the person to register as a patient in CLIMEDO
 	 * @return true if the registration was successful, false otherwise
 	 */
-	public PatientDiaryRegisterResult registerPatientDiaryPerson(de.symeda.sormas.api.person.PersonDto person) {
+	public PatientDiaryRegisterResult registerPatientDiaryPerson(PersonDto person) {
 		try {
 			Invocation.Builder invocationBuilder = getExternalDataPersonInvocationBuilder(person.getUuid());
 			Response response = invocationBuilder.post(Entity.json(""));
@@ -338,7 +338,7 @@ private Invocation.Builder getExternalDataPersonInvocationBuilder(String personU
 	 *            the person to validate
 	 * @return the result of the validation
 	 */
-	public ExternalJournalValidation validatePatientDiaryPerson(de.symeda.sormas.api.person.PersonDto person) {
+	public ExternalJournalValidation validatePatientDiaryPerson(PersonDto person) {
 		EnumSet<PatientDiaryValidationError> validationErrors = EnumSet.noneOf(PatientDiaryValidationError.class);
 
 		String email = person.getEmailAddress();
@@ -385,7 +385,7 @@ public ExternalJournalValidation validatePatientDiaryPerson(de.symeda.sormas.api
 		return new ExternalJournalValidation(validationErrors.isEmpty(), getValidationMessage(validationErrors));
 	}
 
-	private boolean isEmailAvailable(de.symeda.sormas.api.person.PersonDto person) {
+	private boolean isEmailAvailable(PersonDto person) {
 		PatientDiaryQueryResponse response = queryPatientDiary(EMAIL_QUERY_PARAM, person.getEmailAddress())
 			.orElseThrow(() -> new RuntimeException("Could not query patient diary for Email address availability"));
 		boolean notUsed = response.getCount() == 0;
@@ -398,7 +398,7 @@ private boolean isEmailAvailable(de.symeda.sormas.api.person.PersonDto person) {
 		return notUsed || samePerson;
 	}
 
-	private boolean isPhoneAvailable(de.symeda.sormas.api.person.PersonDto person, String phone) {
+	private boolean isPhoneAvailable(PersonDto person, String phone) {
 		PatientDiaryQueryResponse response = queryPatientDiary(MOBILE_PHONE_QUERY_PARAM, phone)
 			.orElseThrow(() -> new RuntimeException("Could not query patient diary for phone number availability"));
 		boolean notUsed = response.getCount() == 0;

sormas-api/src/main/resources/doc/SORMAS_User_Rights.xlsx

@@ -10,11 +10,13 @@
 
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.mockito.Spy;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -33,14 +35,8 @@ public void setUp() {
 		MockitoAnnotations.initMocks(this);
 		PatientDiaryQueryResponse queryResponse = new PatientDiaryQueryResponse();
 		queryResponse.setCount(0);
-		doReturn(Optional.ofNullable(queryResponse)).when(externalJournalService).queryPatientDiary("Email", "[email protected]");
-		doReturn(Optional.ofNullable(queryResponse)).when(externalJournalService).queryPatientDiary("Email", "test@test");
-		doReturn(Optional.ofNullable(queryResponse)).when(externalJournalService).queryPatientDiary("Email", "[email protected]");
-		doReturn(Optional.ofNullable(queryResponse)).when(externalJournalService)
-			.queryPatientDiary("Mobile phone", "+49 621 1218490");
-		doReturn(Optional.ofNullable(queryResponse)).when(externalJournalService)
-			.queryPatientDiary("Mobile phone", "+49 621 1218491");
-		doReturn(Optional.ofNullable(queryResponse)).when(externalJournalService).queryPatientDiary("Mobile phone", "0");;
+		queryResponse.setResults(Collections.emptyList());
+		doReturn(Optional.of(queryResponse)).when(externalJournalService).queryPatientDiary(Mockito.any(String.class), Mockito.any(String.class));
 	}
 
 	@Test