alex/cpp-opds
1
0
Fork 0
Code Issues Pull Requests 2 Actions Projects Wiki Activity

WIP: Новые таблицы и изменение старых структур #6

Draft
alex wants to merge 12 commits from Новые-таблицы into master
pull from: Новые-таблицы
merge into: alex:master
Conversation 0 Commits 12 Files Changed 36 +226 -138
7 changed files with 226 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0198f6d022 - Show all commits

160
src/main.cpp
View File

@@ -8,11 +8,11 @@
#include <restapi/restapiserver.h>
/* Опыты с odb */
#include <database/database.hxx> // create_database
#include <model/author_s-odb.hxx> // Должен быть здесь
#include <model/author_s.h>
#include <model/book_s-odb.hxx> // Должен быть здесь
#include <model/book_s.h>
#include <database/database.hxx> // create_database
#include <odb/database.hxx>
#include <iostream>
@@ -22,79 +22,79 @@ 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)
SH<Author_S>::create("George Orwell", "en"),
SH<Author_S>::create("J.K. Rowling", "en"),
SH<Author_S>::create("J.R.R. Tolkien", "en"),
SH<Author_S>::create("Leo Tolstoy", "ru"),
SH<Author_S>::create("Fyodor Dostoevsky", "ru"),
SH<Author_S>::create("Mark Twain", "en"),
SH<Author_S>::create("Charles Dickens", "en"),
SH<Author_S>::create("Virginia Woolf", "en"),
SH<Author_S>::create("Ernest Hemingway", "en"),
SH<Author_S>::create("Gabriel García Márquez", "en"),
SH<Author_S>::create("Franz Kafka", "de"),
SH<Author_S>::create("Harper Lee", "en"),
SH<Author_S>::create("William Shakespeare", "en"),
SH<Author_S>::create("Oscar Wilde", "en"),
SH<Author_S>::create("Aldous Huxley", "en"),
SH<Author_S>::create("Jane Austen", "en"),
SH<Author_S>::create("John Steinbeck", "en"),
SH<Author_S>::create("Agatha Christie", "en"),
SH<Author_S>::create("Isaac Asimov", "ru"),
};
// Список книг
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)
Book_S({ .author = authors[0], .title = "1984" }),
Book_S({ .author = authors[1], .title = "Harry Potter and the Philosopher's Stone" }),
Book_S({ .author = authors[2], .title = "The Hobbit" }),
Book_S({ .author = authors[3], .title = "War and Peace" }),
Book_S({ .author = authors[4], .title = "Crime and Punishment" }),
Book_S({ .author = authors[5], .title = "Adventures of Huckleberry Finn" }),
Book_S({ .author = authors[6], .title = "A Tale of Two Cities" }),
Book_S({ .author = authors[7], .title = "Mrs. Dalloway" }),
Book_S({ .author = authors[8], .title = "The Old Man and the Sea" }),
Book_S({ .author = authors[9], .title = "One Hundred Years of Solitude" }),
Book_S({ .author = authors[10], .title = "The Trial" }),
Book_S({ .author = authors[11], .title = "To Kill a Mockingbird" }),
Book_S({ .author = authors[12], .title = "Macbeth" }),
Book_S({ .author = authors[13], .title = "The Picture of Dorian Gray" }),
Book_S({ .author = authors[14], .title = "Brave New World" }),
Book_S({ .author = authors[15], .title = "Pride and Prejudice" }),
Book_S({ .author = authors[4], .title = "The Brothers Karamazov" }),
Book_S({ .author = authors[16], .title = "The Grapes of Wrath" }),
Book_S({ .author = authors[17], .title = "Murder on the Orient Express" }),
Book_S({ .author = authors[18], .title = "I, Robot" }),
Book_S({ .author = authors[0], .title = "Animal Farm" }),
Book_S({ .author = authors[1], .title = "Harry Potter and the Chamber of Secrets" }),
Book_S({ .author = authors[2], .title = "The Lord of the Rings: The Fellowship of the Ring" }),
Book_S({ .author = authors[3], .title = "Anna Karenina" }),
Book_S({ .author = authors[4], .title = "The Idiot" }),
Book_S({ .author = authors[5], .title = "The Adventures of Tom Sawyer" }),
Book_S({ .author = authors[6], .title = "Oliver Twist" }),
Book_S({ .author = authors[7], .title = "To the Lighthouse" }),
Book_S({ .author = authors[8], .title = "For Whom the Bell Tolls" }),
Book_S({ .author = authors[9], .title = "Love in the Time of Cholera" }),
Book_S({ .author = authors[10], .title = "The Metamorphosis" }),
Book_S({ .author = authors[11], .title = "Go Set a Watchman" }),
Book_S({ .author = authors[12], .title = "King Lear" }),
Book_S({ .author = authors[13], .title = "The Importance of Being Earnest" }),
Book_S({ .author = authors[14], .title = "Brave New World Revisited" }),
Book_S({ .author = authors[15], .title = "Emma" }),
Book_S({ .author = authors[4], .title = "The Double" }),
Book_S({ .author = authors[16], .title = "Of Mice and Men" }),
Book_S({ .author = authors[17], .title = "And Then There Were None" }),
Book_S({ .author = authors[18], .title = "The Foundation Trilogy" }),
Book_S({ .author = authors[0], .title = "Down and Out in Paris and London" }),
Book_S({ .author = authors[1], .title = "Harry Potter and the Prisoner of Azkaban" }),
Book_S({ .author = authors[2], .title = "The Lord of the Rings: The Two Towers" }),
Book_S({ .author = authors[3], .title = "War and Peace" }),
Book_S({ .author = authors[4], .title = "The Brothers Karamazov" }),
Book_S({ .author = authors[5], .title = "The Prince and the Pauper" }),
Book_S({ .author = authors[6], .title = "David Copperfield" }),
Book_S({ .author = authors[7], .title = "The Waves" }),
Book_S({ .author = authors[8], .title = "A Farewell to Arms" }),
Book_S({ .author = authors[9], .title = "Chronicle of a Death Foretold" }),
};
// Сохранение авторов в базу данных
@@ -132,16 +132,16 @@ int main(int argc, char* argv[])
fillBooksBD(db);
// Сохранение дополнителньых авторов в базу данных
{
auto authors = fillAuthorDB();
odb::core::transaction t(db->begin());
for (auto& author : authors)
{
SH<Author_S> tempAuthor = SH<Author_S>::create(author.first, author.last, author.age);
db->persist(tempAuthor);
}
t.commit();
}
// {
// auto authors = fillAuthorDB();
// odb::core::transaction t(db->begin());
// for (auto& author : authors)
// {
// SH<Author_S> tempAuthor = SH<Author_S>::create(author., author.last, author.age);
// db->persist(tempAuthor);
// }
// t.commit();
// }
RestApiServer server(*db);
server.start(8080);

