From 1b963a748629f75d0ef37372912f39be54a2f57f Mon Sep 17 00:00:00 2001
From: chatlanin <zimin@chatlanin.com.ru>
Date: Fri, 12 Jul 2024 20:19:49 +0300
Subject: [PATCH] fix function name

---
 src/trs/helpers/verification.hpp  |  2 +-
 src/trs/libs/function_manager.hpp |  2 +-
 src/trs/libs/inspector.hpp        |  4 ++--
 src/trs/libs/transaction.hpp      |  8 ++++----
 tests/main.cpp                    | 12 ++++++------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/trs/helpers/verification.hpp b/src/trs/helpers/verification.hpp
index 8ad4301..25bcb3a 100644
--- a/src/trs/helpers/verification.hpp
+++ b/src/trs/helpers/verification.hpp
@@ -10,7 +10,7 @@ namespace trs
   {
     try
     {
-      fm.valid(tr.m_passport.m_func_name);
+      fm.valid(tr.m_passport.m_function_name);
     } 
     catch (hack::exception& ex)
     {
diff --git a/src/trs/libs/function_manager.hpp b/src/trs/libs/function_manager.hpp
index 51dd71b..ba27f77 100644
--- a/src/trs/libs/function_manager.hpp
+++ b/src/trs/libs/function_manager.hpp
@@ -38,7 +38,7 @@ namespace trs
 
       void execute(Transaction& tr) 
       {
-        m_functions[tr.m_passport.m_func_name](tr);
+        m_functions[tr.m_passport.m_function_name](tr);
       }
   }; 
 }
diff --git a/src/trs/libs/inspector.hpp b/src/trs/libs/inspector.hpp
index d5a4905..bde6ca4 100644
--- a/src/trs/libs/inspector.hpp
+++ b/src/trs/libs/inspector.hpp
@@ -23,14 +23,14 @@ namespace trs
 
       void valid(Transaction& tr) 
       {
-        if (!valid(tr.m_passport.m_func_name))
+        if (!valid(tr.m_passport.m_function_name))
         {
           hack::exception ex;
           ex.description("Function is not register in inspector. Please do it");
           throw ex; 
         }
 
-        m_functions[tr.m_passport.m_func_name](tr);
+        m_functions[tr.m_passport.m_function_name](tr);
       }
 
     private:
diff --git a/src/trs/libs/transaction.hpp b/src/trs/libs/transaction.hpp
index c65f0a5..7194cf5 100644
--- a/src/trs/libs/transaction.hpp
+++ b/src/trs/libs/transaction.hpp
@@ -21,7 +21,7 @@ namespace trs
       struct passport
       {
         int m_id = -1000; // Эта сущность, которая зашифрована в токене. Например id организации
-        std::string m_func_name;
+        std::string m_function_name;
         std::string m_token = "no token";
       } m_passport;
 
@@ -44,7 +44,7 @@ namespace trs
       {
         JSON j;
         j["transaction_id"] = m_transaction_id;
-        j["func_name"] = m_passport.m_func_name;
+        j["function_name"] = m_passport.m_function_name;
         j["token"] = m_passport.m_token;
         j["payload"] = m_data.m_payload;
         j["result"] = m_data.m_result;
@@ -59,8 +59,8 @@ namespace trs
       {
         try
         {
-          m_passport.m_func_name = req.get_header_value("TRS-server-function");
-          if (m_passport.m_func_name.empty()) throw std::invalid_argument{ var::NO_VALID_DATA };
+          m_passport.m_function_name = req.get_header_value("TRS-server-function");
+          if (m_passport.m_function_name.empty()) throw std::invalid_argument{ var::NO_VALID_DATA };
         }
         catch(std::exception& e)
         {
diff --git a/tests/main.cpp b/tests/main.cpp
index a5a93e4..8f5f318 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -26,11 +26,11 @@ namespace worckspaces
 
 auto main(int argc, char* args[]) -> int
 {
-  trs::client cli {"localhost:5000", "token_auth"};
-  cli.post("/",trs::JSON{{ "test", "test message" }});
+  // trs::client cli {"localhost:5000", "token_auth"};
+  // cli.post("/",trs::JSON{{ "key", "test message" }});
 
-  // trs::server srv;
-  // srv.init("test service", "app_connection", "log_connection");
-  // srv.registration("healthcheck", worckspaces::inspector, worckspaces::provider);
-  // srv.run();
+  trs::server srv;
+  srv.init("test service", "app_connection", "log_connection");
+  srv.registration("healthcheck", worckspaces::inspector, worckspaces::provider);
+  srv.run();
 }