added more changes

Author: jnsereko

api/src/main/java/org/openmrs/module/fhir2/api/dao/impl/FhirBatchDaoImpl.java

@@ -33,8 +33,8 @@ protected void setupSearchParams(Criteria criteria, SearchParameterMap theParams
 				case FhirConstants.ENCOUNTER_TYPE_REFERENCE_SEARCH_HANDLER:
 					entry.getValue()
 							.forEach(param -> handleAndListParam((TokenAndListParam) param.getParam(),
-									t -> Optional.of(eq("et.uuid", t.getValue())))
-									.ifPresent(t -> criteria.createAlias("encounterType", "et").add(t)));
+									t -> Optional.of(eq("bh.uuid", t.getValue()))));
+
 					break;
 			}
 		});

api/src/main/java/org/openmrs/module/fhir2/api/impl/FhirBatchServiceImpl.java

@@ -15,37 +15,43 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.hl7.fhir.r4.model.Bundle;
-import org.openmrs.BaseOpenmrsData;
 import org.openmrs.module.fhir2.FhirConstants;
 import org.openmrs.module.fhir2.api.FhirBatchService;
-import org.openmrs.module.fhir2.api.dao.FhirDao;
+import org.openmrs.module.fhir2.api.dao.FhirBatchDao;
+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.OpenmrsFhirTranslator;
+import org.openmrs.module.fhir2.api.translators.BatchTranslator;
+import org.openmrs.module.fhir2.model.FhirBatch;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 @Component
 @Transactional
 @Setter(AccessLevel.PACKAGE)
 @Getter(AccessLevel.PROTECTED)
-public class FhirBatchServiceImpl extends BaseFhirService<Bundle, org.openmrs.BaseOpenmrsData> implements FhirBatchService {
+public class FhirBatchServiceImpl extends BaseFhirService<Bundle, FhirBatch> implements FhirBatchService {
+
+	@Autowired
+	private FhirBatchDao dao;
+
+	@Autowired
+	private SearchQueryInclude<Bundle> searchQueryInclude;
+
+	@Autowired
+	private BatchTranslator translator;
+
+	@Autowired
+	private SearchQuery<FhirBatch, Bundle, FhirBatchDao, BatchTranslator, SearchQueryInclude<Bundle>> searchQuery;
+
 
 	@Override
 	public IBundleProvider searchBatches(TokenAndListParam identifier, TokenAndListParam batchType) {
 		SearchParameterMap theParams = new SearchParameterMap()
 				.addParameter(FhirConstants.OPENMRS_FHIR_EXT_BATCH_IDENTIFIER, identifier)
 				.addParameter(FhirConstants.ENCOUNTER_TYPE_REFERENCE_SEARCH_HANDLER, batchType);
 
-		return null;
-	}
-
-	@Override
-	protected FhirDao<BaseOpenmrsData> getDao() {
-		return null;
-	}
-
-	@Override
-	protected OpenmrsFhirTranslator<BaseOpenmrsData, Bundle> getTranslator() {
-		return null;
+		return searchQuery.getQueryResults(theParams, dao, translator, searchQueryInclude);
 	}
 }

api/src/main/java/org/openmrs/module/fhir2/api/translators/BatchTranslator.java

@@ -0,0 +1,31 @@
+package org.openmrs.module.fhir2.api.translators;
+
+import org.hl7.fhir.r4.model.Bundle;
+import org.hl7.fhir.r4.model.DiagnosticReport;
+import org.openmrs.Order;
+import org.openmrs.module.fhir2.api.translators.ToFhirTranslator;
+import org.openmrs.module.fhir2.model.FhirBatch;
+import org.openmrs.module.fhir2.model.FhirDiagnosticReport;
+
+import javax.annotation.Nonnull;
+
+public interface BatchTranslator extends OpenmrsFhirUpdatableTranslator<FhirBatch, Bundle> {
+
+	/**
+	 * Maps a {@link Order} to a {@link Bundle}
+	 *
+	 * @param fhirBatch the FhirBatch object to translate
+	 * @return the corresponding FHIR Bundle
+	 */
+	@Override
+	Bundle toFhirResource(@Nonnull FhirBatch fhirBatch);
+
+	/**
+	 * Maps {@link Bundle} to {@link FhirBatch}
+	 *
+	 * @param bundle the FHIR batch to translate
+	 * @return the corresponding OpenMRS FhirBatch
+	 */
+	@Override
+	FhirBatch toOpenmrsType(@Nonnull Bundle bundle);
+}

api/src/main/java/org/openmrs/module/fhir2/api/translators/impl/BatchTranslatorImpl.java

@@ -0,0 +1,44 @@
+package org.openmrs.module.fhir2.api.translators.impl;
+
+import org.hl7.fhir.r4.model.Bundle;
+import org.hl7.fhir.r4.model.DiagnosticReport;
+import org.openmrs.Concept;
+import org.openmrs.Obs;
+import org.openmrs.module.fhir2.FhirConstants;
+import org.openmrs.module.fhir2.api.translators.BatchTranslator;
+import org.openmrs.module.fhir2.model.FhirBatch;
+import org.openmrs.module.fhir2.model.FhirDiagnosticReport;
+
+import javax.annotation.Nonnull;
+
+import static org.apache.commons.lang3.Validate.notNull;
+
+public class BatchTranslatorImpl implements BatchTranslator {
+
+	@Override
+	public Bundle toFhirResource(@Nonnull FhirBatch fhirBatch) {
+		notNull(fhirBatch, "The batch operation should not be null");
+
+		Bundle bundle = new Bundle();
+
+		bundle.setId(fhirBatch.getUuid());
+
+		if (fhirBatch.getDateChanged() != null) {
+			bundle.getMeta().setLastUpdated(fhirBatch.getDateChanged());
+		} else {
+			bundle.getMeta().setLastUpdated(fhirBatch.getDateCreated());
+		}
+
+		return bundle;
+	}
+
+	@Override
+	public FhirBatch toOpenmrsType(@Nonnull Bundle bundle) {
+		return toOpenmrsType(new FhirBatch(), bundle);
+	}
+
+	@Override
+	public FhirBatch toOpenmrsType(@Nonnull FhirBatch existingObject, @Nonnull Bundle resource) {
+		return null;
+	}
+}