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

src/model/book_s.h

@@ -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)