Merge pull request #684 from Sohandey/develop

MOSIP-34325
mosip · Aug 5, 2024 · de067f3 · de067f3
2 parents 3008b99 + bfb6047
commit de067f3
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 74 deletions.
diff --git a/apitest/src/main/resources/preReg/AddLostUinApplication/AddLostUinApplication.yml b/apitest/src/main/resources/preReg/AddLostUinApplication/AddLostUinApplication.yml
@@ -32,14 +32,13 @@ AddLostUinApplication:
       output: '{
    "errors": [
     {
-      "errorCode": "PRG_CORE_REQ_014"
+      "errorCode": "PRG_PAM_CORE_001"
     }
   ]
 }'
    Prereg_AddLostUinApplication_invalid_lang_code:
       endPoint: /preregistration/v1/applications/lostuin
       role: batch
-      templateFields: ["langCode"]
       restMethod: post
       inputTemplate: preReg/AddLostUinApplication/addLostUinApplication
       outputTemplate: preReg/error
@@ -50,8 +49,11 @@ AddLostUinApplication:
   "id": "mosip.pre-registration.lostuin.create"
 }'
       output: '{
-  "bookingType": "LOST_FORGOTTEN_UIN",
-  "applicationStatusCode": "SUBMITTED"
+   "errors": [
+    {
+      "errorCode": "PRG_CORE_REQ_014"
+    }
+  ]
 }'
    Prereg_AddLostUinApplication_without_version:
       endPoint: /preregistration/v1/applications/lostuin
@@ -69,7 +71,7 @@ AddLostUinApplication:
       output: '{
    "errors": [
     {
-      "errorCode": "PRG_CORE_REQ_014"
+      "errorCode": "PRG_CORE_REQ_002"
     }
   ]
 }'
@@ -89,7 +91,7 @@ AddLostUinApplication:
       output: '{
    "errors": [
     {
-      "errorCode": "PRG_CORE_REQ_014"
+      "errorCode": "PRG_CORE_REQ_002"
     }
   ]
 }'
@@ -109,7 +111,7 @@ AddLostUinApplication:
       output: '{
    "errors": [
     {
-      "errorCode": "PRG_CORE_REQ_014"
+      "errorCode": "PRG_CORE_REQ_002"
     }
   ]
 }'
@@ -165,7 +167,7 @@ AddLostUinApplication:
       output: '{
    "errors": [
     {
-      "errorCode": "PRG_CORE_REQ_014"
+      "errorCode": "PRG_CORE_REQ_003"
     }
   ]
 }'
diff --git a/apitest/src/main/resources/preReg/CancelAppointment/CancelAppointment.yml b/apitest/src/main/resources/preReg/CancelAppointment/CancelAppointment.yml
@@ -24,7 +24,7 @@ CancelAppointment:
       output: '{
    "errors": [
     {
-      "errorCode": "PRG_APP_013"
+      "errorCode": "PRG_BOOK_RCI_013"
     }
   ]
 }'
@@ -41,7 +41,7 @@ CancelAppointment:
       output: '{
    "errors": [
     {
-      "errorCode": "PRG_APP_013"
+      "errorCode": "PRG_BOOK_RCI_013"
     }
   ]
 }'

diff --git a/apitest/src/main/resources/preReg/DeleteAllDocForaPRID/DeleteAllDocForaPRID.yml b/apitest/src/main/resources/preReg/DeleteAllDocForaPRID/DeleteAllDocForaPRID.yml
@@ -23,7 +23,7 @@ DeleteAllDocForaPRID:
       output: '{
    "errors": [
     {
-      "errorCode": "PRG_PAM_APP_005",
+      "errorCode": "PRG_PAM_APP_005"
     }
   ]
 }'
diff --git a/...ources/preReg/GetAllApplicationsWithapplicationId/GetAllApplicationsWithapplicationId.yml b/...ources/preReg/GetAllApplicationsWithapplicationId/GetAllApplicationsWithapplicationId.yml
@@ -23,7 +23,7 @@ GetAllApplicationsWithapplicationId:
 }'
       output: '{
 }'
-   Prereg_GetAllApplicationsWithapplicationId_with_invalid_app;icationId:
+   Prereg_GetAllApplicationsWithapplicationId_with_invalid_applicationId:
       endPoint: /preregistration/v1/applications/{applicationId}
       role: batch
       checkErrorsOnlyInResponse: true
@@ -36,7 +36,7 @@ GetAllApplicationsWithapplicationId:
       output: '{
   "errors": [
     {
-      "errorCode": "PRG_APP_016"
+      "errorCode": "PRG_APP_013"
     }
   ]
 }'
diff --git a/apitest/src/main/resources/preReg/GetPRIDByDateRange/GetPRIDByDateRange.yml b/apitest/src/main/resources/preReg/GetPRIDByDateRange/GetPRIDByDateRange.yml
@@ -2,6 +2,7 @@ GetPRIDByDateRange:
    Prereg_GetPRIDByDateRange_All_Valid_Smoke_sid:
       endPoint: /preregistration/v1/sync
       role: regproc
