X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a481c1e57ecc91e87e24f8074602f5ed3de77a07..51998949e60e2a7e86e4393b315cfb76a58ca80d:/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
index cef5b203..10c45ab9 100644
--- a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
@@ -26,10 +26,14 @@
  *
  */
 
-#include <cmath>
-
 #include "firebird_store.h"
+
 #include "stg/ibpp.h"
+#include "stg/tariff.h"
+#include "stg/tariff_conf.h"
+#include "stg/common.h"
+
+#include <cmath>
 
 namespace
 {
@@ -126,7 +130,7 @@ catch (IBPP::Exception & ex)
 return 0;
 }
 //-----------------------------------------------------------------------------
-int FIREBIRD_STORE::SaveTariff(const TARIFF_DATA & td,
+int FIREBIRD_STORE::SaveTariff(const STG::TariffData & td,
                                const std::string & tariffName) const
 {
 STG_LOCKER lock(&mutex);
@@ -165,6 +169,7 @@ try
 
     query += " where pk_tariff = ?";
 
+    unsigned num = 5;
     st->Prepare(query);
     st->Set(1, td.tariffConf.fee);
     st->Set(2, td.tariffConf.free);
@@ -172,16 +177,21 @@ try
     st->Set(4, td.tariffConf.traffType);
 
     if (schemaVersion > 0)
-        st->Set(5, TARIFF::PeriodToString(td.tariffConf.period));
+        {
+        st->Set(5, STG::Tariff::toString(td.tariffConf.period));
+        ++num;
+        }
+
     if (schemaVersion > 1)
         {
-        st->Set(6, TARIFF::ChangePolicyToString(td.tariffConf.changePolicy));
+        st->Set(6, STG::Tariff::toString(td.tariffConf.changePolicy));
         IBPP::Timestamp policyTimeout;
         time_t2ts(td.tariffConf.changePolicyTimeout, &policyTimeout);
         st->Set(7, policyTimeout);
+        num += 2;
         }
 
-    st->Set(8, id);
+    st->Set(num, id);
     st->Execute();
     st->Close();
 
@@ -255,7 +265,7 @@ catch (IBPP::Exception & ex)
 return 0;
 }
 //-----------------------------------------------------------------------------
-int FIREBIRD_STORE::RestoreTariff(TARIFF_DATA * td,
+int FIREBIRD_STORE::RestoreTariff(STG::TariffData * td,
                                   const std::string & tariffName) const
 {
 STG_LOCKER lock(&mutex);
@@ -284,13 +294,12 @@ try
     st->Get(3, td->tariffConf.fee);
     st->Get(4, td->tariffConf.free);
     st->Get(5, td->tariffConf.passiveCost);
-    //st->Get(6, td->tariffConf.traffType);
-    td->tariffConf.traffType = TARIFF::IntToTraffType(Get<int>(st, 6));
+    td->tariffConf.traffType = STG::Tariff::fromInt(Get<int>(st, 6));
     if (schemaVersion > 0)
-        td->tariffConf.period = TARIFF::StringToPeriod(Get<std::string>(st, 7));
+        td->tariffConf.period = STG::Tariff::parsePeriod(Get<std::string>(st, 7));
     if (schemaVersion > 1)
         {
-        td->tariffConf.changePolicy = TARIFF::StringToChangePolicy(Get<std::string>(st, 8));
+        td->tariffConf.changePolicy = STG::Tariff::parseChangePolicy(Get<std::string>(st, 8));
         td->tariffConf.changePolicyTimeout = ts2time_t(Get<IBPP::Timestamp>(st, 9));
         }
     st->Close();