Skip to content
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.

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

O3-2996: Add billing module to openmrs distro pom file and spa config #842

Closed
wants to merge 15 commits into from

Conversation

ODORA0
Copy link
Member

@ODORA0 ODORA0 commented Aug 21, 2024

This PR is to introduce the Billing and StockManagement modules to the reference application. Billing requires Stock Management as a dependency.

  • Added stock management backend module
  • Added billing backend module
  • Added stock management frontend module
  • Added billing frontend module

@ODORA0 ODORA0 marked this pull request as draft August 21, 2024 13:09
@ODORA0 ODORA0 changed the title Alaboso feat/billing mvp O3-2996: Add billing module to openmrs distro pom file and spa config Aug 21, 2024
@ODORA0 ODORA0 marked this pull request as ready for review August 22, 2024 08:35
@gracepotma
Copy link
Contributor

Woohoo!! It will be great to have this included in the O3 RefApp / EMR distro.

distro/pom.xml Outdated
@@ -49,6 +49,11 @@
<ordertemplates.version>1.0.2</ordertemplates.version>
<patientflags.version>3.0.7</patientflags.version>
<o3forms.version>2.3.0-SNAPSHOT</o3forms.version>
<patientflags.version>3.0.5</patientflags.version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you intentionally change the patient flags and o2forms modules?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed, slipped somehow during conflict resolution.

distro/pom.xml Outdated
@@ -49,6 +49,9 @@
<ordertemplates.version>1.0.2</ordertemplates.version>
<patientflags.version>3.0.7</patientflags.version>
<o3forms.version>2.3.0-SNAPSHOT</o3forms.version>
<!-- Stock Management and Billing -->
<stockmanagement.version>2.0.1-SNAPSHOT</stockmanagement.version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the above, did you intend to use 2.0.2-SNAPSHOT?

distro/pom.xml Outdated
@@ -49,6 +49,9 @@
<ordertemplates.version>1.0.2</ordertemplates.version>
<patientflags.version>3.0.7</patientflags.version>
<o3forms.version>2.3.0-SNAPSHOT</o3forms.version>
<!-- Stock Management and Billing -->
<stockmanagement.version>2.0.1-SNAPSHOT</stockmanagement.version>
<billing.version>1.1.0</billing.version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Has version 1.1.0 of the billing module been released?

Copy link
Member Author

@ODORA0 ODORA0 Aug 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this was released. We had to do this also when we were adding domains to iniz that depends on the released version of the module

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I failed to find such a release from this repository: https://github.com/openmrs/openmrs-module-billing
Or are you using another repository?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dkayiwa - I think there was a manual release on BambooCI, link

@ODORA0 - The task Build and Validate Configuration is failing because some privileges (likely) reference Roles that may not be in the Roles iniz domain. Please check

Copy link
Member

@dkayiwa dkayiwa Aug 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there was a manual release on BambooCI, link

Could there be a reason why you set this to false? https://github.com/openmrs/openmrs-module-billing/blob/main/pom.xml#L367

For I notice that no tag was created on github https://github.com/openmrs/openmrs-module-billing/tags
And the billing module is still having 1.1.0-SNAPSHOT https://github.com/openmrs/openmrs-module-billing/blob/main/pom.xml#L8

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We didn't set that to false, it must have been a default value and we didn't catch it. We will fix it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The module versions changed and the push configuration updated

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could there be a reason why you are not using the latest snapshot version 1.2.0-SNAPSHOT of this module to take advantage of the latest changes? Just like you have done for the stockmanagement module.

@ibacher
Copy link
Member

ibacher commented Oct 10, 2024

The build here is failing not because of anything specific to do with versions, but because the OCL package that this tries to add is broken, in the sense that it has mappings to CIEL concepts that are not themselves part of the collection. OCL collections should be complete in the sense that all referenced concepts must be included.

I notice on OCL itself there is a newer version of the collection from OCL with more concepts, which has more concepts and fewer mappings, so it may be that this is fixed by adopting a newer version of the collection.

If you review the logs in the failing Build and Validate Configuration step, you will find a detailed list of every mapping with a missing concept in the collection.

@alaboso
Copy link
Contributor

alaboso commented Oct 10, 2024

The build here is failing not because of anything specific to do with versions, but because the OCL package that this tries to add is broken, in the sense that it has mappings to CIEL concepts that are not themselves part of the collection. OCL collections should be complete in the sense that all referenced concepts must be included.

I notice on OCL itself there is a newer version of the collection from OCL with more concepts, which has more concepts and fewer mappings, so it may be that this is fixed by adopting a newer version of the collection.

If you review the logs in the failing Build and Validate Configuration step, you will find a detailed list of every mapping with a missing concept in the collection.

Yes - this is correct @ibacher . so what we have done is, we have gone through the OCL package and updated all the mappings that are broken. We have also bumped initializer module, openconceptlab module and packager-plugin versions. This is to take advantage of latest developments. After all these, there's one error, it's conflicting Clinical consultation concepts. one is [DemoQueue-Service-ClinicalConsultation:Clinical Consultation] used by OCL DemoQueue package and the other is 167410:Clinical consultation] used in OCL billing package
We could use the CIEL:167410 and in both packages and I believe there shouldn't be an error.
Additionally, we will close this PR and create a new one (to simplify merging and rebasing issues) if @ODORA0 agrees that is..

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants