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

utility-service поправил возвращение ответов при обработки Notification.

Browse source
This commit is contained in:
AKurakin 2023-06-29 11:55:18 +03:00
parent 55fa772b52
commit fa2cb814c8
3 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/NotificationService.java
View file

@ -1,6 +1,7 @@
package ru.spcex.clearing.utility.service;
import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.producer.Producer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
@ -31,10 +32,10 @@ public class NotificationService extends QueueConsumer implements InitializingBe
private final KafkaSender kafkaSender;
@Autowired
public NotificationService(Consumer<String, Object> kafkaQueue,
public NotificationService(Consumer<String, Object> kafkaQueue, Producer<String, Object> kafkaProducer,
ImdgProvider imdgProvider,
KafkaSender kafkaSender) {
super(kafkaQueue);
super(kafkaQueue, kafkaProducer);
this.notificationMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Notification, Notification.class);
this.kafkaSender = kafkaSender;
}
@ -51,17 +52,17 @@ public class NotificationService extends QueueConsumer implements InitializingBe
}
private void notificationNewRequest(BaseRequest<NotificationNewRequest> notificationNewRequestBaseRequest) {
log.info("Starting notificationNewRequest processing...");
log.info("Starting notificationNewRequest {} processing...", notificationNewRequestBaseRequest.getId());
NotificationNewRequest request = notificationNewRequestBaseRequest.getRequestPayload();
Notification notification = notificationBuilderFromNotificationNewRequest(request);
notificationMap.insert(notification);
log.info("NotificationNewRequest successfully processed! Generated id:\t{}", notification.getId());
log.info("NotificationNewRequest {} successfully processed! Generated id:\t{}", notificationNewRequestBaseRequest.getId(), notification.getId());
}
private void notificationUpdateRequest(BaseRequest<NotificationUpdateRequest> notificationUpdateRequestBaseRequest) {
NotificationUpdateRequest request = notificationUpdateRequestBaseRequest.getRequestPayload();
Long id = request.getId();
log.info("Starting notificationUpdateRequest processing by id: {} ...", id);
Long id = request == null ? null : request.getId();
log.info("Starting notificationUpdateRequest {} processing by id: {} ...", notificationUpdateRequestBaseRequest.getId(), id);
Notification notification = notificationMap.getSingleObjectByID(id);
if (notification == null) {
throw new NullPointerException("Notification by id:{" + id + "} is null!");
@ -69,8 +70,8 @@ public class NotificationService extends QueueConsumer implements InitializingBe
notification.setNotificationStatus(request.getNotificationStatus());
notification.setUpdated(Instant.now());
notificationMap.update(notification);
sendFeedbackString(notification.getObjectType(), notification.getNotificationStatus());
log.info("NotificationUpdateRequest successfully processed!");
sendFeedbackString(notification);
log.info("NotificationUpdateRequest {} successfully processed!", notificationUpdateRequestBaseRequest.getId());
}
private Notification notificationBuilderFromNotificationNewRequest(NotificationNewRequest request) {
@ -89,16 +90,18 @@ public class NotificationService extends QueueConsumer implements InitializingBe
return notification;
}
private void sendFeedbackString(String objectType, String status) {
private void sendFeedbackString(Notification notification) {
String objectType = notification.getObjectType();
if (objectType.equalsIgnoreCase(statement.getKey())) {
kafkaSender.sendRequestToQueue(CLEARING_NOTIFICATION_FEEDBACK, buildFeedbackRequest(status));
kafkaSender.sendRequestToQueue(CLEARING_NOTIFICATION_FEEDBACK, buildFeedbackRequest(notification.getId(), notification.getNotificationStatus()));
} else {
log.warn("Unsupported notification type {}", objectType);
}
}
private NotificationFeedbackRequest buildFeedbackRequest(String status) {
private NotificationFeedbackRequest buildFeedbackRequest(Long notificationId, String status) {
NotificationFeedbackRequest request = new NotificationFeedbackRequest();
request.setNotificationId(notificationId);
request.setNotificationStatus(status);
return request;
}

10
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/NotificationFeedbackRequest.java
View file

@ -4,9 +4,19 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
public class NotificationFeedbackRequest {
@JsonProperty
public Long notificationId;
@JsonProperty
public String notificationStatus;
public Long getNotificationId() {
return notificationId;
}
public void setNotificationId(Long notificationId) {
this.notificationId = notificationId;
}
public String getNotificationStatus() {
return notificationStatus;
}

6
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/service/QueueConsumer.java
View file

@ -56,6 +56,9 @@ public class QueueConsumer implements AutoCloseable {
this.outputExecutor = Executors.newSingleThreadExecutor();
this.json = new ObjectMapper();
this.supportStartOffsetTimeWindow = false;
if (producer == null) {
log.debug("For {} kafka producer not set. Did not send reply.", getClass().getName());
}
}
/**
@ -68,6 +71,9 @@ public class QueueConsumer implements AutoCloseable {
public QueueConsumer(Consumer<String, Object> kafkaQueue, Producer<String, Object> kafkaResponseQueue) {
this(kafkaQueue);
this.producer = kafkaResponseQueue;
if (producer == null) {
log.warn("For {} kafka producer not set. Did not send reply.", getClass().getName());
}
}
protected boolean needsProcessing(String topicName, BaseRequest<?> request) {