Skip to content

Commit

Permalink
mvn clean package
Browse files Browse the repository at this point in the history
  • Loading branch information
@icrc-loliveira
icrc-loliveira committed Jul 17, 2024
1 parent 3256945 commit 986ccf2
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 33 deletions.
3 changes: 1 addition & 2 deletions api/src/main/java/org/openmrs/module/fhir2/api/dao/impl/FhirQuestionnaireDaoImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ public List<Form> getQuestionnairesByIds(@Nonnull Collection<Integer> ids) {
@SuppressWarnings("unchecked")
@Override
public List<Form> getSearchResults(@Nonnull SearchParameterMap theParams) {
Session session = sessionFactory.openSession();
session.beginTransaction();
Session session = sessionFactory.getCurrentSession();

// Create CriteriaBuilder
CriteriaBuilder builder = session.getCriteriaBuilder();
Expand Down
33 changes: 17 additions & 16 deletions api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirQuestionnaireDaoImplTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,50 +25,51 @@
import org.openmrs.module.fhir2.api.search.param.SearchParameterMap;
import org.openmrs.test.BaseModuleContextSensitiveTest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.test.context.ContextConfiguration;

@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
public class FhirQuestionnaireDaoImplTest extends BaseModuleContextSensitiveTest {

private static final String FORM_UUID = "504c83c7-cfbf-4ae7-a4da-bdfa3236689f";
private static final String FORM_2_UUID = "504c83c7-cfbf-4ae7-a4da-bdfa3236689f";

private static final String[] QUESTIONNAIRE_SEARCH_DATA_FILES = {
"org/openmrs/module/fhir2/api/dao/impl/FhirQuestionnaireDaoImplTest_initial_data.xml" };
private static final String FORM_2_NAME = "Form 2 name";

private static final String QUESTIONNAIRE_SEARCH_DATA_FILES = "org/openmrs/module/fhir2/api/dao/impl/FhirQuestionnaireDaoImplTest_initial_data.xml";

private FhirQuestionnaireDaoImpl dao;

@Autowired
@Qualifier("sessionFactory")
private SessionFactory sessionFactory;

@Before
public void setup() throws Exception {
dao = new FhirQuestionnaireDaoImpl();
dao.setSessionFactory(sessionFactory);
for (String search_data : QUESTIONNAIRE_SEARCH_DATA_FILES) {
executeDataSet(search_data);
}
executeDataSet(QUESTIONNAIRE_SEARCH_DATA_FILES);
}

@Test
public void getQuestionnaireById_shouldRetrieveQuestionnaireById() {
Form result = dao.getQuestionnaireById(1);
Form result = dao.getQuestionnaireById(2);

assertThat(result, notNullValue());
assertThat(result.getUuid(), equalTo(FORM_UUID));
assertThat(result.getId(), equalTo(1));
assertThat(result.getUuid(), equalTo(FORM_2_UUID));
assertThat(result.getId(), equalTo(2));
}

@Test
public void getQuestionnaireById_shouldRetrieveQuestionnaireByIds() {
List<Integer> ids = new ArrayList<>();
ids.add(10);
ids.add(20);
ids.add(2);
ids.add(3);
List<Form> result = dao.getQuestionnairesByIds(ids);

assertThat(result, notNullValue());
assertThat(result.size(), equalTo(2));
assertThat(result.get(0).getUuid(), equalTo(FORM_UUID));
assertThat(result.get(0).getId(), equalTo(1));
assertThat(result.get(0).getUuid(), equalTo(FORM_2_UUID));
assertThat(result.get(0).getId(), equalTo(2));
}

@Test
Expand All @@ -83,21 +84,21 @@ public void getSearchResults_shouldRetrieveAllQuestionnaires() {

assertThat(result, notNullValue());
assertThat(result.size(), equalTo(2));
assertThat(result.get(0).getUuid(), equalTo(FORM_UUID));
assertThat(result.get(0).getUuid(), equalTo(FORM_2_UUID));
assertThat(result.get(0).getId(), equalTo(1));
}

@Test
public void getSearchResults_shouldRetrieveQuestionnaireByParamName() {

StringAndListParam listParam = new StringAndListParam();
listParam.addAnd(new StringParam("Form 1 name"));
listParam.addAnd(new StringParam(FORM_2_NAME));
SearchParameterMap theParams = new SearchParameterMap().addParameter(FhirConstants.NAME_SEARCH_HANDLER, listParam);

List<Form> result = dao.getSearchResults(theParams);

assertThat(result, notNullValue());
assertThat(result.get(0).getUuid(), equalTo(FORM_UUID));
assertThat(result.get(0).getUuid(), equalTo(FORM_2_UUID));
assertThat(result.get(0).getId(), equalTo(1));
}

Expand Down
19 changes: 4 additions & 15 deletions ...urces/org/openmrs/module/fhir2/api/dao/impl/FhirQuestionnaireDaoImplTest_initial_data.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,8 @@
-->
<dataset>
<global_property property="patient.identifierRegex" property_value="^0*@SEARCH@([A-Z]+-[0-9])?$" uuid="c92cce6d-7e7d-4c53-a3c9-faaac17f8f8b"/>
<location location_id="1" name="Test Location" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" uuid="92ab9667-4686-49af-8be8-65a4b58fc49c"/>
<patient_identifier_type patient_identifier_type_id="1" name="Test Identifier Type" description="Test description" creator="1" date_created="2005-01-01 00:00:00.0" required="false" retired="false" uuid="c5576187-9a67-43a7-9b7c-04db22851211"/>
<person person_id="2" gender="M" dead="false" creator="1" date_created="2005-01-01 00:00:00.0" voided="false" uuid="61b38324-e2fd-4feb-95b7-9e9a2a4400df"/>
<person person_id="3" gender="M" dead="true" creator="1" date_created="2005-01-01 00:00:00.0" voided="false" uuid="5c521595-4e12-46b0-8248-b8f2d3697766"/>
<person_name person_name_id="2" preferred="true" person_id="2" given_name="John" middle_name="F" family_name="Doe" creator="1" date_created="2005-01-01 00:00:00.0" voided="false" uuid="7e2acadc-5073-4a39-914a-debcbec8c1c9"/>
<person_name person_name_id="3" preferred="true" person_id="3" given_name="I" middle_name="am" family_name="voided" creator="1" date_created="2005-01-01 00:00:00.0" voided="false" uuid="37e60810-0ba9-4f32-ba80-0af59f59e966"/>
<person_name person_name_id="33" preferred="false" person_id="2" given_name="Some other name" middle_name=" " family_name="Last Name of other name" creator="1" date_created="2004-01-01 00:00:00.0" voided="false" uuid="c9714a2d-a97e-4673-80f8-ac8dd5ced083"/>
<patient patient_id="2" creator="1" date_created="2005-01-01 00:00:00.0" voided="false"/>
<patient patient_id="3" creator="1" date_created="2005-01-01 00:00:00.0" voided="true"/>
<encounter_type encounter_type_id="1" name="Encounter type" description="Encounter" creator="1" date_created="2004-01-01 00:00:00.0" retired="false" uuid="504c83c7-cfbf-4ae7-a4da-bdfa3236689f"/>
<form form_id="1" name="Form 1 name" version="1" published="1" description="This is the form 1 description" encounter_type="1" creator="1" date_created="2004-01-01 00:00:00.0" retired="false" uuid="504c83c7-cfbf-4ae7-a4da-bdfa3236689f"/>
<form_resource form_resource_id="1" form_id="1" name="FHIR Questionnaire" value_reference="e756e7ae-b6c5-4d64-91dd-4cf76b87f24e" datatype="org.openmrs.customdatatype.datatype.LongFreeTextDatatype" uuid="504c83c7-cfbf-4ae7-a4da-bdfa32366891"/>
<form form_id="2" name="Form 2 name" version="1" published="1" description="This is the form 2 description" encounter_type="1" creator="1" date_created="2004-01-01 00:00:00.0" retired="false" uuid="104c83c7-cfbf-4ae7-a4da-bdfa3236689d"/>
<form_resource form_resource_id="2" form_id="2" name="FHIR Questionnaire" value_reference="d756e7ae-b6c5-4d64-91dd-4cf76b87f24d" datatype="org.openmrs.customdatatype.datatype.LongFreeTextDatatype" uuid="104c83c7-cfbf-4ae7-a4da-bdfa32366891"/>
<form form_id="2" name="Form 2 name" version="0.1" build="0" published="0" description="This is the form 2 description" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retired_reason="" uuid="504c83c7-cfbf-4ae7-a4da-bdfa3236689f"/>
<form form_id="3" name="Form 3 name" version="0.1" build="0" published="0" description="This is the form 3 description" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retired_reason="" uuid="104c83c7-cfbf-4ae7-a4da-bdfa3236689d"/>
<form_resource form_resource_id="1" form_id="2" name="FHIR Questionnaire" value_reference="e756e7ae-b6c5-4d64-91dd-4cf76b87f24e" datatype="org.openmrs.customdatatype.datatype.LongFreeTextDatatype" uuid="504c83c7-cfbf-4ae7-a4da-bdfa32366891"/>
<form_resource form_resource_id="2" form_id="3" name="FHIR Questionnaire" value_reference="d756e7ae-b6c5-4d64-91dd-4cf76b87f24d" datatype="org.openmrs.customdatatype.datatype.LongFreeTextDatatype" uuid="104c83c7-cfbf-4ae7-a4da-bdfa32366891"/>
</dataset>

0 comments on commit 986ccf2

Please sign in to comment.