Merge branch 'main' into O3-4521

Author: dilankavishka

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/http/DoctorHttpService.java

@@ -16,6 +16,8 @@
 import static io.gatling.javaapi.core.CoreDsl.StringBody;
 import static io.gatling.javaapi.core.CoreDsl.bodyString;
 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;
@@ -230,6 +232,19 @@ public HttpRequestActionBuilder getAllowedFileExtensions() {
 				.get("/openmrs/ws/rest/v1/systemsetting?&v=custom:(value)&q=attachments.allowedFileExtensions");
 	}
 
+	public HttpRequestActionBuilder uploadAttachment(String patientUuid) {
+		return http("Upload Attachment Request")
+				.post("/openmrs/ws/rest/v1/attachment")
+				.bodyPart(StringBodyPart("fileCaption", "Test Image"))
+				.bodyPart(StringBodyPart("patient", patientUuid))
+				.bodyPart(
+						RawFileBodyPart("file", "Sample_1MB_image.jpg")
+								.contentType("image/jpg")
+								.fileName("Sample_1MB_image.jpg")
+						)
+				.asMultipartForm();
+	}
+	
 	public HttpRequestActionBuilder getLabResults(String patientUuid) {
 		return http("Get Lab Results of Patient")
 				.get("/openmrs/ws/fhir2/R4/Observation?category=laboratory&patient=" + patientUuid + "&_count=100&_summary=data")

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

@@ -71,8 +71,11 @@ public ChainBuilder openVitalsAndBiometricsTab(String patientUuid) {
 				MID_UPPER_ARM_CIRCUMFERENCE
 		);
 		return exec(httpService.getPatientObservations(patientUuid, vitals))
-				.exec(httpService.getPatientObservations(patientUuid, biometrics))
-				.exec(httpService.saveVitalsData(patientUuid));
+				.exec(httpService.getPatientObservations(patientUuid, biometrics));
+	}
+
+	public ChainBuilder recordVitals(String patientUuid){
+		return exec(httpService.saveVitalsData(patientUuid));
 	}
 
 	public ChainBuilder openMedicationsTab(String patientUuid) {
@@ -130,9 +133,15 @@ public ChainBuilder openAttachmentsTab(String patientUuid) {
 				.exec(httpService.getAllowedFileExtensions());
 	}
 
+
 	public ChainBuilder openProgramsTab(String patientUuid) {
 		return exec(httpService.getPrograms())
 				.exec(httpService.getProgramEnrollments(patientUuid));
+  }
+  
+	public ChainBuilder addAttachment(String patientUuid){
+		return exec(httpService.uploadAttachment(patientUuid))
+				.exec(httpService.getAttachments(patientUuid));
 	}
 
 	public ChainBuilder openVisitsTab(String 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}"))
@@ -49,6 +51,8 @@ public ScenarioBuilder getScenarioBuilder() {
 				.exec(registry.openAttachmentsTab("#{patient_uuid}"))
 				.pause(5)
 				.exec(registry.openProgramsTab("#{patient_uuid}"))
+        .pause(5)
+				.exec(registry.addAttachment("#{patient_uuid}"))
 				.pause(5)
 				.exec(registry.addDrugOrder("#{patient_uuid}", "#{visitUuid}", "#{currentUserUuid}"))
 				.pause(5)