Fix bug bottle neck

lcmd65 · Feb 20, 2022 · cc9624f · cc9624f
1 parent ebecf08
commit cc9624f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/app_helpers/Auth.cpp b/app_helpers/Auth.cpp
@@ -61,9 +61,9 @@ namespace app_helpers
             return (getSessionUserId(req) > 0);
         }
 
-        User user(const drogon::HttpRequestPtr& req)
+        User user(const drogon::HttpRequestPtr& req, const drogon::orm::DbClientPtr dbClient)
         {
-            auto dbClient = drogon::app().getDbClient();
+            // auto dbClient = drogon::app().getDbClient();
 
             return drogon::orm::Mapper<User>(dbClient).findByPrimaryKey(getSessionUserId(req));
         }

diff --git a/app_helpers/Auth.hpp b/app_helpers/Auth.hpp
@@ -16,7 +16,7 @@ namespace app_helpers
 
         bool isLoggedIn(const drogon::HttpRequestPtr& req);
 
-        User user(const drogon::HttpRequestPtr& req);
+        User user(const drogon::HttpRequestPtr& req, const drogon::orm::DbClientPtr dbClient);
 
         void logout(const drogon::HttpRequestPtr& req);
     }

diff --git a/controllers/StockCtrl.cc b/controllers/StockCtrl.cc
@@ -185,8 +185,6 @@ void StockCtrl::create(const HttpRequestPtr &req, std::function<void(const HttpR
         }
         const auto& reqJson = *reqJsonPtr;
 
-        auto dbClient = app().getDbClient()->newTransaction();
-        orm::Mapper<Stock> stkMapper{dbClient};
         Stock stk;
 
         const auto& name = reqJson["name"];
@@ -201,7 +199,7 @@ void StockCtrl::create(const HttpRequestPtr &req, std::function<void(const HttpR
         {
             throw std::logic_error("Chưa điền idi");
         }
-        stk.setName(idi.asString());
+        stk.setIdi(idi.asString());
 
         const auto& sell_price = reqJson["sell_price"];
         if (!sell_price.isInt())
@@ -249,8 +247,13 @@ void StockCtrl::create(const HttpRequestPtr &req, std::function<void(const HttpR
             stk.setNote(note.asString());
         }
 
-        const auto& curUser = app_helpers::Auth::user(req);
-        stk.setUpdatedUserId(curUser.getValueOfId());
+        auto dbClient = app().getDbClient()->newTransaction();
+        orm::Mapper<Stock> stkMapper{dbClient};
+
+        // TODO: Fix updated user
+        // const auto& curUser = app_helpers::Auth::user(req, dbClient);
+        // stk.setUpdatedUserId(curUser.getValueOfId());
+        stk.setUpdatedUserId(1);
 
         const auto now = trantor::Date::now();
 
@@ -320,7 +323,8 @@ void StockCtrl::create(const HttpRequestPtr &req, std::function<void(const HttpR
             Transaction transaction;
             transaction.setDescription("Kho #{" + std::to_string(id) + "}: Nhập {"+ std::to_string(stk.getValueOfQuantity()) +"} (VND)");
             transaction.setAmount(-(stk.getValueOfQuantity() * stk.getValueOfCostPrice()));
-            transaction.setCashierId(curUser.getValueOfId());
+            // TODO: Fix updated user
+            // transaction.setCashierId(curUser.getValueOfId());
             transaction.setPaidDate(trantor::Date::fromDbStringLocal(inout_date.asString()));
             orm::Mapper<Transaction>(dbClient).insert(transaction);
 

diff --git a/views/vue/dashboard/pages/stocks/Edit.vue b/views/vue/dashboard/pages/stocks/Edit.vue
@@ -199,7 +199,7 @@
                     >
                         <a-date-picker
                             v-model:value="formData.inout_date"
-                            format="YYYY-MM-DD HH:mm:ss"
+                            value-format="YYYY-MM-DD HH:mm:ss"
                             show-time
                             type="date"
                             :disabledDate="disabledLastMonthAndTomorrow"
@@ -679,8 +679,8 @@ export default defineComponent({
             const stockId = this.id;
 
             const request = stockId
-                ? RequestRepository.put
-                : RequestRepository.post;
+                ? RequestApiRepository.post
+                : RequestApiRepository.post;
             request("/stocks" + (stockId ? `/${stockId}` : ""), {
                 ...this.formData,
                 inout_date: dayjs(this.formData.inout_date).format(
@@ -695,8 +695,8 @@ export default defineComponent({
                     };
                 }),
             })
-                .then((res) => {
-                    const sData = res.data.data;
+                .then(data => {
+                    const sData = data.data;
 
                     this.$message.success(
                         stockId