Resolved merge conflicts

Signed-off-by: Mohanachandran S <[email protected]>
mohanachandran-s · Oct 23, 2024 · bcc00b7 · bcc00b7
2 parents bce296d + b5a6411
commit bcc00b7
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 32 deletions.
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java b/api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java
@@ -88,12 +88,6 @@ public static void main(String[] arg) {
 			KeycloakUserManager.createUsers();
 			KeycloakUserManager.closeKeycloakInstance();
 
-			//List<String> localDocCatCode =new ArrayList<>(BaseTestCase.getDocCatCode());
-
-			// List<String> localDocCatCode =new ArrayList<>(BaseTestCase.getDocCatCode());
-
-			// List<String> localDocCatCode =new ArrayList<>(BaseTestCase.getDocCatCode());
-
 			startTestRunner();
 		} catch (Exception e) {
 			LOGGER.error("Exception " + e.getMessage());

diff --git a/pre-registration/pom.xml b/pre-registration/pom.xml
@@ -115,8 +115,8 @@
 		<sonar.cpd.exclusions>**/dto/**,**/entity/**,**/config/**</sonar.cpd.exclusions>
 
 		<!-- Mosip kernel -->
-		<kernel.bom.version>1.3.0-SNAPSHOT</kernel.bom.version>
-		<kernel.core.version>1.3.0-SNAPSHOT</kernel.core.version>
+		<kernel.bom.version>1.3.0-beta.1</kernel.bom.version>
+		<kernel.core.version>1.3.0-beta.1</kernel.core.version>
 		<pre.registration.core.version>1.3.0-SNAPSHOT</pre.registration.core.version>
 		<spring-cloud.version>2020.0.4</spring-cloud.version>
 	</properties>

diff --git a/pre-registration/pre-registration-application-service/pom.xml b/pre-registration/pre-registration-application-service/pom.xml
@@ -17,11 +17,12 @@
 	<properties>
 		<!-- Mosip kernel -->
 		<kernel.khazana.version>1.3.0-SNAPSHOT</kernel.khazana.version>
-		<kernel.idobjectvalidator.version>1.3.0-SNAPSHOT</kernel.idobjectvalidator.version>
-		<kernel.templatemanager.velocity.version>1.3.0-SNAPSHOT</kernel.templatemanager.velocity.version>
-		<kernel.qrcodegenerator.zxing.version>1.3.0-SNAPSHOT</kernel.qrcodegenerator.zxing.version>
-		<kernel.transliteration.icu4j.version>1.3.0-SNAPSHOT</kernel.transliteration.icu4j.version>
-		<kernel.bom.version>1.3.0-SNAPSHOT</kernel.bom.version>
+		<kernel.idobjectvalidator.version>1.3.0-beta.1</kernel.idobjectvalidator.version>
+		<kernel.templatemanager.velocity.version>1.3.0-beta.1</kernel.templatemanager.velocity.version>
+		<kernel.qrcodegenerator.zxing.version>1.3.0-beta.1</kernel.qrcodegenerator.zxing.version>
+		<kernel.transliteration.icu4j.version>1.3.0-beta.1</kernel.transliteration.icu4j.version>
+		<kernel.bom.version>1.3.0-beta.1</kernel.bom.version>
+		<mosip.openid.bridge.version>1.3.0-beta.1</mosip.openid.bridge.version>
 		<pre.registration.core.version>1.3.0-SNAPSHOT</pre.registration.core.version>
 		<!-- Others -->
 		<org.hamcrest.version>2.1</org.hamcrest.version>
@@ -221,7 +222,7 @@
 				<dependency>
 					<groupId>io.mosip.kernel</groupId>
 					<artifactId>kernel-auth-adapter</artifactId>
-					<version>${project.version}</version>
+					<version>${mosip.openid.bridge.version}</version>
 				</dependency>
 				<dependency>
 					<groupId>io.mosip.kernel</groupId>

diff --git a/...ervice/src/main/java/io/mosip/preregistration/application/service/DemographicService.java b/...ervice/src/main/java/io/mosip/preregistration/application/service/DemographicService.java
@@ -668,14 +668,13 @@ public MainResponseDTO<DeletePreRegistartionDTO> deleteIndividual(String preregI
 							if ((demographicEntity.getStatusCode().equals(StatusCodes.BOOKED.getCode()))) {
 								getBookingServiceToDeleteAllByPreId(preregId);
 							}
-							int isDeletedDemo = demographicRepository.deleteByPreRegistrationId(preregId);
-							serviceUtil.deleteApplicationFromApplications(preregId);
-							if (isDeletedDemo > 0) {
+							try {
+								this.demographicRepository.delete(demographicEntity);
+								serviceUtil.deleteApplicationFromApplications(preregId);
 								deleteDto.setPreRegistrationId(preregId);
 								deleteDto.setDeletedBy(userId);
 								deleteDto.setDeletedDateTime(new Date(System.currentTimeMillis()));
-
-							} else {
+							} catch (Exception e) {
 								throw new RecordFailedToDeleteException(DemographicErrorCodes.PRG_PAM_APP_004.getCode(),
 										DemographicErrorMessages.FAILED_TO_DELETE_THE_PRE_REGISTRATION_RECORD
 												.getMessage());

diff --git a/pre-registration/pre-registration-captcha-service/pom.xml b/pre-registration/pre-registration-captcha-service/pom.xml
@@ -18,10 +18,10 @@
 
 	<properties>
 		<!-- Mosip kernel -->
-		<kernel.keymanager.version>1.3.0-SNAPSHOT</kernel.keymanager.version>
-		<kernel.transliteration.icu4j.version>1.3.0-SNAPSHOT</kernel.transliteration.icu4j.version>
-		<kernel.idobjectvalidator.version>1.3.0-SNAPSHOT</kernel.idobjectvalidator.version>
-		<kernel.bom.version>1.3.0-SNAPSHOT</kernel.bom.version>
+		<kernel.keymanager.version>1.3.0-beta.1</kernel.keymanager.version>
+		<kernel.transliteration.icu4j.version>1.3.0-beta.1</kernel.transliteration.icu4j.version>
+		<kernel.idobjectvalidator.version>1.3.0-beta.1</kernel.idobjectvalidator.version>
+		<kernel.bom.version>1.3.0-beta.1</kernel.bom.version>
 		<pre.registration.core.version>1.3.0-SNAPSHOT</pre.registration.core.version>
 	</properties>
 

diff --git a/pre-registration/pre-registration-core/pom.xml b/pre-registration/pre-registration-core/pom.xml
@@ -17,10 +17,10 @@
 
 	<properties>
 		<!-- Mosip kernel -->
-		<kernel.templatemanager.velocity.version>1.3.0-SNAPSHOT</kernel.templatemanager.velocity.version>
-		<kernel.logger.logback.version>1.3.0-SNAPSHOT</kernel.logger.logback.version>
-		<kernel.dataaccess.hibernate.version>1.3.0-SNAPSHOT</kernel.dataaccess.hibernate.version>
-		<kernel.bom.version>1.3.0-SNAPSHOT</kernel.bom.version>
+		<kernel.templatemanager.velocity.version>1.3.0-beta.1</kernel.templatemanager.velocity.version>
+		<kernel.logger.logback.version>1.3.0-beta.1</kernel.logger.logback.version>
+		<kernel.dataaccess.hibernate.version>1.3.0-beta.1</kernel.dataaccess.hibernate.version>
+		<kernel.bom.version>1.3.0-beta.1</kernel.bom.version>
 	</properties>
 
 	<dependencyManagement>

diff --git a/pre-registration/pre-registration-datasync-service/pom.xml b/pre-registration/pre-registration-datasync-service/pom.xml
@@ -16,10 +16,11 @@
 
 	<properties>
 		<!-- Mosip kernel -->
-		<kernel.keymanager.version>1.3.0-SNAPSHOT</kernel.keymanager.version>
-		<kernel.ref.idobjectvalidator.version>1.3.0-SNAPSHOT</kernel.ref.idobjectvalidator.version>
-		<kernel.transliteration.icu4j.version>1.3.0-SNAPSHOT</kernel.transliteration.icu4j.version>
-		<kernel.bom.version>1.3.0-SNAPSHOT</kernel.bom.version>
+		<kernel.keymanager.version>1.3.0-beta.1</kernel.keymanager.version>
+		<kernel.ref.idobjectvalidator.version>1.3.0-beta.1</kernel.ref.idobjectvalidator.version>
+		<kernel.transliteration.icu4j.version>1.3.0-beta.1</kernel.transliteration.icu4j.version>
+		<kernel.bom.version>1.3.0-beta.1</kernel.bom.version>
+		<mosip.openid.bridge.version>1.3.0-beta.1</mosip.openid.bridge.version>
 		<pre.registration.core.version>1.3.0-SNAPSHOT</pre.registration.core.version>
 		<pre.registration.application.service.version>1.3.0-SNAPSHOT</pre.registration.application.service.version>
 		<pre.application.service.version>1.3.0-SNAPSHOT</pre.application.service.version>
@@ -142,7 +143,7 @@
 				<dependency>
 					<groupId>io.mosip.kernel</groupId>
 					<artifactId>kernel-auth-adapter</artifactId>
-					<version>${project.version}</version>
+					<version>${mosip.openid.bridge.version}</version>
 				</dependency>
 				<dependency>
 					<groupId>io.mosip.kernel</groupId>