Address review comments.

5 files changed, 27 insertions, 3 deletions

diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_publish_app_service_request.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_publish_app_service_request.cc
index 7a71bea57f..ff69c90029 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_publish_app_service_request.cc
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_publish_app_service_request.cc
@@ -90,7 +90,6 @@ void ASPublishAppServiceRequest::Run() {
           manifest, false, UINT32_MAX);
 
   response_params[strings::app_service_record] = service_record;
-  // TODO: Add AppServiceRecord to response
   SendResponse(true,
                (*message_)[strings::params][strings::correlation_id].asUInt(),
                hmi_apis::FunctionID::AppService_PublishAppService,
diff --git a/src/components/policy/policy_external/include/policy/policy_table/enums.h b/src/components/policy/policy_external/include/policy/policy_table/enums.h
index 0b571823f9..094e5cc7c6 100644
--- a/src/components/policy/policy_external/include/policy/policy_table/enums.h
+++ b/src/components/policy/policy_external/include/policy/policy_table/enums.h
@@ -446,7 +446,7 @@ enum FunctionID {
   SetCloudAppPropertiesID = 50,
 
   /**
-   * @brief PublishAppServiceID
+   * @brief PublishAppServiceID.
    */
   PublishAppServiceID = 52,
 
@@ -541,6 +541,11 @@ enum FunctionID {
   OnRCStatusID = 32785,
 
   /**
+   * @brief OnAppServiceDataID.
+   */
+  OnAppServiceDataID = 32786,
+
+  /**
    * @brief EncodedSyncPDataID.
    */
   EncodedSyncPDataID = 65536,
diff --git a/src/components/policy/policy_external/src/policy_table/enums.cc b/src/components/policy/policy_external/src/policy_table/enums.cc
index 72dd7aea72..2260d7e320 100644
--- a/src/components/policy/policy_external/src/policy_table/enums.cc
+++ b/src/components/policy/policy_external/src/policy_table/enums.cc
@@ -1221,6 +1221,11 @@ bool EnumFromJsonString(const std::string& literal, FunctionID* result) {
     return true;
   }
 
+  if ("OnAppServiceData" == literal) {
+    *result = OnAppServiceDataID;
+    return true;
+  }
+
   if ("EncodedSyncPData" == literal) {
     *result = EncodedSyncPDataID;
     return true;
diff --git a/src/components/policy/policy_regular/include/policy/policy_table/enums.h b/src/components/policy/policy_regular/include/policy/policy_table/enums.h
index f8f4e9e029..a62a60f2e9 100644
--- a/src/components/policy/policy_regular/include/policy/policy_table/enums.h
+++ b/src/components/policy/policy_regular/include/policy/policy_table/enums.h
@@ -432,7 +432,7 @@ enum FunctionID {
   SetCloudAppPropertiesID = 50,
 
   /**
-   * @brief PublishAppServiceID
+   * @brief PublishAppServiceID.
    */
   PublishAppServiceID = 52,
 
@@ -527,6 +527,11 @@ enum FunctionID {
   OnRCStatusID = 32785,
 
   /**
+   * @brief OnAppServiceDataID.
+   */
+  OnAppServiceDataID = 32786,
+
+  /**
    * @brief EncodedSyncPDataID.
    */
   EncodedSyncPDataID = 65536,
diff --git a/src/components/policy/policy_regular/src/policy_table/enums.cc b/src/components/policy/policy_regular/src/policy_table/enums.cc
index f53b27776d..5c011fbfa0 100644
--- a/src/components/policy/policy_regular/src/policy_table/enums.cc
+++ b/src/components/policy/policy_regular/src/policy_table/enums.cc
@@ -887,6 +887,8 @@ bool IsValidEnum(FunctionID val) {
       return true;
     case OnRCStatusID:
       return true;
+    case OnAppServiceDataID:
+      return true;
     case EncodedSyncPDataID:
       return true;
     case SyncPDataID:
@@ -1038,6 +1040,8 @@ const char* EnumToJsonString(FunctionID val) {
       return "OnWayPointChange";
     case OnRCStatusID:
       return "OnRCStatus";
+    case OnAppServiceDataID:
+      return "OnAppServiceData";
     case EncodedSyncPDataID:
       return "EncodedSyncPData";
     case SyncPDataID:
@@ -1291,6 +1295,7 @@ bool EnumFromJsonString(const std::string& literal, FunctionID* result) {
     *result = SendHapticDataID;
     return true;
   }
+
   if ("SetCloudAppProperties" == literal) {
     *result = SetCloudAppPropertiesID;
     return true;
@@ -1391,6 +1396,11 @@ bool EnumFromJsonString(const std::string& literal, FunctionID* result) {
     return true;
   }
 
+  if ("OnAppServiceData" == literal) {
+    *result = OnAppServiceDataID;
+    return true;
+  }
+
   if ("EncodedSyncPData" == literal) {
     *result = EncodedSyncPDataID;
     return true;