From d16ae7b9a503ecb0bb10fa2710d3c8e3e9ee190f Mon Sep 17 00:00:00 2001 From: Elena Mamontova Date: Fri, 5 Aug 2016 19:46:31 +0300 Subject: [PATCH 1/1] Ticket 37. In the ApplyChanges() function switch construction changed to TariffChangelsAllowed() function call. --- .../configuration/sgconfig/parser_users.cpp | 50 +++---------------- 1 file changed, 6 insertions(+), 44 deletions(-) diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp index ce07b094..18744106 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser_users.cpp @@ -598,54 +598,16 @@ int CHG_USER::ApplyChanges() const TARIFF * newTariff = m_tariffs.FindByName(m_ucr.tariffName.const_data()); if (newTariff) { - switch (tariff->GetChangePolicy()) + if (tariff->TariffChangelsAllowed(*newTariff) == "") { - case TARIFF::ALLOW: - { if (!u->GetProperty().tariffName.Set(m_ucr.tariffName.const_data(), &m_currAdmin, m_login, &m_store)) return -1; u->ResetNextTariff(); - break; - } - case TARIFF::TO_CHEAP: - { - if (newTariff->GetFee() < tariff->GetFee()) - { - if (!u->GetProperty().tariffName.Set(m_ucr.tariffName.const_data(), &m_currAdmin, m_login, &m_store)) - return -1; - u->ResetNextTariff(); - } - else - GetStgLogger()("Tariff change is prohibited for user %s due to the policy %s. Current tariff %s is more cheap than new tariff %s.", - u->GetLogin().c_str(), - TARIFF::ChangePolicyToString(tariff->GetChangePolicy()).c_str(), - u->GetTariff()->GetName().c_str(), - newTariff->GetName().c_str()); - break; - } - case TARIFF::TO_EXPENSIVE: - { - if (newTariff->GetFee() > tariff->GetFee()) - { - if (!u->GetProperty().tariffName.Set(m_ucr.tariffName.const_data(), &m_currAdmin, m_login, &m_store)) - return -1; - u->ResetNextTariff(); - } - else - GetStgLogger()("Tariff change is prohibited for user %s due to the policy %s. Current tariff %s is more expensive than new tariff %s.", - u->GetLogin().c_str(), - TARIFF::ChangePolicyToString(tariff->GetChangePolicy()).c_str(), - u->GetTariff()->GetName().c_str(), - newTariff->GetName().c_str()); - break; - } - case TARIFF::DENY: - { - GetStgLogger()("Tariff change is prohibited for user %s. Tariff %s.", - u->GetLogin().c_str(), - u->GetTariff()->GetName().c_str()); - break; - } + } + else + { + std::string message = tariff->TariffChangelsAllowed(*newTariff); + GetStgLogger()("Tariff change is prohibited for user %s. %s", u->GetLogin().c_str(), message.c_str()); } } else -- 2.44.2