45
src/model/author_s.h
View File

@@ -1,40 +1,28 @@
// file : hello/person.hxx
// copyright : not copyrighted - public domain
#ifndef AUTHOR_S_H
#define AUTHOR_S_H
#include "model_global.h"
#include <QString>
#include <odb/core.hxx>
#include <odb/database.hxx>
#include <odb/query.hxx>
#pragma db object
class MODEL_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)
{
}
Author_S(const QString& fullName,
const QString& langCode) :
m_fullName(fullName),
m_langCode(langCode)
{}
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; }
quint64 id() const { return m_id; }
void setId(quint64 newId) { m_id = newId; }
QString full_name() const { return m_firstName + " " + m_lastName; }
QString fullName() const { return m_fullName; }
void setFullName(const QString& newFullName) { m_fullName = newFullName; }
void age(unsigned short age) { m_age = age; }
QString langCode() const { return m_langCode; }
void setLangCode(const QString& newLangCode) { m_langCode = newLangCode; }
private:
friend class odb::access;
@@ -43,9 +31,8 @@ private:
#pragma db id auto
quint64 m_id;
QString m_firstName;
QString m_lastName;
quint64 m_age;
QString m_fullName;
QString m_langCode;
};
#pragma db view object(Author_S)
@@ -53,12 +40,6 @@ 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

69
src/model/book_s.h
View File

@@ -1,37 +1,64 @@
// file : hello/person.hxx
// copyright : not copyrighted - public domain
#ifndef BOOK_S_H
#define BOOK_S_H
#include "model_global.h"
#include <QSharedPointer>
#include <QString>
#include <odb/core.hxx>
#include <rcore/smarttypes.h>
#include <QDateTime>
#include "author_s.h"
#include "genre_s.h"
#include "series_s.h"
struct Book_SZ
{
SH<Author_S> author;
QString title;
SH<Series_S> series;
quint8 year;
SH<Genre_S> genre;
QDateTime lastModified = QDateTime::currentDateTime();
QString lang;
};
#pragma db object
class MODEL_EXPORT Book_S
{
public:
Book_S() = default;
Book_S(const QString& name,
const SH<Author_S>& author,
const int year)
Book_S(const Book_SZ& book)
{
m_author = author;
m_name = name;
m_year = year;
};
m_author = book.author;
m_title = book.title;
m_series = book.series;
m_year = book.year;
m_genre = book.genre;
m_lastModified = book.lastModified;
m_lang = book.lang;
}
quint64 id() const { return m_id; }
void setId(const quint64& newId) { m_id = newId; }
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; }
void setAuthor(const SH<Author_S>& newAuthor) { m_author = newAuthor; }
QString title() const { return m_title; }
void setTitle(const QString& newTitle) { m_title = newTitle; }
SH<Series_S> series() const { return m_series; }
void setSeries(const SH<Series_S>& newSeries) { m_series = newSeries; }
quint8 year() const { return m_year; }
void setYear(const quint8& newYear) { m_year = newYear; }
SH<Genre_S> genre() const { return m_genre; }
void setGenre(const SH<Genre_S>& newGenre) { m_genre = newGenre; }
QDateTime lastModified() const { return m_lastModified; }
void setLastModified(const QDateTime& newLastModified) { m_lastModified = newLastModified; }
QString lang() const { return m_lang; }
void setLang(const QString& newLang) { m_lang = newLang; }
private:
friend class odb::access;
@@ -41,8 +68,12 @@ private:
quint64 m_id;
SH<Author_S> m_author;
QString m_name;
QString m_title;
SH<Series_S> m_series;
quint8 m_year;
SH<Genre_S> m_genre;
QDateTime m_lastModified;
QString m_lang;
};
// #pragma db view object(Book_S) object(Author_S = author:Book_S::m_author)

28
src/model/genre_s.h Normal file
View File

@@ -0,0 +1,28 @@
#ifndef GENRE_H
#define GENRE_H
#include "model_global.h"
#pragma db object
class MODEL_EXPORT Genre_S
{
public:
Genre_S() = default;
quint64 id() const { return m_id; }
void setId(const quint64& newId) { m_id = newId; }
QString name() const { return m_name; }
void setName(const QString& newName) { m_name = newName; }
private:
friend class odb::access;
private:
#pragma db id auto
quint64 m_id;
QString m_name;
};
#endif // GENRE_H

3
src/model/model_global.h
View File

@@ -9,4 +9,7 @@
#define MODEL_EXPORT Q_DECL_IMPORT
#endif
#include <odb/core.hxx>
#include <rcore/smarttypes.h>
#endif // MODEL_GLOBAL_H

28
src/model/series_s.h Normal file
View File

@@ -0,0 +1,28 @@
#ifndef SERIES_H
#define SERIES_H
#include "model_global.h"
#pragma db object
class MODEL_EXPORT Series_S
{
public:
Series_S() = default;
quint64 id() const { return m_id; }
void setId(const quint64& newId) { m_id = newId; }
QString serName() const { return m_serName; }
void setSerName(const QString& newSerName) { m_serName = newSerName; }
private:
friend class odb::access;
private:
#pragma db id auto
quint64 m_id;
QString m_serName;
};
#endif // SERIES_H

31
src/restapi/restapiserver.cpp
View File

@@ -79,9 +79,18 @@ QByteArray RestApiServer::processRequest(const QString& request)
{
QJsonObject j;
j["id"] = QString::number(book.id());
j["name"] = book.name();
j["author"] = book.author()->full_name();
QJsonObject author;
author["id"] = QString::number(book.author()->id());
author["fullName"] = book.author()->fullName();
author["langCode"] = book.author()->langCode();
j["author"] = author;
// j["series"] = book.series()->serName();
// j["genre"] = book.genre()->name();
j["title"] = book.title();
j["year"] = book.year();
j["lastModified"] = book.lastModified().toString();
j["lang"] = book.lang();
jArray.push_back(j);
}
auto jDoc = QJsonDocument(jArray);
@@ -103,9 +112,18 @@ QByteArray RestApiServer::processRequest(const QString& request)
QJsonObject j;
j["id"] = QString::number(book.id());
j["title"] = book.name();
j["author"] = book.author()->full_name();
QJsonObject author;
author["id"] = QString::number(book.author()->id());
author["fullName"] = book.author()->fullName();
author["langCode"] = book.author()->langCode();
j["author"] = author;
// j["series"] = book.series()->serName();
// j["genre"] = book.genre()->name();
j["title"] = book.title();
j["year"] = book.year();
j["lastModified"] = book.lastModified().toString();
j["lang"] = book.lang();
jArray.push_back(j);
}
auto jDoc = QJsonDocument(jArray);
@@ -126,9 +144,8 @@ QByteArray RestApiServer::processRequest(const QString& request)
QJsonObject j;
j["id"] = QString::number(author.id());
j["first"] = author.firstName();
j["last"] = author.lastName();
j["age"] = author.age();
j["fullName"] = author.fullName();
j["langCode"] = author.langCode();
jArray.push_back(j);
}
auto jDoc = QJsonDocument(jArray);