Попытка сделать первые образы

2025-03-29 10:09:49 +05:00
21 changed files with 223 additions and 691 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "redkbuild"]
 	path = redkbuild
 	url = git@gitea.redkit-lab.work:redkit-lab/redkbuild.git
-[submodule "redkitty"]
-	path = redkitty
-	url = git@gitea.redkit-lab.work:redkit-lab/redkitty.git
--- a/33
+++ b/33
@@ -0,0 +1,33 @@
+# Используем образ с поддержкой Qt и инструментов сборки
+FROM nexus.redkit-lab.ru:8084/rkl/dev-scada-debian-10:v1.1
+
+RUN apt update && apt upgrade -y && apt-get clean -y && apt-get autoremove --purge -y
+
+# Создаем пользователя, дабы выходящие файлы не были под root
+# ENV USER_NAME=ubuilder
+# RUN adduser $USER_NAME; \
+#     usermod -aG sudo $USER_NAME; \
+#     echo "$USER_NAME:123" | chpasswd
+# USER $USER_NAME
+# ENV HOME=/home/$USER_NAME
+# WORKDIR $HOME
+
+RUN qbs config defaultProfile qt_clang19_51513
+
+# Создаем рабочую директорию
+WORKDIR /app
+
+# Копируем локальный код в контейнер
+COPY . .
+
+# Собираем проект
+# RUN qbs setup-toolchains --type gcc /usr/bin/g++ gcc && \
+#     qbs setup-qt /usr/lib/qt5/bin/qmake qt5 && \
+#     qbs resolve && \
+#     qbs build --jobs $(nproc)
+
+# Указываем команду для запуска приложения
+# CMD ["./dockertools/run.sh"]
+# CMD ["/bin/bash"]
+
+
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -0,0 +1,16 @@
+version: '3.8'
+
+services:
+  cpp_opds:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: cpp_opds:latest
+    container_name: cpp_opds
+    ports:
+      - "8000:80"
+    volumes:
+      - .:/app
+    environment:
+      - ENV_VAR=value
+    restart: unless-stopped
--- a/dockertools/run.sh
+++ b/dockertools/run.sh
--- a/prerequisites/qbs/imports/SQLiteArtifactsExport.qbs
+++ b/prerequisites/qbs/imports/SQLiteArtifactsExport.qbs
@@ -1,8 +0,0 @@
-import qbs
-
-Export {
-    Depends { name: "cpp" }
-    Depends { name: "rsc.sqlite.settings" }
-
-    rsc.sqlite.settings.includeRegexValues: exportingProduct.includeRegexValue
-}
--- a/prerequisites/qbs/modules/karchive/karchive.qbs
+++ b/prerequisites/qbs/modules/karchive/karchive.qbs
@@ -1,53 +0,0 @@
-import qbs
-
-Module {
-    id: karchive
-
-    readonly property string karchive_path: project.sourceDirectory + "/external_libs/karchive"
-    readonly property string libKF5ArchivePath: karchive.karchive_path + "/lib"
-                                                + (qbs.buildVariant == "release" ? "/Release" : "/Debug")
-    property bool installFiles: true
-
-    Depends { name: "glob" }
-    Depends { name: "cpp" }
-    Depends { name: "zlib" }
-
-    Properties
-    {
-        condition: qbs.targetOS.contains("linux") || qbs.targetOS.contains("astra")
-        cpp.includePaths: [ karchive.karchive_path + "/include/lin" ]
-        cpp.libraryPaths: [ karchive.libKF5ArchivePath + "/lin" ]
-        cpp.dynamicLibraries: "KF5Archive"
-    }
-
-    Properties {
-        condition: qbs.targetOS.contains("windows")
-        cpp.includePaths: [ karchive.karchive_path + "/include/win" ]
-        cpp.libraryPaths: [ karchive.libKF5ArchivePath + "/win" ]
-        cpp.dynamicLibraries: "KF5Archive"
-    }
-
-    InstallGroup {
-        name: "karchive_lin"
-        condition: qbs.targetOS.contains("linux") || qbs.targetOS.contains("astra")
-        files: [
-            karchive.libKF5ArchivePath + "/lin/libKF5Archive.so",
-            karchive.libKF5ArchivePath + "/lin/libKF5Archive.so.5",
-            karchive.libKF5ArchivePath + "/lin/libKF5Archive.so.5.108.0"
-        ]
-        qbs.install: karchive.installFiles
-        qbs.installDir: glob.binInstallPrefix
-    }
-
-    InstallGroup {
-        name: "karchive_win"
-        condition: qbs.targetOS.contains("windows")
-        files: [
-            karchive.libKF5ArchivePath + "/win/KF5Archive.dll",
-            karchive.libKF5ArchivePath + "/win/KF5Archive.lib"
-        ]
-        qbs.install: karchive.installFiles
-        qbs.installDir: glob.binInstallPrefix
-    }
-    zlib.installFiles: true
-}
--- a/project.qbs
+++ b/project.qbs
@@ -3,18 +3,16 @@ import qbs
 Project {
    name: "opds++"
    qbsSearchPaths: [
-        "redkitty/qbs",
-        "redkbuild",
-        "redkitty/lib/redkit-gen-integration/qbs",
-        "prerequisites/qbs",
+        "redkbuild"
    ]

    references: [
-        "redkitty/lib/rsc/libs_impl/rdbaseimpl/rdbaseimpl.qbs",
-        "redkitty/lib/rcore/rcore.qbs",
-
        "src/cpp-opds.qbs",
        "src/database/database.qbs",
        "src/restapi/restapi.qbs",
+        "src/model/model.qbs",
+        "src/repositories/repositories.qbs",
+        "src/services/services.qbs",
+        "src/sql_builder/sql_builder.qbs",
    ]
 }
