Merge branch 'openmrs:main' into O3-4527

Author: UNCANNY69

README.md

@@ -3,7 +3,7 @@
 This repository contains performance testing scripts and configurations for OpenMRS using Gatling.
 
 The latest report can be found
-at [openmrs.github.io/openmrs-contrib-performance-test](https://openmrs.github.io/openmrs-contrib-performance-test/)
+at [here](https://o3-performance.openmrs.org/)
 
 ## Table of Contents
 
@@ -31,13 +31,15 @@ and easy-to-use framework for simulating user load and measuring system performa
 
 To run the performance tests locally, follow these steps:
 
-1. Start OpenMRS on port 80. (Use the docker file: [src/test/resources/docker-compose.yml](src/test/resources/docker-compose.yml) It contains demo patients for the test. [Learn more](#generating-demo-patient-data))
-
-For using the docker file, run the following command:
-```bash
+1. Install dependencies (and compile)
+   ```bash
+   ./mvnw install -DskipTests
+   ```
+2. Start OpenMRS on port 80. (Use the docker file: [src/test/resources/docker-compose.yml](src/test/resources/docker-compose.yml) It contains demo patients for the test. [Learn more](#generating-demo-patient-data))
+   ```bash
    docker compose -f src/test/resources/docker-compose.yml up
-```
-2. Execute the following command in your terminal:
+   ```
+3. Execute the following command in your terminal:
 
    **Standard** `export SIMULATION_PRESET='standard' && ./mvnw gatling:test` \
    **dev**  `export SIMULATION_PRESET=dev TIER_COUNT=2 TIER_DURATION_MINUTES=1 USER_INCREMENT_PER_TIER=10 && ./mvnw gatling:test`

pom.xml

@@ -10,7 +10,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <gatling.version>3.13.4</gatling.version>
-    <gatling-maven-plugin.version>4.15.1</gatling-maven-plugin.version>
+    <gatling-maven-plugin.version>4.16.1</gatling-maven-plugin.version>
     <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
     <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
     <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.18.2</version>
+      <version>2.18.3</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
@@ -40,12 +40,12 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>2.0.16</version>
+      <version>2.0.17</version>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.5.16</version>
+      <version>1.5.17</version>
     </dependency>
   </dependencies>
 

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

@@ -53,4 +53,8 @@ public class Constants {
 	public static final String DIABETIC_KETOSIS_CONCEPT = "123107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
 	public static final String DIABETIC_FOOT_ULCER_CONCEPT = "149069AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
 
+	// Vitals
+	public static final String VITALS_FORM_UUID = "9f26aad4-244a-46ca-be49-1196df1a8c9a";
+	public static final String VITALS_LOCATION_UUID = "ba685651-ed3b-4e63-9b35-78893060758a";
+	public static final String VITALS_ENCOUNTER_TYPE_UUID = "67a71486-1a54-468f-ac3e-7091a9a79584";
 }

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

@@ -7,34 +7,46 @@
 
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import static io.gatling.javaapi.core.CoreDsl.StringBody;
 import static io.gatling.javaapi.core.CoreDsl.bodyString;
-import static io.gatling.javaapi.core.CoreDsl.exec;
 import static io.gatling.javaapi.core.CoreDsl.jsonPath;
 import static io.gatling.javaapi.http.HttpDsl.RawFileBodyPart;
 import static io.gatling.javaapi.http.HttpDsl.StringBodyPart;
 import static io.gatling.javaapi.http.HttpDsl.http;
 import static org.openmrs.performance.Constants.ALLERGY_REACTION_UUID;
+import static org.openmrs.performance.Constants.ARTERIAL_BLOOD_OXYGEN_SATURATION;
 import static org.openmrs.performance.Constants.CARE_SETTING_UUID;
 import static org.openmrs.performance.Constants.CLINICIAN_ENCOUNTER_ROLE;
 import static org.openmrs.performance.Constants.CODED_ALLERGEN_UUID;
 import static org.openmrs.performance.Constants.DAYS;
 import static org.openmrs.performance.Constants.DEFAULT_DOSING_TYPE;
+import static org.openmrs.performance.Constants.DIASTOLIC_BLOOD_PRESSURE;
 import static org.openmrs.performance.Constants.DRUG_ORDER;
+import static org.openmrs.performance.Constants.HEIGHT_CM;
+import static org.openmrs.performance.Constants.MID_UPPER_ARM_CIRCUMFERENCE;
 import static org.openmrs.performance.Constants.ONCE_DAILY;
 import static org.openmrs.performance.Constants.ORAL;
 import static org.openmrs.performance.Constants.ORDER;
 import static org.openmrs.performance.Constants.OUTPATIENT_CLINIC_LOCATION_UUID;
+import static org.openmrs.performance.Constants.PULSE;
+import static org.openmrs.performance.Constants.RESPIRATORY_RATE;
 import static org.openmrs.performance.Constants.SEVERITY_UUID;
+import static org.openmrs.performance.Constants.SYSTOLIC_BLOOD_PRESSURE;
 import static org.openmrs.performance.Constants.TABLET;
+import static org.openmrs.performance.Constants.TEMPERATURE_C;
 import static org.openmrs.performance.Constants.VISIT_NOTE_CONCEPT_UUID;
 import static org.openmrs.performance.Constants.VISIT_NOTE_ENCOUNTER_TYPE_UUID;
 import static org.openmrs.performance.Constants.VISIT_NOTE_FORM_UUID;
+import static org.openmrs.performance.Constants.VITALS_ENCOUNTER_TYPE_UUID;
+import static org.openmrs.performance.Constants.VITALS_FORM_UUID;
+import static org.openmrs.performance.Constants.VITALS_LOCATION_UUID;
+import static org.openmrs.performance.Constants.WEIGHT_KG;
 
 public class DoctorHttpService extends HttpService {
 
@@ -362,4 +374,37 @@ public HttpRequestActionBuilder saveDiagnosis(String patientUuid, String encount
 		}
 	}
 
+	public HttpRequestActionBuilder saveVitalsData(String patientUuid) {
+		ZonedDateTime now = ZonedDateTime.now();
+		String encounterDatetime = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ"));
+		
+		Map<String, Object> encounter = new HashMap<>();
+		encounter.put("form", VITALS_FORM_UUID);
+		encounter.put("patient", patientUuid);
+		encounter.put("location", VITALS_LOCATION_UUID);
+		encounter.put("encounterType", VITALS_ENCOUNTER_TYPE_UUID);
+		encounter.put("encounterDatetime", encounterDatetime);
+		
+		List<Map<String, Object>> observations = new ArrayList<>();
+		observations.add(Map.of("concept", SYSTOLIC_BLOOD_PRESSURE, "value", 34));
+		observations.add(Map.of("concept", DIASTOLIC_BLOOD_PRESSURE, "value", 44));
+		observations.add(Map.of("concept", RESPIRATORY_RATE, "value", 100));
+		observations.add(Map.of("concept", ARTERIAL_BLOOD_OXYGEN_SATURATION, "value", 20));
+		observations.add(Map.of("concept", PULSE, "value", 120));
+		observations.add(Map.of("concept", TEMPERATURE_C, "value", 28));
+		observations.add(Map.of("concept", WEIGHT_KG, "value", 60));
+		observations.add(Map.of("concept", HEIGHT_CM, "value", 121));
+		observations.add(Map.of("concept", MID_UPPER_ARM_CIRCUMFERENCE, "value", 34));
+		
+		encounter.put("obs", observations);
+		
+		try {
+			String body = new ObjectMapper().writeValueAsString(encounter); // Convert Map to JSON
+			return http("Save Vitals").post("/openmrs/ws/rest/v1/encounter").body(StringBody(body));
+		}
+		catch (JsonProcessingException e) {
+			throw new RuntimeException("Error converting visitNote to JSON", e);
+		}
+	}
+
 }

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

@@ -1,7 +1,6 @@
 package org.openmrs.performance.http;
 
 import io.gatling.javaapi.http.HttpRequestActionBuilder;
-
 import java.util.Set;
 import java.util.StringJoiner;
 
@@ -115,4 +114,6 @@ public HttpRequestActionBuilder getActiveOrders(String patientUuid) {
 		return http("Get Active Orders")
 				.get("/openmrs/ws/rest/v1/order?patient="+patientUuid+"&careSetting=6f0c9a92-6f24-11e3-af88-005056821db0&status=ACTIVE&orderType=131168f4-15f5-102d-96e4-000c29c2a5d7&v=custom:(uuid,dosingType,orderNumber,accessionNumber,patient:ref,action,careSetting:ref,previousOrder:ref,dateActivated,scheduledDate,dateStopped,autoExpireDate,orderType:ref,encounter:ref,orderer:(uuid,display,person:(display)),orderReason,orderReasonNonCoded,orderType,urgency,instructions,commentToFulfiller,drug:(uuid,display,strength,dosageForm:(display,uuid),concept),dose,doseUnits:ref,frequency:ref,asNeeded,asNeededCondition,quantity,quantityUnits:ref,numRefills,dosingInstructions,duration,durationUnits:ref,route:ref,brandName,dispenseAsWritten)");
 	}
+
+	
 }

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

@@ -75,6 +75,10 @@ public ChainBuilder openVitalsAndBiometricsTab(String patientUuid) {
 		return exec(httpService.getPatientObservations(patientUuid, vitals))
 				.exec(httpService.getPatientObservations(patientUuid, biometrics));
 	}
+
+	public ChainBuilder recordVitals(String patientUuid){
+		return exec(httpService.saveVitalsData(patientUuid));
+	}
 
 	public ChainBuilder openMedicationsTab(String patientUuid) {
 		return exec(httpService.getDrugOrders(patientUuid));

src/test/java/org/openmrs/performance/scenarios/VisitPatientScenario.java

@@ -30,6 +30,8 @@ public ScenarioBuilder getScenarioBuilder() {
 				.pause(2)
 				.exec(registry.openVitalsAndBiometricsTab("#{patient_uuid}"))
 				.pause(5)
+				.exec(registry.recordVitals("#{patient_uuid}"))
+				.pause(5)
 				.exec(registry.openMedicationsTab("#{patient_uuid}"))
 				.pause(5)
 				.exec(registry.openOrdersTab("#{patient_uuid}"))