Skip to content
Snippets Groups Projects
Commit 7576d0d7 authored by Martin Lowe's avatar Martin Lowe :flag_ca:
Browse files

Merge branch 'malowe/main/eca-fix' into 'main'

Fix error when new required field is empty in prevalidation (usermail)

See merge request !133
parents 96c440c6 a0e22f69
No related branches found
No related tags found
1 merge request!133Fix error when new required field is empty in prevalidation (usermail)
Pipeline #17528 passed
...@@ -15,7 +15,6 @@ import java.util.ArrayList; ...@@ -15,7 +15,6 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.ApplicationScoped;
...@@ -459,6 +458,7 @@ public class DefaultValidationService implements ValidationService { ...@@ -459,6 +458,7 @@ public class DefaultValidationService implements ValidationService {
* </p> * </p>
* <ul> * <ul>
* <li>The validation status exists * <li>The validation status exists
* <li>The validation status has a user mail associated with it
* <li>Validation status has no present errors * <li>Validation status has no present errors
* <li>Modification date is either unset or matches when set * <li>Modification date is either unset or matches when set
* <li>User mail is set and matches (ignores case) * <li>User mail is set and matches (ignores case)
...@@ -472,6 +472,7 @@ public class DefaultValidationService implements ValidationService { ...@@ -472,6 +472,7 @@ public class DefaultValidationService implements ValidationService {
*/ */
private boolean isValidationStatusCurrentAndValid(Optional<CommitValidationStatus> status, Commit c) { private boolean isValidationStatusCurrentAndValid(Optional<CommitValidationStatus> status, Commit c) {
return status.isPresent() && status.get().getErrors().isEmpty() && c.getAuthor() != null return status.isPresent() && status.get().getErrors().isEmpty() && c.getAuthor() != null
&& StringUtils.isNotBlank(status.get().getUserMail())
&& status.get().getUserMail().equalsIgnoreCase(c.getAuthor().getMail()) && status.get().getUserMail().equalsIgnoreCase(c.getAuthor().getMail())
&& (c.getLastModificationDate() == null || status.get().getLastModified().equals(c.getLastModificationDate())); && (c.getLastModificationDate() == null || status.get().getLastModified().equals(c.getLastModificationDate()));
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment