Merge 22030e7 into 86a8d61

pointonsoftware · Dec 31, 2020 · 5ab08c4 · 5ab08c4
2 parents 86a8d61 + 22030e7
commit 5ab08c4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/core/domain/customermgmt/customermgmtcontroller.cpp b/core/domain/customermgmt/customermgmtcontroller.cpp
@@ -37,7 +37,7 @@ CustomerManagementController::CustomerManagementController(
 }
 
 std::vector<entity::Customer> CustomerManagementController::list() {
-    LOG_DEBUG("Getting the list of products");
+    LOG_DEBUG("Getting the list of customers");
     return mCachedList;
 }
 
@@ -59,7 +59,7 @@ CUSTOMERMGMTAPISTATUS CustomerManagementController::save(const entity::Customer&
     {
         LOG_DEBUG("Validating fields");
         entity::validator::PersonValidator validator(customer);
-        validationResult->insert(validator.result().begin(), validator.result().end());
+        validationResult->merge(validator.result());
     }
     if (!validationResult->empty()) {
         LOG_WARN("Entity contains invalid data. Returning validation results.");

diff --git a/core/domain/customermgmt/customermgmtcontroller.hpp b/core/domain/customermgmt/customermgmtcontroller.hpp
@@ -53,7 +53,7 @@ class CustomerManagementController : public CustomerManagementControlInterface {
 
     CustomerMgmtDataPtr mDataProvider;
     CustomerMgmtViewPtr mView;
-    std::vector<entity::Customer> mCachedList;  // List of products
+    std::vector<entity::Customer> mCachedList;  // List of customers
 };
 
 }  // namespace customermgmt

diff --git a/core/domain/employeemgmt/employeecontroller.cpp b/core/domain/employeemgmt/employeecontroller.cpp
@@ -148,7 +148,7 @@ EMPLMGMTSTATUS EmployeeMgmtController::save(const SaveEmployeeData& employeeData
         entity::validator::UserValidator validator(
                 entity::User("Proxy", "Proxy", employeeData.PIN,
                              "2020/10/10 10:10:10", "Proxy"));
-        employeeData.validationResult->insert(validator.result().begin(), validator.result().end());
+        employeeData.validationResult->merge(validator.result());
     }
     if (!employeeData.validationResult->empty()) {
         LOG_WARN("Entity contains invalid data. Returning validation results.");
@@ -208,28 +208,28 @@ ValidationErrors EmployeeMgmtController::validateDetails(const entity::Employee&
      // validate key employee data
     {
         entity::validator::EmployeeValidator validator(employee);
-        validationErrors.insert(validator.result().begin(), validator.result().end());
+        validationErrors.merge(validator.result());
     }
     // validate basic information
     {
         entity::validator::PersonValidator validator(employee);
-        validationErrors.insert(validator.result().begin(), validator.result().end());
+        validationErrors.merge(validator.result());
     }
     // validate address
     {
         entity::validator::AddressValidator validator(employee.address());
-        validationErrors.insert(validator.result().begin(), validator.result().end());
+        validationErrors.merge(validator.result());
     }
     // validate contact information
     {
         entity::validator::ContactDetailsValidator validator(employee.contactDetails());
-        validationErrors.insert(validator.result().begin(), validator.result().end());
+        validationErrors.merge(validator.result());
     }
     // validate ID
     {
         for (const entity::PersonalId& personalId : employee.personalIds()) {
             entity::validator::PersonalIDValidator validator(personalId);
-            validationErrors.insert(validator.result().begin(), validator.result().end());
+            validationErrors.merge(validator.result());
         }
     }
     return validationErrors;

diff --git a/core/domain/inventory/inventorycontroller.cpp b/core/domain/inventory/inventorycontroller.cpp
@@ -73,7 +73,7 @@ INVENTORYAPISTATUS InventoryController::save(const entity::Product& product,
     {
         LOG_DEBUG("Validating fields");
         entity::validator::ProductValidator validator(product);
-        validationResult->insert(validator.result().begin(), validator.result().end());
+        validationResult->merge(validator.result());
     }
     if (!validationResult->empty()) {
         LOG_WARN("Entity contains invalid data. Returning validation results.");

diff --git a/core/validator/validator.hpp b/core/validator/validator.hpp
@@ -22,7 +22,7 @@
 #define CORE_VALIDATOR_VALIDATOR_HPP_
 #include <functional>
 #include <string>
-#include <unordered_map>
+#include <map>
 #include <utility>
 #include <vector>
 
@@ -38,7 +38,7 @@ enum ValidationStatus {
 };
 
 // map [field that failed, error message to display]
-typedef std::unordered_map<std::string, std::string> Errors;
+typedef std::map<std::string, std::string> Errors;
 
 class Validator {
  public: