Merge pull request #93 from manjudr/signed-url-changes

#OB-45 feat: Generation of the signed url for the relative path
Sunbird-Obsrv · Dec 16, 2022 · 74d0b82 · 74d0b82
2 parents 4f65988 + 1e677db
commit 74d0b82
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/analytics-api-core/src/main/scala/org/ekstep/analytics/api/service/JobAPIService.scala b/analytics-api-core/src/main/scala/org/ekstep/analytics/api/service/JobAPIService.scala
@@ -377,9 +377,11 @@ class JobAPIService @Inject()(postgresDBUtil: PostgresDBUtil, apiValidator: APIV
         val values = f.split("/").toList.drop(4) // 4 - is derived from 2 -> '//' after http, 1 -> uri and 1 -> container
         values.mkString("/")
       }
-      else {
+      else if(f.contains("wasb")) {
         val values = f.split("/").toList.drop(3) // 3 - is derived from 2 -> '//' after wasb, 1 -> uri
         values.mkString("/")
+      } else{
+        f
       }
       APILogger.log("Getting signed URL for - " + objectKey)
       storageService.getSignedURL(bucket, objectKey, Option((expiry * 60)))

diff --git a/analytics-api-core/src/test/scala/org/ekstep/analytics/api/service/TestJobAPIService.scala b/analytics-api-core/src/test/scala/org/ekstep/analytics/api/service/TestJobAPIService.scala
@@ -751,4 +751,28 @@ class TestJobAPIService extends BaseSpec  {
     values.mkString("/") should be("uci-response-exhaust/427C56316649909179E69188C5CDB091/d655cf03-1f6f-4510-acf6-d3f51b488a5e_response_20220209.csv")
 
   }
+
+  it should "return signed URL for relative path" in {
+
+    EmbeddedPostgresql.execute(
+      s"""truncate table job_request;""")
+    EmbeddedPostgresql.execute(
+      s"""insert into job_request ("tag", "request_id", "job_id", "status", "request_data", "requested_by",
+        "requested_channel", "dt_job_submitted", "dt_job_completed", "download_urls", "dt_file_created", "execution_time") values ('client-2', '462CDD1241226D5CA2E777DA522691EF', 'assessment-score-report',
+        'SUCCESS',  '{"batchFilter":["TPD","NCFCOPY"],"contentFilters":{"request":{"filters":{"identifier":["do_11305960936384921612216","do_1130934466492252161819"],"prevState":"Draft"},"sort_by":{"createdOn":"desc"},"limit":10000,"fields":["framework","identifier","name","channel","prevState"]}},"reportPath":"course-progress-v2/"}',
+        'test-1', 'in.ekstep' , '2020-09-07T13:54:39.019+05:30', '2020-09-08T13:54:39.019+05:30', '{"progress-exhaust/778A3669531143769B5E8C98D42E1CAD/013307481768378368112_progress_20220927.zip"}', '2020-09-08T13:50:39.019+05:30', '10');""")
+
+    when(cacheUtil.getConsumerChannelTable()).thenReturn(mockTable)
+    when(mockTable.get(ArgumentMatchers.any(), ArgumentMatchers.any())).thenReturn(1)
+    reset(mockStorageService)
+    when(mockFc.getStorageService(ArgumentMatchers.any(),ArgumentMatchers.any(),ArgumentMatchers.any())).thenReturn(mockStorageService);
+    when(mockStorageService.getSignedURL(ArgumentMatchers.any(),ArgumentMatchers.any(),ArgumentMatchers.any(),ArgumentMatchers.any())).thenReturn("https://sunbird.org/test/signed/file1.csv");
+    doNothing().when(mockStorageService).closeContext()
+
+    val res = jobApiServiceActorRef.underlyingActor.getDataRequestList("client-2", 10, requestHeaderData)
+    val resultMap = res.result.get
+    val jobRes = JSONUtils.deserialize[List[JobResponse]](JSONUtils.serialize(resultMap.get("jobs").get))
+    jobRes.length should be(1)
+
+  }
 }