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

Raise error if charging schedules are empty #920

Merged
merged 2 commits into from
Feb 17, 2025
Merged

Raise error if charging schedules are empty #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a32a49e
Raise error if charging schedules are empty
jannejy Dec 18, 2024
241bfef
clang format
Pietfried Feb 17, 2025
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
3 changes: 2 additions & 1 deletion include/ocpp/v201/functional_blocks/smart_charging.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ enum class ProfileValidationResultEnum {
ChargingStationMaxProfileEvseIdGreaterThanZero,
DuplicateTxDefaultProfileFound,
DuplicateProfileValidityPeriod,
RequestStartTransactionNonTxProfile
RequestStartTransactionNonTxProfile,
ChargingProfileEmptyChargingSchedules
};

/// \brief This is used to associate charging profiles with a source.
Expand Down
7 changes: 7 additions & 0 deletions lib/ocpp/v201/functional_blocks/smart_charging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ std::string profile_validation_result_to_string(ProfileValidationResultEnum e) {
return "DuplicateProfileValidityPeriod";
case ProfileValidationResultEnum::RequestStartTransactionNonTxProfile:
return "RequestStartTransactionNonTxProfile";
case ProfileValidationResultEnum::ChargingProfileEmptyChargingSchedules:
return "ChargingProfileEmptyChargingSchedules";
}

throw EnumToStringException{e, "ProfileValidationResultEnum"};
Expand Down Expand Up @@ -96,6 +98,7 @@ std::string profile_validation_result_to_reason_code(ProfileValidationResultEnum
case ProfileValidationResultEnum::ChargingSchedulePeriodUnsupportedNumberPhases:
case ProfileValidationResultEnum::ChargingSchedulePeriodExtraneousPhaseValues:
case ProfileValidationResultEnum::ChargingSchedulePeriodPhaseToUseACPhaseSwitchingUnsupported:
case ProfileValidationResultEnum::ChargingProfileEmptyChargingSchedules:
return "InvalidSchedule";
case ProfileValidationResultEnum::TxProfileMissingTransactionId:
return "MissingParam";
Expand Down Expand Up @@ -516,6 +519,10 @@ ProfileValidationResultEnum SmartCharging::validate_tx_profile(const ChargingPro

ProfileValidationResultEnum SmartCharging::validate_profile_schedules(ChargingProfile& profile,
std::optional<EvseInterface*> evse_opt) const {
if (profile.chargingSchedule.empty()) {
return ProfileValidationResultEnum::ChargingProfileEmptyChargingSchedules;
}

auto charging_station_supply_phases =
this->device_model.get_value<int32_t>(ControllerComponentVariables::ChargingStationSupplyPhases);

Expand Down
23 changes: 21 additions & 2 deletions tests/lib/ocpp/v201/functional_blocks/test_smart_charging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,12 @@ class SmartChargingTest : public DatabaseTestingUtils {

ChargingProfile
create_charging_profile(int32_t charging_profile_id, ChargingProfilePurposeEnum charging_profile_purpose,
ChargingSchedule charging_schedule, std::optional<std::string> transaction_id = {},
std::vector<ChargingSchedule> charging_schedules,
std::optional<std::string> transaction_id = {},
ChargingProfileKindEnum charging_profile_kind = ChargingProfileKindEnum::Absolute,
int stack_level = DEFAULT_STACK_LEVEL, std::optional<ocpp::DateTime> validFrom = {},
std::optional<ocpp::DateTime> validTo = {}) {
auto recurrency_kind = RecurrencyKindEnum::Daily;
std::vector<ChargingSchedule> charging_schedules = {charging_schedule};
ChargingProfile charging_profile;
charging_profile.id = charging_profile_id;
charging_profile.stackLevel = stack_level;
Expand All @@ -180,6 +180,17 @@ class SmartChargingTest : public DatabaseTestingUtils {
return charging_profile;
}

ChargingProfile
create_charging_profile(int32_t charging_profile_id, ChargingProfilePurposeEnum charging_profile_purpose,
ChargingSchedule charging_schedule, std::optional<std::string> transaction_id = {},
ChargingProfileKindEnum charging_profile_kind = ChargingProfileKindEnum::Absolute,
int stack_level = DEFAULT_STACK_LEVEL, std::optional<ocpp::DateTime> validFrom = {},
std::optional<ocpp::DateTime> validTo = {}) {
return create_charging_profile(charging_profile_id, charging_profile_purpose,
std::vector<ChargingSchedule>{charging_schedule}, transaction_id,
charging_profile_kind, stack_level, validFrom, validTo);
}

ChargingProfileCriterion create_charging_profile_criteria(
std::optional<std::vector<ocpp::v201::ChargingLimitSourceEnum>> sources = std::nullopt,
std::optional<std::vector<int32_t>> ids = std::nullopt,
Expand Down Expand Up @@ -1962,4 +1973,12 @@ TEST_F(SmartChargingTest, K08FR07_GetCompositeSchedule_DoesNotCalculateComposite
smart_charging.handle_message(get_composite_schedule_req);
}

TEST_F(SmartChargingTest, K01_ValidateTxProfile_EmptyChargingSchedule) {
auto profile = create_charging_profile(DEFAULT_PROFILE_ID, ChargingProfilePurposeEnum::ChargingStationMaxProfile,
std::vector<ChargingSchedule>{}, ocpp::DateTime("2024-01-17T17:00:00"));

auto sut = smart_charging.conform_and_validate_profile(profile, DEFAULT_EVSE_ID);
ASSERT_THAT(sut, testing::Eq(ProfileValidationResultEnum::ChargingProfileEmptyChargingSchedules));
}

} // namespace ocpp::v201