HSC-379: Add support for imaging, procedure and medical supply orders #68

VaishSiddharth · 2025-01-09T08:48:42Z

JIRA: https://mekomsolutions.atlassian.net/browse/HSC-379

Add support for Imaging, Procedure and Medical supply orders

VaishSiddharth · 2025-01-17T09:39:56Z

@corneliouzbett @rbuisson Please review the PR.

corneliouzbett

This repository doesn't automatically add license headers; please add them to new Java classes. Regarding "models," a more appropriate name would be "DTOs" (data transfer objects), as that is what they are used for(If you can find a way to depend on OpenMRS API, that would a cleaner approach). Additionally, let's extract these DTOs into a dedicated sub-module within this project, along with mappers to transform them into FHIR resources. WDYT?

camel-openmrs-fhir/pom.xml

camel-openmrs-fhir/src/main/java/org/openmrs/eip/fhir/routes/resources/ProcedureRouter.java

camel-openmrs-fhir/src/main/java/org/openmrs/eip/fhir/routes/resources/SupplyRequestRouter.java

...penmrs-fhir/src/test/java/org/openmrs/eip/fhir/routes/resources/SupplyRequestRouterTest.java

VaishSiddharth · 2025-01-20T10:00:30Z

@corneliouzbett regarding

Additionally, let's extract these DTOs into a dedicated sub-module within this project, along with mappers to transform them into FHIR resources. WDYT?

This is an intermediate solution where we don't actually depend on FHIR resources (as they are not implemented) because of which we have to depend on OpenMRS rest APIs hence need of DTOs and mappers.
I would not like to make this a structured way of doing things by splitting up the DTOs and mappers to a sub module rather we should keep it intact inside the route so that when we are ready with the FHIR resources we can delete all this code.

corneliouzbett

The code looks good. Some nit-picking comments. However, the disabled tests should be fixed before merging.

camel-openmrs-fhir/src/main/java/org/openmrs/eip/fhir/routes/resources/ProcedureRouter.java

camel-openmrs-fhir/src/main/java/org/openmrs/eip/fhir/routes/resources/SupplyRequestRouter.java

camel-openmrs-fhir/src/test/java/org/openmrs/eip/fhir/spring/OpenmrsFhirConfigurationTest.java

camel-openmrs-fhir/src/test/java/org/openmrs/eip/fhir/routes/resources/ProcedureRouterTest.java

camel-openmrs-fhir/src/main/java/org/openmrs/eip/fhir/spring/OpenmrsRestConfiguration.java

VaishSiddharth · 2025-01-24T11:31:08Z

@rbuisson can you merge this PR I don't have write access to this repository.

corneliouzbett

Hi @VaishSiddharth I missed out statuses and handling of OpenMRS order actions. Can you look into it.

camel-openmrs-fhir/src/main/java/org/openmrs/eip/fhir/routes/resources/ProcedureRouter.java

camel-openmrs-fhir/src/main/java/org/openmrs/eip/fhir/routes/resources/SupplyRequestRouter.java

Ruhanga · 2025-01-28T10:03:06Z

camel-openmrs-fhir/src/main/java/org/openmrs/eip/fhir/Constants.java

 	public static final String TEST_ORDER_TYPE_UUID = "52a447d3-a64a-11e3-9aeb-50e549534c5e";

+	public static final String IMAGING_ORDER_TYPE_UUID = "8d2aff07-55e6-4a4a-8878-72b9eb36a3b8";
+
+	public static final String PROCEDURE_ORDER_TYPE_UUID = "67a92e56-0f88-11ea-8d71-362b9e155667";
+
+	public static final String SUPPLY_REQUEST_ORDER_TYPE_UUID = "67a92bd6-0f88-11ea-8d71-362b9e155667";
+
 	public static final String DRUG_ORDER_TYPE_UUID = "131168f4-15f5-102d-96e4-000c29c2a5d7";



Generally, hardcoding UUIDs is not ideal, as different implementations may require different sets of UUIDs. I would prefer making these configurable with default values, rather than embedding them directly into the code.

Yeah you are right. But let's take this up separately as this is an existing practice for this repo.

Have created a ticket here

Unfortunately, this issue is becoming more prominent as it is going to be consumed by existing distributions with pre-existing data. The sooner this is addressed, the better. I believe this can be resolved in the current PR, as it already includes the majority of the referenced UUIDs.

@Ruhanga I would not want to include the changes you suggested in this PR. I have created a new PR for the above ticket. Will need to fix test cases to make it work.

