ATT-39: Old AttachmentsController to use ComplexViewHelper when fetching obs.

Author: mks-d

omod-1.10/src/main/java/org/openmrs/module/attachments/rest/AttachmentBytesResource1_10.java

@@ -60,7 +60,7 @@ public void getFile(@PathVariable("uuid") String uuid, @RequestParam(required =
 
 		String mimeType = attComplexData.getMimeType();
 
-		// The attachment meta data is sent as HTTP headers.
+		// The attachment metadata is sent as HTTP headers.
 		response.setContentType(mimeType);
 		response.addHeader("Content-Family", getContentFamily(mimeType).name());
 		response.addHeader("File-Name", attComplexData.getTitle());

omod-2.0/src/test/java/org/openmrs/module/attachments/rest/AttachmentRestController2_0Test.java

@@ -116,10 +116,10 @@ public void postAttachment_shouldUpdateObsComment() throws Exception {
 	}
 
 	@Test
-	public void doSearch_shouldReturnResult() {
+	public void doSearch_shouldReturnResults() {
 
 		// Setup
-		AttachmentResource1_10 res = new AttachmentResource1_10();
+		AttachmentResource2_0 res = new AttachmentResource2_0();
 		Patient patient = patientService.getPatient(2);
 
 		List<Attachment> attachments = as.getAttachments(patient, false);

omod/src/main/java/org/openmrs/module/attachments/web/controller/AttachmentsController.java

@@ -1,18 +1,26 @@
 package org.openmrs.module.attachments.web.controller;
 
+import static org.openmrs.module.attachments.AttachmentsContext.getContentFamily;
+
+import java.io.IOException;
+import java.util.Iterator;
+
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.openmrs.Encounter;
 import org.openmrs.Obs;
 import org.openmrs.Patient;
 import org.openmrs.Provider;
 import org.openmrs.Visit;
-import org.openmrs.Encounter;
 import org.openmrs.module.attachments.AttachmentsConstants;
 import org.openmrs.module.attachments.AttachmentsContext;
 import org.openmrs.module.attachments.ComplexObsSaver;
 import org.openmrs.module.attachments.VisitCompatibility;
 import org.openmrs.module.attachments.obs.AttachmentComplexData;
+import org.openmrs.module.attachments.obs.ComplexViewHelper;
 import org.openmrs.module.attachments.obs.ValueComplex;
 import org.openmrs.module.attachments.rest.AttachmentBytesResource1_10;
 import org.openmrs.module.webservices.rest.web.ConversionUtil;
@@ -28,12 +36,6 @@
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Iterator;
-
-import static org.openmrs.module.attachments.AttachmentsContext.getContentFamily;
-
 /*
  * @Deprecated and replaced by
  * {@link org.openmrs.module.attachments.rest.AttachmentBytesResource1_10 AttachmentBytesResource}
@@ -56,6 +58,10 @@ public class AttachmentsController {
 	@Qualifier(AttachmentsConstants.COMPONENT_COMPLEXOBS_SAVER)
 	protected ComplexObsSaver obsSaver;
 
+	@Autowired
+	@Qualifier(AttachmentsConstants.COMPONENT_COMPLEXVIEW_HELPER)
+	protected ComplexViewHelper complexViewHelper;
+	
 	protected final Log log = LogFactory.getLog(getClass());
 
 	@RequestMapping(value = AttachmentsConstants.LEGACY_UPLOAD_ATTACHMENT_URL, method = RequestMethod.POST)
@@ -110,7 +116,7 @@ public void downloadDocument(@RequestParam("obs") String obsUuid,
 
 		// Getting the Core/Platform complex data object
 		Obs obs = context.getObsService().getObsByUuid(obsUuid);
-		Obs complexObs = context.getObsService().getComplexObs(obs.getObsId(), view);
+		Obs complexObs = context.getObsService().getComplexObs(obs.getObsId(), complexViewHelper.getView(obs, view));
 		ComplexData complexData = complexObs.getComplexData();
 
 		// Switching to our complex data object