Fixed the column names in CSV export.

UIs/BeetRoundWidgets/dialogs/edititemdialog.cpp

@@ -30,6 +30,8 @@ void EditItemDialog::createContent() {
   /// online user stuff
   connect(m_detailMapper, &ItemDetailMapper::createOnlineAccountTriggered, this,
           &EditItemDialog::createOnlineAccountTriggered);
+  connect(m_detailMapper, &ItemDetailMapper::sendInviteMailTriggered, this,
+          &EditItemDialog::sendInviteMailTriggered);
 }
 
 void EditItemDialog::accept() {

UIs/BeetRoundWidgets/dialogs/edititemdialog.h

@@ -21,6 +21,8 @@ class EditItemDialog : public AbstractDialog {
 
  signals:
   void createOnlineAccountTriggered(const QString& mailAddress);
+  void sendInviteMailTriggered(const QString& mailAddress);
+
  public slots:
   void accept() override;
   void reject() override;

UIs/BeetRoundWidgets/dialogs/newitemdialog.cpp

@@ -139,7 +139,7 @@ void NewItemDialog::resetContent() {
   m_firstNameEdit->setText("");
   m_shareTypeBox->setCurrentIndex(0);
   m_amountSpinBox->setValue(1);
-  m_biddingTypeBox->setCurrentIndex(0);
+  m_biddingTypeBox->setCurrentIndex(4);
   m_bidding1SpinBox->setValue(0);
   m_bidding2SpinBox->setValue(0);
   m_bidding3SpinBox->setValue(0);

UIs/BeetRoundWidgets/dialogs/settingsdialog.cpp

@@ -27,12 +27,12 @@ void SettingsDialog::createContent() {
   serverLayout->addWidget(m_urlEdit, 0, 1);
   QLabel* emailLabel = new QLabel("Email:");
   m_emailEdit        = new QLineEdit();
-  m_emailEdit->setEnabled(false);
+  // m_emailEdit->setEnabled(false);
   serverLayout->addWidget(emailLabel, 1, 0);
   serverLayout->addWidget(m_emailEdit, 1, 1);
   QLabel* passwordLabel = new QLabel("Password:");
   m_passwordEdit        = new QLineEdit();
-  m_passwordEdit->setEnabled(false);
+  // m_passwordEdit->setEnabled(false);
   m_passwordEdit->setEchoMode(QLineEdit::Password);
   serverLayout->addWidget(passwordLabel, 2, 0);
   serverLayout->addWidget(m_passwordEdit, 2, 1);

UIs/BeetRoundWidgets/mainwindow.cpp

@@ -570,4 +570,7 @@ void MainWindow::setupEventTab() {
 void MainWindow::initServerConnection() {
   connect(m_editItemDialog.get(), &EditItemDialog::createOnlineAccountTriggered, m_core.get(),
           &GenericCore::onCreateOnlineAccountTriggered);
+  connect(m_editItemDialog.get(), &EditItemDialog::sendInviteMailTriggered, m_core.get(),
+          &GenericCore::onSendInviteMailTriggered);
+  emit m_core->loginAndStoreAuthToken();
 }

UIs/BeetRoundWidgets/views/itemdetailmapper.cpp

@@ -1,5 +1,6 @@
 #include "itemdetailmapper.h"
 
+#include <data/settingshandler.h>
 #include <QAbstractItemModel>
 #include <QComboBox>
 #include <QDataWidgetMapper>
@@ -157,6 +158,10 @@ ItemDetailMapper::ItemDetailMapper(QWidget* parent)
   outerLayout->addLayout(rightLayout);
   setLayout(outerLayout);
 
+  const QVariantMap serverSettings = SettingsHandler::getSettings("Server");
+  const QString urlValue           = serverSettings.value("url").toString();
+  m_serverUrl                      = urlValue;
+
   /// online user account
   connect(m_mailEdit, &QLineEdit::textChanged, this, &ItemDetailMapper::onMailEditChanged);
   connect(m_onlineIdDisplay, &QLineEdit::textChanged, this, &ItemDetailMapper::onOnlineIDChanged);
@@ -165,6 +170,8 @@ ItemDetailMapper::ItemDetailMapper(QWidget* parent)
 
   connect(m_createOnlineAccountButton, &QAbstractButton::clicked, this,
           &ItemDetailMapper::onCreateOnlineAccountTriggered);
+  connect(m_sendInviteMailButton, &QAbstractButton::clicked, this,
+          &ItemDetailMapper::onSendInviteMailTriggered);
 }
 
 void ItemDetailMapper::setModelMappings(QTableView* tableView) {
@@ -243,15 +250,6 @@ void ItemDetailMapper::updateButtons(int row) {
   m_nextButton->setEnabled(row < m_model->rowCount() - 1);
 }
 
-void ItemDetailMapper::emitContentChanged(const QModelIndex& currentIndex) {
-  // BUG QR-Code isn't updated after changes through the ItemDetailMapper #18
-  QString toStringText = "";
-  if (currentIndex.isValid()) {
-    toStringText = currentIndex.data(ToStringRole).toString();
-  }
-  emit contentChanged(toStringText);
-}
-
 void ItemDetailMapper::onCurrentIndexChanged(const QModelIndex& current,
                                              const QModelIndex& /*previous*/) {
   if (!isEnabled()) {
@@ -259,7 +257,6 @@ void ItemDetailMapper::onCurrentIndexChanged(const QModelIndex& current,
   }
   m_mapper->setCurrentModelIndex(current);
   updateButtons(current.row());
-  emitContentChanged(current);
 }
 
 void ItemDetailMapper::updateQRCode(const QString text) {
@@ -295,14 +292,15 @@ void ItemDetailMapper::onOnlineIDChanged(const QString& text) {
   }
 }
 
-void ItemDetailMapper::onAccessCodeChanged(const QString& text) {
+void ItemDetailMapper::onAccessCodeChanged(const QString& accessCode) {
-  if (text.isEmpty()) {
+  if (accessCode.isEmpty()) {
     m_sendInviteMailButton->setEnabled(false);
     m_accessUrlDisplay->setText("");
     updateQRCode("");
   } else {
     m_sendInviteMailButton->setEnabled(true);
-    const QString accessUrl = "http://127.0.0.1:4000/api/users/" + text;
+    const QString accessUrl = m_serverUrl + "/log_in/" + accessCode;
+    // const QString accessUrl = "https://bietrunde.das-gruene-zebra.de/log_in/" + text;
     m_accessUrlDisplay->setText(accessUrl);
     updateQRCode(accessUrl);
   }
@@ -311,3 +309,7 @@ void ItemDetailMapper::onAccessCodeChanged(const QString& text) {
 void ItemDetailMapper::onCreateOnlineAccountTriggered() {
   emit createOnlineAccountTriggered(m_mailEdit->text());
 }
+
+void ItemDetailMapper::onSendInviteMailTriggered() {
+  emit sendInviteMailTriggered(m_mailEdit->text());
+}

UIs/BeetRoundWidgets/views/itemdetailmapper.h

@@ -31,6 +31,7 @@ class ItemDetailMapper : public QWidget {
   void contentChanged(const QString text);
 
   void createOnlineAccountTriggered(const QString& mailAddress);
+  void sendInviteMailTriggered(const QString& mailAddress);
 
  private slots:
   void rowsInserted(const QModelIndex& parent, int start, int end);
@@ -38,14 +39,14 @@ class ItemDetailMapper : public QWidget {
   void toPrevious();
   void toNext();
   void updateButtons(int row);
-  void emitContentChanged(const QModelIndex& currentIndex);
   void onCurrentIndexChanged(const QModelIndex& current, const QModelIndex& previous);
 
   void updateQRCode(const QString text = "");
   void onMailEditChanged(const QString& text);
   void onOnlineIDChanged(const QString& text);
-  void onAccessCodeChanged(const QString& text);
+  void onAccessCodeChanged(const QString& accessCode);
   void onCreateOnlineAccountTriggered();
+  void onSendInviteMailTriggered();
 
  private:
   /// *** members ***
@@ -56,6 +57,7 @@ class ItemDetailMapper : public QWidget {
 
   std::unique_ptr<QDataWidgetMapper> m_mapper;
 
+  QString m_serverUrl;
   /// *** GUI elements ***
   /// left layout
   QLabel* m_numberLabel;

UIs/BeetRoundWidgets/widgets/summarywidget.cpp

@@ -16,14 +16,23 @@ SummaryWidget::SummaryWidget(std::shared_ptr<ModelSummary> modelSummary, QWidget
   QVBoxLayout* mainLayout = new QVBoxLayout(this);
 
   /// monthly need
-  QHBoxLayout* footerLayout  = new QHBoxLayout();
+  QHBoxLayout* footerLayout = new QHBoxLayout();
+
+  QLabel* nTotalSharesLabel  = new QLabel("Erwartete Ernteanteile:");
+  const qreal expectedShares = m_modelSummary->nTotalExpectedShares();
+  m_nTotalExpectedShares     = new QLabel(QString::number(expectedShares));
+
   QLabel* financialNeedLabel = new QLabel("monatlicher Finanzbedarf:");
   m_financialNeedBox         = new QSpinBox();
   m_financialNeedBox->setMaximum(50000);
   m_financialNeedBox->setValue(m_financialNeed);
+
   connect(m_financialNeedBox, &QSpinBox::valueChanged, this,
           &SummaryWidget::onFinancialNeedChanged);
 
+  footerLayout->addWidget(nTotalSharesLabel);
+  footerLayout->addWidget(m_nTotalExpectedShares);
+  footerLayout->addStretch(1);
   footerLayout->addWidget(financialNeedLabel);
   footerLayout->addWidget(m_financialNeedBox);
   footerLayout->addStretch(1);
@@ -50,6 +59,11 @@ void SummaryWidget::onNExpectedBiddingChanged(int newNExpected) {
   m_biddingStatus3->onExpectedBiddingsChanged(newNExpected);
 }
 
+void SummaryWidget::onNTotalExpectedSharesChanged(qreal newNExpected) {
+  const QString expectedSharesString = QString::number(newNExpected);
+  m_nTotalExpectedShares->setText(expectedSharesString);
+}
+
 void SummaryWidget::onNPlacedBiddingsChanged(const int roundNumber) {
   switch (roundNumber) {
     case 1:
@@ -140,6 +154,9 @@ void SummaryWidget::setupConnections() {
   //      "bindProperty(&bindable, &signal, &getter, widget)"
   QObject::connect(m_modelSummary.get(), &ModelSummary::nExpectedBiddingsChanged,
                    [&]() { onNExpectedBiddingChanged(m_modelSummary->nExpectedBiddings()); });
+  QObject::connect(m_modelSummary.get(), &ModelSummary::nTotalExpectedSharesChanged, this, [&]() {
+    onNTotalExpectedSharesChanged(m_modelSummary->nTotalExpectedShares());
+  });
   QObject::connect(m_modelSummary.get(), &ModelSummary::nPlacedBiddingsChanged, this,
                    &SummaryWidget::onNPlacedBiddingsChanged);
   QObject::connect(m_modelSummary.get(), &ModelSummary::biddingSumChanged, this,

UIs/BeetRoundWidgets/widgets/summarywidget.h

@@ -18,6 +18,7 @@ class SummaryWidget : public QWidget {
  private slots:
   void onFinancialNeedChanged(int newFinancialNeed);
   void onNExpectedBiddingChanged(int newNExpected);
+  void onNTotalExpectedSharesChanged(qreal newNExpected);
 
   void onNPlacedBiddingsChanged(const int roundNumber);
   void onBiddingSumChanged(const int roundNumber);
@@ -31,8 +32,9 @@ class SummaryWidget : public QWidget {
   std::unique_ptr<BiddingRoundStatusWidget> m_biddingStatus3;
 
   // TODO read from settings (maybe via model/core; maybe set in constructor)
-  const int m_financialNeed    = 13942;
+  const int m_financialNeed      = 13942;
-  QSpinBox* m_financialNeedBox = nullptr;
+  QSpinBox* m_financialNeedBox   = nullptr;
+  QLabel* m_nTotalExpectedShares = nullptr;
 
   QLabel* m_rowCountValueLabel;
   QLabel* m_nExpectedBiddingsValueLabel;

libs/BeetRoundCore/formats/csvparser.cpp

@@ -23,9 +23,12 @@ QList<ModelItemValues> CsvParser::getItemsFromCSVFile(const QString& fileName) {
 
 bool CsvParser::exportToCSVFile(const QList<QStringList>& rows, const QString& filePath) {
   Document doc(std::string(), LabelParams(0, -1));
-  const QList<QString> headerNames = GET_HEADER_NAMES();
+  // const QList<QString> headerNames = GET_HEADER_NAMES();
-  for (int column = 0; column < headerNames.size(); ++column) {
+  const int columnCount = USER_FACING_ROLES.size();
-    doc.SetColumnName(column, headerNames.at(column).toStdString());
+  for (int column = 0; column < columnCount; ++column) {
+    const UserRoles role   = GET_ROLE_FOR_COLUMN(column);
+    std::string columnName = ROLE_NAMES.value(role).toStdString();
+    doc.SetColumnName(column, columnName);
   }
   for (int row = 0; row < rows.size(); ++row) {
     QStringList rowValues = rows.at(row);
@@ -129,8 +132,22 @@ ModelItemValues CsvParser::getItemValuesForRow(
 QVariant CsvParser::parseItemValue(const int role, const std::string& valueString) {
   QVariant result;
   if (STRING_ROLES.contains(role)) {
-    /// string values
+    if (role == ShareTypeRole) {
-    result = QString::fromStdString(valueString);
+      if (valueString == "AGA") {
+        result = "erarbeitet";
+      } else if (valueString == "ja") {
+        result = "bezahlt";
+
+      } else if (valueString == "teils") {
+        result = "teils/teils";
+
+      } else {
+        result = "";
+      }
+    } else {
+      /// string values
+      result = QString::fromStdString(valueString);
+    }
   } else if (INT_ROLES.contains(role)) {
     /// int values
 

libs/BeetRoundCore/formats/jsonparser.cpp

@@ -4,6 +4,7 @@
 #include <QJsonObject>
 
 #include "../model/metadata.h"
+#include "../structs.h"
 
 QList<ModelItemValues> JsonParser::toItemValuesList(const QByteArray& jsonData,
                                                     const QString& rootValueName) {
@@ -70,7 +71,7 @@ QByteArray JsonParser::itemValuesListToJson(const QList<ModelItemValues>& itemVa
   return jsonDoc.toJson(QJsonDocument::Compact);
 }
 
-QByteArray JsonParser::ToJsonObject(const QHash<QString, QVariant>& values,
+QByteArray JsonParser::toJsonDoc(const QHash<QString, QVariant>& values,
                                     const QString& objectName) {
   QJsonDocument jsonDoc;
   QJsonObject rootObject;
@@ -90,6 +91,45 @@ QByteArray JsonParser::ToJsonObject(const QHash<QString, QVariant>& values,
   return jsonDoc.toJson(QJsonDocument::Compact);
 }
 
+ModelItemValues JsonParser::serverUserCredentialsToItemValues(const QJsonDocument& jsonDoc) {
+  ModelItemValues values;
+
+  const QJsonObject rootObject = jsonDoc["data"].toObject();
+
+  const QString emailAddress = rootObject["email"].toString();
+  const QString uuid         = rootObject["id"].toString();
+  const QString token        = rootObject["token"].toString();
+
+  values.insert(MailRole, emailAddress);
+  values.insert(OnlineIdRole, uuid);
+  values.insert(AccessCodeRole, token);
+
+  return values;
+}
+
+QList<bidding> JsonParser::extractBiddings(const QJsonDocument& jsonDoc) {
+  QList<bidding> result;
+
+  if (jsonDoc.isEmpty()) {
+    return result;
+  }
+  QJsonArray itemArray = JsonParser::extractItemArray(jsonDoc, "data");
+
+  foreach (QJsonValue value, itemArray) {
+    // REFACTOR implement & use "JsonParser::parseServerResponse(const QJsonObject& object,
+    //          QHash<QString, int> entries)"
+    QJsonObject itemJsonObject = value.toObject();
+    bidding values{.userId       = itemJsonObject.value("user_id").toString(),
+                   .biddingRound = itemJsonObject.value("bidding_round").toInt(),
+                   .amount       = itemJsonObject.value("amount").toInt(),
+                   .depotWishOne = itemJsonObject.value("depot_wish_one").toString(),
+                   .depotWishTwo = itemJsonObject.value("depot_wish_two").toString()};
+    result.append(values);
+  }
+
+  return result;
+}
+
 QJsonArray JsonParser::extractItemArray(const QJsonDocument& doc, const QString& objectName) {
   QJsonArray itemArray;
   if (objectName.isEmpty()) {
@@ -101,8 +141,6 @@ QJsonArray JsonParser::extractItemArray(const QJsonDocument& doc, const QString&
   return itemArray;
 }
 
-JsonParser::JsonParser() {}
-
 ModelItemValues JsonParser::jsonObjectToItemValues(const QJsonObject& itemJsonObject) {
   ModelItemValues values;
 
@@ -115,6 +153,8 @@ ModelItemValues JsonParser::jsonObjectToItemValues(const QJsonObject& itemJsonOb
   return values;
 }
 
+JsonParser::JsonParser() {}
+
 pair<int, QVariant> JsonParser::getKeyValuePair(const QJsonObject& itemJsonObject, const int role) {
   QVariant result;
   const QJsonValue jsonValue = itemJsonObject[ROLE_NAMES.value(role)];

libs/BeetRoundCore/formats/jsonparser.h

@@ -9,6 +9,7 @@ class QByteArray;
 class QJsonArray;
 
 typedef QMap<int, QVariant> ModelItemValues;
+class bidding;
 
 using namespace std;
 
@@ -18,15 +19,22 @@ class JsonParser {
                                                  const QString& rootValueName = "");
   static QByteArray itemValuesListToJson(const QList<ModelItemValues>& itemValuesList,
                                          const QString& objectName = "");
-  static QByteArray ToJsonObject(const QHash<QString, QVariant>& Values,
+  static QByteArray toJsonDoc(const QHash<QString, QVariant>& Values,
                                  const QString& objectName = "");
 
- private:
+  static ModelItemValues serverUserCredentialsToItemValues(const QJsonDocument& jsonDoc);
-  explicit JsonParser();
+  static QList<bidding> extractBiddings(const QJsonDocument& jsonDoc);
+  // static ModelItemValues parseServerResponse(const QJsonDocument& jsonDoc,
+  //                                            QHash<QString, int> entries);
+  // static ModelItemValues parseServerResponse(const QJsonObject& object,
+  //                                            QHash<QString, int> entries);
 
   static QJsonArray extractItemArray(const QJsonDocument& doc, const QString& objectName);
   static ModelItemValues jsonObjectToItemValues(const QJsonObject& itemJsonObject);
 
+ private:
+  explicit JsonParser();
+
   static pair<int, QVariant> getKeyValuePair(const QJsonObject& itemJsonObject, const int role);
 };
 

libs/BeetRoundCore/genericcore.cpp

@@ -15,6 +15,7 @@
 #include "constants.h"
 #include "data/filehandler.h"
 #include "data/settingshandler.h"
+#include "formats/jsonparser.h"
 #include "model/generalsortfiltermodel.h"
 #include "model/metadata.h"
 #include "model/modelsummary.h"
@@ -155,16 +156,23 @@ bool GenericCore::isSyncServerSetup() const {
   }
 }
 
-void GenericCore::onBiddingsChanged(int round, QList<bidding> biddings) {
+void GenericCore::onLoginSuccessful() {
-  qInfo() << "onBiddingsChanged: round:" << round << "- biddings:" << biddings.count();
+  qInfo() << "Login successful.";
+  emit displayStatusMessage("Login successful.");
+  emit sendGetRequest(GetCurrentBiddingRound);
+}
+
+void GenericCore::onBiddingsChanged(const QList<bidding> biddings) {
+  qInfo() << "onBiddingsChanged: biddings:" << biddings.count();
   // NEXT merge biddings into model
+  m_mainModel->updateBiddings(biddings);
 }
 
 void GenericCore::onCreateOnlineAccountTriggered(const QString& mailAddress) {
   qInfo() << "Creating online account for:" << mailAddress;
   QHash<QString, QVariant> hash;
   hash.insert("email", mailAddress);
-  const QByteArray jsonDoc = JsonParser::ToJsonObject(hash, "user");
+  const QByteArray jsonDoc = JsonParser::toJsonDoc(hash, "user");
   emit sendPostRequest(RegisterUser, jsonDoc);
 }
 
@@ -176,6 +184,12 @@ void GenericCore::onOnlineUserAccountReceived(const QString mailAddress,
   const QString message = QString("Online credentials received for: %1").arg(mailAddress);
   emit displayStatusMessage(message);
 }
+
+void GenericCore::onSendInviteMailTriggered(const QString& mailAddress) {
+  qInfo() << "Sending invite mail to:" << mailAddress;
+  const QString serverUrl               = m_serverCommunicator->getUserLoginUrl();
+  const QJsonDocument mailInviteJsonDoc = m_mainModel->getMailInviteJsonDoc(mailAddress, serverUrl);
+  emit sendPostRequest(MailInvite, mailInviteJsonDoc.toJson());
 }
 
 void GenericCore::setupModels() {
@@ -248,6 +262,7 @@ void GenericCore::applyServerConfiguration() {
   if (!urlValue.isEmpty()) {
     const QString emailValue    = serverSettings.value("email").toString();
     const QString passwordValue = serverSettings.value("password").toString();
-    m_serverCommunicator->setServerConfiguration(urlValue, emailValue, passwordValue);
+    const QString authToken     = serverSettings.value("token").toString();
+    m_serverCommunicator->setServerConfiguration(urlValue, emailValue, passwordValue, authToken);
   }
 }

libs/BeetRoundCore/genericcore.h

@@ -47,17 +47,21 @@ class GenericCore : public QObject {
   bool isSyncServerSetup() const;
 
  public slots:
-  void onBiddingsChanged(int round, QList<bidding> biddings);
+  void onLoginSuccessful();
+
+  void onBiddingsChanged(const QList<bidding> biddings);
 
   void onCreateOnlineAccountTriggered(const QString& mailAddress);
   void onOnlineUserAccountReceived(const QString mailAddress,
                                    const QString uuid,
                                    const QString accessToken);
+  void onSendInviteMailTriggered(const QString& mailAddress);
 
  signals:
   void displayStatusMessage(QString message);
 
   /// *** server communication ***
+  void loginAndStoreAuthToken();
   ///     request signals
   void sendGetRequest(GetRequestTypes type, QVariant data = QVariant());
   void sendPostRequest(PostRequestTypes type, QByteArray data);

libs/BeetRoundCore/model/metadata.h

@@ -91,7 +91,7 @@ enum GetRequestTypes {
   GetBiddingsOfSpecificRound,
   GetBiddingsOfHighestRound
 };
-enum PostRequestTypes { RegisterUser };
+enum PostRequestTypes { LogInAdmin, RegisterUser, MailInvite };
 
 /// functions
 static UserRoles GET_ROLE_FOR_COLUMN(const int column) {

libs/BeetRoundCore/model/modelsummary.cpp

@@ -10,6 +10,8 @@ ModelSummary::ModelSummary(std::shared_ptr<TableModel> model, QObject* parent)
   // TODO ? use existing model signals (dataChanged(role),...) instead of special signals
   connect(m_model.get(), &TableModel::nExpectedBiddingsChanged, this,
           &ModelSummary::nExpectedBiddingsChanged);
+  connect(m_model.get(), &TableModel::nTotalExpectedSharesChanged, this,
+          &ModelSummary::nTotalExpectedSharesChanged);
   connect(m_model.get(), &TableModel::nPlacedBiddingsChanged, this,
           &ModelSummary::nPlacedBiddingsChanged);
   connect(m_model.get(), &TableModel::biddingSumChanged, this, &ModelSummary::biddingSumChanged);
@@ -29,6 +31,8 @@ QBindable<int> ModelSummary::bindableRowCount() {
   return &m_rowCount;
 }
 
+qreal ModelSummary::nTotalExpectedShares() const { return m_model->nTotalExpectedShares(); }
+
 int ModelSummary::nExpectedBiddings() const { return m_model->nExpectedBiddings(); }
 
 int ModelSummary::nPlacedBiddings1() const { return m_model->nPlacedBiddings1(); }

libs/BeetRoundCore/model/modelsummary.h

@@ -19,6 +19,8 @@ class ModelSummary : public QObject {
 
   int rowCount() const;
   QBindable<int> bindableRowCount();
+
+  qreal nTotalExpectedShares() const;
   int nExpectedBiddings() const;
   int nPlacedBiddings1() const;
   int nPlacedBiddings2() const;
@@ -36,6 +38,7 @@ class ModelSummary : public QObject {
   void rowCountChanged();
 
   void nExpectedBiddingsChanged();
+  void nTotalExpectedSharesChanged();
   void nPlacedBiddingsChanged(const int roundNumber);
   void biddingSumChanged(const int roundNumber);
   void biddingAverageChanged(const int roundNumber);

libs/BeetRoundCore/model/tablemodel.cpp

@@ -1,16 +1,17 @@
 #include "tablemodel.h"
 
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+
 #include "../formats/jsonparser.h"
+#include "../structs.h"
 #include "commands/edititemcommand.h"
 #include "commands/insertrowscommand.h"
 #include "commands/removerowscommand.h"
 #include "metadata.h"
 #include "modelitem.h"
 
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-
 QByteArray TableModel::generateExampleItems() {
   QJsonDocument doc = QJsonDocument();
   QJsonObject rootObject;
@@ -238,6 +239,55 @@ void TableModel::setOnlineCredentials(const QString& mail,
   setItemData(itemIndex, {{OnlineIdRole, uuid}, {AccessCodeRole, token}});
 }
 
+QJsonDocument TableModel::getMailInviteJsonDoc(const QString& mail,
+                                               const QString& serverUrl) const {
+  QJsonDocument doc = QJsonDocument();
+
+  QModelIndex index = getIndexByRoleValue(mail, MailRole);
+
+  if (index.isValid()) {
+    QJsonObject rootObject;
+
+    const QString user_id   = data(index, OnlineIdRole).toString();
+    const QString email     = data(index, MailRole).toString();
+    const QString name      = data(index, FullNameRole).toString();
+    const QString token     = data(index, AccessCodeRole).toString();
+    const QString accessUrl = serverUrl + "/" + token;
+
+    QJsonObject userObject;
+    userObject.insert("user_id", user_id);
+    userObject.insert("email", email);
+    userObject.insert("name", name);
+    userObject.insert("access_url", accessUrl);
+
+    rootObject.insert("user", userObject);
+
+    doc.setObject(rootObject);
+  }
+  return doc;
+}
+
+void TableModel::updateBiddings(const QList<bidding> biddings) {
+  QListIterator<bidding> i(biddings);
+  while (i.hasNext()) {
+    const bidding localBidding = i.next();
+    qInfo() << "Processing bidding:";
+
+    const int biddingRound = localBidding.biddingRound;
+
+    if (biddingRound == 0 || biddingRound > 3) {
+      qWarning() << "Bidding round exceeds valid bounds. Ignoring...";
+      continue;
+    }
+    const QString uuid          = localBidding.userId;
+    const QModelIndex itemIndex = getIndexByRoleValue(localBidding.userId, OnlineIdRole);
+    if (itemIndex.isValid()) {
+      qInfo() << "Found Uuid for user:" << itemIndex.data(MailRole);
+      const QMap<int, QVariant> values = getItemValues(localBidding);
+      setItemData(itemIndex, values);
+    }
+  }
+}
 
 bool TableModel::removeRows(int firstRow, int nRows, const QModelIndex& parentIndex) {
   if (parentIndex != QModelIndex()) {
@@ -290,6 +340,30 @@ void TableModel::insertItems(int startPosition,
   m_undoStack->push(insertCommand);
 }
 
+qreal TableModel::nTotalExpectedShares() const {
+  qreal result = 0;
+  for (auto i = m_items.begin(), end = m_items.end(); i != end; ++i) {
+    /// if BiddingTypeRole is not empty
+    const QString biddingType = (*i)->data(BiddingTypeRole).toString();
+    const qreal shareAmount   = (*i)->data(ShareAmountRole).toReal();
+    if (biddingType.isEmpty() || shareAmount == 0.0) {
+      continue;
+    }
+    /// add amount
+    const QString shareType = (*i)->data(ShareTypeRole).toString();
+    if (shareType == "bezahlt") {
+      result += shareAmount;
+    } else if (shareType == "teils/teils") {
+      result += shareAmount / 2;
+    } else {
+      qInfo() << "Share type not 'bezahlt' nor 'teils/teils'. Will be ignored..";
+      qDebug() << "Share type:" << shareType;
+    }
+  }
+  qInfo() << "Biddings expected for " << result << "shares!";
+  return result;
+}
+
 int TableModel::nExpectedBiddings() const {
   int result = 0;
   for (auto i = m_items.begin(), end = m_items.end(); i != end; ++i) {
@@ -330,6 +404,7 @@ qreal TableModel::biddingAverage2() const {
   qInfo() << "average calculation (2):" << averageBidding;
   return averageBidding;
 }
+
 qreal TableModel::biddingAverage3() const {
   const UserRoles biddingRole = Bidding3Role;
   const qreal averageBidding  = averageBiddingAmount(biddingRole);
@@ -346,6 +421,7 @@ void TableModel::onRowCountChanged(const QModelIndex& parent, int first, int las
   }
   emit rowCountChanged();
   emit nExpectedBiddingsChanged();
+  emit nTotalExpectedSharesChanged();
 
   emit nPlacedBiddingsChanged(1);
   emit nPlacedBiddingsChanged(2);
@@ -386,9 +462,9 @@ void TableModel::execEditItemData(const int row, const QMap<int, QVariant>& chan
   bool isDataChanged         = item->setItemData(changedValues);
 
   if (isDataChanged) {
-    /// FIXME due to the mapping from roles to the DisplayRole of different columns the complete row
+    /// FIXME due to the mapping from roles to the DisplayRole of different columns the complete
-    /// is getting notified about (potential) data changes; dataChanged should be called only for
+    /// row is getting notified about (potential) data changes; dataChanged should be called only
-    /// the affected columns
+    /// for the affected columns
     const QModelIndex firstIndex = this->index(row, 0);
     const QModelIndex lastIndex  = this->index(row, USER_FACING_ROLES.size() - 1);
     QList<int> roles             = changedValues.keys();
@@ -398,6 +474,7 @@ void TableModel::execEditItemData(const int row, const QMap<int, QVariant>& chan
     if (roles.contains(BiddingTypeRole) || roles.contains(ShareAmountRole) ||
         roles.contains(ShareTypeRole)) {
       emit nExpectedBiddingsChanged();
+      emit nTotalExpectedSharesChanged();
     }
     if (roles.contains(ShareAmountRole) || roles.contains(ShareTypeRole)) {
       emit nPlacedBiddingsChanged(1);
@@ -526,6 +603,15 @@ bool TableModel::isItemEqualToItemValues(const QModelIndex& itemIndex,
 int TableModel::nPlacedBiddings(const UserRoles biddingRole) const {
   int result = 0;
   for (auto i = m_items.begin(), end = m_items.end(); i != end; ++i) {
+    const QString biddingType = (*i)->data(BiddingTypeRole).toString();
+    const qreal shareAmount   = (*i)->data(ShareAmountRole).toReal();
+    const QString shareType   = (*i)->data(ShareTypeRole).toString();
+    if (biddingType.isEmpty() || shareAmount == 0.0) {
+      continue;
+    }
+    if (shareType == "erarbeitet" || shareType == "") {
+      continue;
+    }
     int localBidding = (*i)->data(biddingRole).toInt();
     if (localBidding > 0) {
       result++;
@@ -537,6 +623,15 @@ int TableModel::nPlacedBiddings(const UserRoles biddingRole) const {
 int TableModel::biddingSum(const UserRoles biddingRole) const {
   int result = 0;
   for (auto i = m_items.begin(), end = m_items.end(); i != end; ++i) {
+    const QString biddingType = (*i)->data(BiddingTypeRole).toString();
+    const qreal shareAmount   = (*i)->data(ShareAmountRole).toReal();
+    const QString shareType   = (*i)->data(ShareTypeRole).toString();
+    if (biddingType.isEmpty() || shareAmount == 0.0) {
+      continue;
+    }
+    if (shareType == "erarbeitet" || shareType == "") {
+      continue;
+    }
     result += (*i)->data(biddingRole).toInt();
   }
   return result;
@@ -561,10 +656,14 @@ qreal TableModel::averageBiddingAmount(const UserRoles biddingRole) const {
 qreal TableModel::totalSharesWithBiddings(const UserRoles biddingRole) const {
   qreal result = 0;
   for (auto i = m_items.begin(), end = m_items.end(); i != end; ++i) {
-    const qreal bidding     = (*i)->data(biddingRole).toReal();
+    const QString biddingType = (*i)->data(BiddingTypeRole).toString();
-    const qreal shareAmount = (*i)->data(ShareAmountRole).toReal();
+    const qreal shareAmount   = (*i)->data(ShareAmountRole).toReal();
+    if (biddingType.isEmpty() || shareAmount == 0.0) {
+      continue;
+    }
+    const int bidding       = (*i)->data(biddingRole).toInt();
     const QString shareType = (*i)->data(ShareTypeRole).toString();
-    const bool isValid      = bidding != 0 && shareAmount != 0;
+    const bool isValid      = bidding != 0 && shareAmount != 0.0;
     if (isValid) {
       // qInfo() << "Including entry in bidding average calculation. MailRole:"
       //         << (*i)->data(MailRole);
@@ -603,9 +702,38 @@ QModelIndex TableModel::getIndexByRoleValue(const QString& valueString, const in
     }
   }
   if (itemRow < 0 || itemRow >= m_items.length()) {
-    qWarning() << "Couldn't find item with mail address:" << valueString << "- Returning...";
+    qWarning() << "Couldn't find item with:" << valueString << " matching role" << role
+               << "- Returning...";
     return QModelIndex();
   }
   const QModelIndex itemIndex = index(itemRow, 0);
   return itemIndex;
 }
+
+QMap<int, QVariant> TableModel::getItemValues(const bidding bid) {
+  const int biddingRound     = bid.biddingRound;
+  const int amount           = bid.amount;
+  const QString depotWishOne = bid.depotWishOne;
+  const QString depotWishTwo = bid.depotWishTwo;
+
+  UserRoles biddingRole;
+  switch (biddingRound) {
+    case 1:
+      biddingRole = Bidding1Role;
+      break;
+    case 2:
+      biddingRole = Bidding2Role;
+      break;
+    case 3:
+      biddingRole = Bidding3Role;
+      break;
+    default:
+      break;
+  }
+
+  if (biddingRound == 1) {
+    return {{biddingRole, amount}, {DepotWish1Role, depotWishOne}, {DepotWish2Role, depotWishTwo}};
+  } else {
+    return {{biddingRole, amount}};
+  }
+}

libs/BeetRoundCore/model/tablemodel.h

@@ -4,6 +4,7 @@
 #include <QAbstractTableModel>
 #include "metadata.h"
 
+class bidding;
 class QUndoStack;
 class ModelItem;
 
@@ -45,6 +46,10 @@ class TableModel : public QAbstractTableModel {
   bool updateItem(const ModelItemValues& itemValues);
 
   void setOnlineCredentials(const QString& mail, const QString& uuid, const QString& token);
+  QJsonDocument getMailInviteJsonDoc(const QString& mail, const QString& serverUrl) const;
+
+  void updateBiddings(const QList<bidding> biddings);
+
  public slots:
   // bool insertRows(int position, int rows, const QModelIndex& parentIndex = QModelIndex())
   // override;
@@ -58,6 +63,7 @@ class TableModel : public QAbstractTableModel {
                    const QModelIndex& parentIndex = QModelIndex());
 
   /// property functions
+  qreal nTotalExpectedShares() const;
   int nExpectedBiddings() const;
   int nPlacedBiddings1() const;
   int nPlacedBiddings2() const;
@@ -75,6 +81,7 @@ class TableModel : public QAbstractTableModel {
   void rowCountChanged();
 
   void nExpectedBiddingsChanged();
+  void nTotalExpectedSharesChanged();
   void nPlacedBiddingsChanged(const int roundNumber);
   void biddingSumChanged(const int roundNumber);
   void biddingAverageChanged(const int roundNumber);
@@ -108,6 +115,7 @@ class TableModel : public QAbstractTableModel {
   qreal totalSharesWithBiddings(const UserRoles biddingRole) const;
 
   QModelIndex getIndexByRoleValue(const QString& valueString, const int role) const;
+  QMap<int, QVariant> getItemValues(const bidding bid);
 };
 
 #endif  // TABLEMODEL_H

libs/BeetRoundCore/network/apiroutes.h

@@ -5,11 +5,16 @@
 
 // TODO add namespace
 
+static const QString ROUTE_USER_LOG_IN = "/log_in";
+
 static const QString apiPrefix = "/api/";
 
 static const QString ROUTE_ITEMS = apiPrefix + "items";
 
+static const QString ROUTE_ADMIN_LOG_IN = apiPrefix + "log_in";
+
 static const QString ROUTE_REGISTER_USER = apiPrefix + "users";
+static const QString ROUTE_MAIL_INVITE   = apiPrefix + "invite";
 
 static const QString ROUTE_BIDDINGROUNDS        = apiPrefix + "bidding_rounds";
 static const QString ROUTE_CURRENT_BIDDINGROUND = ROUTE_BIDDINGROUNDS + "/get_current";

libs/BeetRoundCore/network/servercommunicator.cpp

@@ -5,10 +5,13 @@
 #include <QRestAccessManager>
 #include <QRestReply>
 
+#include "../formats/jsonparser.h"
 #include "../genericcore.h"
 #include "../structs.h"
 #include "apiroutes.h"
 
+#include "../data/settingshandler.h"
+
 using namespace Qt::StringLiterals;
 
 ServerCommunicator::ServerCommunicator(GenericCore* core)
@@ -18,6 +21,9 @@ ServerCommunicator::ServerCommunicator(GenericCore* core)
   m_restManager = std::make_shared<QRestAccessManager>(&m_netManager);
   m_serviceApi  = std::make_shared<QNetworkRequestFactory>();
 
+  connect(core, &GenericCore::loginAndStoreAuthToken, this, &ServerCommunicator::onLoginTriggered);
+  connect(this, &ServerCommunicator::loginSuccessful, core, &GenericCore::onLoginSuccessful);
+
   connect(m_core, &GenericCore::sendGetRequest, this,
           &ServerCommunicator::onSendGetRequestTriggered);
   connect(m_core, &GenericCore::sendPostRequest, this,
@@ -50,11 +56,22 @@ void ServerCommunicator::setUrl(const QUrl& url) {
 
 void ServerCommunicator::setServerConfiguration(const QString url,
                                                 const QString email,
-                                                const QString password) {
+                                                const QString password,
+                                                const QString authToken) {
   setUrl(url);
 
-  m_email    = email;
+  m_email     = email;
-  m_password = password;
+  m_password  = password;
+  m_authToken = authToken;
+
+  if (!m_authToken.isEmpty()) {
+    m_serviceApi->setBearerToken(authToken.toLatin1());
+  }
+}
+
+QString ServerCommunicator::getUserLoginUrl() const {
+  const QString logInUrl = m_serviceApi->baseUrl().toString() + ROUTE_USER_LOG_IN;
+  return logInUrl;
 }
 
 void ServerCommunicator::onSendGetRequestTriggered(const GetRequestTypes type,
@@ -90,6 +107,7 @@ void ServerCommunicator::onSendGetRequestTriggered(const GetRequestTypes type,
     return;
   }
 
+  m_serviceApi->setBearerToken(m_authToken.toLatin1());
   const QNetworkRequest request = m_serviceApi->createRequest(path);
 
   m_restManager->get(request, this, [this, type](QRestReply& reply) {
@@ -139,9 +157,15 @@ void ServerCommunicator::onSendPostRequestTriggered(const PostRequestTypes type,
                                                     const QByteArray data) {
   QString path;
   switch (type) {
+    case LogInAdmin:
+      path = ROUTE_ADMIN_LOG_IN;
+      break;
     case RegisterUser:
       path = ROUTE_REGISTER_USER;
       break;
+    case MailInvite:
+      path = ROUTE_MAIL_INVITE;
+      break;
     default:
       qWarning() << "No route found for PostRequestType:" << type;
       break;
@@ -153,6 +177,7 @@ void ServerCommunicator::onSendPostRequestTriggered(const PostRequestTypes type,
     return;
   }
 
+  m_serviceApi->setBearerToken(m_authToken.toLatin1());
   const QNetworkRequest request = m_serviceApi->createRequest(path);
 
   m_restManager->post(request, data, this, [this, type](QRestReply& reply) {
@@ -169,7 +194,7 @@ void ServerCommunicator::onSendPostRequestTriggered(const PostRequestTypes type,
       } else {
         int statusCode = reply.httpStatus();
         qWarning() << "Request not successful:" << statusCode;
-        qCritical() << "Content:" << reply.readJson();
+        qInfo() << "Content:" << reply.readJson();
         onPostReplyFailure(type, QString("HTTP status code: %1").arg(statusCode));
       }
     }
@@ -179,10 +204,18 @@ void ServerCommunicator::onSendPostRequestTriggered(const PostRequestTypes type,
 void ServerCommunicator::onPostReplySuccessful(const PostRequestTypes type,
                                                const QJsonDocument doc) {
   switch (type) {
+    case LogInAdmin:
+      qInfo() << "Admin successfully logged in:" << type;
+      handleLogInReply(doc);
+      break;
     case RegisterUser:
       qInfo() << "Register user successful:" << type;
       onlineUserAccountReply(doc);
       break;
+    case MailInvite:
+      qInfo() << "Mail invite successful sent:" << type;
+      mailInviteSentReply(doc);
+      break;
     default:
       qWarning() << "Can't match request type:" << type;
       break;
@@ -193,11 +226,42 @@ void ServerCommunicator::onPostReplyFailure(const PostRequestTypes type,
                                             const QString errorString) {
   const QString message =
       QString("Request of type %1 returned: %2").arg(QString::number(type), errorString);
-  m_core->displayStatusMessage(message);
+  // NEXT improve error message to the UI;
+  emit m_core->displayStatusMessage(message);
+}
+
+QByteArray ServerCommunicator::createLoginBody() {
+  QHash<QString, QVariant> values;
+  values.insert("email", m_email);
+  values.insert("password", m_password);
+  return JsonParser::toJsonDoc(values, "admin");
+}
+
+void ServerCommunicator::handleLogInReply(const QJsonDocument jsonDoc) {
+  QJsonObject rootObject = jsonDoc.object();
+  bool hasErrors         = rootObject.contains(QString("errors"));
+  if (hasErrors) {
+    qCritical() << "Reply has error(s)!";
+    QString errorString = rootObject["errors"].toString();
+    emit m_core->displayStatusMessage(errorString);
+  } else {
+    qInfo() << "Reply has no error(s)!";
+    const QJsonObject dataObject = rootObject["data"].toObject();
+    const QString authToken      = dataObject["token"].toString();
+    m_authToken                  = authToken;
+
+    SettingsHandler::saveSettings({{"token", authToken}}, "Server");
+
+    emit loginSuccessful();
+    emit m_core->displayStatusMessage("Successfully logged in.");
+  }
 }
 
 void ServerCommunicator::currentBiddingRoundChangedReply(const QJsonDocument jsonDoc) {
   qInfo() << "Current bidding round received.";
+  // REFACTOR implement & use "JsonParser::parseServerResponse(const QJsonDocument& jsonDoc,
+  //          QHash<QString, int> entries)" (generalized version of
+  //          "serverUserCredentialsToItemValues")
   const QJsonObject rootObject = jsonDoc["data"].toObject();
   const int roundNumber        = rootObject["round_number"].toInt();
   const bool stopped           = rootObject["stopped"].toBool();
@@ -209,26 +273,49 @@ void ServerCommunicator::currentBiddingRoundChangedReply(const QJsonDocument jso
 }
 
 void ServerCommunicator::currentBiddingsReply(const QJsonDocument jsonDoc) {
-  qCritical() << "currentBiddingsReply:" << jsonDoc;
+  qInfo() << "currentBiddingsReply:" << jsonDoc;
 
-  // NEXT extract biddings from jsonDoc
+  const QList<bidding> biddings = JsonParser::extractBiddings(jsonDoc);
-  const int roundNumber = 0;
+
-  const bidding dummyBidding{.userId       = QUuid(),
+  emit biddingsChanged(biddings);
-                             .biddingRound = 0,
-                             .amount       = 123,
-                             .depotWishOne = "one",
-                             .depotWishTwo = "two"};
-  const QList<bidding> biddings{dummyBidding};
-  emit biddingsChanged(roundNumber, biddings);
 }
 
 void ServerCommunicator::onlineUserAccountReply(const QJsonDocument jsonDoc) {
   qInfo() << "Online user account received.";
-  // TODO move data extraction of jsonDoc into JsonParser
+  ModelItemValues values = JsonParser::serverUserCredentialsToItemValues(jsonDoc);
-  const QJsonObject rootObject = jsonDoc["data"].toObject();
-  const QString emailAddress   = rootObject["email"].toString();
-  const QString uuid           = rootObject["id"].toString();
-  const QString token          = rootObject["token"].toString();
 
-  emit onlineUserAccountReceived(emailAddress, uuid, token);
+  emit onlineUserAccountReceived(values[MailRole].toString(), values[OnlineIdRole].toString(),
+                                 values[AccessCodeRole].toString());
+}
+
+void ServerCommunicator::mailInviteSentReply(const QJsonDocument jsonDoc) {
+  qInfo() << "Invitation mail successfully sent.";
+  emit m_core->displayStatusMessage("Invitation mail successfully sent.");
+}
+
+void ServerCommunicator::onLoginTriggered() {
+  qInfo() << "Login triggered...";
+  if (m_email.isEmpty() || m_password.isEmpty()) {
+    emit m_core->displayStatusMessage(
+        "Missing email or password in settings! Not trying to log in.");
+    return;
+  }
+  if (m_authToken.isEmpty()) {
+    /// get new authToken
+    qInfo() << "Creating a new authToken!";
+    const QByteArray loginBody = createLoginBody();
+    onSendPostRequestTriggered(LogInAdmin, loginBody);
+
+  } else {
+    /// try authToken
+    qWarning() << "Validity check of token not implemented yet!!!";
+    qInfo() << "Assuming validity of token...";
+
+    emit loginSuccessful();
+    // TODO try validity of token and trigger log_in if not valid
+    // try default route to test access;
+    // if (access denied) {
+    //   m_apiClient->sendAPIRequestPost(ROUTE_LOG_IN_ADMIN, );
+    // }
+  }
 }

libs/BeetRoundCore/network/servercommunicator.h

@@ -22,9 +22,15 @@ class ServerCommunicator : public QObject {
   QUrl url() const;
   void setUrl(const QUrl& url);
 
-  void setServerConfiguration(const QString url, const QString email, const QString password);
+  void setServerConfiguration(const QString url,
+                              const QString email,
+                              const QString password,
+                              const QString authToken);
+  QString getUserLoginUrl() const;
 
  public slots:
+  void onLoginTriggered();
+
   void onSendGetRequestTriggered(const GetRequestTypes type, QVariant data);
   void onGetReplySuccessful(const GetRequestTypes type, const QJsonDocument doc);
   void onGetReplyFailure(const GetRequestTypes type, const QString errorString);
@@ -43,8 +49,10 @@ class ServerCommunicator : public QObject {
   void deleteRequestSuccessful(const QByteArray responseData);
   void deleteRequestFailure(const QString errorString);
 
+  void loginSuccessful();
+
   void currentBiddingRoundChanged(int round, bool isRunning);
-  void biddingsChanged(int round, QList<bidding> biddings);
+  void biddingsChanged(QList<bidding> biddings);
   void onlineUserAccountReceived(const QString mailAddress,
                                  const QString uuid,
                                  const QString accessToken);
@@ -58,12 +66,17 @@ class ServerCommunicator : public QObject {
 
   QString m_email;
   QString m_password;
-  // QString m_authToken;
+  QString m_authToken;
+
+  QByteArray createLoginBody();
 
   /// reply parser
+  void handleLogInReply(const QJsonDocument jsonDoc);
+
   void currentBiddingRoundChangedReply(const QJsonDocument jsonDoc);
   void currentBiddingsReply(const QJsonDocument jsonDoc);
   void onlineUserAccountReply(const QJsonDocument jsonDoc);
+  void mailInviteSentReply(const QJsonDocument jsonDoc);
 };
 
 #endif  // SERVERCOMMUNICATOR_H

libs/BeetRoundCore/structs.h

@@ -4,7 +4,7 @@
 #include <QUuid>
 
 struct bidding {
-  QUuid userId;
+  QString userId;
   int biddingRound;
   int amount;
   QString depotWishOne;

tests/GenericCoreTests/CMakeLists.txt

@@ -17,7 +17,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core LinguistTools)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core LinguistTools)
 
-add_executable(${TARGET_APP} core_test.cpp)
+add_executable(${TARGET_APP} core_test.cpp
+  model_test.cpp)
 
 target_include_directories(${TARGET_APP} PRIVATE ${CORE_LIB_DIR}/include)
 

tests/GenericCoreTests/core_test.cpp

@@ -9,7 +9,7 @@ inline void PrintTo(const QString& qString, ::std::ostream* os) { *os << qUtf8Pr
 QT_END_NAMESPACE
 
 TEST(CoreTests, TestEqualString) {
-  const QString coreName("GenericCore");
+  const QString coreName("BeetRoundCore");
   const QString coreVersion("0.1.0");
   const auto expected = QString("%1 (Version %2)").arg(coreName).arg(coreVersion);
   auto core           = std::make_unique<GenericCore>();

tests/GenericCoreTests/model_test.cpp

@@ -0,0 +1,131 @@
+#include <gtest/gtest.h>
+
+#include <QString>
+
+#include <QtGui/QUndoCommand>
+
+#include "../../libs/BeetRoundCore/model/tablemodel.h"
+
+QT_BEGIN_NAMESPACE
+inline void PrintTo(const QString& qString, ::std::ostream* os) { *os << qUtf8Printable(qString); }
+QT_END_NAMESPACE
+
+struct ModelTest : testing::Test {
+  std::shared_ptr<TableModel> model;
+
+  ModelTest() { model = make_shared<TableModel>(new QUndoStack()); }
+
+  virtual ~ModelTest() {}
+};
+
+struct ModelTestWithData : ModelTest {
+  ModelTestWithData() {
+    QList<ModelItemValues> itemList;
+
+    ModelItemValues itemValues1 = {{Bidding1Role, 100},
+                                   {ShareTypeRole, "bezahlt"},
+                                   {ShareAmountRole, 1},
+                                   {BiddingTypeRole, "digital"}};
+    itemList.append(itemValues1);
+
+    ModelItemValues itemValues2 = {{Bidding1Role, 100},
+                                   {ShareTypeRole, "bezahlt"},
+                                   {ShareAmountRole, 1},
+                                   {BiddingTypeRole, ""}};
+    itemList.append(itemValues2);
+
+    ModelItemValues itemValues3 = {{Bidding1Role, 50},
+                                   {ShareTypeRole, "teils/teils"},
+                                   {ShareAmountRole, 1},
+                                   {BiddingTypeRole, "paper"}};
+    itemList.append(itemValues3);
+
+    ModelItemValues itemValues4 = {{Bidding1Role, 50},
+                                   {ShareTypeRole, "bezahlt"},
+                                   {ShareAmountRole, 0.5},
+                                   {BiddingTypeRole, "paper"}};
+    itemList.append(itemValues4);
+
+    ModelItemValues itemValues5 = {{Bidding1Role, 100},
+                                   {ShareTypeRole, "erarbeitet"},
+                                   {ShareAmountRole, 1},
+                                   {BiddingTypeRole, "paper"}};
+    itemList.append(itemValues5);
+
+    ModelItemValues itemValues6 = {{Bidding1Role, 0},
+                                   {ShareTypeRole, "bezahlt"},
+                                   {ShareAmountRole, 1},
+                                   {BiddingTypeRole, "online"}};
+    itemList.append(itemValues6);
+
+    model->insertItems(0, itemList);
+  }
+};
+
+/// empty model
+
+TEST_F(ModelTest, TestRowCountEmpty) {
+  const int expectedRowCount = 0;
+
+  const auto actualRowCount = model->rowCount();
+
+  ASSERT_EQ(expectedRowCount, actualRowCount);
+}
+
+TEST_F(ModelTest, TestBidding1Average) {
+  const int expected               = 0;
+  const auto actualBidding1Average = model->biddingAverage1();
+
+  ASSERT_EQ(expected, actualBidding1Average);
+}
+
+TEST_F(ModelTest, ExpectedPlacedBiddings) {
+  const int expected                = 0;
+  const auto expectedPlacedBiddings = model->nExpectedBiddings();
+
+  ASSERT_EQ(expected, expectedPlacedBiddings);
+}
+
+TEST_F(ModelTest, ExpectedTotalShareAmount) {
+  const int expected              = 0;
+  const auto nTotalExpectedShares = model->nTotalExpectedShares();
+
+  ASSERT_EQ(expected, nTotalExpectedShares);
+}
+
+/// model with data
+
+TEST_F(ModelTestWithData, TestRowCount) {
+  const int expected = 6;
+
+  const auto actual = model->rowCount();
+  ASSERT_EQ(expected, actual);
+}
+
+TEST_F(ModelTestWithData, TestBidding1Average) {
+  const qreal expected = 100;
+  const auto actual    = model->biddingAverage1();
+
+  ASSERT_EQ(expected, actual);
+}
+
+TEST_F(ModelTestWithData, ExpectedPlacedBiddings) {
+  const int expected = 4;
+  const auto actual  = model->nExpectedBiddings();
+
+  ASSERT_EQ(expected, actual);
+}
+
+TEST_F(ModelTestWithData, PlacedBiddings1) {
+  const int expected = 3;
+  const auto actual  = model->nPlacedBiddings1();
+
+  ASSERT_EQ(expected, actual);
+}
+
+TEST_F(ModelTestWithData, NTotalExpectedShares) {
+  const qreal expected = 3;
+  const auto actual    = model->nTotalExpectedShares();
+
+  ASSERT_EQ(expected, actual);
+}