I would request @rbuisson to please merge this PR as this is blocking HSC deployment.

corneliouzbett

Left a comment, small issue
This can be merge in!

camel-openmrs-fhir/src/test/java/org/openmrs/eip/fhir/spring/OpenmrsRestConfigurationTest.java

VaishSiddharth added 12 commits January 9, 2025 14:16

[WIP] Add Procedure router

37ecd8d

[WIP] Add MedicalSupply orders support

6398896

Fix

550280c

Add MedicalSupply support

07d0480

Remove table from FhirResource listen tables for MedicalSupply

3ea0a72

Refactor

8927840

Add lombok and remove hardcoings

f3a2aac

Unit tests added for SupplyRequest and Procedure order router

6d0b7b2

Fix

4d11a07

Fix+

47eecec

Add tests

6899925

Disabled unit tests for Supply and Procedure orders

f477007

corneliouzbett reviewed Jan 20, 2025

View reviewed changes

VaishSiddharth added 6 commits January 20, 2025 16:05

Address comments

f5d43cd

Address comments+

cad1e09

Address comments+

fc82bb8

Add support for OAuth

3789978

Add http headers

f89334f

Fix test

d8646c4

corneliouzbett reviewed Jan 23, 2025

View reviewed changes

VaishSiddharth added 3 commits January 24, 2025 12:02

Address comments

e8167ba

Fix tests

8d2ed1a

Refactor

102a3d1

VaishSiddharth requested a review from corneliouzbett January 24, 2025 09:16

corneliouzbett approved these changes Jan 24, 2025

View reviewed changes

corneliouzbett changed the title ~~HSC-379: Add support for Imaging, Procedure and Medical supply orders~~ HSC-379: Add support for imaging, procedure and medical supply orders Jan 24, 2025

corneliouzbett reviewed Jan 27, 2025

View reviewed changes

camel-openmrs-fhir/src/main/java/org/openmrs/eip/fhir/routes/resources/ProcedureRouter.java Outdated Show resolved Hide resolved

camel-openmrs-fhir/src/main/java/org/openmrs/eip/fhir/routes/resources/SupplyRequestRouter.java Outdated Show resolved Hide resolved

Add support for discontinue and modify order

3516ce6

VaishSiddharth requested a review from corneliouzbett January 28, 2025 08:39

Ruhanga requested changes Jan 28, 2025

View reviewed changes

corneliouzbett approved these changes Jan 28, 2025

View reviewed changes

camel-openmrs-fhir/src/test/java/org/openmrs/eip/fhir/spring/OpenmrsRestConfigurationTest.java Outdated Show resolved Hide resolved

Fix * imports

f23991e

rbuisson merged commit 2ca128b into openmrs:master Jan 29, 2025
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

HSC-379: Add support for imaging, procedure and medical supply orders #68

HSC-379: Add support for imaging, procedure and medical supply orders #68

VaishSiddharth commented Jan 9, 2025 •

edited

Loading

VaishSiddharth commented Jan 17, 2025

corneliouzbett left a comment

VaishSiddharth commented Jan 20, 2025

corneliouzbett left a comment

VaishSiddharth commented Jan 24, 2025

corneliouzbett left a comment

Ruhanga Jan 28, 2025

VaishSiddharth Jan 28, 2025

Ruhanga Jan 28, 2025

VaishSiddharth Jan 28, 2025

corneliouzbett left a comment

HSC-379: Add support for imaging, procedure and medical supply orders #68

HSC-379: Add support for imaging, procedure and medical supply orders #68

Conversation

VaishSiddharth commented Jan 9, 2025 • edited Loading

VaishSiddharth commented Jan 17, 2025

corneliouzbett left a comment

Choose a reason for hiding this comment

VaishSiddharth commented Jan 20, 2025

corneliouzbett left a comment

Choose a reason for hiding this comment

VaishSiddharth commented Jan 24, 2025

corneliouzbett left a comment

Choose a reason for hiding this comment

Ruhanga Jan 28, 2025

Choose a reason for hiding this comment

VaishSiddharth Jan 28, 2025

Choose a reason for hiding this comment

Ruhanga Jan 28, 2025

Choose a reason for hiding this comment

VaishSiddharth Jan 28, 2025

Choose a reason for hiding this comment

corneliouzbett left a comment

Choose a reason for hiding this comment

VaishSiddharth commented Jan 9, 2025 •

edited

Loading