Online account can now be created from the EditItemDialog. The response isn't processed properly yet.

This commit is contained in:
2026-02-18 11:24:40 +01:00
parent 7a8859843e
commit faf01d6e15
12 changed files with 163 additions and 64 deletions

View File

@ -26,6 +26,10 @@ void EditItemDialog::createContent() {
innerLayout->addWidget(m_detailMapper); innerLayout->addWidget(m_detailMapper);
m_outerLayout->insertWidget(0, m_contentContainer); m_outerLayout->insertWidget(0, m_contentContainer);
/// online user stuff
connect(m_detailMapper, &ItemDetailMapper::createOnlineAccountTriggered, this,
&EditItemDialog::createOnlineAccountTriggered);
} }
void EditItemDialog::accept() { void EditItemDialog::accept() {

View File

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

View File

@ -16,7 +16,6 @@
#include "genericcore.h" #include "genericcore.h"
#include "model/generalsortfiltermodel.h" #include "model/generalsortfiltermodel.h"
#include "model/metadata.h" #include "model/metadata.h"
#include "model/modelsummary.h"
#include "model/tablemodel.h" #include "model/tablemodel.h"
#include "widgets/biddingroundcontrol.h" #include "widgets/biddingroundcontrol.h"
#include "widgets/comboboxdelegate.h" #include "widgets/comboboxdelegate.h"
@ -75,6 +74,10 @@ MainWindow::MainWindow(QWidget* parent)
onCurrentChanged(QModelIndex(), QModelIndex()); onCurrentChanged(QModelIndex(), QModelIndex());
setupEventTab(); setupEventTab();
// #ifndef QT_DEBUG
initServerConnection();
// #endif
} }
MainWindow::~MainWindow() { delete ui; } MainWindow::~MainWindow() { delete ui; }
@ -563,3 +566,8 @@ void MainWindow::setupEventTab() {
ui->tabWidget->insertTab(0, containerWidget, "Event (&1)"); ui->tabWidget->insertTab(0, containerWidget, "Event (&1)");
} }
void MainWindow::initServerConnection() {
connect(m_editItemDialog.get(), &EditItemDialog::createOnlineAccountTriggered, m_core.get(),
&GenericCore::onCreateOnlineAccountTriggered);
}

View File

@ -120,5 +120,7 @@ class MainWindow : public QMainWindow {
void createGuiDialogs(); void createGuiDialogs();
void setupEventTab(); void setupEventTab();
void initServerConnection();
}; };
#endif // MAINWINDOW_H #endif // MAINWINDOW_H

View File

