Remove storing p1_opname and soc_status

src/data-service.cpp

@@ -91,68 +91,6 @@ void DataService_v2::reset_connection()
 	s_connection.reset(nullptr);
 }
 
-void DataService_v2::store(const P1Opname &opname)
-{
-	if (m_read_only)
-		return;
-
-	bool first_reset = true;
-	do
-	{
-		try
-		{
-			pqxx::transaction tx(get_connection());
-
-			tx.exec("INSERT INTO p1_opname (verbruik_hoog, verbruik_laag, levering_hoog, levering_laag) VALUES (" +
-					tx.quote(opname.verbruik_hoog) + ", " +
-					tx.quote(opname.verbruik_laag) + ", " +
-					tx.quote(opname.levering_hoog) + ", " +
-					tx.quote(opname.levering_laag) + ")");
-			tx.commit();
-		}
-		catch (const pqxx::broken_connection &e)
-		{
-			if (first_reset)
-			{
-				first_reset = false;
-				reset_connection();
-				continue;
-			}
-			std::cerr << "Failed to write opname: " << e.what() << '\n';
-		}
-	} while (false);
-}
-
-void DataService_v2::store(const SessySOC &soc)
-{
-	if (m_read_only)
-		return;
-
-	bool first_reset = true;
-	do
-	{
-		try
-		{
-			pqxx::transaction tx(get_connection());
-
-			tx.exec("INSERT INTO sessy_soc (nr, soc) VALUES (" +
-					tx.quote(soc.nr) + ", " +
-					tx.quote(soc.sessy.state_of_charge) + ")");
-			tx.commit();
-		}
-		catch (const pqxx::broken_connection &e)
-		{
-			if (first_reset)
-			{
-				first_reset = false;
-				reset_connection();
-				continue;
-			}
-			std::cerr << "Failed to write opname: " << e.what() << '\n';
-		}
-	} while (false);
-}
-
 void DataService_v2::store(const GrafiekPunt &pt)
 {
 	if (m_read_only)

src/data-service.hpp

@@ -156,8 +156,6 @@ class DataService_v2
   public:
 	static DataService_v2 &instance();
 
-	void store(const P1Opname &opname);
-	void store(const SessySOC &soc);
 	void store(const GrafiekPunt &pt);
 
 	void reset_connection();

src/p1-service.cpp

@@ -69,14 +69,6 @@ void P1Service::run()
 {
 	using namespace std::literals;
 
-	using namespace date;
-	using namespace std::chrono;
-
-	using quarters = std::chrono::duration<int64_t, std::ratio<60 * 15>>;
-
-	auto now = std::chrono::system_clock::now();
-	auto next = ceil<quarters>(now);
-
 	for (;;)
 	{
 		try
@@ -88,14 +80,6 @@ void P1Service::run()
 				m_opname = opname;
 				m_status = status;
 			}
-
-			now = std::chrono::system_clock::now();
-			if (now < next)
-				continue;
-
-			DataService_v2::instance().store(m_opname);
-
-			next = ceil<quarters>(now);
 		}
 		catch (const std::exception &e)
 		{

src/sessy-service.cpp

@@ -55,43 +55,13 @@ SessyService &SessyService::instance()
 SessyService::SessyService(boost::asio::io_context &io_context)
 	: m_io_context(io_context)
 {
-	m_current = read();
-	m_thread = std::thread(std::bind(&SessyService::run, this));
 }
 
 std::vector<SessySOC> SessyService::get_soc() const
 {
 	return read();
 }
 
-void SessyService::run()
-{
-	using namespace std::literals;
-
-	using namespace date;
-	using namespace std::chrono;
-
-	using quarters = std::chrono::duration<int64_t, std::ratio<60 * 15>>;
-
-	for (;;)
-	{
-		try
-		{
-			auto now = std::chrono::system_clock::now();
-			std::this_thread::sleep_until(ceil<quarters>(now));
-
-			m_current = read();
-
-			for (auto &soc : m_current)
-				DataService_v2::instance().store(soc);
-		}
-		catch (const std::exception &e)
-		{
-			std::cerr << e.what() << '\n';
-		}
-	}
-}
-
 std::vector<SessySOC> SessyService::read() const
 {
 	auto &config = mcfp::config::instance();

src/sessy-service.hpp

@@ -45,13 +45,8 @@ class SessyService
   private:
 	SessyService(boost::asio::io_context &io_context);
 
-	void run();
-
 	std::vector<SessySOC> read() const;
 
 	boost::asio::io_context &m_io_context;
-	std::thread m_thread;
-	std::vector<SessySOC> m_current;
-
 	static std::unique_ptr<SessyService> s_instance;
 };