Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Fix/SubscribeVD response success based on individual vd item results #3861

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[WIP] Fix/SubscribeVD response success based on individual vd item results #3861

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...ger/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ void SubscribeVehicleDataRequest::on_event(const event_engine::Event& event) {
if (!SubscribePendingVehicleData(app, converted_msg_params)) {
result_code = mobile_apis::Result::GENERIC_ERROR;
response_info = "Subscription failed for some Vehicle data";
SendResponse(false, result_code, response_info.c_str());
SendResponse(
false, result_code, response_info.c_str(), &converted_msg_params);
return;
}
}
Expand Down Expand Up @@ -214,6 +215,7 @@ bool SubscribeVehicleDataRequest::SubscribePendingVehicleData(
VD_ResultCode::VDRC_DATA_NOT_SUBSCRIBED,
VD_ResultCode::VDRC_IGNORED});

bool overall_success = vi_waiting_for_subscribe_.empty();
for (auto vi_name = vi_waiting_for_subscribe_.begin();
vi_name != vi_waiting_for_subscribe_.end();) {
const bool is_subscription_successful = CheckSubscriptionStatus(
Expand All @@ -223,6 +225,7 @@ bool SubscribeVehicleDataRequest::SubscribePendingVehicleData(
auto& ext = VehicleInfoAppExtension::ExtractVIExtension(*app);
ext.subscribeToVehicleInfo(*vi_name);
vi_name = vi_waiting_for_subscribe_.erase(vi_name);
overall_success = true;
} else {
auto res_code =
static_cast<hmi_apis::Common_VehicleDataResultCode::eType>(
Expand All @@ -238,7 +241,7 @@ bool SubscribeVehicleDataRequest::SubscribePendingVehicleData(
}
}
}
return vi_waiting_for_subscribe_.empty();
return vi_waiting_for_subscribe_.empty() && overall_success;
}

bool SubscribeVehicleDataRequest::Init() {
Expand Down