Skip to content

U4X-1037: Return changes for U4X-1031 that were overwitten by another commit. #214

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

Merged
merged 1 commit into from
Jun 12, 2025
Merged

U4X-1037: Return changes for U4X-1031 that were overwitten by another commit. #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,6 @@
<artifactId>openmrs-web</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>uiframework-api</artifactId>
</dependency>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>fhir2-api</artifactId>
Expand Down
8 changes: 2 additions & 6 deletions api/src/main/java/org/openmrs/module/ugandaemrsync/tasks/CrossBorderIntegrationSyncTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.openmrs.module.ugandaemrsync.model.SyncFhirProfile;
import org.openmrs.module.ugandaemrsync.server.SyncFHIRRecord;
import org.openmrs.scheduler.tasks.AbstractTask;
import org.openmrs.ui.framework.SimpleObject;


import static org.openmrs.module.ugandaemrsync.UgandaEMRSyncConfig.PATIENT_ID_TYPE_CROSS_BORDER_UUID;
Expand All @@ -35,7 +34,7 @@ public void execute() {

}

public SimpleObject updatePatientWithCBI(String patientDataObject) throws Exception {
public void updatePatientWithCBI(String patientDataObject) throws Exception {
ObjectMapper objectMapper = new ObjectMapper();
try {
UgandaEMRSyncService ugandaEMRSyncService = Context.getService(UgandaEMRSyncService.class);
Expand All @@ -48,14 +47,11 @@ public SimpleObject updatePatientWithCBI(String patientDataObject) throws Except
}
if (patient != null) {
log.info("Patient " + patient.getNames() + "Successfully Updated");
return SimpleObject.create("status", objectMapper.writeValueAsString("Patient Successfully Updated "));
}
}

} catch (Exception e) {
return SimpleObject.create("status",
objectMapper.writeValueAsString("There was a problem updating in patient cross boarder ID"));
log.error("There was a problem updating in patient cross boarder ID",e);
}
return null;
}
}
34 changes: 2 additions & 32 deletions ...rc/main/java/org/openmrs/module/ugandaemrsync/tasks/SendDHIS2DataToCentralServerTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import org.openmrs.module.ugandaemrsync.server.SyncGlobalProperties;
import org.openmrs.module.ugandaemrsync.api.UgandaEMRHttpURLConnection;
import org.openmrs.scheduler.tasks.AbstractTask;
import org.openmrs.ui.framework.SimpleObject;
import org.springframework.stereotype.Component;
import java.io.IOException;
import java.io.InputStream;
Expand All @@ -33,19 +32,14 @@ public class SendDHIS2DataToCentralServerTask extends AbstractTask {
protected Log log = LogFactory.getLog(getClass());
SyncGlobalProperties syncGlobalProperties = new SyncGlobalProperties();
protected byte[] data ;
SimpleObject serverResponseObject;

public SimpleObject getServerResponseObject(){
return serverResponseObject;
}
UgandaEMRHttpURLConnection ugandaEMRHttpURLConnection = new UgandaEMRHttpURLConnection();


public SendDHIS2DataToCentralServerTask() {}

public SendDHIS2DataToCentralServerTask(byte[] data, SimpleObject simpleObject) {
public SendDHIS2DataToCentralServerTask(byte[] data) {
this.data = data;
this.serverResponseObject= simpleObject;
}


Expand All @@ -56,14 +50,6 @@ public void execute() {
String baseUrl = ugandaEMRHttpURLConnection.getBaseURL(syncGlobalProperties.getGlobalProperty(GP_DHIS2_SERVER_URL));
if (isBlank(syncGlobalProperties.getGlobalProperty(GP_DHIS2_SERVER_URL))) {
log.error("DHIS 2 server URL is not set");

try {
map.put("responseCode", responseCode);
map.put("responseMessage", "DHIS 2 server URL is not set");
serverResponseObject = SimpleObject.create("message", objectMapper.writeValueAsString(map));
} catch (IOException e) {
log.error("error creating message to interface", e);
}
log.error("DHIS 2 server URL is not set");
return;
}
Expand All @@ -72,11 +58,7 @@ public void execute() {
if (!ugandaEMRHttpURLConnection.isConnectionAvailable()) {
map.put("responseCode", responseCode);
map.put("responseMessage", "Failed to connect to the internet. Check connection");
try {
serverResponseObject = SimpleObject.create("message", objectMapper.writeValueAsString(map));
} catch (IOException e) {
e.printStackTrace();
}

return;
}

Expand All @@ -85,11 +67,6 @@ public void execute() {
map.put("responseCode", responseCode);
map.put("responseMessage", "Server Not Available");

try {
serverResponseObject = SimpleObject.create("message", objectMapper.writeValueAsString(map));
} catch (IOException e) {
e.printStackTrace();
}
return;
}

Expand All @@ -111,13 +88,6 @@ public void execute() {
log.error(e);
}


try {
serverResponseObject = SimpleObject.create("message", objectMapper.writeValueAsString(map));
serverResponseObject.put("responseCode", responseCode);
} catch (IOException e) {
e.printStackTrace();
}
}

public Map getMapOfResults(InputStream inputStreamReader, int responseCode) throws IOException {
Expand Down
8 changes: 2 additions & 6 deletions api/src/main/java/org/openmrs/module/ugandaemrsync/tasks/SendPatientsToFacilitySHRTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import org.openmrs.module.ugandaemrsync.model.SyncFhirProfile;
import org.openmrs.module.ugandaemrsync.server.SyncFHIRRecord;
import org.openmrs.scheduler.tasks.AbstractTask;
import org.openmrs.ui.framework.SimpleObject;

public class SendPatientsToFacilitySHRTask extends AbstractTask {
protected final Log log = LogFactory.getLog(SendPatientsToFacilitySHRTask.class);
Expand All @@ -31,7 +30,7 @@ public void execute() {

}

public SimpleObject transferIn(String patientDataObject) throws Exception {
public void transferIn(String patientDataObject) throws Exception {
ObjectMapper objectMapper = new ObjectMapper();
try {
UgandaEMRSyncService ugandaEMRSyncService = Context.getService(UgandaEMRSyncService.class);
Expand All @@ -45,14 +44,11 @@ public SimpleObject transferIn(String patientDataObject) throws Exception {
}
if (patient != null) {
log.info("Patient " + patient.getNames() + "Successfully Created");
return SimpleObject.create("status", objectMapper.writeValueAsString("Patient Successfully Created "));
}
}

} catch (Exception e) {
return SimpleObject.create("status",
objectMapper.writeValueAsString("There was a problem transferring in patient"));
log.info(e);
}
return null;
}
}
3 changes: 0 additions & 3 deletions api/src/main/java/org/openmrs/module/ugandaemrsync/tasks/SendReportsTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import org.openmrs.module.ugandaemrsync.model.SyncTaskType;
import org.openmrs.module.ugandaemrsync.server.SyncGlobalProperties;
import org.openmrs.scheduler.tasks.AbstractTask;
import org.openmrs.ui.framework.SimpleObject;
import org.springframework.stereotype.Component;

import static org.apache.commons.lang.StringUtils.isBlank;
Expand All @@ -30,8 +29,6 @@ public class SendReportsTask extends AbstractTask {

SyncTaskType syncTaskType;

SimpleObject response;

public SendReportsTask() {
super();
}
Expand Down
6 changes: 0 additions & 6 deletions api/src/test/java/org/openmrs/module/ugandaemrsync/server/SyncFHIRRecordTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.MockedStatic;
import org.openmrs.Patient;
import org.openmrs.api.PatientService;
import org.openmrs.api.context.Context;
import org.openmrs.module.ugandaemrsync.api.UgandaEMRSyncService;
import org.openmrs.module.ugandaemrsync.model.SyncFhirProfile;
Expand All @@ -21,11 +18,8 @@
import org.openmrs.test.BaseModuleContextSensitiveTest;
import org.springframework.context.annotation.ComponentScan;

import java.text.SimpleDateFormat;
import java.util.*;

import static org.mockito.Mockito.*;

@ComponentScan(basePackages = {"org.openmrs.module.fhir2"})
public class SyncFHIRRecordTest extends BaseModuleContextSensitiveTest {

Expand Down
12 changes: 0 additions & 12 deletions omod/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,6 @@
<artifactId>idgen-api</artifactId>
</dependency>

<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>uiframework-omod</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>appui-omod</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>calculation-api</artifactId>
Expand Down
38 changes: 0 additions & 38 deletions ...enmrs/module/ugandaemrsync/fragment/controller/GenerateInitialDataFragmentController.java
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions ...s/module/ugandaemrsync/fragment/controller/GenerateInitialFHIRDataFragmentController.java
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions ...org/openmrs/module/ugandaemrsync/fragment/controller/GetFacilityIdFragmentController.java
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions ...ain/java/org/openmrs/module/ugandaemrsync/fragment/controller/HomeFragmentController.java
View file
Open in desktop

This file was deleted.

Loading