FM2-130:Adding support for the FHIR Media resource #328
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| * This Source Code Form is subject to the terms of the Mozilla Public License, | ||
| * v. 2.0. If a copy of the MPL was not distributed with this file, You can | ||
| * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under | ||
| * the terms of the Healthcare Disclaimer located at http://openmrs.org/license. | ||
| * | ||
| * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS | ||
| * graphic logo is a trademark of OpenMRS Inc. | ||
| */ | ||
| package org.openmrs.module.fhir2.api; | ||
|
|
||
| import java.util.HashSet; | ||
|
|
||
| import ca.uhn.fhir.model.api.Include; | ||
| import ca.uhn.fhir.rest.api.SortSpec; | ||
| import ca.uhn.fhir.rest.api.server.IBundleProvider; | ||
| import ca.uhn.fhir.rest.param.DateRangeParam; | ||
| import ca.uhn.fhir.rest.param.ReferenceAndListParam; | ||
| import ca.uhn.fhir.rest.param.StringAndListParam; | ||
| import ca.uhn.fhir.rest.param.TokenAndListParam; | ||
| import org.hl7.fhir.r4.model.Media; | ||
|
|
||
| public interface FhirMediaService extends FhirService<Media> { | ||
|
|
||
| IBundleProvider searchForMedia(TokenAndListParam status, TokenAndListParam type, ReferenceAndListParam subject, | ||
| ReferenceAndListParam encounterReference, DateRangeParam createdDateTime, TokenAndListParam contentType, | ||
| TokenAndListParam id, StringAndListParam contentDataType, StringAndListParam contentTitle, | ||
| DateRangeParam contentCreated, DateRangeParam lastUpdated, HashSet<Include> includes, | ||
| HashSet<Include> revIncludes, SortSpec sort); | ||
| } |
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,39 @@ | ||
| /* | ||
| * This Source Code Form is subject to the terms of the Mozilla Public License, | ||
| * v. 2.0. If a copy of the MPL was not distributed with this file, You can | ||
| * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under | ||
| * the terms of the Healthcare Disclaimer located at http://openmrs.org/license. | ||
| * | ||
| * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS | ||
| * graphic logo is a trademark of OpenMRS Inc. | ||
| */ | ||
| package org.openmrs.module.fhir2.api.dao; | ||
|
|
||
| import javax.annotation.Nonnull; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import org.openmrs.Obs; | ||
| import org.openmrs.annotation.Authorized; | ||
| import org.openmrs.module.fhir2.api.search.param.SearchParameterMap; | ||
| import org.openmrs.util.PrivilegeConstants; | ||
|
|
||
| public interface FhirMediaDao extends FhirDao<Obs> { | ||
|
|
||
| @Override | ||
| @Authorized(PrivilegeConstants.GET_OBS) | ||
| Obs get(@Nonnull String uuid); | ||
|
|
||
| @Override | ||
| @Authorized(PrivilegeConstants.ADD_OBS) | ||
| Obs createOrUpdate(@Nonnull Obs newEntry); | ||
|
|
||
| @Override | ||
| @Authorized(PrivilegeConstants.DELETE_OBS) | ||
| Obs delete(@Nonnull String uuid); | ||
|
|
||
| @Override | ||
| @Authorized(PrivilegeConstants.GET_OBS) | ||
| List<String> getSearchResultUuids(@Nonnull SearchParameterMap theParams); | ||
|
|
||
| } |
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,131 @@ | ||
| /* | ||
| * This Source Code Form is subject to the terms of the Mozilla Public License, | ||
| * v. 2.0. If a copy of the MPL was not distributed with this file, You can | ||
| * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under | ||
| * the terms of the Healthcare Disclaimer located at http://openmrs.org/license. | ||
| * | ||
| * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS | ||
| * graphic logo is a trademark of OpenMRS Inc. | ||
| */ | ||
| package org.openmrs.module.fhir2.api.dao.impl; | ||
|
|
||
| import static org.hibernate.criterion.Restrictions.eq; | ||
|
|
||
| import javax.annotation.Nonnull; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import ca.uhn.fhir.rest.param.DateParam; | ||
| import ca.uhn.fhir.rest.param.ReferenceAndListParam; | ||
| import ca.uhn.fhir.rest.param.TokenAndListParam; | ||
| import lombok.AccessLevel; | ||
| import lombok.Setter; | ||
| import org.hibernate.Criteria; | ||
| import org.openmrs.Obs; | ||
| import org.openmrs.api.ObsService; | ||
| import org.openmrs.api.context.Context; | ||
| import org.openmrs.module.fhir2.FhirConstants; | ||
| import org.openmrs.module.fhir2.api.dao.FhirMediaDao; | ||
| import org.openmrs.module.fhir2.api.search.param.SearchParameterMap; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| @Component | ||
| @Setter(AccessLevel.PACKAGE) | ||
| public class FhirMediaDaoImpl extends BaseFhirDao<Obs> implements FhirMediaDao { | ||
|
|
||
| // private ObsService obsService = Context.getObsService(); | ||
|
|
||
| @Autowired | ||
| private ObsService obsService; | ||
|
|
||
| @Override | ||
| public Obs get(@Nonnull String uuid) { | ||
| return obsService.getObsByUuid(uuid); | ||
| } | ||
|
|
||
| @Override | ||
| public Obs createOrUpdate(@Nonnull Obs newEntry) { | ||
| return obsService.saveObs(newEntry, FhirConstants.SAVED_SUCCESSFULLY); | ||
| } | ||
|
|
||
| @Override | ||
| public Obs delete(@Nonnull String uuid) { | ||
| return super.delete(uuid); | ||
| } | ||
|
|
||
| @Override | ||
| public List<Obs> getSearchResults(@Nonnull SearchParameterMap theParams, @Nonnull List<String> resourceUuids) { | ||
| return resourceUuids.stream().map(obsService::getObsByUuid).collect(Collectors.toList()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void setupSearchParams(Criteria criteria, SearchParameterMap theParams) { | ||
| theParams.getParameters().forEach(entry -> { | ||
|
There was a problem hiding this comment. Here, we'll want to ensure that we're only searching ComplexObs and not just any Obs. This looks like it could be done as something like: if (lacksAlias(criteria, "c")) {
criteria.createAlias("concept", "c");
}
if (lacksAlias(criteria, "cdt")) {
criteria.createAlias("c.datatype", "cdt");
}
criteria.add(eq("cdt.hl7_abbreviation", "ED")); |
||
| switch (entry.getKey()) { | ||
| case FhirConstants.MEDIA_STATUS: | ||
| entry.getValue().forEach(status -> handleStatus(criteria, (TokenAndListParam) status.getParam())); | ||
| break; | ||
| case FhirConstants.MEDIA_TYPE: | ||
| entry.getValue().forEach(type -> handleMediaType(criteria, (TokenAndListParam) type.getParam())); | ||
| break; | ||
| case FhirConstants.MEDIA_SUBJECT: | ||
| entry.getValue() | ||
| .forEach(subject -> handleMediaSubject(criteria, (ReferenceAndListParam) subject.getParam())); | ||
| break; | ||
| case FhirConstants.MEDIA_ENCOUNTER_REFERENCE: | ||
| break; | ||
| case FhirConstants.MEDIA_CREATED_DATE_TIME: | ||
| entry.getValue().forEach( | ||
| createdTime -> handleDate(createdTime.getPropertyName(), (DateParam) createdTime.getParam()) | ||
| .ifPresent(criteria::add)); | ||
| break; | ||
| case FhirConstants.MEDIA_CONTENT_TYPE: | ||
| break; | ||
| case FhirConstants.CONTENT_DATA: | ||
| break; | ||
| case FhirConstants.CONTENT_TITLE: | ||
| break; | ||
| case FhirConstants.CONTENT_DATE_OF_CREATION: | ||
| entry.getValue().forEach(contentDateOfCreation -> handleDate(contentDateOfCreation.getPropertyName(), | ||
| (DateParam) contentDateOfCreation.getParam())); | ||
| break; | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| // private void handleStatus(Criteria criteria, TokenAndListParam status) { | ||
| // if(status != null){ | ||
| // if(lacksAlias(criteria, "st")){ | ||
| // criteria.createAlias("status", "st"); | ||
| // handleAndListParam(status, (tag) -> Optional.of(eq("st.status", tag.getValue()))).ifPresent(criteria::add); | ||
| // } | ||
| // } | ||
| // } | ||
|
|
||
| private void handleStatus(Criteria criteria, TokenAndListParam status) { | ||
| // handleAndListParam(status, (data) -> propertyLike("status", status)).ifPresent(criteria::add); | ||
| } | ||
|
|
||
| private void handleMediaType(Criteria criteria, TokenAndListParam mediaType) { | ||
| if (mediaType != null) { | ||
| if (lacksAlias(criteria, "mt")) { | ||
| criteria.createAlias("mediaType", "mt"); | ||
| handleAndListParam(mediaType, (tag) -> Optional.of(eq("mt.type", tag.getValue()))).ifPresent(criteria::add); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void handleMediaSubject(Criteria criteria, ReferenceAndListParam mediaSubject) { | ||
| if (mediaSubject != null) { | ||
| if (lacksAlias(criteria, "ms")) { | ||
| criteria.createAlias("mediaSubject", "ms"); | ||
| handleAndListParam(mediaSubject, (tag) -> Optional.of(eq("ms.subject", tag.getValue()))) | ||
| .ifPresent(criteria::add); | ||
|
|
||
| } | ||
| } | ||
| } | ||
| } | ||
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,84 @@ | ||
| /* | ||
| * This Source Code Form is subject to the terms of the Mozilla Public License, | ||
| * v. 2.0. If a copy of the MPL was not distributed with this file, You can | ||
| * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under | ||
| * the terms of the Healthcare Disclaimer located at http://openmrs.org/license. | ||
| * | ||
| * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS | ||
| * graphic logo is a trademark of OpenMRS Inc. | ||
| */ | ||
| package org.openmrs.module.fhir2.api.impl; | ||
|
|
||
| import javax.annotation.Nonnull; | ||
|
|
||
| import java.util.HashSet; | ||
|
|
||
| import ca.uhn.fhir.model.api.Include; | ||
| import ca.uhn.fhir.rest.api.SortSpec; | ||
| import ca.uhn.fhir.rest.api.server.IBundleProvider; | ||
| import ca.uhn.fhir.rest.param.DateRangeParam; | ||
| import ca.uhn.fhir.rest.param.ReferenceAndListParam; | ||
| import ca.uhn.fhir.rest.param.StringAndListParam; | ||
| import ca.uhn.fhir.rest.param.TokenAndListParam; | ||
| import lombok.AccessLevel; | ||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
| import org.hl7.fhir.r4.model.Media; | ||
| import org.openmrs.Obs; | ||
| import org.openmrs.module.fhir2.FhirConstants; | ||
| import org.openmrs.module.fhir2.api.FhirMediaService; | ||
| import org.openmrs.module.fhir2.api.dao.FhirMediaDao; | ||
| import org.openmrs.module.fhir2.api.search.SearchQuery; | ||
| import org.openmrs.module.fhir2.api.search.SearchQueryInclude; | ||
| import org.openmrs.module.fhir2.api.search.param.SearchParameterMap; | ||
| import org.openmrs.module.fhir2.api.translators.MediaTranslator; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.stereotype.Component; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| @Component | ||
| @Transactional | ||
| @Getter(AccessLevel.PROTECTED) | ||
| @Setter(AccessLevel.MODULE) | ||
| public class FhirMediaServiceImpl extends BaseFhirService<Media, Obs> implements FhirMediaService { | ||
|
|
||
| @Autowired | ||
| private FhirMediaDao dao; | ||
|
|
||
| @Autowired | ||
| private MediaTranslator translator; | ||
|
|
||
| @Autowired | ||
| private SearchQuery<Obs, Media, FhirMediaDao, MediaTranslator, SearchQueryInclude<Media>> searchQuery; | ||
|
|
||
| @Autowired | ||
| private SearchQueryInclude<Media> searchQueryInclude; | ||
|
|
||
| @Override | ||
| public Media get(@Nonnull String uuid) { | ||
| return super.get(uuid); | ||
| } | ||
|
|
||
| @Override | ||
| public IBundleProvider searchForMedia(TokenAndListParam status, TokenAndListParam type, ReferenceAndListParam subject, | ||
| ReferenceAndListParam encounterReference, DateRangeParam createdDateTime, TokenAndListParam contentType, | ||
| TokenAndListParam id, StringAndListParam contentDataType, StringAndListParam contentTitle, | ||
| DateRangeParam contentCreated, DateRangeParam lastUpdated, HashSet<Include> includes, | ||
| HashSet<Include> revIncludes, SortSpec sort) { | ||
|
|
||
| SearchParameterMap theParams = new SearchParameterMap().addParameter(FhirConstants.MEDIA_STATUS, status) | ||
| .addParameter(FhirConstants.MEDIA_TYPE, type).addParameter(FhirConstants.MEDIA_SUBJECT, subject) | ||
| .addParameter(FhirConstants.MEDIA_ENCOUNTER_REFERENCE, encounterReference) | ||
| .addParameter(FhirConstants.MEDIA_CREATED_DATE_TIME, createdDateTime) | ||
| .addParameter(FhirConstants.MEDIA_CONTENT_TYPE, contentType) | ||
| .addParameter(FhirConstants.CONTENT_DATA, contentDataType) | ||
| .addParameter(FhirConstants.CONTENT_TITLE, contentTitle) | ||
| .addParameter(FhirConstants.CONTENT_DATE_OF_CREATION, contentCreated) | ||
| .addParameter(FhirConstants.COMMON_SEARCH_HANDLER, FhirConstants.ID_PROPERTY, id) | ||
tendomart marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| .addParameter(FhirConstants.COMMON_SEARCH_HANDLER, FhirConstants.LAST_UPDATED_PROPERTY, lastUpdated) | ||
| .addParameter(FhirConstants.COMMON_SEARCH_HANDLER, includes) | ||
| .addParameter(FhirConstants.COMMON_SEARCH_HANDLER, revIncludes).setSortSpec(sort); | ||
|
|
||
| return searchQuery.getQueryResults(theParams, dao, translator, searchQueryInclude); | ||
| } | ||
| } | ||
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.
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 doesn't seem right to me. Why did you change the example query?