Server: client-server logic implementation

.gitignore

@@ -55,7 +55,9 @@ doc/api/
 *.out
 
 local.properties
+**/main.cpp
+!client/main.cpp
+!client/client/test_server.cpp
+!server/main.cpp
 
-main.cpp
-
-*pb*
+*pb*

CMakeLists.txt

@@ -1,34 +1,10 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(EfficioTaskTracker LANGUAGES CXX)
+project(test-server)
 
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
+#add_compile_options(-fsanitize=address,undefined,leak)
+#add_link_options(-fsanitize=address,undefined,leak)
 
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-find_package(Qt6 COMPONENTS Widgets Core Gui Sql REQUIRED)
-
-add_subdirectory(scripts)
-add_subdirectory(database)
-add_subdirectory(ui/main-window)
-add_subdirectory(ui/authorization-windows)
-add_subdirectory(ui/note-widget)
+add_subdirectory(server)
 add_subdirectory(proto)
-add_executable(EfficioTaskTracker main.cpp)
-
-target_link_libraries(EfficioTaskTracker PRIVATE
-        Qt6::Widgets
-        Qt6::Core
-        Qt6::Gui
-        Qt6::Sql
-        model-proto
-        efficio-rpc
-        Database
-        Scripts
-        AuthorizationWindows
-        MainWindow
-        NoteWidget
-)
+add_subdirectory(client)

README.md

@@ -24,13 +24,7 @@
 git clone git@github.com:toximu/efficio-task-tracker.git
 ```
 
-2. Start **PostgreSQL** service
-
-```bash
-sudo service postgresql start && sudo -u postgres psql
-```
-
-3. Create **efficio** user
+2. Create **efficio** user
 
 ```SQL
 CREATE USER efficio WITH PASSWORD 'admin';
@@ -39,29 +33,50 @@ GRANT ALL PRIVILEGES ON DATABASE efficio TO efficio;
 \q
 ```
 
-4. Enter under **efficio** profile
+3. Build
 
 ```bash
-psql -U efficio -d efficio -h localhost
+mkdir -p build && cd build
+cmake ..
+make
 ```
 
-> After that run the server on address **localhost** and **port** 5432 in your pgAdmin4
-
-5. Build and start app
+4. Run the server and client in different terminal windows
 
 ```bash
