Merge pull request #308 from rheafernandes/large-video

Added test coverage for http util without mocking

content-api/content-actors/src/main/scala/org/sunbird/content/upload/mgr/UploadManager.scala

@@ -24,6 +24,8 @@ object UploadManager {
 
 	private val MEDIA_TYPE_LIST = List("image", "video")
 	private val kfClient = new KafkaClient
+	private val CONTENT_ARTIFACT_ONLINE_SIZE: Double = Platform.getDouble("content.artifact.size.for_online", 209715200.asInstanceOf[Double])
+
 
 	def upload(request: Request, node: Node)(implicit oec: OntologyEngineContext, ec: ExecutionContext): Future[Response] = {
 		val identifier: String = node.getIdentifier
@@ -47,10 +49,13 @@ object UploadManager {
 	def updateNode(request: Request, identifier: String, mediaType: String, contentType: String, result: Map[String, AnyRef])(implicit oec: OntologyEngineContext, ec: ExecutionContext): Future[Response] = {
 		val updatedResult = result - "identifier"
 		val artifactUrl = updatedResult.getOrElse("artifactUrl", "").asInstanceOf[String]
+		val size: Double = updatedResult.getOrElse("size", 0.asInstanceOf[Double]).asInstanceOf[Double]
 		if (StringUtils.isNotBlank(artifactUrl)) {
 			val updateReq = new Request(request)
 			updateReq.getContext().put("identifier", identifier)
 			updateReq.getRequest.putAll(mapAsJavaMap(updatedResult))
+			if( size > CONTENT_ARTIFACT_ONLINE_SIZE)
+				updateReq.put("contentDisposition", "online-only")
 			if (StringUtils.equalsIgnoreCase("Asset", contentType) && MEDIA_TYPE_LIST.contains(mediaType))
 				updateReq.put("status", "Processing")
 

content-api/content-actors/src/test/resources/application.conf

@@ -496,4 +496,6 @@ dial_service {
   }
 }
 content.link_dialcode.validation=true
-content.link_dialcode.max_limit=10
\ No newline at end of file
+content.link_dialcode.max_limit=10
+# This is added to handle large artifacts sizes differently
+content.artifact.size.for_online=209715200
\ No newline at end of file

content-api/content-service/conf/application.conf

@@ -574,4 +574,6 @@ dial_service {
   }
 }
 content.link_dialcode.validation=true
-content.link_dialcode.max_limit=10
\ No newline at end of file
+content.link_dialcode.max_limit=10
+# This is added to handle large artifacts sizes differently
+content.artifact.size.for_online=209715200
\ No newline at end of file

content-api/hierarchy-manager/src/test/resources/application.conf

@@ -472,3 +472,5 @@ collection.image.migration.enabled=true
 
 content.tagging.backward_enable=true
 content.tagging.property="subject,medium"
+# This is added to handle large artifacts sizes differently
+content.artifact.size.for_online=209715200

platform-core/platform-common/src/main/java/org/sunbird/common/HttpUtil.java

@@ -72,12 +72,14 @@ public class HttpUtil {
 			Map<String, Object> metadataMap = new HashMap<>();
 			HttpResponse<String> response = Unirest.head(url).headers(headers).asString();
 			if (response.getStatus() == 200) {
-				metadataMap.put("Content-Length", ((Number) Long.parseLong(response.getHeaders().getOrDefault("Content-Length", response.getHeaders().get("content-length")).get(0))).longValue());
+				metadataMap.put("Content-Length", ((Number) Double.parseDouble(response.getHeaders().getOrDefault("Content-Length", response.getHeaders().get("content-length")).get(0))).doubleValue());
 				metadataMap.put("Content-Type", response.getHeaders().getOrDefault("Content-Type", response.getHeaders().get("content-type")).get(0));
 				return metadataMap;
 			} else {
-				throw new ClientException("ERR_API_CALL", "Fetching of file related metadata Failed with response code " + response.getStatus() + "and message: " + response.getStatusText());
+				throw new ClientException("ERR_API_CALL", "Fetching of file related metadata Failed with response code " + response.getStatus() + " and message: " + response.getStatusText());
 			}
+		} catch (ClientException e) {
+			throw new ClientException("ERR_API_CALL", "Something Went Wrong While Making API Call | Error is: " + e.getMessage());
 		} catch (Exception e) {
 			throw new ServerException("ERR_API_CALL", "Something Went Wrong While Making API Call | Error is: " + e.getMessage());
 		}

platform-core/platform-common/src/main/java/org/sunbird/common/Platform.java

@@ -68,4 +68,12 @@ public class Platform {
 		return config.hasPath(key) ? config.getStringList(key) : defaultVal;
 	}
 
+	public static Long getLong(String key, Long defaultVal) {
+		return config.hasPath(key) ? config.getLong(key) : defaultVal;
+	}
+
+	public static Double getDouble(String key, Double defaultVal) {
+		return config.hasPath(key) ? config.getDouble(key) : defaultVal;
+	}
+
 }

platform-core/platform-common/src/test/java/org/sunbird/common/HttpUtilTests.java

+package org.sunbird.common;
+
+import org.junit.Test;
+import org.sunbird.common.exception.ClientException;
+import org.sunbird.common.exception.ServerException;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class HttpUtilTests {
+
+    HttpUtil httpUtil = new HttpUtil();
+
+    @Test
+    public void testGetMetadataValidUrl() throws Exception {
+        Map<String, Object> metadata = httpUtil.getMetadata("https://sunbirddev.blob.core.windows.net/sunbird-content-dev/content/assets/do_1130384356456120321307/3point4gb.mp4", new HashMap<>());
+        assertNotNull(metadata);
+        assertNotNull(metadata.get("Content-Type"));
+        assertNotNull(metadata.get("Content-Length"));
+        assertTrue(metadata.get("Content-Length") instanceof Number);
+        assertTrue(metadata.get("Content-Type") instanceof String);
+    }
+
+
+    @Test(expected = ClientException.class)
+    public void testGetMetadataInvalidUrl() throws Exception {
+       httpUtil.getMetadata("https://sunbirddev.blob.core.windows.net/sunbird-content-dev/content/assets/do_113038435645612032130743/3point4gb.mp4", new HashMap<>());
+    }
+}

platform-modules/mimetype-manager/src/test/resources/application.conf

@@ -470,4 +470,5 @@ collection.image.migration.enabled=true
 content.tagging.backward_enable=true
 content.tagging.property="subject,medium"
 content.h5p.library.path="https://s3.ap-south-1.amazonaws.com/ekstep-public-dev/content/templates/h5p-library-latest.zip"
-
+# This is added to handle large artifacts sizes differently
+content.artifact.size.for_online=209715200

schemas/collection/1.0/schema.json

@@ -105,7 +105,8 @@
       "enum": [
         "inline",
         "online",
-        "attachment"
+        "attachment",
+        "online-only"
       ],
       "default": "inline"
     },

schemas/content/1.0/schema.json

@@ -105,7 +105,8 @@
             "enum": [
                 "inline",
                 "online",
-                "attachment"
+                "attachment",
+                "online-only"
             ],
             "default": "inline"
         },