+      checkErrorsOnlyInResponse: true
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRangeResult

diff --git a/apitest/src/main/resources/preReg/SendNotifications/SendNotifications.yml b/apitest/src/main/resources/preReg/SendNotifications/SendNotifications.yml
@@ -1,10 +1,10 @@
 SendNotifications:
    Prereg_SendNotifications_All_Valid_Smoke:
-      endPoint: /preregistration/v1/notification
+      endPoint: /preregistration/v1/notification/notify
       role: batch
       checkErrorsOnlyInResponse: true
       restMethod: post
-      inputTemplate: preReg/SendNotifications/sendNotifications_$LANGNUMBER$
+      inputTemplate: preReg/SendNotifications/sendNotificationsNotify
       outputTemplate: preReg/SendNotifications/sendNotificationsResult
       input: '{ 
     "id":"mosip.pre-registration.notification.notify",
@@ -14,10 +14,9 @@ SendNotifications:
   "preRegistrationId":"$ID:CreatePrereg_All_Valid_Smoke_BookByPRID_sid_preRegistrationId$",
   "appointmentDate":"$ID:GetAppointmentDetails_BookByPRID_All_Valid_Smoke_sid_appointment_date$",
   "appointmentTime":"$ID:GetAppointmentDetails_BookByPRID_All_Valid_Smoke_sid_time_slot_from$",
-  "mobNum":"9090872300",
-  "emailID":"[email protected]",
-  "additionalRecipient":false,
-  "isBatch":false           
+  "mobNum":"9090872333",
+  "emailID":"[email protected]",
+  "isBatch":true           
 }'
       output: '{
 }'
@@ -46,7 +45,7 @@ SendNotifications:
       endPoint: /preregistration/v1/notification
       role: batch
       restMethod: post
-      inputTemplate: preReg/SendNotifications/sendNotifications_$LANGNUMBER$
+      inputTemplate: preReg/SendNotifications/sendNotificationsNotify
       outputTemplate: preReg/error
       input: '{ 
     "id":"mosip.pre-registration.notification.notifyasdf",
@@ -72,7 +71,7 @@ SendNotifications:
       endPoint: /preregistration/v1/notification
       role: batch
       restMethod: post
-      inputTemplate: preReg/SendNotifications/sendNotifications_$LANGNUMBER$
+      inputTemplate: preReg/SendNotifications/sendNotificationsNotify
       outputTemplate: preReg/error
       input: '{ 
     "id":"mosip.pre-registration.notification.notify",

diff --git a/apitest/src/main/resources/preReg/SendOtp/SendOtp.yml b/apitest/src/main/resources/preReg/SendOtp/SendOtp.yml
@@ -1,20 +1,4 @@
 SendOtp:
-   Prereg_SendOtp_All_Valid_Smoke_Phone_sid:
-      endPoint: /preregistration/v1/login/sendOtp/langcode
-      role: batch
-      restMethod: post
-      inputTemplate: preReg/SendOtp/sendotp
-      outputTemplate: preReg/SendOtp/sendotpResult
-      input: '{
-  "version": "1.0",
-  "requesttime": "$TIMESTAMP$",
-  "userId": "9090872300",
-  "id": "mosip.pre-registration.login.sendotp"
-}'
-      output: '{
-  "status": "success"
-}'
-
    Prereg_SendOtp_Invalid_Phone_Neg:
       endPoint: /preregistration/v1/login/sendOtp/langcode
       role: batch
@@ -75,22 +59,6 @@ SendOtp:
   ]
 }'
 
-   Prereg_SendOtp_All_Valid_Smoke_email_sid:
-      endPoint: /preregistration/v1/login/sendOtp/langcode
-      role: batch
-      restMethod: post
-      inputTemplate: preReg/SendOtp/sendotp
-      outputTemplate: preReg/SendOtp/sendotpResult
-      input: '{
-  "version": "1.0",
-  "requesttime": "$TIMESTAMP$",
-  "userId": "[email protected]",
-  "id": "mosip.pre-registration.login.sendotp"
-}'
-      output: '{
-  "status": "success"
-}'
-
    Prereg_SendOtp_Invalid__email_Neg:
       endPoint: /preregistration/v1/login/sendOtp/langcode
       role: batch
@@ -149,4 +117,34 @@ SendOtp:
       "errorCode": "PRG_PAM_LGN_008"
     }
   ]
-}'
+}'
+   Prereg_SendOtp_All_Valid_Smoke_Phone_sid:
+      endPoint: /preregistration/v1/login/sendOtp/langcode
+      role: batch
+      restMethod: post
+      inputTemplate: preReg/SendOtp/sendotp
+      outputTemplate: preReg/SendOtp/sendotpResult
+      input: '{
+  "version": "1.0",
+  "requesttime": "$TIMESTAMP$",
+  "userId": "9090872300",
+  "id": "mosip.pre-registration.login.sendotp"
+}'
+      output: '{
+  "status": "success"
+}'
+   Prereg_SendOtp_All_Valid_Smoke_email_sid:
+      endPoint: /preregistration/v1/login/sendOtp/langcode
+      role: batch
+      restMethod: post
+      inputTemplate: preReg/SendOtp/sendotp
+      outputTemplate: preReg/SendOtp/sendotpResult
+      input: '{
+  "version": "1.0",
+  "requesttime": "$TIMESTAMP$",
+  "userId": "[email protected]",
+  "id": "mosip.pre-registration.login.sendotp"
+}'
+      output: '{
+  "status": "success"
+}'
diff --git a/apitest/src/main/resources/preReg/ValidateOtp/ValidateOtp.yml b/apitest/src/main/resources/preReg/ValidateOtp/ValidateOtp.yml
@@ -1,5 +1,5 @@
 ValidateOtp:
-   Prereg_ValidateOtp_All_Valid_Smoke_Phone_sid:
+   Prereg_SendOtp_All_Valid_Smoke_email_sid:
       endPoint: /preregistration/v1/login/validateOtp
       role: batch
       checkErrorsOnlyInResponse: true
@@ -9,36 +9,30 @@ ValidateOtp:
       input: '{
   "version": "1.0",
   "requesttime": "$TIMESTAMP$",
-  "userId": "9090872300",
+  "userId": "[email protected]",
   "otp": "111111",
   "id": "mosip.pre-registration.login.useridotp"
 }'
       output: '{
 }'
-
-   Prereg_ValidateOtp_Invalid_Phone_Neg:
+   Prereg_ValidateOtp_All_Valid_Smoke_Phone_sid:
       endPoint: /preregistration/v1/login/validateOtp
       role: batch
       checkErrorsOnlyInResponse: true
       restMethod: post
       inputTemplate: preReg/ValidateOtp/validateOtp
-      outputTemplate: preReg/error
+      outputTemplate: preReg/ValidateOtp/validateOtpResult
       input: '{
   "version": "1.0",
   "requesttime": "$TIMESTAMP$",
-  "userId": "909",
+  "userId": "9090872300",
   "otp": "111111",
   "id": "mosip.pre-registration.login.useridotp"
 }'
       output: '{
-       "errors": [
-    {
-      "errorCode": "PRG_PAM_LGN_013"
-    }
-  ]
 }'
 
-   Prereg_ValidateOtp_SpacialCharacters_Phone_Neg:
+   Prereg_ValidateOtp_Invalid_Phone_Neg:
       endPoint: /preregistration/v1/login/validateOtp
       role: batch
       checkErrorsOnlyInResponse: true
@@ -48,7 +42,7 @@ ValidateOtp:
       input: '{
   "version": "1.0",
   "requesttime": "$TIMESTAMP$",
-  "userId": "$!(",
+  "userId": "909",
   "otp": "111111",
   "id": "mosip.pre-registration.login.useridotp"
 }'
@@ -59,24 +53,27 @@ ValidateOtp:
     }
   ]
 }'
-
-   Prereg_SendOtp_All_Valid_Smoke_email_sid:
+   Prereg_ValidateOtp_SpacialCharacters_Phone_Neg:
       endPoint: /preregistration/v1/login/validateOtp
       role: batch
       checkErrorsOnlyInResponse: true
       restMethod: post
       inputTemplate: preReg/ValidateOtp/validateOtp
-      outputTemplate: preReg/ValidateOtp/validateOtpResult
+      outputTemplate: preReg/error
       input: '{
   "version": "1.0",
   "requesttime": "$TIMESTAMP$",
-  "userId": "[email protected]",
+  "userId": "$!(",
   "otp": "111111",
   "id": "mosip.pre-registration.login.useridotp"
 }'
       output: '{
+       "errors": [
+    {
+      "errorCode": "PRG_PAM_LGN_013"
+    }
+  ]
 }'
-
    Prereg_ValidateOtp_SpacialCharacters_Email_Neg:
       endPoint: /preregistration/v1/login/validateOtp
       role: batch

diff --git a/apitest/src/main/resources/preReg/bookAppointment/bookAppointment.yml b/apitest/src/main/resources/preReg/bookAppointment/bookAppointment.yml
@@ -639,7 +639,7 @@ BookAppointment:
       output: '{
    "errors": [
     {
-      "errorCode": "PRG_CORE_REQ_013"
+      "errorCode": "PRG_BOOK_RCI_031"
       
     }
   ]
@@ -664,7 +664,7 @@ BookAppointment:
       output: '{
    "errors": [
     {
-      "errorCode": "PRG_CORE_REQ_013"
+      "errorCode": "PRG_CORE_REQ_015"
       
     }
   ]