--- a/2
+++ b/2
--- a/1
+++ b/1
--- a/src/cpp-opds.qbs
+++ b/src/cpp-opds.qbs
@@ -1,28 +1,22 @@
 /*!
    \qmltype cpp-opds
-    \inherits Project
+    \inherits Application
    \brief Описание
 */
 PSApplication {
-    // CppApplication {
    cpp.defines: [
        // You can make your code fail to compile if it uses deprecated APIs.
        // In order to do so, uncomment the following line.
        //"QT_DISABLE_DEPRECATED_BEFORE=0x060000" // disables all the APIs deprecated before Qt 6.0.0
-            "DATABASE_SQLITE"
-        ]
+        "DATABASE_SQLITE"]
    consoleApplication: true

+    // Depends { name: "Qt"; submodules: [ "core", "sql", "network" ] }
    Depends { name: "Qt"; submodules: ["core", "sql", "network"] }
    Depends { name: "cpp" }
    Depends { name: "database" }
-        Depends { name: "odb.gen" }
-        Depends { name: "sqlite3" }
+    Depends { name: "services" }
    Depends { name: "restapi" }
-        Depends { name: "redkit_gen" }
-        Depends { name: "rdbase" }
-
-        cpp.cxxLanguageVersion: "c++20"

    Group {
        name: "cpp"
@@ -30,13 +24,4 @@ PSApplication {
            "main.cpp",
        ]
    }
-
-        cpp.dynamicLibraries: [
-            "odb-sqlite",
-            "odb-qt",
-            "odb",
-            "sqlite3"
-        ]
-
-    // }
-} // Project
+} // Application
--- a/src/database/author_s.h
+++ b/src/database/author_s.h
@@ -1,64 +0,0 @@
-// file      : hello/person.hxx
-// copyright : not copyrighted - public domain
-
-#ifndef AUTHOR_S_H
-#define AUTHOR_S_H
-
-#include "database_global.h"
-
-#include <QString>
-
-#include <odb/core.hxx>
-#include <odb/database.hxx>
-#include <odb/query.hxx>
-
-#pragma db object
-class DATABASE_EXPORT Author_S
-{
-public:
-    Author_S() = default;
-
-    Author_S(const QString& firstN,
-             const QString& lastN,
-             const unsigned short age) :
-        m_firstName(firstN),
-        m_lastName(lastN),
-        m_age(age)
-    {
-    }
-
-    unsigned long long id() const { return m_id; }
-    QString firstName() const { return m_firstName; }
-    QString lastName() const { return m_lastName; }
-    unsigned short age() const { return m_age; }
-
-    QString full_name() const { return m_firstName + " " + m_lastName; }
-
-    void age(unsigned short age) { m_age = age; }
-
-private:
-    friend class odb::access;
-
-private:
-#pragma db id auto
-    quint64 m_id;
-
-    QString m_firstName;
-    QString m_lastName;
-    quint8 m_age;
-};
-
-#pragma db view object(Author_S)
-struct person_stat
-{
-#pragma db column("count(" + Author_S::m_id + ")")
-    std::size_t count;
-
-#pragma db column("min(" + Author_S::m_age + ")")
-    unsigned short min_age;
-
-#pragma db column("max(" + Author_S::m_age + ")")
-    unsigned short max_age;
-};
-
-#endif // AUTHOR_S_H
--- a/src/database/book_s.h
+++ b/src/database/book_s.h
@@ -1,64 +0,0 @@
-// file      : hello/person.hxx
-// copyright : not copyrighted - public domain
-
-#ifndef BOOK_S_H
-#define BOOK_S_H
-
-#include "database_global.h"
-
-#include <QSharedPointer>
-#include <QString>
-#include <odb/core.hxx>
-#include <rcore/smarttypes.h>
-
-#include "author_s.h"
-
-#pragma db object
-class DATABASE_EXPORT Book_S
-{
-public:
-    Book_S() = default;
-
-    Book_S(const QString& name,
-           const SH<Author_S>& author,
-           const int year)
-    {
-        m_author = author;
-        m_name = name;
-        m_year = year;
-    };
-
-    unsigned long long id() const { return m_id; }
-    SH<Author_S> author() const { return m_author; }
-    QString name() const { return m_name; }
-    int year() const { return m_year; }
-
-private:
-    friend class odb::access;
-
-private:
-#pragma db id auto
-    quint64 m_id;
-
-    SH<Author_S> m_author;
-    QString m_name;
-    quint8 m_year;
-};
-
-// #pragma db view object(Book_S) object(Author_S = author:Book_S::m_author)
-// struct BookByAuthorView
-// {
-// #pragma db column(Book_S::m_id)
-//     quint64 book_id;
-
-// #pragma db column(Book_S::m_name)
-//     QString book_name;
-
-// #pragma db column(Book_S::m_year)
-//     qint8 year;
-
-// #pragma db column(Author_S::m_first + " " + Author_S::m_last)
-//     QString author_full_name;
-// };
-
-#endif // BOOK_S_H
--- a/src/database/database.hxx
+++ b/src/database/database.hxx
@@ -1,183 +0,0 @@
-// file      : hello/database.hxx
-// copyright : not copyrighted - public domain
-
-//
-// Create concrete database instance based on the DATABASE_* macros.
-//
-
-#ifndef DATABASE_HXX
-#define DATABASE_HXX
-
-#include <cstdlib> // std::exit
-#include <iostream>
-#include <memory> // std::unique_ptr
-#include <string>
-
-#include <odb/database.hxx>
-
-#if defined(DATABASE_MYSQL)
-#include <odb/mysql/database.hxx>
-#elif defined(DATABASE_SQLITE)
-#include <odb/connection.hxx>
-#include <odb/schema-catalog.hxx>
-#include <odb/sqlite/database.hxx>
-#include <odb/transaction.hxx>
-#elif defined(DATABASE_PGSQL)
-#include <odb/pgsql/database.hxx>
-#elif defined(DATABASE_ORACLE)
-#include <odb/oracle/database.hxx>
-#elif defined(DATABASE_MSSQL)
-#include <odb/mssql/database.hxx>
-#else
-#error unknown database; did you forget to define the DATABASE_* macros?
-#endif
-
-#include <filesystem>
-#include <random>
-#include <rcore/smarttypes.h>
-
-using oDBase = odb::sqlite::database;
-using uDBase = U<oDBase>;
-
-struct testData
-{
-    QString first;
-    QString last;
-    int age;
-};
-
-// Функция для генерации случайной строки (имени или фамилии)
-QString generate_random_string(const QVector<QString>& pool)
-{
-    static std::random_device rd;
-    static std::mt19937 gen(rd());
-    std::uniform_int_distribution<> dis(0, pool.size() - 1);
-    return pool[dis(gen)];
-}
-
-// Функция для генерации случайного года
-int generate_random_year(int min_year = 1900, int max_year = 2020)
-{
-    static std::random_device rd;
-    static std::mt19937 gen(rd());
-    std::uniform_int_distribution<> dis(min_year, max_year);
-    return dis(gen);
-}
-
-QVector<testData> fillDB()
-{
-    QVector<QString> first_names = {
-        "John", "Jane", "Alex", "Chris", "Robert", "Emily", "James", "Linda", "David", "Sarah",
-        "Michael", "Elizabeth", "Daniel", "Samantha", "William", "Olivia", "Ethan", "Sophia", "Joshua", "Charlotte",
-        "Daniel", "Grace", "Benjamin", "Isabella", "Matthew", "Victoria", "Henry", "Abigail", "Samuel", "Megan",
-        "Lucas", "Lily", "Andrew", "Madison", "Jackson", "Chloe", "Aiden", "Amelia", "Thomas", "Natalie",
-        "Ryan", "Zoe", "Jack", "Harper", "Elijah", "Ava", "Isaac", "Mia", "Caleb", "Ella"
-    };
-    QVector<QString> last_names = {
-        "Doe", "Smith", "Johnson", "Williams", "Jones", "Brown", "Davis", "Miller", "Wilson", "Moore",
-        "Taylor", "Anderson", "Thomas", "Jackson", "White", "Harris", "Martin", "Thompson", "Garcia", "Martinez",
-        "Roberts", "Clark", "Lewis", "Walker", "Young", "Allen", "King", "Wright", "Scott", "Adams",
-        "Baker", "Gonzalez", "Nelson", "Carter", "Mitchell", "Perez", "Robinson", "Hughes", "Flores", "Cook",
-        "Rogers", "Gutierrez", "Ramirez", "Diaz", "Perez", "Ross", "Sanders", "Price", "Howard", "Cooper"
-    };
-
-    QVector<testData> vecTest;
-
-    for (int i = 0; i < 50; ++i)
-    {
-        QString first_name = generate_random_string(first_names);
-        QString last_name = generate_random_string(last_names);
-        int birth_year = generate_random_year(1900, 2000);
-
-        vecTest.push_back({ first_name, last_name, birth_year });
-    }
-
-    return vecTest;
-}
-
-inline uDBase openDB(const std::string path_db)
-{
-    // Открыть БД, если она существует
-    auto db_ptr = new oDBase(path_db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE);
-
-    if (std::filesystem::is_regular_file(path_db))
-        return uDBase(db_ptr);
-
-    // И создать новую, если не существует
-    uDBase db(db_ptr);
-
-    odb::connection_ptr connect_ptr(db->connection());
-
-    connect_ptr->execute("PRAGMA foreign_keys=OFF");
-
-    odb::transaction tans(db->begin());
-    odb::schema_catalog::create_schema(*db);
-    tans.commit();
-
-    connect_ptr->execute("PRAGMA foreign_keys=ON");
-
-    return db;
-}
-
-inline std::unique_ptr<odb::database> create_database(int& argc, char* argv[])
-{
-    using namespace std;
-    using namespace odb::core;
-
-    if (argc > 1 && argv[1] == string("--help"))
-    {
-        cout << "Usage: " << argv[0] << " [options]" << endl
-             << "Options:" << endl;
-
-#if defined(DATABASE_MYSQL)
-        odb::mysql::database::print_usage(cout);
-#elif defined(DATABASE_SQLITE)
-        odb::sqlite::database::print_usage(cout);
-#elif defined(DATABASE_PGSQL)
-        odb::pgsql::database::print_usage(cout);
-#elif defined(DATABASE_ORACLE)
-        odb::oracle::database::print_usage(cout);
-#elif defined(DATABASE_MSSQL)
-        odb::mssql::database::print_usage(cout);
-#endif
-
-        exit(0);
-    }
-
-#if defined(DATABASE_MYSQL)
-    unique_ptr<database> db(new odb::mysql::database(argc, argv));
-#elif defined(DATABASE_SQLITE)
-
-    unique_ptr<database> db(new odb::sqlite::database(argc,
-                                                      argv,
-                                                      false,
-                                                      SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE));
-
-    // Create the database schema. Due to bugs in SQLite foreign key
-    // support for DDL statements, we need to temporarily disable
-    // foreign keys.
-    //
-    {
-        connection_ptr connect_ptr(db->connection());
-
-        connect_ptr->execute("PRAGMA foreign_keys=OFF");
-
-        transaction tans(connect_ptr->begin());
-        schema_catalog::create_schema(*db);
-        tans.commit();
-
-        connect_ptr->execute("PRAGMA foreign_keys=ON");
-    }
-#elif defined(DATABASE_PGSQL)
-    unique_ptr<database> db(new odb::pgsql::database(argc, argv));
-#elif defined(DATABASE_ORACLE)
-    unique_ptr<database> db(new odb::oracle::database(argc, argv));
-#elif defined(DATABASE_MSSQL)
-    unique_ptr<database> db(
-    new odb::mssql::database(argc, argv, false, "TrustServerCertificate=yes"));
-#endif
-
-    return db;
-}
-
-#endif // DATABASE_HXX
--- a/src/database/database.qbs
+++ b/src/database/database.qbs
@@ -1,55 +1,16 @@
-/*!
-    \qmltype cpp-opds
-    \inherits Project
-    \brief Описание
-*/
+import qbs
+
 PSLibrary {
-    cpp.defines: [
-        // You can make your code fail to compile if it uses deprecated APIs.
-        // In order to do so, uncomment the following line.
-        //"QT_DISABLE_DEPRECATED_BEFORE=0x060000" // disables all the APIs deprecated before Qt 6.0.0
-        "DATABASE_SQLITE",
-        "DATABASE_LIBRARY"
-    ]
-    consoleApplication: true
+    Depends { name: "Qt"; submodules: "sql"}

-    Depends { name: "Qt"; submodules: [ "core", "sql", "network" ] }
-    Depends { name: "cpp" }
-
-    Depends { name: "odb.gen" }
-    Depends { name: "rdbase" }
-
-    Depends { name: "redkit_gen" }
-    redkit_gen.includeModules: ["JsonSerializer"]
-
-    odb.gen.databases: "sqlite"
-    cpp.cxxLanguageVersion: "c++17"
+    Depends { name: "model" }
+    Depends { name: "sql_builder" }

    Group {
        name: "cpp"
        files: [
-            "databasemanager.*",
-            "*.cpp",
-            "*.h",
-            "*.hxx",
-        ]
-        excludeFiles: odbs.files
-    }
-
-    Group {
-        id: odbs
-        name: "odb"
-        files: [
-            "author_s.h",
-            "book_s.h",
-        ]
-        fileTags: ["hpp", "odbxx"]
-    }
-
-    cpp.dynamicLibraries: [
-        "odb-sqlite",
-        "odb-qt",
-        "odb",
-        "sqlite3"
+            "**/*.h",
+            "**/*.cpp"
        ]
    }
+}
--- a/src/database/database_global.h
+++ b/src/database/database_global.h
@@ -1,12 +0,0 @@
-#ifndef DATABASE_GLOBAL_H
-#define DATABASE_GLOBAL_H
-
-#include <QtCore/qglobal.h>
-
-#if defined(DATABASE_LIBRARY)
-#define DATABASE_EXPORT Q_DECL_EXPORT
-#else
-#define DATABASE_EXPORT Q_DECL_IMPORT
-#endif
-
-#endif // DATABASE_GLOBAL_H
--- a/src/database/databasemanager.cpp
+++ b/src/database/databasemanager.cpp
@@ -0,0 +1,38 @@
+#include "databasemanager.h"
+
+#include <model/author.h>
+#include <model/book.h>
+
+DatabaseManager::DatabaseManager() {}
+
+DatabaseManager::~DatabaseManager()
+{
+    if (db.isOpen())
+        db.close();
+}
+
+DatabaseManager& DatabaseManager::instance()
+{
+    static DatabaseManager instance;
+    return instance;
+}
+
+bool DatabaseManager::connect(const QString& dbPath)
+{
+    db = QSqlDatabase::addDatabase("QSQLITE");
+    db.setDatabaseName(dbPath);
+    return db.open();
+}
+
+QSqlDatabase& DatabaseManager::database()
+{
+    return db;
+}
+
+void DatabaseManager::initializeDatabase()
+{
+    QSqlQuery query;
+
+    query.exec(model::createTableBook());
+    query.exec(model::createTableAuthor());
+}
--- a/src/database/databasemanager.h
+++ b/src/database/databasemanager.h
@@ -0,0 +1,21 @@
+#ifndef DATABASEMANAGER_H
+#define DATABASEMANAGER_H
+
+#include <QDebug>
+#include <QtSql>
+
+class Q_DECL_EXPORT DatabaseManager
+{
+public:
+    static DatabaseManager& instance();
+    bool connect(const QString& dbPath);
+    QSqlDatabase& database();
+    void initializeDatabase();
+
+private:
+    DatabaseManager();
+    ~DatabaseManager();
+    QSqlDatabase db;
+};
+
+#endif // DATABASEMANAGER_H
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,137 +1,53 @@
 #include <QCoreApplication>

-#include <QPointer>
-#include <QSharedPointer>
-#include <QString>
-#include <QVector>
-
 #include <restapi/restapiserver.h>

-/* Опыты с odb */
-#include <database/author_s-odb.hxx> // Должен быть здесь
-#include <database/author_s.h>
-#include <database/book_s-odb.hxx> // Должен быть здесь
-#include <database/book_s.h>
-#include <database/database.hxx> // create_database
-#include <odb/database.hxx>
+#include <database/databasemanager.h>

-#include <iostream>
+#include <services/author_service.h>
+#include <services/book_service.h>

-void fillBooksBD(uDBase& db)
-{
-    try
-    {
-        QVector<SH<Author_S>> authors = {
-            SH<Author_S>::create("George", "Orwell", 142),
-            SH<Author_S>::create("J.K.", "Rowling", 56),
-            SH<Author_S>::create("J.R.R.", "Tolkien", 81),
-            SH<Author_S>::create("Leo", "Tolstoy", 189),
-            SH<Author_S>::create("Fyodor", "Dostoevsky", 174),
-            SH<Author_S>::create("Mark", "Twain", 183),
-            SH<Author_S>::create("Charles", "Dickens", 208),
-            SH<Author_S>::create("Virginia", "Woolf", 134),
-            SH<Author_S>::create("Ernest", "Hemingway", 122),
-            SH<Author_S>::create("Gabriel", "García Márquez", 98),
-            SH<Author_S>::create("Franz", "Kafka", 100),
-            SH<Author_S>::create("Harper", "Lee", 64),
-            SH<Author_S>::create("William", "Shakespeare", 459),
-            SH<Author_S>::create("Oscar", "Wilde", 155),
-            SH<Author_S>::create("Aldous", "Huxley", 123),
-            SH<Author_S>::create("Jane", "Austen", 210),
-            SH<Author_S>::create("John", "Steinbeck", 116),
-            SH<Author_S>::create("Agatha", "Christie", 124),
-            SH<Author_S>::create("Isaac", "Asimov", 105)
-        };
-
-        // Список книг
-        QVector<Book_S> books = {
-            Book_S("1984", authors[0], 1949),
-            Book_S("Harry Potter and the Philosopher's Stone", authors[1], 1997),
-            Book_S("The Hobbit", authors[2], 1937),
-            Book_S("War and Peace", authors[3], 1869),
-            Book_S("Crime and Punishment", authors[4], 1866),
-            Book_S("Adventures of Huckleberry Finn", authors[5], 1884),
-            Book_S("A Tale of Two Cities", authors[6], 1859),
-            Book_S("Mrs. Dalloway", authors[7], 1925),
-            Book_S("The Old Man and the Sea", authors[8], 1952),
-            Book_S("One Hundred Years of Solitude", authors[9], 1967),
-            Book_S("The Trial", authors[10], 1925),
-            Book_S("To Kill a Mockingbird", authors[11], 1960),
-            Book_S("Macbeth", authors[12], 1606),
-            Book_S("The Picture of Dorian Gray", authors[13], 1890),
-            Book_S("Brave New World", authors[14], 1932),
-            Book_S("Pride and Prejudice", authors[15], 1813),
-            Book_S("The Brothers Karamazov", authors[4], 1880),
-            Book_S("The Grapes of Wrath", authors[16], 1939),
-            Book_S("Murder on the Orient Express", authors[17], 1934),
-            Book_S("I, Robot", authors[18], 1950),
-            Book_S("Animal Farm", authors[0], 1945),
-            Book_S("Harry Potter and the Chamber of Secrets", authors[1], 1998),
-            Book_S("The Lord of the Rings: The Fellowship of the Ring", authors[2], 1954),
-            Book_S("Anna Karenina", authors[3], 1878),
-            Book_S("The Idiot", authors[4], 1869),
-            Book_S("The Adventures of Tom Sawyer", authors[5], 1876),
-            Book_S("Oliver Twist", authors[6], 1837),
-            Book_S("To the Lighthouse", authors[7], 1927),
-            Book_S("For Whom the Bell Tolls", authors[8], 1940),
-            Book_S("Love in the Time of Cholera", authors[9], 1985),
-            Book_S("The Metamorphosis", authors[10], 1915),
-            Book_S("Go Set a Watchman", authors[11], 2015),
-            Book_S("King Lear", authors[12], 1605),
-            Book_S("The Importance of Being Earnest", authors[13], 1895),
-            Book_S("Brave New World Revisited", authors[14], 1958),
-            Book_S("Emma", authors[15], 1815),
-            Book_S("The Double", authors[4], 1846),
-            Book_S("Of Mice and Men", authors[16], 1937),
-            Book_S("And Then There Were None", authors[17], 1939),
-            Book_S("The Foundation Trilogy", authors[18], 1951),
-            Book_S("Down and Out in Paris and London", authors[0], 1933),
-            Book_S("Harry Potter and the Prisoner of Azkaban", authors[1], 1999),
-            Book_S("The Lord of the Rings: The Two Towers", authors[2], 1954),
-            Book_S("War and Peace", authors[3], 1869),
-            Book_S("The Brothers Karamazov", authors[4], 1880),
-            Book_S("The Prince and the Pauper", authors[5], 1881),
-            Book_S("David Copperfield", authors[6], 1850),
-            Book_S("The Waves", authors[7], 1931),
-            Book_S("A Farewell to Arms", authors[8], 1929),
-            Book_S("Chronicle of a Death Foretold", authors[9], 1981)
-        };
-
-        // Сохранение авторов в базу данных
-        {
-            odb::core::transaction t(db->begin());
-            for (auto& author : authors)
-                db->persist(author); // Используем get() для получения сырого указателя
-            t.commit();
-        }
-
-        // Сохранение книг в базу данных
-        {
-            odb::core::transaction t(db->begin());
-            for (auto& book : books)
-                db->persist(book);
-            t.commit();
-        }
-
-        std::cout << "Test data added successfully." << std::endl;
-    }
-    catch (const odb::exception& e)
-    {
-        std::cerr << "Error adding test data: " << e.what() << std::endl;
-    }
-}
+#include <QDebug>

 int main(int argc, char* argv[])
 {
    QCoreApplication a(argc, argv);

-    const std::string dbPath = "test_db.sqlite";
-    uDBase db(openDB(dbPath));
+    if (!DatabaseManager::instance().connect("library.db"))
+    {
+        qCritical() << "Ошибка: не удалось подключиться к базе данных!";
+        return -1;
+    }

-    // TODO Как-то нужно выполнять лишь раз
-    // fillBooksBD(db);
+    DatabaseManager::instance().initializeDatabase();

-    RestApiServer server(*db);
+    if (BookService::add({ .title = "Война и мир",
+                           .author = { .name = "Лев Толстой" },
+                           .filePath = "/books/war_and_peace.epub" }))
+    {
+        qDebug() << "Книга успешно добавлена!";
+    }
+    else
+    {
+        qCritical() << "Ошибка при добавлении книги!";
+    }
+
+    QVector<model::Book> books = BookService::fetchAll();
+
+    for (const model::Book& book : books)
+    {
+        qDebug() << "ID:" << book.id << "Название:" << book.title
+                 << "Автор:" << book.author.name << "Файл:" << book.filePath;
+    }
+
+    QVector<model::Author> authors = AuthorService::fetchAll();
+
+    for (const model::Author& author : authors)
+    {
+        qDebug() << "ID:" << author.id << "Имя:" << author.name;
+    }
+
+    RestApiServer server;
    server.start(8080);

    // Set up code that uses    the Qt event loop here.
--- a/src/restapi/restapi.qbs
+++ b/src/restapi/restapi.qbs
@@ -1,38 +1,15 @@
-/*!
-    \qmltype cpp-opds
-    \inherits Project
-    \brief Описание
-*/
-WPSLibrary {
-    cpp.defines: [
-        // You can make your code fail to compile if it uses deprecated APIs.
-        // In order to do so, uncomment the following line.
-        //"QT_DISABLE_DEPRECATED_BEFORE=0x060000" // disables all the APIs deprecated before Qt 6.0.0
-        "DATABASE_SQLITE"
-    ]
-    consoleApplication: true
+import qbs

+PSLibrary {
    Depends { name: "Qt"; submodules: ["core", "sql", "network"] }
-    Depends { name: "cpp" }
-    Depends { name: "database" }
-    Depends { name: "odb.gen" }
-    Depends { name: "redkit_gen" }
-    Depends { name: "rdbase" }

-    cpp.cxxLanguageVersion: "c++20"
+    Depends { name: "services" }

    Group {
        name: "cpp"
        files: [
-            "restapiserver.*",
+            "*.h",
+            "*.cpp"
        ]
    }
-
-    cpp.dynamicLibraries: [
-        "odb-sqlite",
-        "odb-qt",
-        "odb",
-        "sqlite3"
-    ]
-
-} // Project
+}
--- a/src/restapi/restapiserver.cpp
+++ b/src/restapi/restapiserver.cpp
@@ -1,23 +1,15 @@
 #include "restapiserver.h"

+#include <services/author_service.h>
+#include <services/book_service.h>
+
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>

-#include <database/author_s-odb.hxx> // Должен быть здесь
-#include <database/author_s.h>
-#include <database/book_s-odb.hxx> // Должен быть здесь
-#include <database/book_s.h>
-
-#include <odb/core.hxx>
-#include <odb/database.hxx>
-#include <odb/query.hxx>
-
-#include <redkit-gen-modules/json_serializer.h>
-
-RestApiServer::RestApiServer(odb::database& db, QObject* parent) :
-    QTcpServer(parent), m_db(db) {}
+RestApiServer::RestApiServer(QObject* parent) :
+    QTcpServer(parent) {}

 void RestApiServer::start(quint16 port)
 {
@@ -27,7 +19,7 @@ void RestApiServer::start(quint16 port)
    }
    else
    {
-        qDebug() << "REST API сервер запущен по адресу:";
+        qDebug() << "REST API сервер запущен на порту:" << port;
        qDebug() << QString("http://127.0.0.1:%1").arg(port);
    }
 }
@@ -39,8 +31,6 @@ void RestApiServer::incomingConnection(qintptr socketDescriptor)

    connect(socket, &QTcpSocket::readyRead, this, &RestApiServer::handleRequest);
    connect(socket, &QTcpSocket::disconnected, socket, &QTcpSocket::deleteLater);
-
-    qWarning() << "Есть входящее подключение" << socket->socketDescriptor();
 }

 void RestApiServer::handleRequest()
@@ -59,80 +49,70 @@ void RestApiServer::handleRequest()

 QByteArray RestApiServer::processRequest(const QString& request)
 {
-    // qWarning() << request << "\n\n";
-
    if (request.startsWith("GET /books/author/"))
    {
        QString author = request.section(' ', 1, 1).section('/', 3, 3).replace("%20", " ");
-        quint64 ageReq = author.toInt();

-        QStringList nameParts = author.split(' ');
-        QString firstName = nameParts.size() > 0 ? nameParts[0] : "";
-        QString lastName = nameParts.size() > 1 ? nameParts[1] : "";
+        // Books books;
+        // QList<BookRecord> results = books.getBooksByAuthor(author);

-        odb::transaction t(m_db.begin());
+        QByteArray jsonResponse = "{ \"books\": [";
+        // for (const BookRecord& book : results)
+        // {
+        //     jsonResponse += QString("{ \"id\": %1, \"title\": \"%2\", \"author\": \"%3\", \"year\": %4 },")
+        //                     .arg(book.id)
+        //                     .arg(book.title)
+        //                     .arg(book.author)
+        //                     .arg(book.year)
+        //                     .toUtf8();
+        // }
+        // if (results.size() > 0)
+        //     jsonResponse.chop(1); // Убираем последнюю запятую
+        // jsonResponse += "] }";

-        auto books = m_db.query<Book_S>(odb::query<Book_S>::author->id == ageReq);
-
-        QJsonArray jArray;
-        for (const auto& book : books)
-        {
-            QJsonObject j;
-            j["id"] = QString::number(book.id());
-            j["name"] = book.name();
-            j["author"] = book.author()->full_name();
-            j["year"] = book.year();
-            jArray.push_back(j);
-        }
-        auto jDoc = QJsonDocument(jArray);
-
-        t.commit();
-
-        return "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\r\n" + jDoc.toJson(QJsonDocument::Indented);
+        return "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\r\n" + jsonResponse;
    }

    if (request.startsWith("GET /books"))
    {
-        odb::transaction t(m_db.begin());
-        odb::result<Book_S> res(m_db.query<Book_S>());
+        auto books = BookService::fetchAll();

        QJsonArray jArray;
-        for (auto it = res.begin(); it != res.end(); ++it)
+
+        for (auto it = books.begin(); it != books.end(); ++it)
        {
            const auto& book = *it;

            QJsonObject j;
-            j["id"] = QString::number(book.id());
-            j["title"] = book.name();
-            j["author"] = book.author()->full_name();
-            j["year"] = book.year();
+            j["id"] = QString::number(book.id);
+            j["title"] = QString(book.title);
+            j["author"] = QString(book.author.name);
+            j["local_path"] = book.filePath;
            jArray.push_back(j);
        }
        auto jDoc = QJsonDocument(jArray);
-        t.commit();

        return "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\r\n" + jDoc.toJson(QJsonDocument::Indented);
    }

    if (request.startsWith("GET /author"))
    {
-        odb::transaction t(m_db.begin());
-        odb::result<Author_S> res(m_db.query<Author_S>());
+        // auto books = BookService::fetchAll();
+        auto authors = AuthorService::fetchAll();

        QJsonArray jArray;
-        for (auto it = res.begin(); it != res.end(); ++it)
+        for (auto it = authors.begin(); it != authors.end(); ++it)
        {
            const auto& author = *it;

            QJsonObject j;
-            j["id"] = QString::number(author.id());
-            j["first"] = author.firstName();
-            j["last"] = author.lastName();
-            j["age"] = author.age();
+            j["id"] = QString::number(author.id);
+            j["name"] = QString(author.name);
+            // j["last"] = QString::fromStdString(author.last());
+            // j["age"] = author.age();
            jArray.push_back(j);
        }
        auto jDoc = QJsonDocument(jArray);
-        t.commit();

        return "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\r\n" + jDoc.toJson(QJsonDocument::Indented);
    }
--- a/src/restapi/restapiserver.h
+++ b/src/restapi/restapiserver.h
@@ -1,9 +1,6 @@
 #ifndef RESTAPISERVER_H
 #define RESTAPISERVER_H

-#include <odb/database.hxx>
-
-#include <QObject>
 #include <QTcpServer>
 #include <QTcpSocket>

@@ -11,7 +8,7 @@ class Q_DECL_EXPORT RestApiServer : public QTcpServer
 {
    Q_OBJECT
 public:
-    explicit RestApiServer(odb::core::database& db, QObject* parent = nullptr);
+    explicit RestApiServer(QObject* parent = nullptr);
    void start(quint16 port = 8080);

 protected:
@@ -22,8 +19,6 @@ private slots:

 private:
    QByteArray processRequest(const QString& request);
-
-    odb::core::database& m_db;
 };

 #endif // RESTAPISERVER_H