-mkdir -p build && cd build
-cmake ..
-make
-./EfficioTaskTracker -platform xcb
+build/server/Server
+build/client/EfficioTaskTracker
+```
+
+## Recent problems
+
+### 1) libpqxx not installed
+
+```shell
+CMake Error at server/service/CMakelists.txt:8 (find_package):
+  By not providing "Findlibpqxx.cmake" in CMAKE_MODULE_PATH this project has
+  asked CMake to find a package configuration file provided by "libpqxx", 
+  but CMake did not find one.
 ```
 
+1) Clone [libpqxx repository](https://github.com/jtv/libpqxx) into `server/`
+2) `cd libpqxx/` then build and install it
+
+```shell
+cmake .
+cmake --build .
+cmake --install .
+```
+
+Now try to build **EFFICIO** one more time
+
 ## Technologies Used
 - Qt 6.8.2
 - PostgreSQL 17.4
 - CMake 3.28.3
-- VcXsrv server (XLaunch)
+- gRPC 1.72.0
+- pqxx 7.9.2-1
 
 ## License
 
-This project is licensed under the **MIT License**. See the [LICENSE](https://github.com/toximu/efficio-task-tracker/blob/main/LICENSE) file for details.
+This project is licensed under the **MIT License**. See the [LICENSE](https://github.com/toximu/efficio-task-tracker/blob/main/LICENSE) file for details.

client/CMakeLists.txt

@@ -0,0 +1,34 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(EfficioTaskTracker LANGUAGES CXX)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(Qt6 COMPONENTS Widgets Core Gui Sql REQUIRED)
+
+add_subdirectory(ui/main-window)
+add_subdirectory(ui/note-widget)
+add_subdirectory(ui/authorization-windows)
+add_subdirectory(ui/theme-manager)
+add_subdirectory(client)
+add_executable(EfficioTaskTracker main.cpp)
+
+target_link_libraries(EfficioTaskTracker PRIVATE
+        model-proto
+        Qt6::Widgets
+        Qt6::Core
+        Qt6::Gui
+        Qt6::Sql
+        Database
+        Client
+        NoteWidget
+        MainWindow
+        AuthorizationWindows
+        ThemeManager
+        model-proto
+)

client/client/CMakeLists.txt

@@ -0,0 +1,34 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(Service LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(Protobuf CONFIG REQUIRED)
+find_package(gRPC CONFIG REQUIRED)
+find_package(Threads)
+
+
+file(GLOB SOURCES "src/*.cpp")
+file(GLOB HEADERS "include/*.h")
+
+add_library(Client STATIC ${SOURCES} ${HEADERS})
+
+target_link_libraries(Client
+        model-proto
+        efficio-rpc
+        protobuf::libprotobuf
+        gRPC::grpc
+        gRPC::grpc++
+        Service
+)
+
+target_include_directories(Client
+        PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+        ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+add_executable(test-server test_server.cpp)
+target_link_libraries(test-server Client)

client/client/include/auth_requests.h

@@ -0,0 +1,63 @@
+#pragma once
+
+#include <common_client_call.h>
+#include <efficio-rpc-proto/efficio.grpc.pb.h>
+#include <grpcpp/grpcpp.h>
+#include "common_client_call.h"
+
+using Efficio_proto::Auth;
+using Efficio_proto::AuthRequest;
+using Efficio_proto::AuthResponse;
+using Efficio_proto::User;
+using grpc::Channel;
+using grpc::ClientAsyncResponseReader;
+using grpc::CompletionQueue;
+
+class AuthRequests {
+public:
+    explicit AuthRequests(
+        const std::shared_ptr<Channel> &channel,
+        CompletionQueue *cq
+    );
+
+    bool try_authenticate_user(User *user) const;
+    bool try_register_user(User *user) const;
+
+private:
+    class TryAuthenticateUserClientCall : public CommonClientCall {
+    public:
+        TryAuthenticateUserClientCall(
+            const AuthRequest &request,
+            CompletionQueue *cq,
+            Auth::Stub *stub
+        );
+        void Proceed(bool ok) override;
+        AuthResponse get_reply();
+
+    private:
+        AuthResponse reply_;
+        ClientContext context;
+        Status status;
+        std::unique_ptr<ClientAsyncResponseReader<AuthResponse>> responder_;
+    };
+
+    class TryRegisterUserClientCall : public CommonClientCall {
+    public:
+        TryRegisterUserClientCall(
+            const AuthRequest &request,
+            CompletionQueue *cq,
+            Auth::Stub *stub
+        );
+        void Proceed(bool ok) override;
+        AuthResponse get_reply();
+
+    private:
+        AuthResponse reply_;
+        ClientContext context;
+        Status status;
+        std::unique_ptr<ClientAsyncResponseReader<AuthResponse>> responder_;
+    };
+
+    std::unique_ptr<Auth::Stub> stub_;
+    std::unique_ptr<CompletionQueue> cq_;
+};

client/client/include/client_implementation.h

@@ -0,0 +1,48 @@
+#ifndef CLIENTIMPLEMENTATION_H
+#define CLIENTIMPLEMENTATION_H
+
+#include <grpcpp/grpcpp.h>
+#include <thread>
+#include "auth_requests.h"
+#include "update_requests.h"
+
+using Efficio_proto::User;
+using grpc::Channel;
+using grpc::CompletionQueue;
+
+class ClientImplementation {
+    CompletionQueue cq_;
+    std::shared_ptr<Channel> channel_;
+    UpdateRequests update_requests_;
+    AuthRequests auth_requests_;
+
+public:
+    explicit ClientImplementation(const std::shared_ptr<Channel> &channel);
+    std::thread complete_rpc_thread_;
+
+    void CompleteRpc();
+    std::shared_ptr<Channel> get_channel();
+    CompletionQueue *get_cq();
+
+    bool try_authenticate_user(User *user);
+    bool try_register_user(User *user);
+
+    bool try_update_note(Note *note) const;
+    bool try_create_note(Note *note, const std::string& project_code) const;
+    bool try_fetch_note(Note *note) const;
+
+    bool create_project(
+        Project *project,
+        const std::string &title,
+        const User &user
+    );
+    bool get_project(Project *project, const std::string &code);
+    bool try_join_project(
+        Project *project,
+        const std::string &code,
+        const User &user
+    );
+    bool try_leave_project(const std::string &code, const User &user);
+};
+
+#endif  // CLIENTIMPLEMENTATION_H

client/client/include/common_client_call.h

@@ -0,0 +1,20 @@
+#ifndef COMMON_CLIENT_CALL_H
+#define COMMON_CLIENT_CALL_H
+
+#include <grpc++/grpc++.h>
+
+using grpc::ClientContext;
+using grpc::Status;
+
+class CommonClientCall {
+public:
+    explicit CommonClientCall() = default;
+    virtual ~CommonClientCall() = default;
+
+    ClientContext context;
+    Status status;
+
+    virtual void Proceed(bool = true) = 0;
+};
+
+#endif  // COMMON_CLIENT_CALL_H