clean

Author: iljavaleev

.github/workflows/deploy.yml

@@ -14,23 +14,51 @@ jobs:
         include:
           - image_name: valeevilja/cppbot:v1
             dockerfile: Dockerfile
+      
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
-
+        uses: docker/setup-buildx-action@v3
+      
       - name: Login to Docker Hub
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ matrix.image_name }}
+      
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/amd64
+          file: ${{ matrix.dockerfile }}
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
 
   deploy:
     name: Deploy to server
     runs-on: ubuntu-latest
     needs: build_and_push
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4
+      - name: Copy infra files to server
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.HOST }}
+          username: ${{ secrets.SERVER }}
+          key: ${{ secrets.SERVER_SSH_KEY }}
+          passphrase: ${{ secrets.PASSPHRASE }}
+          source: "cppinfra/docker-compose.yml,cppinfra/swag_nginx.conf"
+          target: ${{ secrets.DEPLOY_PATH }}
+          overwrite: true
+          strip_components: 1
+
 
       - name: executing remote ssh commands to deploy
         uses: appleboy/ssh-action@master

.gitignore

@@ -13,6 +13,6 @@
 
 build/
 data/
-cppinfra/
 .env
-todo.txt
+todo.txt
+/db_setup/db_mock_data.sql

botstaff/CMakeLists.txt

@@ -1,15 +1,15 @@
 add_library(func
-src/handlers/handlers.cpp
-src/handlers/user_handlers/userHandlers.cpp
-src/handlers/teacher_handlers/teacherHandlers.cpp
-src/handlers/teacher_handlers/createLessonHandlers.cpp
-src/handlers/user_handlers/userRegistration.cpp
-src/commands.cpp
-src/database/psql.cpp
-src/keyboards/keyboards.cpp
-src/keyboards/teacher_keyboards/teacherKeyboards.cpp
-src/keyboards/user_keyboards/userKeyboards.cpp
-src/utils.cpp
+src/handlers/Handlers.cpp
+src/handlers/user_handlers/UserHandlers.cpp
+src/handlers/teacher_handlers/TeacherHandlers.cpp
+src/handlers/teacher_handlers/CreateLessonHandlers.cpp
+src/handlers/user_handlers/UserRegistration.cpp
+src/Commands.cpp
+src/database/PSQL.cpp
+src/keyboards/Keyboards.cpp
+src/keyboards/teacher_keyboards/TeacherKeyboards.cpp
+src/keyboards/user_keyboards/UserKeyboards.cpp
+src/Utils.cpp
 src/database/CRUD.cpp
 )
 

botstaff/include/botstaff/commands.hpp

@@ -1,5 +1,5 @@
-#ifndef commands_hpp
-#define commands_hpp
+#ifndef Commands_hpp
+#define Commands_hpp
 
 #include <tgbot/tgbot.h>
 #include <vector>
@@ -8,4 +8,4 @@ using namespace TgBot;
 
 std::vector<BotCommand::Ptr> create_commands();
 
-#endif /* HasPtr_h */
+#endif

botstaff/include/botstaff/database/CRUD.hpp

@@ -8,18 +8,32 @@
 #include <chrono>
 #include <memory>
 
-std::shared_ptr<BotUser> construct_user(const pqxx::row& res);
-std::shared_ptr<UserLesson> construct_user_lesson(const pqxx::row& res);
 
 struct BotUser{
     BotUser(){}
     BotUser(long chat_id):chat_id(chat_id){}
+    BotUser(const BotUser& other)
+    {
+        chat_id = other.chat_id;
+        teacher = other.teacher;
+        tgusername = other.tgusername;
+        first_name = other.first_name;
+        last_name = other.last_name;
+        phone = other.phone;
+        email = other.email;
+        cls = other.cls;
+        comment = other.comment;
+        role = other.role;
+        is_active = other.is_active;
+
+    }
     static std::shared_ptr<BotUser> get(long);
     static std::vector<std::shared_ptr<BotUser>> get_all(std::string&);
     static bool exists(long id);
     void update();
     void destroy();
     void create();   
+    
     long chat_id{};
     long teacher{};
     std::string tgusername{};
@@ -47,12 +61,26 @@ struct UserLesson{
             std::chrono::floor<std::chrono::days>(now)
         };
     }
+    UserLesson(const UserLesson& other)
+    {
+        id = other.id;
+        date = other.date;
+        time = other.time;
+        teacher = other.teacher;
+        pupil = other.pupil;
+        objectives = other.objectives;
+        comment_for_pupil = other.comment_for_pupil;
+        comment_for_teacher = other.comment_for_teacher;
+        is_paid = other.is_paid;
+    }
+
     static std::shared_ptr<UserLesson> get(int);
     static std::vector<std::shared_ptr<UserLesson>> get_all(std::string&);
     static bool exists(long id);
     void update();
     void destroy();
     int create();   
+    
     int id{};
     std::chrono::year_month_day date{};
     std::string time{};
@@ -64,5 +92,7 @@ struct UserLesson{
     bool is_paid{};
 };
 
+std::shared_ptr<BotUser> construct_user(const pqxx::row& res);
+std::shared_ptr<UserLesson> construct_user_lesson(const pqxx::row& res);
 
-#endif /* HasPtr_h */
+#endif

botstaff/include/botstaff/database/psql.hpp

@@ -1,5 +1,6 @@
-#ifndef psql_h
-#define psql_h
+#ifndef PSQL_h
+#define PSQL_h
+
 #include <pqxx/pqxx>
 #include <string>
 #include <iostream>

botstaff/include/botstaff/handlers/handlers.hpp

