From 2bd1c4d097ccdbb77d953cd3f0b6d0f3e2e53244 Mon Sep 17 00:00:00 2001 From: khuddus shariff Date: Tue, 7 Nov 2023 18:28:27 +0530 Subject: [PATCH 1/4] [ MOSIP-27859 ] Adding pkt_cr_dtimes and setting the packet date and time from metadata of the packet Signed-off-by: khuddus shariff --- .../validator/PacketValidateProcessor.java | 34 +++++++++++ .../PacketValidateProcessorTest.java | 57 ++++++++++++++----- .../exception/util/PlatformErrorMessages.java | 9 +++ .../dto/InternalRegistrationStatusDto.java | 10 ++++ .../entity/RegistrationStatusEntity.java | 11 ++++ .../impl/RegistrationStatusServiceImpl.java | 2 + 6 files changed, 110 insertions(+), 13 deletions(-) diff --git a/registration-processor/pre-processor/registration-processor-packet-validator-stage/src/main/java/io/mosip/registration/processor/stages/packet/validator/PacketValidateProcessor.java b/registration-processor/pre-processor/registration-processor-packet-validator-stage/src/main/java/io/mosip/registration/processor/stages/packet/validator/PacketValidateProcessor.java index cd65a8c1f3a..3828b179c91 100644 --- a/registration-processor/pre-processor/registration-processor-packet-validator-stage/src/main/java/io/mosip/registration/processor/stages/packet/validator/PacketValidateProcessor.java +++ b/registration-processor/pre-processor/registration-processor-packet-validator-stage/src/main/java/io/mosip/registration/processor/stages/packet/validator/PacketValidateProcessor.java @@ -3,12 +3,16 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; import java.util.Arrays; import java.util.Date; import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import io.mosip.kernel.core.util.DateUtils; import io.mosip.registration.processor.core.constant.ProviderStageName; import io.mosip.registration.processor.packet.storage.utils.PriorityBasedPacketManagerService; import org.apache.commons.io.IOUtils; @@ -160,6 +164,9 @@ public class PacketValidateProcessor { @Value("${mosip.notificationtype}") private String notificationTypes; + @Value("${mosip.registration.processor.datetime.pattern}") + private String dateformat; + @Autowired private Decryptor decryptor; @@ -189,6 +196,8 @@ public MessageDTO process(MessageDTO object, String stageName) { registrationStatusDto = registrationStatusService.getRegistrationStatus(registrationId); + setPacketCreatedDateTime(registrationStatusDto); + registrationStatusDto .setLatestTransactionTypeCode(RegistrationTransactionTypeCode.VALIDATE_PACKET.toString()); registrationStatusDto.setRegistrationStageName(stageName); @@ -467,6 +476,31 @@ public MessageDTO process(MessageDTO object, String stageName) { } + private void setPacketCreatedDateTime(InternalRegistrationStatusDto registrationStatusDto) throws ApisResourceAccessException, PacketManagerException, JsonProcessingException, IOException { + try { + Map metaInfo = packetManagerService.getMetaInfo( + registrationStatusDto.getRegistrationId(), registrationStatusDto.getRegistrationType(), ProviderStageName.PACKET_VALIDATOR); + String packetCreatedDateTime = metaInfo.get(JsonConstant.CREATIONDATE); + if (packetCreatedDateTime != null && !packetCreatedDateTime.isEmpty()) { + LocalDateTime dateTime = DateUtils.parseToLocalDateTime(packetCreatedDateTime); + registrationStatusDto.setPacketCreateDateTime(dateTime); + } else { + regProcLogger.warn(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(), + " -- " + registrationStatusDto.getRefId(), + PlatformErrorMessages.RPR_PVM_PACKET_CREATED_DATE_TIME_EMPTY_OR_NULL.getMessage()); + } + } catch (DateTimeParseException e) { + regProcLogger.warn(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(), + " -- " + registrationStatusDto.getRefId(), + PlatformErrorMessages.RPR_PVM_PACKET_CREATED_DATE_TIME_PARSE_EXCEPTION.getMessage() + e.getMessage()); + }catch (IllegalArgumentException ex) + { + regProcLogger.warn(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(), + " -- " + registrationStatusDto.getRefId(), + PlatformErrorMessages.RPR_PVM_INVALID_ARGUMENT_EXCEPTION.getMessage() + ex.getMessage()); + } + } + private boolean isValidSupervisorStatus(String registrationId) { SyncRegistrationEntity regEntity = syncRegistrationService.findByRegistrationId(registrationId); if (regEntity.getSupervisorStatus().equalsIgnoreCase(APPROVED)) { diff --git a/registration-processor/pre-processor/registration-processor-packet-validator-stage/src/test/java/io/mosip/registration/processor/stages/packet/validator/PacketValidateProcessorTest.java b/registration-processor/pre-processor/registration-processor-packet-validator-stage/src/test/java/io/mosip/registration/processor/stages/packet/validator/PacketValidateProcessorTest.java index c7f736444ef..71fc428f9bf 100644 --- a/registration-processor/pre-processor/registration-processor-packet-validator-stage/src/test/java/io/mosip/registration/processor/stages/packet/validator/PacketValidateProcessorTest.java +++ b/registration-processor/pre-processor/registration-processor-packet-validator-stage/src/test/java/io/mosip/registration/processor/stages/packet/validator/PacketValidateProcessorTest.java @@ -43,14 +43,12 @@ import io.mosip.registration.processor.status.service.RegistrationStatusService; import io.mosip.registration.processor.status.service.SyncRegistrationService; import org.apache.commons.io.IOUtils; +import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Matchers; -import org.mockito.Mock; -import org.mockito.Mockito; +import org.mockito.*; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; @@ -65,14 +63,14 @@ import java.io.IOException; import java.io.InputStream; import java.security.MessageDigest; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; @@ -136,6 +134,7 @@ public class PacketValidateProcessorTest { @Before public void setup() throws Exception { + ReflectionTestUtils.setField(packetValidateProcessor, "dateformat", "yyyy-MM-dd'T'HH:mm:ss.SSS'Z"); ReflectionTestUtils.setField(packetValidateProcessor, "notificationTypes", "SMS|EMAIL"); messageDTO=new MessageDTO(); messageDTO.setRid("123456789"); @@ -242,25 +241,57 @@ public void setup() throws Exception { Mockito.doNothing().when(registrationStatusService).updateRegistrationStatus(Matchers.any(), Matchers.any(), Matchers.any()); Mockito.when(auditLogRequestBuilder.createAuditRequestBuilder(Matchers.any(), Matchers.any(), Matchers.any(), Matchers.any(), Matchers.any(), Matchers.any(), Matchers.any())).thenReturn(null); - Map metamap = new HashMap<>(); org.json.JSONArray jsonArray = new org.json.JSONArray(); org.json.JSONObject jsonObject1 = new org.json.JSONObject(); jsonObject1.put("preRegistrationId", "12345"); + metamap.put(JsonConstant.CREATIONDATE,"2023-10-17T03:01:09.893Z"); jsonArray.put(0, jsonObject1); metamap.put(JsonConstant.METADATA, jsonArray.toString()); - Mockito.when(packetManagerService.getMetaInfo(anyString(), any(), any())).thenReturn(metamap); - + Mockito.when(packetManagerService.getMetaInfo(any(), any(), any())).thenReturn(metamap); Mockito.when(objectMapper.readValue(anyString(), any(Class.class))).thenReturn(new FieldValue("preRegistrationId", "12345")); + } + @Test + public void PacketValidationSuccessTest() throws PacketManagerException, ApisResourceAccessException, IOException, JsonProcessingException { + Map metainfo1 = new HashMap<>(); + metainfo1.put(JsonConstant.CREATIONDATE,"2023-10-17T03:01:09.893"); + MessageDTO object = packetValidateProcessor.process(messageDTO, stageName); + ArgumentCaptor argument = ArgumentCaptor + .forClass(InternalRegistrationStatusDto.class); + Mockito.verify(registrationStatusService,Mockito.atLeastOnce()).updateRegistrationStatus(argument.capture(), Mockito.any(), + Mockito.any()); + Assert.assertEquals(LocalDateTime.parse(metainfo1.get(JsonConstant.CREATIONDATE)), argument.getAllValues().get(0).getPacketCreateDateTime()); + Assert.assertTrue(object.getIsValid()); + Assert.assertFalse(object.getInternalError()); + } + @Test + public void PacketValidationSuccessTestwithPacketCreatedDateTimeNull() throws PacketManagerException, ApisResourceAccessException, IOException, JsonProcessingException { + Map metainfo = new HashMap<>(); + metainfo.put(JsonConstant.CREATIONDATE,null); + Mockito.when(packetManagerService.getMetaInfo(any(), any(), any())).thenReturn(metainfo); + MessageDTO object = packetValidateProcessor.process(messageDTO, stageName); + ArgumentCaptor argument = ArgumentCaptor + .forClass(InternalRegistrationStatusDto.class); + Mockito.verify(registrationStatusService,Mockito.atLeastOnce()).updateRegistrationStatus(argument.capture(), Mockito.any(), + Mockito.any()); + assertEquals(metainfo.get(JsonConstant.CREATIONDATE), argument.getAllValues().get(0).getPacketCreateDateTime()); + assertTrue(object.getIsValid()); + assertFalse(object.getInternalError()); } - + @Test - public void PacketValidationSuccessTest() { - assertTrue(packetValidateProcessor.process(messageDTO, stageName).getIsValid()); + public void PacketValidationSuccessTestwithPacketCreatedDateTimeInvalidFormat() throws PacketManagerException, ApisResourceAccessException, IOException, JsonProcessingException { + Map metainfo = new HashMap<>(); + metainfo.put(JsonConstant.CREATIONDATE,"2023-10-1703:01:09.893"); + Mockito.when(packetManagerService.getMetaInfo(any(), any(), any())).thenReturn(metainfo); + MessageDTO object = packetValidateProcessor.process(messageDTO, stageName); + ArgumentCaptor argument = ArgumentCaptor + .forClass(InternalRegistrationStatusDto.class); + Mockito.verify(registrationStatusService,Mockito.atLeastOnce()).updateRegistrationStatus(argument.capture(),any(),any()); + assertEquals(null, argument.getAllValues().get(0).getPacketCreateDateTime()); } - @Test public void PacketValidationFailureTest() throws PacketValidatorException, ApisResourceAccessException, JsonProcessingException, RegistrationProcessorCheckedException, IOException, PacketManagerException { Mockito.when(registrationStatusMapperUtil.getStatusCode(RegistrationExceptionTypeCode.EXCEPTION)).thenReturn("ERROR"); diff --git a/registration-processor/registration-processor-core/src/main/java/io/mosip/registration/processor/core/exception/util/PlatformErrorMessages.java b/registration-processor/registration-processor-core/src/main/java/io/mosip/registration/processor/core/exception/util/PlatformErrorMessages.java index 5f7ab7d8813..a5d3c27eb10 100644 --- a/registration-processor/registration-processor-core/src/main/java/io/mosip/registration/processor/core/exception/util/PlatformErrorMessages.java +++ b/registration-processor/registration-processor-core/src/main/java/io/mosip/registration/processor/core/exception/util/PlatformErrorMessages.java @@ -380,6 +380,15 @@ public enum PlatformErrorMessages { RPR_PVM_PACKET_REJECTED(PlatformConstants.RPR_PACKET_VALIDATOR_MODULE + "011", "Rejected by Supervisor"), + RPR_PVM_PACKET_CREATED_DATE_TIME_EMPTY_OR_NULL(PlatformConstants.RPR_PACKET_VALIDATOR_MODULE + "015", + "Packet Created Date time is Null or Empty"), + + RPR_PVM_PACKET_CREATED_DATE_TIME_PARSE_EXCEPTION(PlatformConstants.RPR_PACKET_VALIDATOR_MODULE + "016", + "Packet Created Date time is not in correct format"), + + RPR_PVM_INVALID_ARGUMENT_EXCEPTION(PlatformConstants.RPR_PACKET_VALIDATOR_MODULE + "017", + "Invalid Argument"), + /** The packet classification failed. */ PACKET_CLASSIFICATION_FAILED("", "Packet Classification failed"), diff --git a/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/dto/InternalRegistrationStatusDto.java b/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/dto/InternalRegistrationStatusDto.java index fd4ba09f197..5873bb4d562 100644 --- a/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/dto/InternalRegistrationStatusDto.java +++ b/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/dto/InternalRegistrationStatusDto.java @@ -41,6 +41,16 @@ public class InternalRegistrationStatusDto implements Serializable { /** The create date time. */ private LocalDateTime createDateTime; + private LocalDateTime packetCreateDateTime; + + public LocalDateTime getPacketCreateDateTime() { + return packetCreateDateTime; + } + + public void setPacketCreateDateTime(LocalDateTime packetCreateDateTime) { + this.packetCreateDateTime = packetCreateDateTime; + } + /** The updated by. */ private String updatedBy; diff --git a/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/entity/RegistrationStatusEntity.java b/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/entity/RegistrationStatusEntity.java index 4fcf6388c99..996fb6de5af 100644 --- a/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/entity/RegistrationStatusEntity.java +++ b/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/entity/RegistrationStatusEntity.java @@ -50,6 +50,17 @@ public class RegistrationStatusEntity extends BaseRegistrationEntity { private LocalDateTime createDateTime; + @Column(name = "pkt_cr_dtimes") + private LocalDateTime packetCreateDateTime; + + public LocalDateTime getPacketCreateDateTime() { + return packetCreateDateTime; + } + + public void setPacketCreateDateTime(LocalDateTime packetCreateDateTime) { + this.packetCreateDateTime = packetCreateDateTime; + } + /** The updated by. */ @Column(name = "upd_by") private String updatedBy; diff --git a/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/service/impl/RegistrationStatusServiceImpl.java b/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/service/impl/RegistrationStatusServiceImpl.java index 64dc3d459c2..abd95c3edc0 100644 --- a/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/service/impl/RegistrationStatusServiceImpl.java +++ b/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/service/impl/RegistrationStatusServiceImpl.java @@ -373,6 +373,7 @@ private InternalRegistrationStatusDto convertEntityToDto(RegistrationStatusEntit registrationStatusDto.setLatestTransactionTypeCode(entity.getLatestTransactionTypeCode()); registrationStatusDto.setRegistrationStageName(entity.getRegistrationStageName()); registrationStatusDto.setUpdateDateTime(entity.getUpdateDateTime()); + registrationStatusDto.setPacketCreateDateTime(entity.getPacketCreateDateTime()); return registrationStatusDto; } @@ -416,6 +417,7 @@ private RegistrationStatusEntity convertDtoToEntity(InternalRegistrationStatusDt registrationStatusEntity.setLatestTransactionTypeCode(dto.getLatestTransactionTypeCode()); registrationStatusEntity.setRegistrationStageName(dto.getRegistrationStageName()); registrationStatusEntity.setLatestTransactionTimes(LocalDateTime.now(ZoneId.of("UTC"))); + registrationStatusEntity.setPacketCreateDateTime(dto.getPacketCreateDateTime()); return registrationStatusEntity; } From b37aa5a669b1323aa47116aacafd0b17bd1b0b61 Mon Sep 17 00:00:00 2001 From: khuddus shariff Date: Tue, 14 Nov 2023 11:08:53 +0530 Subject: [PATCH 2/4] [ MOSIP-27859 ] Adding pkt_cr_dtimes and setting the packet date and time from metadata of the packet Signed-off-by: khuddus shariff --- pom.xml | 2 +- registration-processor/core-processor/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../registration-processor-abis/pom.xml | 4 ++-- .../registration-processor-bio-dedupe-stage/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../registration-processor-demo-dedupe-stage/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../registration-processor-reprocessor-stage/pom.xml | 4 ++-- .../pom.xml | 4 ++-- registration-processor/init/pom.xml | 2 +- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- registration-processor/pom.xml | 12 ++++++------ registration-processor/post-processor/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../registration-processor-printing-stage/pom.xml | 4 ++-- .../pom.xml | 4 ++-- registration-processor/pre-processor/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../registration-processor-external-stage/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 6 +++--- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- registration-processor/qc-users-manger/pom.xml | 2 +- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../registration-processor-core/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../registration-processor-packet-manager/pom.xml | 4 ++-- .../registration-processor-quality-checker/pom.xml | 2 +- .../pom.xml | 4 ++-- .../registration-processor-rest-client/pom.xml | 4 ++-- 38 files changed, 77 insertions(+), 77 deletions(-) diff --git a/pom.xml b/pom.xml index 66a8caf8999..af513e4507a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.mosip registration - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT pom MOSIP Registration Parent POM diff --git a/registration-processor/core-processor/pom.xml b/registration-processor/core-processor/pom.xml index 79096b86a90..aafbb6fd34f 100644 --- a/registration-processor/core-processor/pom.xml +++ b/registration-processor/core-processor/pom.xml @@ -5,9 +5,9 @@ io.mosip.registrationprocessor registration-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT core-processor core-processor diff --git a/registration-processor/core-processor/registration-processor-abis-handler-stage/pom.xml b/registration-processor/core-processor/registration-processor-abis-handler-stage/pom.xml index 32e7fb21310..7fd131c2b02 100644 --- a/registration-processor/core-processor/registration-processor-abis-handler-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-abis-handler-stage/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor core-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-abis-handler-stage - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 UTF-8 diff --git a/registration-processor/core-processor/registration-processor-abis-middleware-stage/pom.xml b/registration-processor/core-processor/registration-processor-abis-middleware-stage/pom.xml index 74d1b430635..887582a8263 100644 --- a/registration-processor/core-processor/registration-processor-abis-middleware-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-abis-middleware-stage/pom.xml @@ -5,10 +5,10 @@ io.mosip.registrationprocessor core-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-abis-middleware-stage - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 UTF-8 diff --git a/registration-processor/core-processor/registration-processor-abis/pom.xml b/registration-processor/core-processor/registration-processor-abis/pom.xml index 0723ff6efc7..17ffafa0f2f 100644 --- a/registration-processor/core-processor/registration-processor-abis/pom.xml +++ b/registration-processor/core-processor/registration-processor-abis/pom.xml @@ -8,10 +8,10 @@ io.mosip.registrationprocessor core-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-abis - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-abis UTF-8 diff --git a/registration-processor/core-processor/registration-processor-bio-dedupe-stage/pom.xml b/registration-processor/core-processor/registration-processor-bio-dedupe-stage/pom.xml index e3e92d1484f..3746ce46b4f 100644 --- a/registration-processor/core-processor/registration-processor-bio-dedupe-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-bio-dedupe-stage/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor core-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-bio-dedupe-stage - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 UTF-8 diff --git a/registration-processor/core-processor/registration-processor-biometric-authentication-stage/pom.xml b/registration-processor/core-processor/registration-processor-biometric-authentication-stage/pom.xml index bbeb8f2772b..3064a2377ca 100644 --- a/registration-processor/core-processor/registration-processor-biometric-authentication-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-biometric-authentication-stage/pom.xml @@ -5,10 +5,10 @@ io.mosip.registrationprocessor core-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-biometric-authentication-stage - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 UTF-8 diff --git a/registration-processor/core-processor/registration-processor-demo-dedupe-stage/pom.xml b/registration-processor/core-processor/registration-processor-demo-dedupe-stage/pom.xml index 283b51f64c0..f80e4a8aae5 100644 --- a/registration-processor/core-processor/registration-processor-demo-dedupe-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-demo-dedupe-stage/pom.xml @@ -5,10 +5,10 @@ io.mosip.registrationprocessor core-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-demo-dedupe-stage - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 UTF-8 diff --git a/registration-processor/core-processor/registration-processor-manual-verification-stage/pom.xml b/registration-processor/core-processor/registration-processor-manual-verification-stage/pom.xml index 2c9b56cc301..ea582077d1e 100644 --- a/registration-processor/core-processor/registration-processor-manual-verification-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-manual-verification-stage/pom.xml @@ -8,11 +8,11 @@ io.mosip.registrationprocessor core-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-manual-verification-stage - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 diff --git a/registration-processor/core-processor/registration-processor-reprocessor-stage/pom.xml b/registration-processor/core-processor/registration-processor-reprocessor-stage/pom.xml index 0b5c00a14b9..dfa480fcb41 100644 --- a/registration-processor/core-processor/registration-processor-reprocessor-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-reprocessor-stage/pom.xml @@ -7,10 +7,10 @@ io.mosip.registrationprocessor core-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-reprocessor-stage - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-reprocessor-stage UTF-8 diff --git a/registration-processor/core-processor/registration-processor-uin-generator-stage/pom.xml b/registration-processor/core-processor/registration-processor-uin-generator-stage/pom.xml index f52e4d9bc72..7690342afdc 100644 --- a/registration-processor/core-processor/registration-processor-uin-generator-stage/pom.xml +++ b/registration-processor/core-processor/registration-processor-uin-generator-stage/pom.xml @@ -4,10 +4,10 @@ io.mosip.registrationprocessor core-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-uin-generator-stage - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 UTF-8 diff --git a/registration-processor/init/pom.xml b/registration-processor/init/pom.xml index 81ead3eacdc..28de38e3db5 100644 --- a/registration-processor/init/pom.xml +++ b/registration-processor/init/pom.xml @@ -6,7 +6,7 @@ io.mosip.registrationprocessor registration-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT init diff --git a/registration-processor/init/registration-processor-packet-receiver-stage/pom.xml b/registration-processor/init/registration-processor-packet-receiver-stage/pom.xml index 93545f1bc09..8c4781d9b3c 100644 --- a/registration-processor/init/registration-processor-packet-receiver-stage/pom.xml +++ b/registration-processor/init/registration-processor-packet-receiver-stage/pom.xml @@ -7,11 +7,11 @@ io.mosip.registrationprocessor init - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-packet-receiver-stage - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-packet-receiver-stage diff --git a/registration-processor/init/registration-processor-registration-status-service/pom.xml b/registration-processor/init/registration-processor-registration-status-service/pom.xml index fc94d56c50d..02de8c65dca 100644 --- a/registration-processor/init/registration-processor-registration-status-service/pom.xml +++ b/registration-processor/init/registration-processor-registration-status-service/pom.xml @@ -8,10 +8,10 @@ io.mosip.registrationprocessor init - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-registration-status-service - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-registration-status-service diff --git a/registration-processor/pom.xml b/registration-processor/pom.xml index d0da7b2dda6..1a5e2fdfdc9 100644 --- a/registration-processor/pom.xml +++ b/registration-processor/pom.xml @@ -5,12 +5,12 @@ io.mosip registration - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT io.mosip.registrationprocessor registration-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT pom registration-processor @@ -107,11 +107,11 @@ 0.1.55 - 1.1.5.5-P5 - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT + 1.1.5.5-P6-SNAPSHOT 1.1.5.5 - 1.1.5.5-P5 - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT + 1.1.5.5-P6-SNAPSHOT 1.1.5.5 1.1.5.5 diff --git a/registration-processor/post-processor/pom.xml b/registration-processor/post-processor/pom.xml index 29b65280d26..348e89e0ec5 100644 --- a/registration-processor/post-processor/pom.xml +++ b/registration-processor/post-processor/pom.xml @@ -6,9 +6,9 @@ io.mosip.registrationprocessor registration-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT post-processor post-processor diff --git a/registration-processor/post-processor/registration-processor-message-sender-stage/pom.xml b/registration-processor/post-processor/registration-processor-message-sender-stage/pom.xml index ab08827cc02..aa004ab7e2c 100644 --- a/registration-processor/post-processor/registration-processor-message-sender-stage/pom.xml +++ b/registration-processor/post-processor/registration-processor-message-sender-stage/pom.xml @@ -7,11 +7,11 @@ io.mosip.registrationprocessor post-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-message-sender-stage - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 UTF-8 diff --git a/registration-processor/post-processor/registration-processor-printing-stage/pom.xml b/registration-processor/post-processor/registration-processor-printing-stage/pom.xml index 36792646e3c..e8d81f794fb 100644 --- a/registration-processor/post-processor/registration-processor-printing-stage/pom.xml +++ b/registration-processor/post-processor/registration-processor-printing-stage/pom.xml @@ -6,10 +6,10 @@ io.mosip.registrationprocessor post-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-printing-stage - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 UTF-8 diff --git a/registration-processor/post-processor/registration-processor-registration-transaction-service/pom.xml b/registration-processor/post-processor/registration-processor-registration-transaction-service/pom.xml index db74d952570..f53fabda7aa 100644 --- a/registration-processor/post-processor/registration-processor-registration-transaction-service/pom.xml +++ b/registration-processor/post-processor/registration-processor-registration-transaction-service/pom.xml @@ -5,10 +5,10 @@ io.mosip.registrationprocessor post-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-registration-transaction-service - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-registration-transaction-service UTF-8 diff --git a/registration-processor/pre-processor/pom.xml b/registration-processor/pre-processor/pom.xml index 354c7fd4c0b..fa6848ffe4c 100644 --- a/registration-processor/pre-processor/pom.xml +++ b/registration-processor/pre-processor/pom.xml @@ -7,9 +7,9 @@ io.mosip.registrationprocessor registration-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT pre-processor pre-processor diff --git a/registration-processor/pre-processor/registration-processor-external-integration-service/pom.xml b/registration-processor/pre-processor/registration-processor-external-integration-service/pom.xml index 52ff0a587b9..462eec39683 100644 --- a/registration-processor/pre-processor/registration-processor-external-integration-service/pom.xml +++ b/registration-processor/pre-processor/registration-processor-external-integration-service/pom.xml @@ -5,10 +5,10 @@ io.mosip.registrationprocessor pre-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-external-integration-service - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 diff --git a/registration-processor/pre-processor/registration-processor-external-stage/pom.xml b/registration-processor/pre-processor/registration-processor-external-stage/pom.xml index d0157e0e899..dcc3e553773 100644 --- a/registration-processor/pre-processor/registration-processor-external-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-external-stage/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor pre-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-external-stage - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 diff --git a/registration-processor/pre-processor/registration-processor-osi-validator-stage/pom.xml b/registration-processor/pre-processor/registration-processor-osi-validator-stage/pom.xml index 84320e1f86f..1de1d00de07 100644 --- a/registration-processor/pre-processor/registration-processor-osi-validator-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-osi-validator-stage/pom.xml @@ -7,10 +7,10 @@ io.mosip.registrationprocessor pre-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-osi-validator-stage - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 UTF-8 diff --git a/registration-processor/pre-processor/registration-processor-packet-classifier-stage/pom.xml b/registration-processor/pre-processor/registration-processor-packet-classifier-stage/pom.xml index 8ed17079a5b..59be1570cdc 100644 --- a/registration-processor/pre-processor/registration-processor-packet-classifier-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-packet-classifier-stage/pom.xml @@ -7,10 +7,10 @@ io.mosip.registrationprocessor pre-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-packet-classifier-stage - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 UTF-8 diff --git a/registration-processor/pre-processor/registration-processor-packet-uploader-stage/pom.xml b/registration-processor/pre-processor/registration-processor-packet-uploader-stage/pom.xml index 4207befeb8f..5624d123a84 100644 --- a/registration-processor/pre-processor/registration-processor-packet-uploader-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-packet-uploader-stage/pom.xml @@ -9,9 +9,9 @@ io.mosip.registrationprocessor pre-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 diff --git a/registration-processor/pre-processor/registration-processor-packet-validator-stage/pom.xml b/registration-processor/pre-processor/registration-processor-packet-validator-stage/pom.xml index cd9acb34790..6ab62808b91 100644 --- a/registration-processor/pre-processor/registration-processor-packet-validator-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-packet-validator-stage/pom.xml @@ -7,10 +7,10 @@ io.mosip.registrationprocessor pre-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-packet-validator-stage - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 UTF-8 @@ -112,7 +112,7 @@ io.mosip.registrationprocessor registration-processor-packet-classifier-stage - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT diff --git a/registration-processor/pre-processor/registration-processor-quality-checker-stage/pom.xml b/registration-processor/pre-processor/registration-processor-quality-checker-stage/pom.xml index 59805ec9254..23384b58e7b 100644 --- a/registration-processor/pre-processor/registration-processor-quality-checker-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-quality-checker-stage/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor pre-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-quality-checker-stage - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 diff --git a/registration-processor/pre-processor/registration-processor-securezone-notification-stage/pom.xml b/registration-processor/pre-processor/registration-processor-securezone-notification-stage/pom.xml index e4add59d8e5..11c0a24aff7 100644 --- a/registration-processor/pre-processor/registration-processor-securezone-notification-stage/pom.xml +++ b/registration-processor/pre-processor/registration-processor-securezone-notification-stage/pom.xml @@ -5,10 +5,10 @@ pre-processor io.mosip.registrationprocessor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT 4.0.0 - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-securezone-notification-stage diff --git a/registration-processor/qc-users-manger/pom.xml b/registration-processor/qc-users-manger/pom.xml index 48d021af310..d3e8b346ed8 100644 --- a/registration-processor/qc-users-manger/pom.xml +++ b/registration-processor/qc-users-manger/pom.xml @@ -8,7 +8,7 @@ io.mosip.registrationprocessor registration-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT diff --git a/registration-processor/registration-processor-bio-dedupe-service-impl/pom.xml b/registration-processor/registration-processor-bio-dedupe-service-impl/pom.xml index f857a141df2..200de766646 100644 --- a/registration-processor/registration-processor-bio-dedupe-service-impl/pom.xml +++ b/registration-processor/registration-processor-bio-dedupe-service-impl/pom.xml @@ -5,11 +5,11 @@ io.mosip.registrationprocessor registration-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-bio-dedupe-service-impl - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-bio-dedupe-service-impl diff --git a/registration-processor/registration-processor-common-camel-bridge/pom.xml b/registration-processor/registration-processor-common-camel-bridge/pom.xml index 127d4214c5d..e236e136868 100644 --- a/registration-processor/registration-processor-common-camel-bridge/pom.xml +++ b/registration-processor/registration-processor-common-camel-bridge/pom.xml @@ -6,10 +6,10 @@ io.mosip.registrationprocessor registration-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-common-camel-bridge - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT jar diff --git a/registration-processor/registration-processor-core/pom.xml b/registration-processor/registration-processor-core/pom.xml index 26063519e69..952a53ced45 100644 --- a/registration-processor/registration-processor-core/pom.xml +++ b/registration-processor/registration-processor-core/pom.xml @@ -7,10 +7,10 @@ io.mosip.registrationprocessor registration-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-core - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT org.mockito diff --git a/registration-processor/registration-processor-info-storage-service/pom.xml b/registration-processor/registration-processor-info-storage-service/pom.xml index 50f995e32c2..3d65d7ad7ed 100644 --- a/registration-processor/registration-processor-info-storage-service/pom.xml +++ b/registration-processor/registration-processor-info-storage-service/pom.xml @@ -7,10 +7,10 @@ io.mosip.registrationprocessor registration-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-info-storage-service - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-info-storage-service UTF-8 diff --git a/registration-processor/registration-processor-message-sender-impl/pom.xml b/registration-processor/registration-processor-message-sender-impl/pom.xml index 30db744394c..b8609b5e010 100644 --- a/registration-processor/registration-processor-message-sender-impl/pom.xml +++ b/registration-processor/registration-processor-message-sender-impl/pom.xml @@ -8,11 +8,11 @@ io.mosip.registrationprocessor registration-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-message-sender-impl - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 diff --git a/registration-processor/registration-processor-packet-manager/pom.xml b/registration-processor/registration-processor-packet-manager/pom.xml index 156efdf7a00..3fff0475e41 100644 --- a/registration-processor/registration-processor-packet-manager/pom.xml +++ b/registration-processor/registration-processor-packet-manager/pom.xml @@ -7,12 +7,12 @@ io.mosip.registrationprocessor registration-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-packet-manager registration-processor-packet-manager - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 diff --git a/registration-processor/registration-processor-quality-checker/pom.xml b/registration-processor/registration-processor-quality-checker/pom.xml index bbb467cf7cf..bf2ed2c33d6 100644 --- a/registration-processor/registration-processor-quality-checker/pom.xml +++ b/registration-processor/registration-processor-quality-checker/pom.xml @@ -8,7 +8,7 @@ io.mosip.registrationprocessor registration-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT diff --git a/registration-processor/registration-processor-registration-status-service-impl/pom.xml b/registration-processor/registration-processor-registration-status-service-impl/pom.xml index 400f5ab598b..24e0cdba14b 100644 --- a/registration-processor/registration-processor-registration-status-service-impl/pom.xml +++ b/registration-processor/registration-processor-registration-status-service-impl/pom.xml @@ -8,10 +8,10 @@ io.mosip.registrationprocessor registration-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-registration-status-service-impl - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 diff --git a/registration-processor/registration-processor-rest-client/pom.xml b/registration-processor/registration-processor-rest-client/pom.xml index 89752cedbe0..c1f1670195b 100644 --- a/registration-processor/registration-processor-rest-client/pom.xml +++ b/registration-processor/registration-processor-rest-client/pom.xml @@ -9,12 +9,12 @@ io.mosip.registrationprocessor registration-processor - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT registration-processor-rest-client registration-processor-rest-client - 1.1.5.5-P5 + 1.1.5.5-P6-SNAPSHOT UTF-8 From 0682383f349069c609cffac4d6e82ccf8f485a07 Mon Sep 17 00:00:00 2001 From: khuddus shariff Date: Thu, 16 Nov 2023 12:25:18 +0530 Subject: [PATCH 3/4] [ MOSIP-27859 ] Adding pkt_cr_dtimes and setting the packet date and time from metadata of the packet Signed-off-by: khuddus shariff --- registration-processor/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/registration-processor/pom.xml b/registration-processor/pom.xml index 1a5e2fdfdc9..4d31101dd2a 100644 --- a/registration-processor/pom.xml +++ b/registration-processor/pom.xml @@ -112,8 +112,8 @@ 1.1.5.5 1.1.5.5-P6-SNAPSHOT 1.1.5.5-P6-SNAPSHOT - 1.1.5.5 - 1.1.5.5 + 1.1.5.5-P6-SNAPSHOT + 1.1.5.5-P6-SNAPSHOT 1.1.5.5 From 94fed5ed4771f379a4d1c715cb30268d2cbfa862 Mon Sep 17 00:00:00 2001 From: khuddus shariff Date: Thu, 16 Nov 2023 18:23:34 +0530 Subject: [PATCH 4/4] [ MOSIP-27859 ] Adding pkt_cr_dtimes and setting the packet date and time from metadata of the packet Signed-off-by: khuddus shariff --- registration-processor/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/registration-processor/pom.xml b/registration-processor/pom.xml index 4d31101dd2a..eeaeb29e60e 100644 --- a/registration-processor/pom.xml +++ b/registration-processor/pom.xml @@ -109,7 +109,7 @@ 1.1.5.5-P6-SNAPSHOT 1.1.5.5-P6-SNAPSHOT - 1.1.5.5 + 1.1.5.5-P6-SNAPSHOT 1.1.5.5-P6-SNAPSHOT 1.1.5.5-P6-SNAPSHOT 1.1.5.5-P6-SNAPSHOT @@ -129,7 +129,7 @@ 1.1.5 1.1.5 1.1.5 - 1.1.5.5-rc2 + 1.1.5.5 1.1.5 1.1.5 **/dto/**,