SUPPORT-8664: fix NPE, config and kafka template bean name

This commit is contained in:
gulnaz 2024-10-31 13:53:44 +03:00
parent 26b7f8b610
commit 5808a3e10a
7 changed files with 18 additions and 13 deletions

View file

@ -31,7 +31,7 @@ public class ErvuDataController {
public ErvuDataController(
JwtTokenService jwtTokenService,
@Qualifier("subpoena") ReplyingKafkaService<Object, Bytes> replyingKafkaService,
@Qualifier("recruit") ReplyingKafkaService<Object, Bytes> replyingKafkaService,
SummonsResponseDataConverter converter) {
this.jwtTokenService = jwtTokenService;
this.replyingKafkaService = replyingKafkaService;

View file

@ -1,13 +1,10 @@
package ru.micord.ervu.converter;
import java.time.LocalDate;
import java.time.temporal.ChronoUnit;
import java.util.Comparator;
import java.util.List;
import java.util.Optional;
import ru.micord.ervu.dto.SubpoenaResponseDto;
import ru.micord.ervu.util.DateUtil;
import org.springframework.stereotype.Component;
import proto.ervu.rp.summons.MeasuresTemporary;
import proto.ervu.rp.summons.ResponseDataAddress;
@ -16,6 +13,7 @@ import proto.ervu.rp.summons.SummonsResponseData;
import static ru.micord.ervu.util.DateUtil.convertToLocalDate;
import static java.util.Objects.requireNonNull;
import static ru.micord.ervu.util.DateUtil.getDaysTill;
/**
* @author gulnaz
@ -48,6 +46,8 @@ public class SummonsResponseDataConverter {
if (summonsInfoOpt.isPresent()) {
SummonsInfo summonsInfo = summonsInfoOpt.get();
String estimatedDate = summonsInfo.getEstimatedDateSummons();
builder.seriesAndNumber(summonsInfo.getSummonsSeries(), summonsInfo.getSummonsNumber())
.visitDateTime(summonsInfo.getVisitDate(), summonsInfo.getVisitTime())
.militaryCommissariatName(summonsInfo.getMilitaryCommissariatName())
@ -60,12 +60,11 @@ public class SummonsResponseDataConverter {
.reasonName(summonsInfo.getReasonName())
.summonsStatusName(summonsInfo.getSummonsStatusName())
.deliveryTypeSummonsName(summonsInfo.getDeliveryTypeSummonsName())
.estimatedDateSummons(summonsInfo.getEstimatedDateSummons())
.estimatedDateSummons(estimatedDate)
.recruitmentStatusCode(
Integer.parseInt(responseData.getRecruitmentInfo().getRecruitmentStatusCode()))
.recruitmentStartDate(responseData.getRecruitmentInfo().getRecruitmentStart())
.daysToAppearance((int) ChronoUnit.DAYS.between(
LocalDate.now(), DateUtil.convertToLocalDate(summonsInfo.getEstimatedDateSummons())))
.daysToAppearance(getDaysTill(convertToLocalDate(estimatedDate)))
.otherRestrictionCount(-1);
summonsInfo.getMeasuresTemporaryPackagesList()

View file

@ -147,7 +147,7 @@ public class ReplyingKafkaConfig {
return replyingKafkaTemplate;
}
@Bean("subpoena")
@Bean("recruit")
public ReplyingKafkaTemplate<String, Object, Bytes> subpoenaReplyingKafkaTemplate(
ProducerFactory<String, Object> subpoenaProducerFactory,
ConcurrentMessageListenerContainer<String, Bytes> subpoenaReplyContainer) {

View file

@ -16,7 +16,7 @@ import ru.micord.ervu.dto.SubpoenaRequestDto;
* @author gulnaz
*/
@Service
@Qualifier("subpoena")
@Qualifier("recruit")
public class SubpoenaReplyingKafkaService extends BaseReplyingKafkaService<Object, Bytes> {
private final ReplyingKafkaTemplate<String, Object, Bytes> replyingKafkaTemplate;
@ -26,7 +26,7 @@ public class SubpoenaReplyingKafkaService extends BaseReplyingKafkaService<Objec
@Value("${ervu.kafka.extract.header.class}")
private String extractHeaderClass;
public SubpoenaReplyingKafkaService(@Qualifier("subpoena")
public SubpoenaReplyingKafkaService(@Qualifier("recruit")
ReplyingKafkaTemplate<String, Object, Bytes> replyingKafkaTemplate) {
this.replyingKafkaTemplate = replyingKafkaTemplate;
}

View file

@ -35,7 +35,7 @@ public class ExtractRpcService extends Behavior {
public ExtractRpcService(
JwtTokenService jwtTokenService,
@Qualifier("subpoena") ReplyingKafkaService<Object, Bytes> replyingKafkaService) {
@Qualifier("recruit") ReplyingKafkaService<Object, Bytes> replyingKafkaService) {
this.jwtTokenService = jwtTokenService;
this.replyingKafkaService = replyingKafkaService;
}

View file

@ -2,6 +2,7 @@ package ru.micord.ervu.util;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import org.springframework.util.StringUtils;
@ -27,4 +28,9 @@ public final class DateUtil {
public static String convertToString(LocalDate date, DateTimeFormatter formatter) {
return date == null ? "" : date.format(formatter);
}
public static int getDaysTill(LocalDate end) {
return (int) ChronoUnit.DAYS.between(
LocalDate.now(), end == null ? LocalDate.now() : end);
}
}