O3-4542: Extend Visit Patient Scenario to add Condition #87

UNCANNY69 · 2025-03-18T07:23:20Z

JIRA LINK: https://openmrs.atlassian.net/browse/O3-4542
This PR was raised to extend the current API coverage by adding the api's to cover addition of condition

UNCANNY69 · 2025-03-18T07:30:43Z

@Bawanthathilan , @jayasanka-sack Can this PR be reviewed? Thanks

jayasanka-sack

Thanks a lot for the PR! Please check my review comments. :)

src/test/java/org/openmrs/performance/Constants.java

src/test/java/org/openmrs/performance/http/DoctorHttpService.java

src/test/java/org/openmrs/performance/registries/DoctorRegistry.java

UNCANNY69 · 2025-03-31T13:51:50Z

@jayasanka-sack @Bawanthathilan , i made the requested changes can it be reviewed again, thanks

jayasanka-sack

Great job! You’re making great progress. 👏

See my updated comments.

src/test/java/org/openmrs/performance/Constants.java

jayasanka-sack · 2025-03-31T14:09:27Z

src/test/java/org/openmrs/performance/Constants.java

@@ -53,6 +53,12 @@ public class Constants {

 	public static final String ORDER = "39da3525-afe4-45ff-8977-c53b7b359158";

+	public static final String BACK_PAIN = "114403AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
+
+	public static final String ONSET_DATE = "2025-03-13T00:00:00+05:30";


The date shouldn't hardcoded, instead you should calculate it based on the current time.

Hi @jayasanka-sack , in this suggestion according to my understanding OnSet date refers to date when the condition appeared which would generally be before the current time should i make it dynamic i.e Current date - X days or just hard code the X ? or just leave it as current date

@jayasanka-sack I’m planning to create a reusable date utility function in utils/CommonUtils. since I’ve noticed many API requests in future would require require dates . The goal is to centralize date function to reduce redundancy and make it versatile . Would you have any suggestions on this ?

Leaving it as current date is okay.
Re: util function, yes that's a nice idea. Open it as a separate PR.

jayasanka-sack · 2025-03-31T14:14:38Z

src/test/java/org/openmrs/performance/http/DoctorHttpService.java

+
+	public HttpRequestActionBuilder searchForConditions(String searchQuery) {
+		return http("Search for Condition")
+				.get("/openmrs/ws/rest/v1/concept?name=" + searchQuery + "&searchType=fuzzy&class=8d4918b0-c2cc-11de-8d13-0010c6dffd0f&v=custom:(uuid,display)");


Handle this this Magic value (the uuid) properly. I guess it should be a constant.

A magic value is a literal value that appears directly in the code without explanation or context.

Yes went past me , its the DIAGNOSIS_UUID i will be changing it

Copilot

Pull Request Overview

This PR extends the API coverage to include condition management during the visit patient scenario.

Added a step in the visit patient scenario to add a condition.
Introduced an addCondition chain in the doctor registry to trigger condition-related API calls.
Implemented searchForConditions and saveCondition endpoints in the HTTP service along with defining related constants.

Reviewed Changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.

File	Description
src/test/java/org/openmrs/performance/scenarios/VisitPatientScenario.java	Added steps to add a condition in the patient visit scenario.
src/test/java/org/openmrs/performance/registries/DoctorRegistry.java	Added new chain method (addCondition) to simulate condition API calls.
src/test/java/org/openmrs/performance/http/DoctorHttpService.java	Introduced searchForConditions and saveCondition endpoints.
src/test/java/org/openmrs/performance/Constants.java	Added constants to support the condition API.

Copilot · 2025-03-31T14:18:13Z

src/test/java/org/openmrs/performance/registries/DoctorRegistry.java

 		String asprin_162_5mg = "a722710f-403b-451f-804b-09f8624b0838";
 		String asprinConcept = "71617AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-		return exec(httpService.getActiveVisitOfPatient(patientUuid), httpService.searchForDrug("asprin"),
-		    httpService.searchForDrug("Tylenol"),
-		    httpService.saveOrder(patientUuid, visitUuid, currentUserUuid, asprin_162_5mg, asprinConcept));
-
+		return exec(
+				httpService.getActiveVisitOfPatient(patientUuid),
+				httpService.searchForDrug("asprin"),
+				httpService.searchForDrug("Tylenol"),
+				httpService.saveOrder(patientUuid, visitUuid, currentUserUuid, asprin_162_5mg, asprinConcept)


Typo in 'asprin'; consider replacing it with 'aspirin' for clarity.

src/test/java/org/openmrs/performance/registries/DoctorRegistry.java

src/test/java/org/openmrs/performance/Constants.java

jayasanka-sack · 2025-04-02T02:26:09Z

src/test/java/org/openmrs/performance/utils/CommonUtils.java

+	public static String getDate(int daysToAdjust) {
+		// Get current date-time and adjust by the specified number of days
+		ZonedDateTime adjustedDateTime = ZonedDateTime.now().plusDays(daysToAdjust);
+
+		return adjustedDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"));
+	}


Split responsibilities into clearly named, single-purpose functions. It makes the code cleaner.

Suggested change

public static String getDate(int daysToAdjust) {

// Get current date-time and adjust by the specified number of days

ZonedDateTime adjustedDateTime = ZonedDateTime.now().plusDays(daysToAdjust);

return adjustedDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"));

}

public static String getCurrentDateTimeAsString() {

ZonedDateTime now = ZonedDateTime.now();

return formatDateTime(now);

}

public static String getAdjustedDateTimeAsString(int daysToAdjust) {

ZonedDateTime adjustedDateTime = ZonedDateTime.now().plusDays(daysToAdjust);

return formatDateTime(adjustedDateTime);

}

private static String formatDateTime(ZonedDateTime dateTime) {

return dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"));

}

also write unit tests for above functions in src/test/java/org/openmrs/performance/utils/TestCommonUtils.java file.

Opening a separate PR for the util would be better I guess.

Sure @jayasanka-sack , will open a new PR for this

Copilot

Pull Request Overview

This PR extends the Visit Patient Scenario to support adding conditions for a patient by introducing new API calls.

Added a new utility method in CommonUtils for generating formatted date strings.
Updated scenario and registry classes to include condition-related chain steps.
Extended DoctorHttpService and Constants to support condition search and save operations.

Reviewed Changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
src/test/java/org/openmrs/performance/utils/CommonUtils.java	Added a getDate method for returning formatted dates.
src/test/java/org/openmrs/performance/scenarios/VisitPatientScenario.java	Updated the scenario to include a step for adding a condition.
src/test/java/org/openmrs/performance/registries/DoctorRegistry.java	Introduced a new addCondition chain builder method.
src/test/java/org/openmrs/performance/http/DoctorHttpService.java	Added endpoints for searching and saving conditions using the new utility method.
src/test/java/org/openmrs/performance/Constants.java	Added new constants for condition operations.

Bawanthathilan

looks good for me @jayasanka-sack

UNCANNY69 added 2 commits March 18, 2025 12:50

O3-4542 Addition of conditions to the patient

0381fb2

O3-4542 Addition of conditions to the patient

2d2f610

jayasanka-sack reviewed Mar 21, 2025

View reviewed changes

UNCANNY69 and others added 2 commits March 31, 2025 17:54

Merge branch 'main' into O3-4542

64a16a6

O3-4542 Addition of conditions to the patient

3fdb113

jayasanka-sack reviewed Mar 31, 2025

View reviewed changes

jayasanka-sack requested review from Bawanthathilan and Copilot March 31, 2025 14:17

Copilot AI reviewed Mar 31, 2025

View reviewed changes

jayasanka-sack reviewed Mar 31, 2025

View reviewed changes

src/test/java/org/openmrs/performance/registries/DoctorRegistry.java Outdated Show resolved Hide resolved

UNCANNY69 and others added 3 commits April 1, 2025 00:13

O3-4542 Additional changes

875decf

O3-4542 Additional changes

698a17e

Merge branch 'main' into O3-4542

7cc710c

jayasanka-sack reviewed Apr 2, 2025

View reviewed changes

src/test/java/org/openmrs/performance/Constants.java Outdated Show resolved Hide resolved

jayasanka-sack reviewed Apr 2, 2025

View reviewed changes

jayasanka-sack requested a review from Copilot April 2, 2025 02:26

Copilot AI reviewed Apr 2, 2025

View reviewed changes

jayasanka-sack mentioned this pull request Apr 2, 2025

O3-4586: Rectify a small inconsistency in the openVisitsTab action #86

Merged

UNCANNY69 added 6 commits April 2, 2025 11:42

Additional changes

4652ba4

Merge remote-tracking branch 'origin/O3-4542' into O3-4542

1c0f974

Additional changes

4d7d407

Additional changes

f0a69c4

Additional changes

0fa8947

Additional changes

f35a5bc

Bawanthathilan approved these changes Apr 3, 2025

View reviewed changes

jayasanka-sack merged commit 676b522 into openmrs:main Apr 3, 2025
3 checks passed

-	public static String getDate(int daysToAdjust) {
-		// Get current date-time and adjust by the specified number of days
-		ZonedDateTime adjustedDateTime = ZonedDateTime.now().plusDays(daysToAdjust);
-		return adjustedDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"));
-	}
+    public static String getCurrentDateTimeAsString() {
+        ZonedDateTime now = ZonedDateTime.now();
+        return formatDateTime(now);
+    }
+    public static String getAdjustedDateTimeAsString(int daysToAdjust) {
+        ZonedDateTime adjustedDateTime = ZonedDateTime.now().plusDays(daysToAdjust);
+        return formatDateTime(adjustedDateTime);
+    }
+    private static String formatDateTime(ZonedDateTime dateTime) {
+        return dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"));
+    }

O3-4542: Extend Visit Patient Scenario to add Condition #87

O3-4542: Extend Visit Patient Scenario to add Condition #87

Uh oh!

Conversation

UNCANNY69 commented Mar 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

UNCANNY69 commented Mar 18, 2025

Uh oh!

jayasanka-sack left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

UNCANNY69 commented Mar 31, 2025

Uh oh!

jayasanka-sack left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

UNCANNY69 Mar 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Mar 31, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Bawanthathilan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

UNCANNY69 commented Mar 18, 2025 •

edited

Loading

UNCANNY69 Mar 31, 2025 •

edited

Loading