-#define TARIFF_DAY 0
-#define TARIFF_NIGHT 1
-
-class STORE;
-class STG_LOGGER;
-class ADMIN;
-
-class TARIFFS_IMPL : public TARIFFS {
-public:
- TARIFFS_IMPL(STORE * store);
- virtual ~TARIFFS_IMPL();
- int ReadTariffs ();
- const TARIFF * FindByName(const std::string & name) const;
- const TARIFF * GetNoTariff() const { return &noTariff; };
- int GetTariffsNum() const;
- int Del(const std::string & name, const ADMIN * admin);
- int Add(const std::string & name, const ADMIN * admin);
- int Chg(const TARIFF_DATA & td, const ADMIN * admin);
-
- void GetTariffsData(std::list<TARIFF_DATA> * tdl);
-
- const std::string & GetStrError() const { return strError; }
-private:
- std::list<TARIFF_IMPL> tariffs;
- STORE * store;
- STG_LOGGER & WriteServLog;
- mutable pthread_mutex_t mutex;
- std::string strError;
- TARIFF_IMPL noTariff;
+#include <string>
+#include <vector>
+#include <set>
+#include <mutex>
+
+namespace STG
+{
+
+struct Store;
+class Logger;
+struct Admin;
+
+class TariffsImpl : public Tariffs {
+ public:
+ using Data = std::vector<TariffImpl>;
+
+ explicit TariffsImpl(Store * store);
+
+ int ReadTariffs () override;
+ const Tariff * FindByName(const std::string & name) const override;
+ const Tariff * GetNoTariff() const override { return &noTariff; }
+ size_t Count() const override;
+ int Del(const std::string & name, const Admin * admin) override;
+ int Add(const std::string & name, const Admin * admin) override;
+ int Chg(const TariffData & td, const Admin * admin) override;
+
+ void AddNotifierAdd(NotifierBase<TariffData> * notifier) override;
+ void DelNotifierAdd(NotifierBase<TariffData> * notifier) override;
+
+ void AddNotifierDel(NotifierBase<TariffData> * notifier) override;
+ void DelNotifierDel(NotifierBase<TariffData> * notifier) override;
+
+ void GetTariffsData(std::vector<TariffData> * tdl) const override;
+
+ const std::string & GetStrError() const override { return strError; }
+
+ private:
+ Data tariffs;
+ Store* store;
+ Logger& WriteServLog;
+ mutable std::mutex m_mutex;
+ std::string strError;
+ TariffImpl noTariff;
+
+ std::set<NotifierBase<TariffData>*> onAddNotifiers;
+ std::set<NotifierBase<TariffData>*> onDelNotifiers;