refactor: making account_link_processor pass through (#363)

rdkcentral · Jan 30, 2024 · a477061 · a477061
1 parent 83b5b1c
commit a477061
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 24 deletions.
diff --git a/core/main/src/firebolt/handlers/discovery_rpc.rs b/core/main/src/firebolt/handlers/discovery_rpc.rs
@@ -467,11 +467,10 @@ impl DiscoveryServer for DiscoveryImpl {
 
     async fn watched(&self, context: CallContext, info: WatchedInfo) -> RpcResult<bool> {
         info!("Discovery.watched");
-        let unit = info.get_progress();
         let request = WatchedRequest {
             context,
             info,
-            unit,
+            unit: None,
         };
         if let Ok(response) = self
             .state
@@ -504,7 +503,7 @@ impl DiscoveryServer for DiscoveryImpl {
         let request = WatchedRequest {
             context: ctx.clone(),
             info: watched_info,
-            unit: ripple_sdk::api::firebolt::fb_discovery::ProgressUnit::WatchNext,
+            unit: None,
         };
         if let Ok(response) = self
             .state

diff --git a/core/main/src/processor/account_link_processor.rs b/core/main/src/processor/account_link_processor.rs
@@ -26,7 +26,7 @@ use ripple_sdk::{
         firebolt::fb_discovery::{
             ClearContentSetParams, ContentAccessAvailability, ContentAccessEntitlement,
             ContentAccessInfo, ContentAccessListSetParams, ContentAccessRequest, MediaEvent,
-            MediaEventsAccountLinkRequestParams, ProgressUnit, SessionParams, SignInRequestParams,
+            MediaEventsAccountLinkRequestParams, SessionParams, SignInRequestParams,
         },
         gateway::rpc_gateway_api::CallContext,
     },
@@ -264,20 +264,14 @@ impl AccountLinkProcessor {
             .await
             .is_ok();
         }
-        let progress =
-            if matches!(request.unit, ProgressUnit::WatchNext) || watched_info.progress > 1.0 {
-                watched_info.progress
-            } else {
-                watched_info.progress * 100.0
-            };
 
         if let Some(dist_session) = state.session_state.get_account_session() {
             let request =
                 MediaEventRequest::MediaEventAccountLink(MediaEventsAccountLinkRequestParams {
                     media_event: MediaEvent {
                         content_id: watched_info.entity_id.to_owned(),
                         completed: watched_info.completed.unwrap_or(true),
-                        progress,
+                        progress: watched_info.progress,
                         progress_unit: request.unit.clone(),
                         watched_on: watched_info.watched_on.clone(),
                         app_id: ctx.app_id.to_owned(),

diff --git a/core/sdk/src/api/account_link.rs b/core/sdk/src/api/account_link.rs
@@ -41,7 +41,7 @@ pub enum AccountLinkRequest {
 pub struct WatchedRequest {
     pub context: CallContext,
     pub info: WatchedInfo,
-    pub unit: ProgressUnit,
+    pub unit: Option<ProgressUnit>,
 }
 
 impl ExtnPayloadProvider for AccountLinkRequest {

diff --git a/core/sdk/src/api/firebolt/fb_discovery.rs b/core/sdk/src/api/firebolt/fb_discovery.rs
@@ -119,16 +119,6 @@ pub struct WatchedInfo {
     pub watched_on: Option<String>,
 }
 
-impl WatchedInfo {
-    pub fn get_progress(&self) -> ProgressUnit {
-        if self.progress.ge(&1.0) {
-            ProgressUnit::Percent
-        } else {
-            ProgressUnit::Seconds
-        }
-    }
-}
-
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct WatchNextInfo {
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -326,15 +316,14 @@ pub struct DiscoveryEntitlement {
 pub enum ProgressUnit {
     Seconds,
     Percent,
-    WatchNext,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct MediaEvent {
     pub content_id: String,
     pub completed: bool,
     pub progress: f32,
-    pub progress_unit: ProgressUnit,
+    pub progress_unit: Option<ProgressUnit>,
     pub watched_on: Option<String>,
     pub app_id: String,
 }