Change video response to Resource (instead of byte array)

Author: DiegoMzmn

backend/src/main/java/urjc/ovteaching/openvidu/OpenViduComponent.java

@@ -35,12 +35,12 @@
 import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.HttpClientErrorException;
 
-import com.google.common.io.ByteStreams;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 
@@ -326,9 +326,9 @@ public List<Recording> getRecordings(Room room) {
 		}
 	}
 
-	public byte[] getVideo(String videoId) throws IOException {
+	public Resource getVideo(String videoId) throws IOException {
 		if(RECORDING_ENABLED) {
-			return ByteStreams.toByteArray(resourceLoader.getResource("file:" + RECORDING_PATH + "/" + videoId + "/" + videoId + ".mp4").getInputStream());
+			return resourceLoader.getResource("file:" + RECORDING_PATH + "/" + videoId + "/" + videoId + ".mp4");
 		}
 		return null;
 	}

backend/src/main/java/urjc/ovteaching/openvidu/RecordingController.java

@@ -4,8 +4,10 @@
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -164,7 +166,7 @@ public ResponseEntity<List<Recording>> getRecordings(@PathVariable String roomNa
 	 * @return the video in byte array
 	 */
 	@GetMapping("/room/{roomName}/recording/{video}")
-	public ResponseEntity<byte[]> getVideo(@PathVariable String roomName, @PathVariable String video) {
+	public ResponseEntity<Resource> getVideo(@PathVariable String roomName, @PathVariable String video) {
 		Room room = roomServ.findByName(roomName);
 		User user = userServ.findByName(this.userComponent.getLoggedUser().getName());
 
@@ -178,8 +180,11 @@ public ResponseEntity<byte[]> getVideo(@PathVariable String roomName, @PathVaria
 			return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
 		}
 		try {
-			byte[] bytes = this.openViduComponent.getVideo(video);			
-			return new ResponseEntity<>(bytes, new HttpHeaders(), HttpStatus.OK);
+			Resource resource = this.openViduComponent.getVideo(video);
+			return ResponseEntity.ok()
+	                .contentType(MediaType.parseMediaType("video/mp4"))
+	                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + resource.getFilename() + "\"")
+	                .body(resource);
 		} catch(IOException e) {
 			e.printStackTrace();
 			return new ResponseEntity<>(HttpStatus.NOT_FOUND);

backend/src/test/java/urjc/ovteaching/RecordingTests.java

@@ -20,12 +20,15 @@
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.core.io.ResourceLoader;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
+import com.google.common.io.ByteStreams;
+
 import urjc.ovteaching.openvidu.OpenViduComponent;
 import urjc.ovteaching.openvidu.RecordingController;
 import urjc.ovteaching.rooms.Room;
@@ -42,6 +45,9 @@ public class RecordingTests {
 
 	@Autowired
 	private MockMvc mvc;
+	
+	@Autowired
+    ResourceLoader resourceLoader;
 
 	@Spy
 	private final RecordingController recordingController = new RecordingController();
@@ -366,12 +372,13 @@ public void getRecordingsOpenViduError() throws Exception {
 
 	@Test
 	public void getVideo() throws Exception {
-		given(this.openviduComponent.getVideo("testRoom")).willReturn(new byte[] {1, 2, 3});
+		given(this.openviduComponent.getVideo("testRoom")).willReturn(resourceLoader.getResource("classpath:json/initialData.json"));
 
 		mvc.perform(MockMvcRequestBuilders.get("/ovTeachingApi/room/testRoom/recording/testRoom")
 				.contentType(MediaType.APPLICATION_JSON))
 				.andExpect(status().isOk())
-				.andExpect(content().bytes(new byte[] {1, 2, 3}));
+				.andExpect(content().contentType("video/mp4"))
+				.andExpect(content().bytes(ByteStreams.toByteArray(resourceLoader.getResource("classpath:json/initialData.json").getInputStream())));
 
 		verify(openviduComponent).getVideo("testRoom");
 	}