Fixes #419

Author: oharsta

server/src/main/java/invite/api/FullSearchQueryParser.java

@@ -29,7 +29,7 @@ public static String parse(String query) {
         if (!StringUtils.hasText(query)) {
             throw new InvalidInputException("Full text query parameter has @NotNull @NotBlank requirement");
         }
-        String parsedQuery = Stream.of(query.split("[ @.,+*]"))
+        String parsedQuery = Stream.of(query.split("[ @.,+*-]"))
                 .filter(part -> !(part.isEmpty() || stopWords.contains(part.toLowerCase())))
                 .map(part -> "+" + part)
                 .collect(Collectors.joining(" "));

server/src/main/java/invite/validation/EmailFormatValidator.java

@@ -1,5 +1,7 @@
 package invite.validation;
 
+import org.springframework.util.StringUtils;
+
 import java.util.regex.Pattern;
 
 public class EmailFormatValidator implements FormatValidator {
@@ -9,9 +11,12 @@ public class EmailFormatValidator implements FormatValidator {
 
     @Override
     public boolean isValid(String subject) {
-        return pattern.matcher(subject).matches();
+        return StringUtils.hasText(subject) && !hasMoreThanOneAt(subject) && pattern.matcher(subject).matches();
     }
 
+    private boolean hasMoreThanOneAt(String input) {
+        return input.indexOf('@') != -1 && input.indexOf('@') != input.lastIndexOf('@');
+    }
     @Override
     public String formatName() {
         return "email";

server/src/test/java/invite/api/FullSearchQueryParserTest.java

@@ -18,6 +18,9 @@ void parse() {
 
         String strippedWhiteSpace = FullSearchQueryParser.parse(" Leitndhireedisvea@example.com  ");
         assertEquals("+Leitndhireedisvea +example*", strippedWhiteSpace);
+
+        String minusCharacter = FullSearchQueryParser.parse("role-bug");
+        assertEquals("+role +bug*", minusCharacter);
     }
 
     @Test

server/src/test/java/invite/validation/EmailFormatValidatorTest.java

@@ -2,6 +2,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class EmailFormatValidatorTest {
@@ -12,6 +13,6 @@ class EmailFormatValidatorTest {
     void isValid() {
         assertTrue(emailFormatValidator.isValid("o@o"));
         assertTrue(emailFormatValidator.isValid("Frits Voorbeeld <frits.fritsmans@voorbeeld.nl>"));
-
+        assertFalse(emailFormatValidator.isValid("o@@o"));
     }
 }