EA-186 - Loosen providermanagement to an aware_of dependency #230
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| package org.openmrs.module.emrapi.account.provider; | ||
|
|
||
| import org.openmrs.OpenmrsMetadata; | ||
| import org.openmrs.Person; | ||
| import org.openmrs.Provider; | ||
| import org.openmrs.annotation.OpenmrsProfile; | ||
| import org.openmrs.api.ProviderService; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
|
|
||
| import java.util.Collection; | ||
|
|
||
| /** | ||
| * Provides an abstraction over Provider services | ||
| */ | ||
| @OpenmrsProfile(modules = {"!providermanagement"}) | ||
|
There was a problem hiding this comment. Provides an implementation of provider-related methods that are used when providermanagement is not installed. This would be where we'd implement logic to support setting roles on the core |
||
| public class CoreProviderService implements ProviderServiceFacade { | ||
|
|
||
| private final ProviderService providerService; | ||
|
|
||
| @Autowired | ||
| public CoreProviderService(ProviderService providerService) { | ||
| this.providerService = providerService; | ||
| } | ||
|
|
||
| @Override | ||
| public Provider newProvider() { | ||
| return new Provider(); | ||
| } | ||
|
|
||
| @Override | ||
| public Collection<Provider> getProvidersByPerson(Person person) { | ||
| return providerService.getProvidersByPerson(person, false); | ||
| } | ||
|
|
||
| @Override | ||
| public Provider saveProvider(Provider provider) { | ||
| return providerService.saveProvider(provider); | ||
| } | ||
|
|
||
| @Override | ||
| public Object getProviderRole(Provider provider) { | ||
| return null; | ||
|
There was a problem hiding this comment. Shouldn't this also throw the same exception as setProviderRole? There was a problem hiding this comment. The way I was seeing it, provider role is always null if the providermanagement module is not running. So why throw an exception? The setter is a different situation - the user is trying to set something and the module is unable to accommodate. |
||
| } | ||
|
|
||
| @Override | ||
| public void setProviderRole(Provider provider, Object providerRole) { | ||
| throw new IllegalStateException("Unable to set the provider role, the provider management module is not installed"); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| package org.openmrs.module.emrapi.account.provider; | ||
|
There was a problem hiding this comment. Provides an implementation of provider-related methods that are used when providermanagement is installed. This allows us to keep any references to providermanagement hidden behind this conditionally loaded bean. The |
||
|
|
||
| import org.openmrs.Person; | ||
| import org.openmrs.Provider; | ||
| import org.openmrs.annotation.OpenmrsProfile; | ||
| import org.openmrs.api.ProviderService; | ||
| import org.openmrs.module.providermanagement.ProviderRole; | ||
| import org.openmrs.module.providermanagement.api.ProviderManagementService; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
|
|
||
| import java.util.Collection; | ||
|
|
||
| /** | ||
| * Provides an abstraction over Provider services | ||
| */ | ||
| @OpenmrsProfile(modules = {"providermanagement:*"}) | ||
| public class ProviderManagementProviderService implements ProviderServiceFacade { | ||
|
|
||
| private final ProviderService providerService; | ||
|
|
||
| private final ProviderManagementService providerManagementService; | ||
|
|
||
| @Autowired | ||
| public ProviderManagementProviderService(ProviderService providerService, ProviderManagementService providerManagementService) { | ||
| this.providerService = providerService; | ||
| this.providerManagementService = providerManagementService; | ||
| } | ||
|
|
||
| @Override | ||
| public Provider newProvider() { | ||
| return new org.openmrs.module.providermanagement.Provider(); | ||
| } | ||
|
|
||
| @Override | ||
| public Collection<org.openmrs.module.providermanagement.Provider> getProvidersByPerson(Person person) { | ||
| return providerManagementService.getProvidersByPerson(person, false); | ||
| } | ||
|
|
||
| @Override | ||
| public Provider saveProvider(Provider provider) { | ||
| return providerService.saveProvider(provider); | ||
| } | ||
|
|
||
| @Override | ||
| public Object getProviderRole(Provider provider) { | ||
| if (provider instanceof org.openmrs.module.providermanagement.Provider) { | ||
| return ((org.openmrs.module.providermanagement.Provider)provider).getProviderRole(); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public void setProviderRole(Provider provider, Object providerRole) { | ||
| if (provider instanceof org.openmrs.module.providermanagement.Provider) { | ||
| org.openmrs.module.providermanagement.Provider p = (org.openmrs.module.providermanagement.Provider) provider; | ||
| if (providerRole == null) { | ||
| p.setProviderRole(null); | ||
| } | ||
| else { | ||
| ProviderRole role = null; | ||
| if (providerRole instanceof ProviderRole) { | ||
| role = (ProviderRole) providerRole; | ||
| } | ||
| else if (providerRole instanceof String) { | ||
| role = getProviderRole((String) providerRole); | ||
| } | ||
| else if (providerRole instanceof Integer) { | ||
| role = providerManagementService.getProviderRole((Integer) providerRole); | ||
| } | ||
| else if (providerRole instanceof String[]) { | ||
| String[] roles = (String[]) providerRole; | ||
| if (roles.length > 1) { | ||
| throw new IllegalArgumentException("Only one provider role may be provided"); | ||
| } | ||
| role = getProviderRole(roles[0]); | ||
| } | ||
| if (role == null) { | ||
| throw new IllegalArgumentException("Unable to set provider role from " + providerRole); | ||
| } | ||
| ((org.openmrs.module.providermanagement.Provider) provider).setProviderRole(role); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private ProviderRole getProviderRole(String ref) { | ||
| ProviderRole role = providerManagementService.getProviderRoleByUuid(ref); | ||
| if (role == null) { | ||
| try { | ||
| Integer roleId = Integer.parseInt(ref); | ||
| role = providerManagementService.getProviderRole(roleId); | ||
| } | ||
| catch (Exception ignored) { | ||
| } | ||
| } | ||
| return role; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package org.openmrs.module.emrapi.account.provider; | ||
|
|
||
| import org.openmrs.OpenmrsMetadata; | ||
| import org.openmrs.Person; | ||
| import org.openmrs.Provider; | ||
|
|
||
| import java.util.Collection; | ||
|
|
||
| /** | ||
| * Provides an abstraction over Provider services | ||
| */ | ||
| public interface ProviderServiceFacade { | ||
|
|
||
| Provider newProvider(); | ||
|
|
||
| Collection<? extends Provider> getProvidersByPerson(Person person); | ||
|
|
||
| Provider saveProvider(Provider provider); | ||
|
|
||
| Object getProviderRole(Provider provider); | ||
|
|
||
| void setProviderRole(Provider provider, Object providerRole); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a necessary backwards-incompatibility on the get/set providerRole methods by broadening to Object as ProviderRole is not available when the providermanagement module is not installed.