Skip to content

Commit

Permalink
updated prereg scripts for consumedscript
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ravikant-M1044571
Ravikant-M1044571 committed Jul 2, 2020
1 parent 5feb0cc commit dcbeab7
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 62 deletions.
13 changes: 13 additions & 0 deletions automationtests/src/main/java/io/mosip/preregistration/dao/PreregistrationDAO.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,19 @@ public String getConsumedStatus(String PreID)

return status;
}
public String getProcessedConsumedStatus(String PreID)
{ String status = null;
String queryString = "SELECT c.status_code FROM prereg.processed_prereg_list c where c.prereg_id='" + PreID+ "'";
List<String> preId_status = dbAccess.getConsumedStatus(queryString, "prereg");
try {
status = preId_status.get(0).toString();

} catch (IndexOutOfBoundsException e) {
Assert.assertTrue(false, "PreRegistartion id is not present in demographic_Consumed table");
}

return status;
}
public String getRegCenterIdOfConsumedApplication(String PreID) {
String queryString = "SELECT c.regcntr_id FROM prereg.reg_appointment_consumed c where c.prereg_id='" + PreID + "'";
List<String> preId_status = dbAccess.getConsumedStatus(queryString, "prereg");
Expand Down
23 changes: 13 additions & 10 deletions automationtests/src/main/java/io/mosip/preregistration/tests/ConsumedTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,28 +41,31 @@ public class ConsumedTestCase extends BaseTestCase implements ITest {
*/
@Test(groups = { "IntegrationScenarios" })
public void consumedBookedAppointment() {
String status = lib.getConsumedStatus(preID);
lib.compareValues(lib.getProcessedConsumedStatus(preID), "Consumed");

/*String status = lib.getConsumedStatus(preID);
String actualRegCenterId = lib.getRegCenterIdOfConsumedApplication(preID);
String actualDocumentId = lib.getDocumentIdOfConsumedApplication(preID);
lib.compareValues(actualDocumentId, documentId.get(preID));
lib.compareValues(status, "Consumed");
lib.compareValues(actualRegCenterId, regCenterId.get(preID));
lib.compareValues(actualRegCenterId, regCenterId.get(preID));*/
}

/**
* @author Ashish Changing status to Consumed using batch job service
*/
@Test(groups = { "IntegrationScenarios" })
public void consumedBatchJobService() {
Response getPreRegistrationDataResponse = lib.getPreRegistrationData(preID, batchJobToken);

/*Response getPreRegistrationDataResponse = lib.getPreRegistrationData(preID, batchJobToken);
lib.compareValues(getPreRegistrationDataResponse.jsonPath().get("errors[0].message").toString(),
"No data found for the requested pre-registration id");
String status = lib.getConsumedStatus(preID);
String actualRegCenterId = lib.getRegCenterIdOfConsumedApplication(preID);
String actualDocumentId = lib.getDocumentIdOfConsumedApplication(preID);
lib.compareValues(actualDocumentId, documentId.get(preID));
lib.compareValues(status, "Consumed");
lib.compareValues(actualRegCenterId, regCenterId.get(preID));
lib.compareValues(actualRegCenterId, regCenterId.get(preID));*/
}

/**
Expand All @@ -71,9 +74,9 @@ public void consumedBatchJobService() {

@Test(groups = { "IntegrationScenarios" })
public void retrivePreRegDataConsumedApplication() {
Response retrivePreRegistrationDataResponse = lib.retrivePreRegistrationData(preID);
/*Response retrivePreRegistrationDataResponse = lib.retrivePreRegistrationData(preID);
lib.compareValues(retrivePreRegistrationDataResponse.jsonPath().get("errors[0].message").toString(),
"No data found for the requested pre-registration id");
"No data found for the requested pre-registration id");*/

}

Expand All @@ -83,23 +86,23 @@ public void retrivePreRegDataConsumedApplication() {
@Test(groups = { "IntegrationScenarios" })
public void consumedMultiplePRID() {
List<String> preRegistrationIds = new ArrayList<String>(consumedPreRegIds);
for (String PreRegId : preRegistrationIds) {
/*for (String PreRegId : preRegistrationIds) {
Response getPreRegistrationStatusResposne = lib.getPreRegistrationStatus(PreRegId, batchJobToken);
lib.compareValues(getPreRegistrationStatusResposne.jsonPath().get("errors[0].message").toString(),
"No data found for the requested pre-registration id");
}
}*/

}

@Test(groups = { "IntegrationScenarios" })
public void cosumedExpiredAppointment() {
String expPreId = lib.expiredPreId;
String status = lib.getConsumedStatus(expPreId);
/*String status = lib.getConsumedStatus(expPreId);
String actualRegCenterId = lib.getRegCenterIdOfConsumedApplication(expPreId);
String actualDocumentId = lib.getDocumentIdOfConsumedApplication(expPreId);
lib.compareValues(actualDocumentId, documentId.get(expPreId));
lib.compareValues(status, "Consumed");
lib.compareValues(actualRegCenterId, regCenterId.get(expPreId));
lib.compareValues(actualRegCenterId, regCenterId.get(expPreId));*/
}

@Override
Expand Down
1 change: 0 additions & 1 deletion automationtests/src/main/java/io/mosip/service/BaseTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ public class BaseTestCase {
public static HashMap<String, String> documentId = new HashMap<>();
public static HashMap<String, String> regCenterId = new HashMap<>();
public static String expiredPreId = null;
public static String consumedPreRegId = null;
public String batchJobToken = null;
public static List<String> expiredPreRegIds = null;
public static List<String> consumedPreRegIds = null;
Expand Down
117 changes: 66 additions & 51 deletions automationtests/src/main/java/io/mosip/util/PreRegistrationLibrary.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public class PreRegistrationLibrary extends BaseTestCase {
// private static CommonLibrary commonLibrary = new CommonLibrary();
io.mosip.kernel.util.CommonLibrary cLib = new io.mosip.kernel.util.CommonLibrary();
RegProcApiRequests regproc=new RegProcApiRequests();

Map<String, String> props = cLib.readProperty("IDRepo");
private static String preReg_CreateApplnURI;
PreregistrationDAO dao = new PreregistrationDAO();
private static String preReg_DataSyncnURI;
Expand Down Expand Up @@ -157,7 +157,7 @@ public List<String> createConsumedPreId() {
List<String> preRegistrationIds = new ArrayList<String>();
String PreID = null;

for (int i = 0; i < 2; i++) {
for (int i = 0; i < 1; i++) {
if (!isValidToken(batchJobToken)) {
batchJobToken = batchToken();
}
Expand All @@ -173,15 +173,17 @@ public List<String> createConsumedPreId() {
regCenterId.put(preID, expectedRegCenterId);
BookAppointment(documentUploadResponse, fetchCentreResponse, preID, batchJobToken);
preRegistrationIds.add(preID);
preID = preRegistrationIds.get(0);
dao.setDate(preID);
}
expiredPreId = preRegistrationIds.get(0);
dao.setDate(expiredPreId);

reverseDataSync(preRegistrationIds);

return preRegistrationIds;
}

public List<String> createExpiredApplication() {
List expiredPreId = new ArrayList<>();
List<String> expiredPreIds = new ArrayList<>();
for (int i = 0; i < 1; i++) {
if (!isValidToken(batchJobToken)) {
batchJobToken = batchToken();
Expand All @@ -194,10 +196,12 @@ public List<String> createExpiredApplication() {
Response avilibityResponse = FetchCentre(batchJobToken);
BookAppointment(documentResponse, avilibityResponse, preID, batchJobToken);
dao.changeStatusWithPrId(preID, "Expired");
expiredPreId.add(preID);
dao.setDate(expiredPreId);
expiredPreIds.add(preID);
expiredPreId = preID;
}

return expiredPreId;
return expiredPreIds;
}


Expand Down Expand Up @@ -406,6 +410,17 @@ public String batchToken() {
public String getConsumedStatus(String PreID) {
return dao.getConsumedStatus(PreID);
}

/**
* Fetching status of processes_preregids
*
* @param PreID-PRID
* of the consumed application
* @return
*/
public String getProcessedConsumedStatus(String PreID) {
return dao.getProcessedConsumedStatus(PreID);
}

/**
* Get Document Id for Consumed Application
Expand Down Expand Up @@ -557,7 +572,7 @@ public boolean fetchDocs1(Response response, String folderName) {
public HashMap<String, String> readConfigProperty(String url, String configParameter) {
List<String> reqParams = new ArrayList<>();
Map<String, String> configParamMap = new HashMap<>();
uiConfigParams = cLib.readProperty("IDRepo").get(configParameter);
uiConfigParams = props.get(configParameter);
String[] uiParams = uiConfigParams.split(",");
for (int i = 0; i < uiParams.length; i++) {
reqParams.add(uiParams[i]);
Expand Down Expand Up @@ -820,7 +835,7 @@ public Response documentUpload(Response responseCreate, String cookie) {
logger.info("File Name:" + file);
request = getRequest(testSuite);
request.put("requesttime", getCurrentDate());
String Document_request = cLib.readProperty("IDRepo").get("req.Documentrequest");
String Document_request = props.get("req.Documentrequest");
// preReg_DocumentUploadURI=preReg_DocumentUploadURI+PreRegistrationId;
preReg_DocumentUploadURI = preReg_DocUploadURI + getPreId(responseCreate);
HashMap<String, String> map = new HashMap<>();
Expand All @@ -844,7 +859,7 @@ public Response documentUpload(Response responseCreate, String PreRegistrationId
logger.info("File Name:" + file);
request = getRequest(testSuite);
request.put("requesttime", getCurrentDate());
String Document_request = cLib.readProperty("IDRepo").get("req.Documentrequest");
String Document_request = props.get("req.Documentrequest");
// preReg_DocumentUploadURI=preReg_DocumentUploadURI+PreRegistrationId;
preReg_DocumentUploadURI = preReg_DocUploadURI + PreRegistrationId;
HashMap<String, String> map = new HashMap<>();
Expand Down Expand Up @@ -911,7 +926,7 @@ public Response documentUploadParm(Response responseCreate, String PreRegistrati
logger.info("File Name:" + file);
request = getRequest(testSuite);
request.put("requesttime", getCurrentDate());
String Document_request = cLib.readProperty("IDRepo").get("req.Documentrequest");
String Document_request = props.get("req.Documentrequest");
preReg_DocumentUploadURI = preReg_DocUploadURI + PreRegistrationId;
HashMap<String, String> map = new HashMap<>();
map.put(Document_request, request.toJSONString());
Expand Down Expand Up @@ -1104,7 +1119,7 @@ public Response FetchCentre(String regCenterID, String cookie) {
request.put("registrationCenterId", regCenterID);
try {

String preReg_FetchCenterIDURI = cLib.readProperty("IDRepo").get("preReg_FetchCenterIDuri");
String preReg_FetchCenterIDURI = props.get("preReg_FetchCenterIDuri");
response = appLib.getWithPathParam(preReg_FetchCenterIDURI, request, cookie);
} catch (Exception e) {
e.printStackTrace();
Expand Down Expand Up @@ -1342,18 +1357,18 @@ public Response logOut(String cookie) {
}

/**
* Its a batch job service which changed the status of consumed application into
* Its a batch job service which updates the status of consumed application into
* Consumed
*
* @author Ashish
* @return
*/
/*public Response consumedStatus() {
/*public void consumedStatus() {
if (!isValidToken(preRegAdminToken)) {
preRegAdminToken = preRegAdminToken();
}
logger.info("Staring batch job to ");
response = appLib.putWithoutData(preReg_ConsumedURI, preRegAdminToken);
return response;
}*/

/*
Expand Down Expand Up @@ -1957,43 +1972,43 @@ public JSONObject BookAppointmentRequest(Response FetchCentreResponse, String pr

@BeforeClass
public void PreRegistrationResourceIntialize() {
preReg_CreateApplnURI = cLib.readProperty("IDRepo").get("preReg_CreateApplnURI");
preReg_DocumentUploadURI = cLib.readProperty("IDRepo").get("preReg_DocumentUploadURI");
preReg_BookingAppointmentURI = cLib.readProperty("IDRepo").get("preReg_BookingAppointmentURI");
preReg_DataSyncnURI = cLib.readProperty("IDRepo").get("preReg_DataSyncnURI");
preReg_FetchRegistrationDataURI = cLib.readProperty("IDRepo").get("preReg_FetchRegistrationDataURI");
preReg_FecthAppointmentDetailsURI = cLib.readProperty("IDRepo").get("preReg_FecthAppointmentDetailsURI");
preReg_FetchAllDocumentURI = cLib.readProperty("IDRepo").get("preReg_FetchAllDocumentURI");
prereg_DeleteDocumentByDocIdURI = cLib.readProperty("IDRepo").get("prereg_DeleteDocumentByDocIdURI");
preReg_DeleteAllDocumentByPreIdURI = cLib.readProperty("IDRepo").get("preReg_DeleteAllDocumentByPreIdURI");
preReg_CopyDocumentsURI = cLib.readProperty("IDRepo").get("preReg_CopyDocumentsURI");
preReg_FetchBookedPreIdByRegIdURI = cLib.readProperty("IDRepo").get("preReg_FetchBookedPreIdByRegIdURI");
preReg_FetchStatusOfApplicationURI = cLib.readProperty("IDRepo").get("preReg_FetchStatusOfApplicationURI");
preReg_DiscardApplnURI = cLib.readProperty("IDRepo").get("preReg_DiscardApplnURI");
preReg_UpdateStatusAppURI = cLib.readProperty("IDRepo").get("preReg_UpdateStatusAppURI");
preReg_CancelAppointmentURI = cLib.readProperty("IDRepo").get("preReg_CancelAppointmentURI");
preReg_ExpiredURI = cLib.readProperty("IDRepo").get("preReg_ExpiredURI");
preReg_ConsumedURI = cLib.readProperty("IDRepo").get("preReg_ConsumedURI");
preReg_ReverseDataSyncURI = cLib.readProperty("IDRepo").get("preReg_ReverseDataSyncURI");
preReg_FetchAllApplicationCreatedByUserURI = cLib.readProperty("IDRepo")
preReg_CreateApplnURI = props.get("preReg_CreateApplnURI");
preReg_DocumentUploadURI = props.get("preReg_DocumentUploadURI");
preReg_BookingAppointmentURI = props.get("preReg_BookingAppointmentURI");
preReg_DataSyncnURI = props.get("preReg_DataSyncnURI");
preReg_FetchRegistrationDataURI = props.get("preReg_FetchRegistrationDataURI");
preReg_FecthAppointmentDetailsURI = props.get("preReg_FecthAppointmentDetailsURI");
preReg_FetchAllDocumentURI = props.get("preReg_FetchAllDocumentURI");
prereg_DeleteDocumentByDocIdURI = props.get("prereg_DeleteDocumentByDocIdURI");
preReg_DeleteAllDocumentByPreIdURI = props.get("preReg_DeleteAllDocumentByPreIdURI");
preReg_CopyDocumentsURI = props.get("preReg_CopyDocumentsURI");
preReg_FetchBookedPreIdByRegIdURI = props.get("preReg_FetchBookedPreIdByRegIdURI");
preReg_FetchStatusOfApplicationURI = props.get("preReg_FetchStatusOfApplicationURI");
preReg_DiscardApplnURI = props.get("preReg_DiscardApplnURI");
preReg_UpdateStatusAppURI = props.get("preReg_UpdateStatusAppURI");
preReg_CancelAppointmentURI = props.get("preReg_CancelAppointmentURI");
preReg_ExpiredURI = props.get("preReg_ExpiredURI");
preReg_ConsumedURI = props.get("preReg_ConsumedURI");
preReg_ReverseDataSyncURI = props.get("preReg_ReverseDataSyncURI");
preReg_FetchAllApplicationCreatedByUserURI = props
.get("preReg_FetchAllApplicationCreatedByUserURI");
preReg_DiscardBookingURI = cLib.readProperty("IDRepo").get("preReg_DiscardBookingURI");

langCodeKey = cLib.readProperty("IDRepo").get("langCode.key");
otpSend_URI = cLib.readProperty("IDRepo").get("otpSend_URI");
validateOTP_URI = cLib.readProperty("IDRepo").get("validateOTP_URI");
preReg_AdminTokenURI = cLib.readProperty("IDRepo").get("preReg_AdminTokenURI");
preReg_translitrationRequestURI = cLib.readProperty("IDRepo").get("preReg_translitrationRequestURI");
invalidateToken_URI = cLib.readProperty("IDRepo").get("invalidateToken_URI");
preReg_GetDocByDocId = cLib.readProperty("IDRepo").get("preReg_GetDocByDocId");
preReg_CancelAppointmenturi = cLib.readProperty("IDRepo").get("preReg_CancelAppointmenturi");
preReg_GetPreRegistrationConfigData = cLib.readProperty("IDRepo").get("preReg_GetPreRegistrationConfigData");
preReg_BookingAppointmenturi = cLib.readProperty("IDRepo").get("preReg_BookingAppointmenturi");
preReg_syncAvailability = cLib.readProperty("IDRepo").get("preReg_syncAvailability");
preReg_FecthAppointmentDetailsuri = cLib.readProperty("IDRepo").get("preReg_FecthAppointmentDetailsuri");
preReg_GetDocByPreId = cLib.readProperty("IDRepo").get("preReg_GetDocByPreId");
qrCode_URI = cLib.readProperty("IDRepo").get("qrCode_URI");
preReg_DocUploadURI = cLib.readProperty("IDRepo").get("preReg_DocUploadURI");
preReg_DiscardBookingURI = props.get("preReg_DiscardBookingURI");

langCodeKey = props.get("langCode.key");
otpSend_URI = props.get("otpSend_URI");
validateOTP_URI = props.get("validateOTP_URI");
preReg_AdminTokenURI = props.get("preReg_AdminTokenURI");
preReg_translitrationRequestURI = props.get("preReg_translitrationRequestURI");
invalidateToken_URI = props.get("invalidateToken_URI");
preReg_GetDocByDocId = props.get("preReg_GetDocByDocId");
preReg_CancelAppointmenturi = props.get("preReg_CancelAppointmenturi");
preReg_GetPreRegistrationConfigData = props.get("preReg_GetPreRegistrationConfigData");
preReg_BookingAppointmenturi = props.get("preReg_BookingAppointmenturi");
preReg_syncAvailability = props.get("preReg_syncAvailability");
preReg_FecthAppointmentDetailsuri = props.get("preReg_FecthAppointmentDetailsuri");
preReg_GetDocByPreId = props.get("preReg_GetDocByPreId");
qrCode_URI = props.get("qrCode_URI");
preReg_DocUploadURI = props.get("preReg_DocUploadURI");
preReg_RetriveBookedPreIdsByRegId = preRegUtil.fetchPreregProp().get("preReg_RetriveBookedPreIdsByRegId");
QRCodeFilePath = preRegUtil.fetchPreregProp().get("QRCodeFilePath");
preReg_NotifyURI = preRegUtil.fetchPreregProp().get("preReg_NotifyURI");
Expand Down

0 comments on commit dcbeab7

Please sign in to comment.