Commit ac2121b4 authored by Viacheslav Pavlov's avatar Viacheslav Pavlov

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
parents 74056e05 5583c7e4
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment