Skip to content

[stoptransaction] Make 'reason' field optional #110

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

Merged
merged 1 commit into from
Feb 15, 2023
Merged

[stoptransaction] Make 'reason' field optional #110

Show file tree
Hide file tree
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
10 changes: 8 additions & 2 deletions src/messages/StopTransaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ bool StopTransactionReqConverter::fromJson(const rapidjson::Value& json,
extract(json, "meterStop", data.meterStop);
bool ret = extract(json, "timestamp", data.timestamp, error_message);
extract(json, "transactionId", data.transactionId);
data.reason = ReasonHelper.fromString(json["reason"].GetString());
if (json.HasMember("reason"))
{
data.reason = ReasonHelper.fromString(json["reason"].GetString());
}
if (json.HasMember("transactionData"))
{
const rapidjson::Value& transactionData = json["transactionData"];
Expand All @@ -83,7 +86,10 @@ bool StopTransactionReqConverter::toJson(const StopTransactionReq& data, rapidjs
fill(json, "meterStop", data.meterStop);
fill(json, "timestamp", data.timestamp);
fill(json, "transactionId", data.transactionId);
fill(json, "reason", ReasonHelper.toString(data.reason));
if (data.reason.isSet())
{
fill(json, "reason", ReasonHelper.toString(data.reason));
}
if (!data.transactionData.empty())
{
rapidjson::Value transactionData(rapidjson::kArrayType);
Expand Down
2 changes: 1 addition & 1 deletion src/messages/StopTransaction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ struct StopTransactionReq
int transactionId;
/** @brief Optional. This contains the reason why the transaction was stopped. MAY only
be omitted when the Reason is "Local". */
ocpp::types::Reason reason;
ocpp::types::Optional<ocpp::types::Reason> reason;
/** @brief Optional. This contains transaction usage details relevant for billing purposes */
std::vector<ocpp::types::MeterValue> transactionData;
};
Expand Down