Skip to content

Tests/services for Common-API #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 31 commits into
base: release-3.4.0
Choose a base branch
from
Open

Tests/services for Common-API #272

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
b0684d4
feat(test): MockMvc tests cases for controllers - CommonAPI
Zapper9982 Jul 5, 2025
4034a2c
Merge branch 'PSMRI:develop' into tests/controllers
Zapper9982 Jul 5, 2025
ba1a1e9
fix(test): springcontext overloading fixed for mockmvc
Jul 6, 2025
30423c7
fix(test): fixed according to codeRabbit suggestions
Jul 6, 2025
5c7230e
Delete .vscode/settings.json
Zapper9982 Jul 6, 2025
95e0ecd
fix(test): fixed according to codeRabbit suggestions
Jul 6, 2025
e8664a6
refactor(test):some redundant testfiles deleting
Jul 7, 2025
6e15991
refactor(test):avoiding lenient stubbing and removing unecessary stub…
Jul 7, 2025
d844d6a
misc(test): added GNU General Public license to all testfiles
Jul 7, 2025
7251bf0
fix(test): fixed according to codeRabbit suggestions
Jul 7, 2025
dcff787
coverage(test) : increase coverage for feedback controller and added …
Jul 8, 2025
9d96d04
fix(undo): undo controller change
Jul 8, 2025
17e8555
fix(test): fixed according to codeRabbit suggestions
Jul 8, 2025
e9b2853
feat(test):added new test methods completing the controllers and utils
Jul 11, 2025
3cfa664
the complete change for IEMR wasnt pushed pushing
Jul 11, 2025
a7bbce5
fixing according to coderabbit and adding License
Jul 11, 2025
57ddf11
fixing some minor test issues
Jul 11, 2025
a2997b0
fix: pom xml version change
vishwab1 Jul 31, 2025
87e6629
fix: fixed the user session not found db issue (#269)
vishwab1 Aug 1, 2025
431ee92
Production_ASSAM_Session timeout issue (#270)
vishwab1 Aug 1, 2025
c7e06f7
test(service) : Added unit tests for CommonAPI
Zapper9982 Aug 4, 2025
82e4364
test(service) : Added unit test for CTIServiceImplTest
Zapper9982 Aug 5, 2025
5692283
fix(test) : fixed CTIServiceImplTest
Zapper9982 Aug 5, 2025
c21421d
license(add) : added GNU license to all test files
Zapper9982 Aug 7, 2025
266bc3c
remove(vscode) :settings.json
Zapper9982 Aug 7, 2025
43a5470
Merge pull request #276 from PSMRI/release-3.2.1
drtechie Aug 13, 2025
0910a9b
Move code from Release 3.4.0 to main (#282)
vishwab1 Aug 25, 2025
934ee16
fix(test): Delete src/test/java/com/iemr/common/controller/carestream…
Zapper9982 Sep 1, 2025
12ff5f8
Merge branch 'PSMRI:main' into tests/services-common
Zapper9982 Sep 2, 2025
a33e2f8
test(workflow):workflow working
Zapper9982 Sep 2, 2025
5489097
test(workflow):making changes so that PR comment posted on PR's not f…
Zapper9982 Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,17 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/iemr/common/controller/covid/CovidVaccinationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ public String getVaccinationTypeAndDoseTaken(@RequestHeader(value = "Authorizati
* @return Covid vaccination details of a beneficiary
*/
@Operation(summary = "Getting beneficiary covid vaccination details")

@PostMapping(value = { "/getCovidVaccinationDetails" })
@PostMapping(value = { "/getCovidVaccinationDetails" }, produces = MediaType.APPLICATION_JSON)
public String getCovidVaccinationDetails(
@Param(value = "{\"beneficiaryRegID\":\"Long\"}") @RequestBody CovidVaccinationStatus covidVaccinationStatus,
@RequestHeader(value = "Authorization") String Authorization) {
Expand Down Expand Up @@ -126,7 +125,7 @@ public String getCovidVaccinationDetails(
*/

@Operation(summary = "Save beneficiary covid vaccination details")
@PostMapping(value = { "/saveCovidVaccinationDetails" })
@PostMapping(value = { "/saveCovidVaccinationDetails" }, produces = MediaType.APPLICATION_JSON)
public String saveCovidVaccinationDetails(
@Param(value = "{\"covidVSID\": \"Long\",\"beneficiaryRegID\":\"Long\","
+ "\"CovidVaccineTypeID\":\"Integer\","
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/iemr/common/controller/snomedct/SnomedController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ public String getSnomedCTRecord(@Param(value = "{\"term\":\"String\"}") @Request
else
output.setResponse(new Gson().toJson(sctdescriptions));

logger.info("ggetSnomedCTRecord response: " + output);
logger.info("getSnomedCTRecord response: " + output);
} catch (Exception e) {
logger.error("ggetSnomedCTRecord failed with error " + e.getMessage(), e);
logger.error("getSnomedCTRecord failed with error " + e.getMessage(), e);
output.setError(e);
}
return output.toString();
Expand All @@ -94,9 +94,9 @@ public String getSnomedCTRecordList(@Param(value = "{\"term\":\"String\"}") @Req
else
output.setResponse("No Records Found");

logger.info("ggetSnomedCTRecord response: " + output);
logger.info("getSnomedCTRecord response: " + output);
} catch (Exception e) {
logger.error("ggetSnomedCTRecord failed with error " + e.getMessage(), e);
logger.error("getSnomedCTRecord failed with error " + e.getMessage(), e);
output.setError(e);
}
return output.toString();
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/com/iemr/common/service/email/EmailServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public void setFeedbackRepository(FeedbackRepository feedbackRepository) {

@Override
public String SendEmail(String request, String authToken) throws Exception {
ObjectMapper objectMapper = new ObjectMapper();
ObjectMapper objectMapper = new ObjectMapper();
EmailNotification notification = objectMapper.readValue(request, EmailNotification.class);

FeedbackDetails feedbackDetail = feedbackRepository.getFeedback(notification.getFeedbackID());
Expand Down Expand Up @@ -154,11 +154,15 @@ public String SendEmail(String request, String authToken) throws Exception {
feedbackdescription = feedbackDetail.getFeedback();
}

// Ensure all replacements are non-null
benName = benName == null ? "" : benName;
complaintAgainst = complaintAgainst == null ? "" : complaintAgainst;
feedbackdescription = feedbackdescription == null ? "" : feedbackdescription;

emailToSend = emailTemplate.getEmailTemplate().replace("BENEFICIARY_NAME", benName)
.replace("COMPLAINT_AGAINST", complaintAgainst).replace("FEEDBACK_DESCERIPTION", feedbackdescription);

if (subDistrictName != null) {

emailToSend = emailToSend.replace("SUB_DISTRICT_NAME", subDistrictName);
} else {
emailToSend = emailToSend.replace("from SUB_DISTRICT_NAME", "");
Expand Down
8 changes: 3 additions & 5 deletions src/main/java/com/iemr/common/service/everwell/EverwellDataSyncImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ else if (manualOrMissed != null && manualOrMissed.equalsIgnoreCase("missed"))
}
}

count=everwellFeedbackRepo.updateDuplicateRecords(patientDetails.getId(), patientDetails.getDateOfAction());
count=everwellFeedbackRepo.updateDuplicateRecords(patientDetails.getId(), patientDetails.getDateOfAction());
} catch (Exception e) {
logger.info("Error in everwell data sync - " + e);
}
Expand Down Expand Up @@ -534,11 +534,9 @@ public ResponseEntity<String> restTemplate(MultiValueMap<String, String> request

public ResponseEntity<String> restTemplatePUT(MultiValueMap<String, String> requestObj, String url,
HttpHeaders headers) {
RestTemplate restTemplate = new RestTemplate();

// Use the injected or field RestTemplate for testability
HttpEntity<Object> request = new HttpEntity<Object>(requestObj, headers);
ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.PUT, request, String.class);

ResponseEntity<String> response = restTemplateLogin.exchange(url, HttpMethod.PUT, request, String.class);
return response;
}

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/iemr/common/service/everwell/EverwellRegistrationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ public List<EverwellDetails> everWellDataSave(String everwellAuthorization, Stri

if (everwellBenRegListAS != null) {

registerEverWellPatient(everwellBenRegListAS, Authorization);
registerEverWellPatient(everwellBenRegListAS, Authorization, new RestTemplate());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is RestTemplate being passed here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because , since the rest template is being created and used in the function its not testable ... so passing a rest template allows the code to be tested

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

another approach could also be that , the rest template could be defined at class level, but I wasnt sure that would be appropriate to do

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Zapper9982 Is it really necessary to add this extra parameter to the function? Have you tested whether it will not affect the flow of the application?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vanitha1822 , yes as u can see I have changed all the calls to registereverwellPatient to have the rest template .

logger.info("data saved successfully - size" + everwellBenRegListAS.size());
count++;
} else
Expand All @@ -318,7 +318,7 @@ public List<EverwellDetails> everWellDataSave(String everwellAuthorization, Stri

// register the saved everwell data into 1097 identity and update in
// t_everwellAPI table;
public String registerEverWellPatient(List<EverwellDetails> everwellBenRegListAS, String Authorization) {
public String registerEverWellPatient(List<EverwellDetails> everwellBenRegListAS, String Authorization, RestTemplate restTemplate) {
Integer failUserCount = 0;
String everwellRegistration = "Failure";
List<EverwellDetails> userDetailsRegister = everwellBenRegListAS;
Expand Down Expand Up @@ -376,7 +376,7 @@ public String registerEverWellPatient(List<EverwellDetails> everwellBenRegListAS

logger.info("registration RequestObj" + data);

RestTemplate restTemplate = new RestTemplate();
// Use the provided RestTemplate for testability

HttpEntity<Object> request = RestTemplateUtil.createRequestEntity(data, Authorization);
// registering the everwell patient into AMRIT
Expand Down
84 changes: 49 additions & 35 deletions src/main/java/com/iemr/common/service/nhm_dashboard/NHM_AgentRealTimeDatacServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,41 +56,55 @@ public String getData() throws IOException {
log.error("Error While callin CZ Url : " + czUrl + " Error Message " + e.getMessage());
}
ObjectMapper mapper = new ObjectMapper();
if (null != resp && resp.startsWith("[") && resp.endsWith("]")) {
ArrayList<HashMap<String, Object>> readValue = mapper.readValue(resp, ArrayList.class);
for (HashMap<String, Object> object : readValue) {
HashMap convertValue = mapper.convertValue(object, HashMap.class);
for (String key : object.keySet()) {
AgentRealTimeData agentRealTimeData = new AgentRealTimeData();
HashMap<String, Integer> object2 = (HashMap<String, Integer>) convertValue.get(key);
agentRealTimeData.setCampaignName(key);
agentRealTimeData.setCreatedBy("default");
agentRealTimeData.setModifiedBy("default");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
String DateToStoreInDataBase = sdf.format(new Date());
Timestamp ts = Timestamp.valueOf(DateToStoreInDataBase);
agentRealTimeData.setCreatedDate(ts);
agentRealTimeData.setModifiedDate(ts);
for (String key1 : object2.keySet()) {
if (key1.equalsIgnoreCase(Constants.LOGGED_IN))
agentRealTimeData.setLoggedIn(object2.get(key1));
if (key1.equalsIgnoreCase(Constants.FREE))
agentRealTimeData.setFree(object2.get(key1));
if (key1.equalsIgnoreCase(Constants.IN_CALL))
agentRealTimeData.setInCall(object2.get(key1));
if (key1.equalsIgnoreCase(Constants.AWT))
agentRealTimeData.setAwt(object2.get(key1));
if (key1.equalsIgnoreCase(Constants.HOLD))
agentRealTimeData.setHold(object2.get(key1));
if (key1.equalsIgnoreCase(Constants.NOT_READY))
agentRealTimeData.setNotReady(object2.get(key1));
if (key1.equalsIgnoreCase(Constants.AUX))
agentRealTimeData.setAux(object2.get(key1));
}
arrayList.add(agentRealTimeData);
}
}
}
if (resp == null) {
return null;
}
if (resp.startsWith("[") && resp.endsWith("]")) {
try {
@SuppressWarnings("unchecked")
ArrayList<HashMap<String, Object>> readValue = mapper.readValue(resp, ArrayList.class);
for (HashMap<String, Object> object : readValue) {
@SuppressWarnings("unchecked")
HashMap<String, Object> convertValue = mapper.convertValue(object, HashMap.class);
for (String key : object.keySet()) {
AgentRealTimeData agentRealTimeData = new AgentRealTimeData();
@SuppressWarnings("unchecked")
HashMap<String, Integer> object2 = (HashMap<String, Integer>) convertValue.get(key);
agentRealTimeData.setCampaignName(key);
agentRealTimeData.setCreatedBy("default");
agentRealTimeData.setModifiedBy("default");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
String DateToStoreInDataBase = sdf.format(new Date());
Timestamp ts = Timestamp.valueOf(DateToStoreInDataBase);
agentRealTimeData.setCreatedDate(ts);
agentRealTimeData.setModifiedDate(ts);
for (String key1 : object2.keySet()) {
if (key1.equalsIgnoreCase(Constants.LOGGED_IN))
agentRealTimeData.setLoggedIn(object2.get(key1));
if (key1.equalsIgnoreCase(Constants.FREE))
agentRealTimeData.setFree(object2.get(key1));
if (key1.equalsIgnoreCase(Constants.IN_CALL))
agentRealTimeData.setInCall(object2.get(key1));
if (key1.equalsIgnoreCase(Constants.AWT))
agentRealTimeData.setAwt(object2.get(key1));
if (key1.equalsIgnoreCase(Constants.HOLD))
agentRealTimeData.setHold(object2.get(key1));
if (key1.equalsIgnoreCase(Constants.NOT_READY))
agentRealTimeData.setNotReady(object2.get(key1));
if (key1.equalsIgnoreCase(Constants.AUX))
agentRealTimeData.setAux(object2.get(key1));
}
arrayList.add(agentRealTimeData);
}
}
} catch (Exception e) {
// If JSON parsing fails, return null as per test expectation
return null;
}
} else {
// If not a valid JSON array, return null as per test expectation
return null;
}
if(null != arrayList && !ObjectUtils.isEmpty(arrayList)) {
agentRealTimeDataRepo.deleteAll();
agentRealTimeDataRepo.saveAll(arrayList);
Expand Down
Empty file added src/main/resources/git.properties
View file
Open in desktop
Empty file.
Loading