Merge branch 'master' into FM2-312

api-2.1/src/main/java/org/openmrs/module/fhir2/api/translators/impl/GroupMemberTranslatorImpl_2_1.java

@@ -0,0 +1,91 @@
+/*
+ * 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.translators.impl;
+
+import static org.apache.commons.lang3.Validate.notNull;
+
+import javax.annotation.Nonnull;
+
+import lombok.AccessLevel;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.hl7.fhir.r4.model.Group;
+import org.hl7.fhir.r4.model.Period;
+import org.openmrs.CohortMembership;
+import org.openmrs.Patient;
+import org.openmrs.annotation.OpenmrsProfile;
+import org.openmrs.module.fhir2.api.dao.FhirPatientDao;
+import org.openmrs.module.fhir2.api.translators.GroupMemberTranslator;
+import org.openmrs.module.fhir2.api.translators.PatientReferenceTranslator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+@Setter(AccessLevel.MODULE)
+@OpenmrsProfile(openmrsPlatformVersion = "2.1.* - 2.*")
+public class GroupMemberTranslatorImpl_2_1 implements GroupMemberTranslator<CohortMembership> {
+
+	@Autowired
+	private PatientReferenceTranslator patientReferenceTranslator;
+
+	@Autowired
+	private FhirPatientDao patientDao;
+
+	@Override
+	public Group.GroupMemberComponent toFhirResource(@Nonnull CohortMembership cohortMember) {
+		notNull(cohortMember, "CohortMember object should not be null");
+		Group.GroupMemberComponent groupMemberComponent = new Group.GroupMemberComponent();
+		groupMemberComponent.setId(cohortMember.getUuid());
+		groupMemberComponent.setInactive(!cohortMember.isActive());
+
+		Patient patient = patientDao.getPatientById(cohortMember.getPatientId());
+		if (patient != null) {
+			groupMemberComponent.setEntity(patientReferenceTranslator.toFhirResource(patient));
+		}
+
+		Period period = new Period();
+		period.setStart(cohortMember.getStartDate());
+		period.setEnd(cohortMember.getEndDate());
+		groupMemberComponent.setPeriod(period);
+
+		return groupMemberComponent;
+	}
+
+	@Override
+	public CohortMembership toOpenmrsType(@Nonnull Group.GroupMemberComponent groupMemberComponent) {
+		notNull(groupMemberComponent, "GroupMemberComponent object should not be null");
+		return toOpenmrsType(new CohortMembership(), groupMemberComponent);
+	}
+
+	@Override
+	public CohortMembership toOpenmrsType(@Nonnull CohortMembership existingCohort,
+	        @Nonnull Group.GroupMemberComponent groupMemberComponent) {
+		notNull(groupMemberComponent, "GroupMemberComponent object should not be null");
+		notNull(existingCohort, "ExistingCohort object should not be null");
+
+		if (groupMemberComponent.hasEntity()) {
+			existingCohort
+			        .setPatientId(patientReferenceTranslator.toOpenmrsType(groupMemberComponent.getEntity()).getPatientId());
+		}
+
+		if (groupMemberComponent.hasPeriod()) {
+			existingCohort.setStartDate(groupMemberComponent.getPeriod().getStart());
+			existingCohort.setEndDate(groupMemberComponent.getPeriod().getEnd());
+		}
+
+		if (groupMemberComponent.hasInactive()) {
+			existingCohort.setVoided(groupMemberComponent.getInactive());
+			existingCohort.setVoidReason("Voided via FHIR API");
+		}
+
+		return existingCohort;
+	}
+}

api-2.1/src/main/java/org/openmrs/module/fhir2/api/translators/impl/GroupTranslatorImpl_2_1.java

@@ -0,0 +1,83 @@
+/*
+ * 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.translators.impl;
+
+import static org.apache.commons.lang3.Validate.notNull;
+
+import javax.annotation.Nonnull;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import lombok.AccessLevel;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.hl7.fhir.r4.model.Group;
+import org.openmrs.Cohort;
+import org.openmrs.CohortMembership;
+import org.openmrs.annotation.OpenmrsProfile;
+import org.openmrs.module.fhir2.api.translators.GroupMemberTranslator;
+import org.openmrs.module.fhir2.api.translators.GroupTranslator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Primary
+@Component
+@Setter(AccessLevel.MODULE)
+@OpenmrsProfile(openmrsPlatformVersion = "2.1.* - 2.*")
+public class GroupTranslatorImpl_2_1 extends BaseGroupTranslator implements GroupTranslator {
+
+	@Autowired
+	private GroupMemberTranslator<CohortMembership> groupMemberTranslator;
+
+	@Override
+	public Group toFhirResource(@Nonnull Cohort cohort) {
+		notNull(cohort, "Cohort object should not be null");
+		Group group = super.toFhirResource(cohort);
+
+		Collection<CohortMembership> memberships = cohort.getMemberships();
+		log.info("Number of members {} ", memberships.size());
+		group.setQuantity(memberships.size());
+		memberships.forEach(membership -> group.addMember(groupMemberTranslator.toFhirResource(membership)));
+
+		return group;
+	}
+
+	@Override
+	public Cohort toOpenmrsType(@Nonnull Group group) {
+		notNull(group, "Group resource should not be null");
+		return toOpenmrsType(new Cohort(), group);
+	}
+
+	@Override
+	public Cohort toOpenmrsType(@Nonnull Cohort existingCohort, @Nonnull Group group) {
+		notNull(group, "group resource object should not be null");
+		notNull(existingCohort, "ExistingCohort object should not be null");
+
+		Cohort finalExistingCohort = super.toOpenmrsType(existingCohort, group);
+
+		if (group.hasMember()) {
+			Set<CohortMembership> memberships = new HashSet<>();
+			group.getMember().forEach(member -> memberships.add(this.setCohort(existingCohort, member)));
+			existingCohort.setMemberships(memberships);
+		}
+
+		return finalExistingCohort;
+	}
+
+	private CohortMembership setCohort(Cohort cohort, Group.GroupMemberComponent groupMember) {
+		CohortMembership cohortMembership = groupMemberTranslator.toOpenmrsType(groupMember);
+		cohortMembership.setCohort(cohort);
+		return cohortMembership;
+	}
+}