@@ -1,32 +1,77 @@
-#ifndef handlers_hpp
-#define handlers_hpp
+#ifndef Handlers_hpp
+#define Handlers_hpp
+
 #include <tgbot/tgbot.h>
 #include <exception>
 #include <functional>
-#include "botstaff/database/psql.hpp"
-#include "botstaff/utils.hpp"
-#include "botstaff/states.hpp"
-#include "botstaff/database/CRUD.hpp"
 #include <unordered_map>
 
+#include "botstaff/database/PSQL.hpp"
+#include "botstaff/Utils.hpp"
+#include "botstaff/States.hpp"
+#include "botstaff/database/CRUD.hpp"
+
 using namespace TgBot;
 using namespace std;
 
 
 namespace CommandHandlers
 {
-    extern std::function<Message::Ptr (Message::Ptr)> startCommand(TgBot::Bot& bot);
-    extern std::function<Message::Ptr (Message::Ptr)> cancelCommand(TgBot::Bot& bot);
-    extern std::function<Message::Ptr (Message::Ptr)> helpCommand(TgBot::Bot& bot);   
+    class start_command{
+        const TgBot::Bot& bot;
+    public:
+        start_command(const TgBot::Bot& _bot):bot(_bot){}
+        Message::Ptr operator()(const Message::Ptr&);
+    };
+
+    class cancel_command{
+        const TgBot::Bot& bot;
+    public:
+        cancel_command(const TgBot::Bot& _bot):bot(_bot){}
+        Message::Ptr operator()(const Message::Ptr&);
+    };
+   
 };
 
 namespace Handlers
 {   
-    extern std::function<Message::Ptr (Message::Ptr)> any_message_handler(TgBot::Bot& bot);   
-    extern std::function<Message::Ptr (CallbackQuery::Ptr)> calendar_handler(TgBot::Bot& bot);
-    extern std::function<Message::Ptr (CallbackQuery::Ptr)> next_month_handler(TgBot::Bot& bot);
-    extern std::function<Message::Ptr (CallbackQuery::Ptr)> calendar_day_handler(TgBot::Bot& bot);
-    extern std::function<Message::Ptr (CallbackQuery::Ptr)> day_info_handler(TgBot::Bot& bot);
+
+    class any_message_handler{
+        const TgBot::Bot& bot;
+    public:
+        any_message_handler(const TgBot::Bot& _bot):bot(_bot){}
+        Message::Ptr operator()(const Message::Ptr&);
+    };
+    
+    class calendar_handler{
+        const TgBot::Bot& bot;
+    public:
+        calendar_handler(const TgBot::Bot& _bot):bot(_bot){}
+        Message::Ptr operator()(const CallbackQuery::Ptr&);
+    };
+    
+    class next_month_handler{
+        const TgBot::Bot& bot;
+    public:
+        next_month_handler(const TgBot::Bot& _bot):bot(_bot){}
+        Message::Ptr operator()(const CallbackQuery::Ptr&);
+    };
+    
+
+    class calendar_day_handler{
+        const TgBot::Bot& bot;
+    public:
+        calendar_day_handler(const TgBot::Bot& _bot):bot(_bot){}
+        Message::Ptr operator()(const CallbackQuery::Ptr&);
+    };
+
+    class day_info_handler{
+        const TgBot::Bot& bot;
+    public:
+        day_info_handler(const TgBot::Bot& _bot):bot(_bot){}
+        Message::Ptr operator()(const CallbackQuery::Ptr&);
+    };
+    
 };
 
 void startWebhook(TgBot::Bot& bot, std::string& webhookUrl);

botstaff/include/botstaff/handlers/teacher_handlers/createLessonHandlers.hpp

@@ -1,57 +1,61 @@
-#ifndef createLessonHandlers_hpp
-#define createLessonHandlers_hpp
+#ifndef CreateLessonHandlers_hpp
+#define CreateLessonHandlers_hpp
 
 #include <tgbot/tgbot.h>
-#include "botstaff/states.hpp"
 #include <unordered_map>
 
+#include "botstaff/States.hpp"
+
 using namespace TgBot;
 using std::unordered_map;
 
 static unordered_map<long, DayForLesson> lessonState;
+
 void clear_lesson_state(long chat_id);
+
 Message::Ptr check_lesson_state( 
-    TgBot::Bot& bot, 
+    const TgBot::Bot& bot, 
     const Message::Ptr message
 );
 
 Message::Ptr lesson_time_handler(
-    TgBot::Bot& bot, 
+    const TgBot::Bot& bot, 
     const Message::Ptr message,
     bool update = false
 );
 
 Message::Ptr lesson_objectives_handler(
-    TgBot::Bot& bot, 
+    const TgBot::Bot& bot, 
     const Message::Ptr message,
     bool update = false
 );
 
 Message::Ptr lesson_comment_for_pupil_handler(
-    TgBot::Bot& bot, 
+    const TgBot::Bot& bot, 
     const Message::Ptr message,
     bool update = false
 );
 
 Message::Ptr lesson_comment_for_teacher_handler(
-    TgBot::Bot& bot, 
+    const TgBot::Bot& bot, 
     const Message::Ptr message,
     bool update = false
 );
+
 // Message::Ptr lesson_paid_handler(
 //     TgBot::Bot& bot, 
 //     const Message::Ptr message,
 //     bool update
 //     );
 
 Message::Ptr send_lesson_info_to_pupil(
-    TgBot::Bot& bot,
+    const TgBot::Bot& bot,
     std::string& message,
     long pupil_id
 );
 
 Message::Ptr send_lesson_update_kb(
-    TgBot::Bot& bot, 
+    const TgBot::Bot& bot, 
     const Message::Ptr& message
 );