Rests model was added

viewmodels/productsviewmodel.cpp

@@ -60,7 +60,7 @@ void ProductsViewModel::setOrderValue(const QString &productId, float value)
 void ProductsViewModel::submitOrder()
 {
     BaseModel *ordersModel = ModelsRegister::model("orders");
-    ordersModel->addItem({
+    ordersModel->submitItem({
         { "userId", settings()->selectedUserId() },
         { "storeId", settings()->selectedStoreId() },
         { "products", m_order.values() },

viewmodels/restsviewmodel.cpp

@@ -1,16 +1,12 @@
 #include "restsviewmodel.h"
 
-#include "models/basemodel.h"
 #include "services/settingsservice.h"
 
 RestsViewModel::RestsViewModel(QObject *parent)
     : QObject{parent}
 {
-    connect(m_restsModel, &BaseModel::dataChanged, this, &RestsViewModel::reloadRests);
     connect(m_productsModel, &BaseModel::dataChanged, this, &RestsViewModel::productsChanged);
     connect(settings(), &SettingsService::selectedStoreIdChanged, this, &RestsViewModel::productsChanged);
-
-    reloadRests();
 }
 
 QVariantList RestsViewModel::products() const
@@ -21,11 +17,10 @@ QVariantList RestsViewModel::products() const
     const QVariantList products = m_productsModel->items();
     for (const QVariant &product : products) {
         QString productId = product.toMap().value("id").toString();
-        QVariantMap rest = m_rests.value(storeId).value(productId).toMap();
         res << QVariantMap {
             { "productId", productId },
             { "title", m_productsModel->itemProperty(productId, "name").toString() },
-            { "rest", rest.value("rest", 0.0).toFloat() }
+            { "rest", m_restsModel->productRest(storeId, productId) }
         };
     }
 
@@ -34,36 +29,10 @@ QVariantList RestsViewModel::products() const
 
 void RestsViewModel::setProductRest(const QString &productId, float rest)
 {
-    QString storeId = settings()->selectedStoreId();
-    QVariantMap productRest = m_rests.value(storeId).value(productId).toMap();
-    productRest["rest"] = rest;
-    productRest["storeId"] = storeId;
-    productRest["productId"] = productId;
-    QString restId = productRest.value("id").toString();
-    if (restId.isEmpty()) {
-        m_restsModel->addItem(productRest);
-    } else {
-        m_restsModel->modifyItem(restId, productRest);
-    }
+    m_restsModel->submitRest(settings()->selectedStoreId(), productId, rest);
 }
 
 SettingsService *RestsViewModel::settings() const
 {
     return SettingsService::instance();
 }
-
-void RestsViewModel::reloadRests()
-{
-    m_rests.clear();
-
-    const QVariantList rests = m_restsModel->items();
-    for (const QVariant &varRest : rests) {
-        QVariantMap rest = varRest.toMap();
-        QString storeId = rest.value("storeId").toString();
-        QVariantMap storeRests = m_rests.value(storeId);
-        storeRests[rest.value("productId").toString()] = rest;
-        m_rests[storeId] = storeRests;
-    }
-
-    emit productsChanged();
-}

viewmodels/restsviewmodel.h

@@ -3,8 +3,10 @@
 
 #include <QObject>
 
+#include "models/restsmodel.h"
 #include "services/modelsregister.h"
 
+class RestsModel;
 class SettingsService;
 class RestsViewModel : public QObject
 {
@@ -24,12 +26,9 @@ signals:
 
 private:
     SettingsService *settings() const;
-    void reloadRests();
 
     BaseModel *m_productsModel = ModelsRegister::model("products");
-    BaseModel *m_restsModel = ModelsRegister::model("rests");
-
-    QMap<QString, QVariantMap> m_rests;
+    RestsModel *m_restsModel = ModelsRegister::get<RestsModel>("rests");
 };
 
 #endif // RESTSVIEWMODEL_H