Merge branch...

Merge branch 'ui-448-request-state-is-changed-to-validated-after-error-email-not-registered-with-pid-server' into 'master'

Ui 448 request state is changed to validated after error email not registered with pid server

See merge request genesys-pgr/genesys-server!441

src/main/java/org/genesys2/server/service/impl/RequestServiceImpl.java

@@ -234,7 +234,7 @@ public class RequestServiceImpl implements RequestService {
 
 	// Rollback for any exception
 	@Override
-	@Transactional
+	@Transactional(rollbackFor= { NoPidException.class, EasySMTAException.class })
 	public MaterialRequest validateClientRequest(String tokenUuid, String key) throws NoSuchVerificationTokenException, NoPidException, EasySMTAException, TokenExpiredException {
 		final VerificationToken consumedToken = tokenVerificationService.consumeToken(REQUEST_TOKENTYPE, tokenUuid, key);
 
@@ -307,13 +307,13 @@ public class RequestServiceImpl implements RequestService {
 	@Transactional
 	@PreAuthorize("hasRole('ADMINISTRATOR')")
 	public MaterialRequest validateRequest(MaterialRequest materialRequest) throws NoPidException, EasySMTAException {
-		// Client email is confirmed
-		materialRequest.setState(MaterialRequest.VALIDATED);
-		materialRequest = requestRepository.save(materialRequest);
 
 		if (!materialRequest.isInternalRequest()) {
 			recheckPid(materialRequest);
 		}
+		// Client email is confirmed
+		materialRequest.setState(MaterialRequest.VALIDATED);
+		materialRequest = requestRepository.save(materialRequest);
 
 		breakup(materialRequest);
 		relayRequests(materialRequest);