@ -156,6 +156,15 @@ ItemDetailMapper::ItemDetailMapper(QWidget* parent)
outerLayout->addLayout(leftLayout); outerLayout->addLayout(leftLayout);
outerLayout->addLayout(rightLayout); outerLayout->addLayout(rightLayout);
setLayout(outerLayout); setLayout(outerLayout);
/// online user account
connect(m_mailEdit, &QLineEdit::textChanged, this, &ItemDetailMapper::onMailEditChanged);
connect(m_onlineIdDisplay, &QLineEdit::textChanged, this, &ItemDetailMapper::onOnlineIDChanged);
connect(m_accessCodeDisplay, &QLineEdit::textChanged, this,
&ItemDetailMapper::onAccessCodeChanged);
connect(m_createOnlineAccountButton, &QAbstractButton::clicked, this,
&ItemDetailMapper::onCreateOnlineAccountTriggered);
} }
void ItemDetailMapper::setModelMappings(QTableView* tableView) { void ItemDetailMapper::setModelMappings(QTableView* tableView) {
@ -265,3 +274,40 @@ void ItemDetailMapper::updateQRCode(const QString text) {
m_qrCodeDisplay->setPixmap(QPixmap::fromImage(image)); m_qrCodeDisplay->setPixmap(QPixmap::fromImage(image));
m_qrCodeDisplay->setToolTip(text); m_qrCodeDisplay->setToolTip(text);
} }
void ItemDetailMapper::onMailEditChanged(const QString& text) {
if (text.isEmpty()) {
m_createOnlineAccountButton->setEnabled(false);
m_sendInviteMailButton->setEnabled(false);
} else {
onOnlineIDChanged(m_onlineIdDisplay->text());
onAccessCodeChanged(m_accessCodeDisplay->text());
}
}
void ItemDetailMapper::onOnlineIDChanged(const QString& text) {
if (text.isEmpty()) {
m_createOnlineAccountButton->setEnabled(true);
m_sendInviteMailButton->setEnabled(false);
} else {
m_createOnlineAccountButton->setEnabled(false);
m_sendInviteMailButton->setEnabled(true);
}
}
void ItemDetailMapper::onAccessCodeChanged(const QString& text) {
if (text.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;
m_accessUrlDisplay->setText(accessUrl);
updateQRCode(accessUrl);
}
}
void ItemDetailMapper::onCreateOnlineAccountTriggered() {
emit createOnlineAccountTriggered(m_mailEdit->text());
}

View File

@ -30,6 +30,8 @@ class ItemDetailMapper : public QWidget {
signals: signals:
void contentChanged(const QString text); void contentChanged(const QString text);
void createOnlineAccountTriggered(const QString& mailAddress);
private slots: private slots:
void rowsInserted(const QModelIndex& parent, int start, int end); void rowsInserted(const QModelIndex& parent, int start, int end);
void rowsRemoved(const QModelIndex& parent, int start, int end); void rowsRemoved(const QModelIndex& parent, int start, int end);
@ -38,7 +40,12 @@ class ItemDetailMapper : public QWidget {
void updateButtons(int row); void updateButtons(int row);
void emitContentChanged(const QModelIndex& currentIndex); void emitContentChanged(const QModelIndex& currentIndex);
void onCurrentIndexChanged(const QModelIndex& current, const QModelIndex& previous); void onCurrentIndexChanged(const QModelIndex& current, const QModelIndex& previous);
void updateQRCode(const QString text = ""); void updateQRCode(const QString text = "");
void onMailEditChanged(const QString& text);
void onOnlineIDChanged(const QString& text);
void onAccessCodeChanged(const QString& text);
void onCreateOnlineAccountTriggered();
private: private:
/// *** members *** /// *** members ***

View File

@ -160,6 +160,17 @@ void GenericCore::onBiddingsChanged(int round, QList<bidding> biddings) {
// NEXT merge biddings into model // NEXT merge biddings into model
} }
void GenericCore::onCreateOnlineAccountTriggered(const QString& mailAddress) {
qInfo() << "Creating online account for:" << mailAddress;
// QJsonDocument onlineCredentialsDoc = m_mainModel->getOnlineCredentialsAsJsonDoc(mailAddress);
// emit createOnlineUser(onlineCredentialsDoc.toJson());
emit sendPostRequest(RegisterUser, mailAddress);
}
// void GenericCore::onOnlineUserCreatedReceived(const QJsonDocument& jsonDoc) {}
// void GenericCore::onOnlineUserExistedReceived(const QJsonDocument jsonDoc) {}
void GenericCore::setupModels() { void GenericCore::setupModels() {
m_mainModel = make_shared<TableModel>(m_modelUndoStack); m_mainModel = make_shared<TableModel>(m_modelUndoStack);
m_sortFilterModel = make_shared<GeneralSortFilterModel>(m_mainModel); m_sortFilterModel = make_shared<GeneralSortFilterModel>(m_mainModel);

View File

@ -49,12 +49,17 @@ class GenericCore : public QObject {
public slots: public slots:
void onBiddingsChanged(int round, QList<bidding> biddings); void onBiddingsChanged(int round, QList<bidding> biddings);
void onCreateOnlineAccountTriggered(const QString& mailAddress);
// void onOnlineUserCreatedReceived(const QJsonDocument& jsonDoc);
// void onOnlineUserExistedReceived(const QJsonDocument jsonDoc);
signals: signals:
void displayStatusMessage(QString message); void displayStatusMessage(QString message);
/// *** server communication *** /// *** server communication ***
/// request signals /// request signals
void sendGetRequest(GetRequestTypes type, QVariant data = QVariant()); void sendGetRequest(GetRequestTypes type, QVariant data = QVariant());
void sendPostRequest(PostRequestTypes type, QVariant data = QVariant());
/// response signals /// response signals
void currentBiddingRoundChanged(int round, bool isRunning); void currentBiddingRoundChanged(int round, bool isRunning);

View File

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

View File

@ -9,6 +9,8 @@ static const QString apiPrefix = "/api/";
static const QString ROUTE_ITEMS = apiPrefix + "items"; static const QString ROUTE_ITEMS = apiPrefix + "items";
static const QString ROUTE_REGISTER_USER = apiPrefix + "users";
static const QString ROUTE_BIDDINGROUNDS = apiPrefix + "bidding_rounds"; static const QString ROUTE_BIDDINGROUNDS = apiPrefix + "bidding_rounds";
static const QString ROUTE_CURRENT_BIDDINGROUND = ROUTE_BIDDINGROUNDS + "/get_current"; static const QString ROUTE_CURRENT_BIDDINGROUND = ROUTE_BIDDINGROUNDS + "/get_current";
static const QString ROUTE_START_BIDDINGROUND = ROUTE_BIDDINGROUNDS + "/start_new"; static const QString ROUTE_START_BIDDINGROUND = ROUTE_BIDDINGROUNDS + "/start_new";

View File

@ -20,6 +20,8 @@ ServerCommunicator::ServerCommunicator(GenericCore* core)
connect(m_core, &GenericCore::sendGetRequest, this, connect(m_core, &GenericCore::sendGetRequest, this,
&ServerCommunicator::onSendGetRequestTriggered); &ServerCommunicator::onSendGetRequestTriggered);
connect(m_core, &GenericCore::sendPostRequest, this,
&ServerCommunicator::onSendPostRequestTriggered);
connect(this, &ServerCommunicator::biddingsChanged, m_core, &GenericCore::onBiddingsChanged); connect(this, &ServerCommunicator::biddingsChanged, m_core, &GenericCore::onBiddingsChanged);
} }
@ -44,66 +46,6 @@ void ServerCommunicator::setUrl(const QUrl& url) {
emit urlChanged(); emit urlChanged();
} }
void ServerCommunicator::fetchItems() {
/// Set up a GET request
m_restManager->get(m_serviceApi->createRequest(ROUTE_ITEMS), this, [this](QRestReply& reply) {
if (reply.isSuccess()) {
qInfo() << "Fetching items successful.";
const QJsonDocument doc = reply.readJson().value();
emit itemsFetched(doc.toJson());
} else {
if (reply.hasError()) {
const QString errorString = reply.errorString();
qCritical() << "ERROR:" << errorString;
emit itemsFetchFailure(errorString);
} else {
int statusCode = reply.httpStatus();
qCritical() << "ERROR:" << statusCode;
emit itemsFetchFailure(QString::number(statusCode));
emit itemsFetchFailure(QString("HTTP status code: %1").arg(statusCode));
}
}
});
}
void ServerCommunicator::postItems(const QByteArray& jsonData) {
QNetworkReply* reply = m_restManager->post(m_serviceApi->createRequest(ROUTE_ITEMS), jsonData);
QObject::connect(reply, &QNetworkReply::finished, [=]() {
if (reply->error() == QNetworkReply::NoError) {
QByteArray responseData = reply->readAll();
const QString message = QString("POST successful! Response: %1").arg(responseData);
qInfo() << message;
emit postRequestSuccessful(responseData);
} else {
const QString message = QString("Error: %1").arg(reply->errorString());
qDebug() << message;
emit postRequestFailure(message);
}
reply->deleteLater();
});
}
void ServerCommunicator::deleteItem(const QString& id) {
const QString deleteRoute = QString("%1/%2").arg(ROUTE_ITEMS, id);
QNetworkReply* reply = m_restManager->deleteResource(m_serviceApi->createRequest(deleteRoute));
QObject::connect(reply, &QNetworkReply::finished, [=]() {
if (reply->error() == QNetworkReply::NoError) {
QByteArray responseData = reply->readAll();
const QString message = QString("DELETE successful! Response: %1").arg(responseData);
qInfo() << message;
emit deleteRequestSuccessful(responseData);
} else {
const QString message = QString("Error: %1").arg(reply->errorString());
qDebug() << message;
emit deleteRequestFailure(message);
}
reply->deleteLater();
});
}
void ServerCommunicator::setServerConfiguration(const QString url, void ServerCommunicator::setServerConfiguration(const QString url,
const QString email, const QString email,
const QString password) { const QString password) {
@ -191,6 +133,75 @@ void ServerCommunicator::onGetReplyFailure(const GetRequestTypes type, const QSt
m_core->displayStatusMessage(message); m_core->displayStatusMessage(message);
} }
void ServerCommunicator::onSendPostRequestTriggered(const PostRequestTypes type, QVariant data) {
QString path;
switch (type) {
case RegisterUser:
path = ROUTE_REGISTER_USER;
break;
default:
qWarning() << "No route found for PostRequestType:" << type;
break;
}
// TODO move into default case of switch statement?
if (path.isEmpty()) {
qDebug() << "Empty path -> Not sending a request.";
return;
}
const QNetworkRequest request = m_serviceApi->createRequest(path);
QJsonDocument doc = QJsonDocument();
QJsonObject rootObject;
QJsonObject itemObject;
itemObject.insert("email", data.toString());
rootObject.insert("user", itemObject);
doc.setObject(rootObject);
m_restManager->post(request, doc, this, [this, type](QRestReply& reply) {
if (reply.isSuccess()) {
int statusCode = reply.httpStatus();
qInfo() << "Request successful. Status code:" << statusCode;
const QJsonDocument doc = reply.readJson().value();
onPostReplySuccessful(type, doc);
} else {
if (reply.hasError()) {
const QString errorString = reply.errorString();
qWarning() << "Network error:" << errorString;
onPostReplyFailure(type, errorString);
} else {
int statusCode = reply.httpStatus();
qWarning() << "Request not successful:" << statusCode;
qCritical() << "Content:" << reply.readJson();
onPostReplyFailure(type, QString("HTTP status code: %1").arg(statusCode));
}
}
});
}
void ServerCommunicator::onPostReplySuccessful(const PostRequestTypes type,
const QJsonDocument doc) {
switch (type) {
case RegisterUser:
qInfo() << "Register user successful:" << type;
m_core->displayStatusMessage(doc.toJson());
break;
default:
qWarning() << "Can't match request type:" << type;
break;
}
}
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);
}
void ServerCommunicator::currentBiddingRoundChangedReply(const QJsonDocument jsonDoc) { void ServerCommunicator::currentBiddingRoundChangedReply(const QJsonDocument jsonDoc) {
qInfo() << "Current bidding round received."; qInfo() << "Current bidding round received.";
const QJsonObject rootObject = jsonDoc["data"].toObject(); const QJsonObject rootObject = jsonDoc["data"].toObject();

View File

@ -29,9 +29,9 @@ class ServerCommunicator : public QObject {
void onGetReplySuccessful(const GetRequestTypes type, const QJsonDocument doc); void onGetReplySuccessful(const GetRequestTypes type, const QJsonDocument doc);
void onGetReplyFailure(const GetRequestTypes type, const QString errorString); void onGetReplyFailure(const GetRequestTypes type, const QString errorString);
void fetchItems(); void onSendPostRequestTriggered(const PostRequestTypes type, QVariant data);
void postItems(const QByteArray& jsonData); void onPostReplySuccessful(const PostRequestTypes type, const QJsonDocument doc);
void deleteItem(const QString& id); void onPostReplyFailure(const PostRequestTypes type, const QString errorString);
signals: signals:
void urlChanged(); void urlChanged();