MOSIP-36852 - fix scenario3 (Prereg_BookAppointmentByPRID_blank_preRe…

…gistrationId) (#800) * MOSIP-36852 - fix scenario3 (Prereg_BookAppointmentByPRID_blank_preRegistrationId) (#754) Signed-off-by: ymahtat-dev <[email protected]> Signed-off-by: Youssef MAHTAT <[email protected]> * MOSIP-36852 - github actions fix - update actions/upload-artifact to version 4 Signed-off-by: Youssef MAHTAT <[email protected]> --------- Signed-off-by: ymahtat-dev <[email protected]> Signed-off-by: Youssef MAHTAT <[email protected]>
mosip · Jan 22, 2025 · d749656 · d749656
1 parent d8dc84a
commit d749656
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml
@@ -153,7 +153,7 @@ jobs:
           find ${{ env.SERVICE_LOCATION }} -path '*/target/*' -exec zip ${{ env.BUILD_ARTIFACT }}.zip {} +
       - name: Upload the springboot jars
         if: ${{ !contains(github.ref, 'master') || !contains(github.ref, 'main') }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.BUILD_ARTIFACT }}
           path: ${{ env.BUILD_ARTIFACT }}.zip

diff --git a/...ce/src/main/java/io/mosip/preregistration/application/service/AppointmentServiceImpl.java b/...ce/src/main/java/io/mosip/preregistration/application/service/AppointmentServiceImpl.java
@@ -147,6 +147,7 @@ public MainResponseDTO<BookingRegistrationDTO> getAppointmentDetails(String preR
 	}
 
 	private void userValidation(String applicationId) {
+		this.applicationIdValidation(applicationId);
 		String authUserId = authUserDetails().getUserId();
 		List<String> list = listAuth(authUserDetails().getAuthorities());
 		if (list.contains("ROLE_INDIVIDUAL")) {
@@ -155,7 +156,7 @@ private void userValidation(String applicationId) {
 							+ " and userID " + authUserId);
 			ApplicationEntity applicationEntity = null;
 			try {
-				applicationEntity = applicationRepostiory.findByApplicationId(applicationId);
+				applicationEntity = applicationRepostiory.findById(applicationId).orElseThrow();
 			} catch (Exception ex) {
 				log.error(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID,
 						"Invaid applicationId/Not Record Found for the ID : " + applicationId);
@@ -169,6 +170,15 @@ private void userValidation(String applicationId) {
 		}
 	}
 
+	private void applicationIdValidation(String applicationId) {
+		if (applicationId == null || applicationId.trim().isEmpty()) {
+			throw new AppointmentExecption(
+					ApplicationErrorCodes.PRG_APP_013.getCode(),
+					"preRegistrationId cannot be empty."
+			);
+		}
+	}
+
 	/**
 	 * This method is used to get the list of authorization role
 	 *