treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backend-api, UserMapStore: заполнение BaseRequest.userId 2

Browse source
This commit is contained in:
AKurakin 2023-04-05 13:18:59 +03:00
parent 1e5e4e393d
commit 316e2fe042
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/AbstractQueueController.java
View file

@ -15,7 +15,7 @@ public class AbstractQueueController {
protected <T> CudResponse processRequest(String destination, IAction<T> iAction) throws ExecutionException, InterruptedException {
CudResponse responseToClient = new CudResponse();
responseToClient.setPayload(operator.sendRequestToQueue(destination, iAction));
responseToClient.setPayload(operator.sendRequestToQueue(destination, iAction, true));
responseToClient.setCode(0);
responseToClient.setMessage("success");
return responseToClient;

2
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/IOperator.java
View file

@ -6,5 +6,5 @@ import ru.spcex.clearing.backendapi.domain.actions.IAction;
import java.util.concurrent.ExecutionException;
public interface IOperator {
QueueSuccessResponse sendRequestToQueue(String destination, IAction<?> iAction) throws ExecutionException, InterruptedException;
QueueSuccessResponse sendRequestToQueue(String destination, IAction<?> iAction, boolean appendUserId) throws ExecutionException, InterruptedException;
}

4
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/UserAuthProcessor.java
View file

@ -47,7 +47,7 @@ public class UserAuthProcessor {
requestData.setSurname(surname);
requestData.setMiddleName(middleName);
try {
operator.sendRequestToQueue(Consts.USER_AUTH_SUCCESS, authEvent);
operator.sendRequestToQueue(Consts.USER_AUTH_SUCCESS, authEvent, false);
} catch (Throwable e) { //ExecutionException | InterruptedException
log.error(ExceptionUtils.getStackTrace(e));
}
@ -59,7 +59,7 @@ public class UserAuthProcessor {
requestData.setUsername(identifier);
requestData.setTime(Instant.now());
try {
operator.sendRequestToQueue(Consts.USER_LOGOUT_SUCCESS, logoutEvent);
operator.sendRequestToQueue(Consts.USER_LOGOUT_SUCCESS, logoutEvent, false);
} catch (Throwable e) {
log.error(ExceptionUtils.getStackTrace(e));
}

6
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/impl/OperatorImpl.java
View file

@ -64,13 +64,15 @@ public class OperatorImpl implements IOperator {
}
@Override
public QueueSuccessResponse sendRequestToQueue(String destination, IAction<?> iAction) throws ExecutionException, InterruptedException {
public QueueSuccessResponse sendRequestToQueue(String destination, IAction<?> iAction, boolean appendUserId) throws ExecutionException, InterruptedException {
throwValidate(destination, iAction);
BaseRequest<Object> request = new BaseRequest<>();
request.setId(idGenerator.nextId());
request.setActionType(iAction.getActionType());
request.setRequestPayload(iAction.toRequest());
request.setUserId(currentUserId());
if (appendUserId) {
request.setUserId(currentUserId());
}
//сохраняет данные о запросе в хранилище
saveRequestToStorage(destination, request);
Future<RecordMetadata> send = kafka.send(new ProducerRecord<>(destination, request));