[Contact] update logs

Verification] Code compiles without errors

Change-Id: I302b548d710a40360936522a3dc15128390a21a1
Signed-off-by: Lukasz Bardeli <l.bardeli@samsung.com>

diff --git a/src/contact/addressbook.cc b/src/contact/addressbook.cc
index 2a2031929a5b24a9a6105367dfbfeab77163d616..25e1c2574829f4b7ebeee6e379fd6f3cd59a78b4 100755 (executable)
--- a/src/contact/addressbook.cc
+++ b/src/contact/addressbook.cc
@@ -61,9 +61,9 @@ PlatformResult AddressBookGet(const JsonObject& args, JsonObject& out) {
   int err = contacts_db_get_record(_contacts_contact._uri, contact_id,
                                    &contacts_record);
   if (CONTACTS_ERROR_NONE != err) {
-    LoggerW("Contacts record get error, error code: %d", err);
-    return PlatformResult(ErrorCode::NOT_FOUND_ERR,
-                          "Contacts record get error");
+    return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR,
+                          "Contacts record get error",
+                          ("Contacts record get error, error code: %d", err));
   }
   ContactUtil::ContactsRecordHPtr contacts_record_ptr(
       &contacts_record, ContactUtil::ContactsDeleter);
@@ -88,17 +88,16 @@ PlatformResult AddressBookAdd(const JsonObject& args, JsonObject& out) {
   long addressBookId = common::stol(FromJson<JsonString>(args, "addressBookId"));
 
   if (!IsNull(contact, "id")) {
-    LoggerW("Contact already exists");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contact already exists");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contact already exists");
   }
 
   contacts_record_h contacts_record = nullptr;
   int err = 0;
   err = contacts_record_create(_contacts_contact._uri, &contacts_record);
   if (CONTACTS_ERROR_NONE != err) {
-    LoggerW("Contacts record create error, error code: %d", err);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "Contacts record create error");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                          "Contacts record create error",
+                          ("Contacts record create error, error code: %d", err));
   }
 
   // contacts_record starts to be protected by unique_ptr
@@ -115,15 +114,15 @@ PlatformResult AddressBookAdd(const JsonObject& args, JsonObject& out) {
   int id = -1;
   err = contacts_db_insert_record(*contacts_record_ptr, &id);
   if (CONTACTS_ERROR_NONE != err) {
-    LoggerW("Contacts db insert error, error code: %d", err);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts db insert error");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts db insert error",
+                              ("Contacts db insert error, error code: %d", err));
   }
 
   contacts_record_h reset_record;
   err = contacts_db_get_record(_contacts_contact._uri, id, &reset_record);
   if (CONTACTS_ERROR_NONE != err) {
-    LoggerW("Contacts record get error, error code: %d", err);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record get error");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record get error",
+                              ("Contacts record get error, error code: %d", err));
   }
   if (nullptr != reset_record) {
     LoggerE("reset");
@@ -147,16 +146,15 @@ PlatformResult AddressBookUpdate(const JsonObject& args, JsonObject& out) {
   long contactId = common::stol(FromJson<JsonString>(contact, "id"));
 
   if (IsNull(contact, "id")) {
-    LoggerW("Contact doesn't exist");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contact doesn't exist");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contact doesn't exist");
   }
 
   contacts_record_h to_update = nullptr;
   int err = contacts_db_get_record(_contacts_contact._uri, contactId, &to_update);
   if (CONTACTS_ERROR_NONE != err) {
-    LoggerW("Problem with getting contact. Error: %d", err);
-    return PlatformResult(ErrorCode::NOT_FOUND_ERR,
-                          "Problem with getting contact");
+    return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR,
+                          "Problem with getting contact",
+                          ("Problem with getting contact. Error: %d", err));
   }
   ContactUtil::ContactsRecordHPtr contacts_record_ptr(
       &to_update, ContactUtil::ContactsDeleter);
@@ -167,18 +165,16 @@ PlatformResult AddressBookUpdate(const JsonObject& args, JsonObject& out) {
   err = contacts_db_update_record(*contacts_record_ptr);
   if (CONTACTS_ERROR_NONE != err) {
     if (CONTACTS_ERROR_INVALID_PARAMETER == err) {
-      LoggerE("Error during executing contacts_db_update_record(). Error: %d",
-              err);
-      return PlatformResult(
+      return LogAndCreateResult(
           ErrorCode::NOT_FOUND_ERR,
-          "Error during executing contacts_db_update_record().");
+          "Error during executing contacts_db_update_record().",
+          ("Error during executing contacts_db_update_record(). Error: %d", err));
     }
     if (CONTACTS_ERROR_DB == err) {
-      LoggerE("Error during executing contacts_db_update_record(). Error: %d",
-              err);
-      return PlatformResult(
+      return LogAndCreateResult(
           ErrorCode::UNKNOWN_ERR,
-          "Error during executing contacts_db_update_record().");
+          "Error during executing contacts_db_update_record().",
+          ("Error during executing contacts_db_update_record(). Error: %d", err));
     }
   }
 
@@ -196,15 +192,15 @@ PlatformResult AddressBookRemove(const JsonObject& args, JsonObject&) {
   int contact_id = common::stol(FromJson<JsonString>(args, "id"));
 
   if (contact_id < 0) {
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Nagative contact id");
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Nagative contact id");
   }
 
   int err = contacts_db_delete_record(_contacts_contact._uri, contact_id);
   if (CONTACTS_ERROR_NO_DATA == err) {
-    return PlatformResult(ErrorCode::NOT_FOUND_ERR,
+    return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR,
                           "Remove failed: contact not found");
   } else if (CONTACTS_ERROR_NONE != err) {
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
                           "Contacts record delete error");
   }
 
@@ -226,8 +222,8 @@ PlatformResult AddressBookAddBatch(const JsonObject& args, JsonArray& out) {
   contacts_list_h contacts_list = NULL;
   int error_code = contacts_list_create(&contacts_list);
   if (CONTACTS_ERROR_NONE != error_code) {
-    LoggerE("list creation failed, code: %d", error_code);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "list creation failed");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "list creation failed",
+                          ("list creation failed, code: %d", error_code));
   }
   ContactUtil::ContactsListHPtr contacts_list_ptr(
       &contacts_list, ContactUtil::ContactsListDeleter);
@@ -237,9 +233,9 @@ PlatformResult AddressBookAddBatch(const JsonObject& args, JsonArray& out) {
     int err = 0;
     err = contacts_record_create(_contacts_contact._uri, &contacts_record);
     if (CONTACTS_ERROR_NONE != err) {
-      LoggerW("Contacts record create error, error code: %d", err);
-      return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                            "Contacts record create error");
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                            "Contacts record create error",
+                            ("Contacts record create error, error code: %d", err));
     }
     ContactUtil::ContactsRecordHPtr x(&contacts_record,
                                       ContactUtil::ContactsDeleter);
@@ -253,9 +249,9 @@ PlatformResult AddressBookAddBatch(const JsonObject& args, JsonArray& out) {
 
     error_code = contacts_list_add(*contacts_list_ptr, *(x.release()));
     if (CONTACTS_ERROR_NONE != error_code) {
-      LoggerE("error during add record to list, code: %d", error_code);
-      return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                            "error during add record to list");
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                            "error during add record to list",
+                            ("error during add record to list, code: %d", error_code));
     }
   }
 
@@ -268,9 +264,9 @@ PlatformResult AddressBookAddBatch(const JsonObject& args, JsonArray& out) {
 
   error_code = contacts_db_insert_records(*contacts_list_ptr, &ids, &count);
   if (CONTACTS_ERROR_NONE != error_code || nullptr == ids) {
-    LoggerE("inserting contacts to db fails, code: %d", error_code);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "inserting contacts to db fails");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                          "inserting contacts to db fails",
+                          ("inserting contacts to db fails, code: %d", error_code));
   }
 
   if (length != count) {
@@ -283,9 +279,9 @@ PlatformResult AddressBookAddBatch(const JsonObject& args, JsonArray& out) {
     error_code =
         contacts_db_get_record(_contacts_contact._uri, ids[i], &contact_record);
     if (CONTACTS_ERROR_NONE != error_code) {
-      LoggerW("Contacts record get error, error code: %d", error_code);
-      return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                            "Contacts record get error");
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                            "Contacts record get error",
+                            ("Contacts record get error, error code: %d", error_code));
     }
     status = ContactUtil::ImportContactFromContactsRecord(
         contact_record, &out_object);
@@ -308,8 +304,8 @@ PlatformResult AddressBookUpdateBatch(const JsonObject& args, JsonArray& out) {
   int err = 0;
   err = contacts_list_create(&contacts_list);
   if (CONTACTS_ERROR_NONE != err) {
-    LoggerE("list creation failed, code: %d", err);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "list creation failed");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "list creation failed",
+                          ("list creation failed, code: %d", err));
   }
   ContactUtil::ContactsListHPtr contacts_list_ptr(
       &contacts_list, ContactUtil::ContactsListDeleter);
@@ -317,15 +313,15 @@ PlatformResult AddressBookUpdateBatch(const JsonObject& args, JsonArray& out) {
     const JsonObject& contact = JsonCast<JsonObject>(item);
     long contactId = common::stol(FromJson<JsonString>(contact, "id"));
     if (IsNull(contact, "id")) {
-      LoggerW("Contact doesn't exist");
-      return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contact doesn't exist");
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contact doesn't exist",
+                                ("Contact doesn't exist"));
     }
     contacts_record_h to_update = nullptr;
     err = contacts_db_get_record(_contacts_contact._uri, contactId, &to_update);
     if (CONTACTS_ERROR_NONE != err) {
-      LoggerW("Problem with getting contact. Error: %d", err);
-      return PlatformResult(ErrorCode::NOT_FOUND_ERR,
-                            "Problem with getting contact");
+      return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR,
+                            "Problem with getting contact",
+                            ("Problem with getting contact. Error: %d", err));
     }
     ContactUtil::ContactsRecordHPtr x(&to_update,
                                       ContactUtil::ContactsDeleter);
@@ -339,26 +335,26 @@ PlatformResult AddressBookUpdateBatch(const JsonObject& args, JsonArray& out) {
 
     err = contacts_list_add(*contacts_list_ptr, *(x.release()));
     if (CONTACTS_ERROR_NONE != err) {
-      LoggerE("error during add record to list, code: %d", err);
-      return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                            "error during add record to list");
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                            "error during add record to list",
+                            ("error during add record to list, code: %d", err));
     }
   }
   err = contacts_db_update_records(*contacts_list_ptr);
   if (CONTACTS_ERROR_NONE != err) {
     if (CONTACTS_ERROR_INVALID_PARAMETER == err) {
-      LoggerE("Error during executing contacts_db_update_record(). Error: %d",
-              err);
-      return PlatformResult(
+      return LogAndCreateResult(
           ErrorCode::NOT_FOUND_ERR,
-          "Error during executing contacts_db_update_record().");
+          "Error during executing contacts_db_update_record().",
+          ("Error during executing contacts_db_update_record(). Error: %d",
+                        err));
     }
     if (CONTACTS_ERROR_DB == err) {
-      LoggerE("Error during executing contacts_db_update_record(). Error: %d",
-              err);
-      return PlatformResult(
+      return LogAndCreateResult(
           ErrorCode::UNKNOWN_ERR,
-          "Error during executing contacts_db_update_record().");
+          "Error during executing contacts_db_update_record().",
+          ("Error during executing contacts_db_update_record(). Error: %d",
+                        err));
     }
   }
   return PlatformResult(ErrorCode::NO_ERROR);
@@ -375,17 +371,17 @@ PlatformResult AddressBookRemoveBatch(const JsonObject& args) {
   for (auto& item : batch_args) {
     long contact_id = common::stol(item.get<std::string>());
     if (contact_id < 0) {
-      return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Nagative contact id");
+      return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Nagative contact id");
     }
     ids[i] = contact_id;
     i++;
   }
   int err = contacts_db_delete_records(_contacts_contact._uri, ids, length);
   if (CONTACTS_ERROR_NO_DATA == err) {
-    return PlatformResult(ErrorCode::NOT_FOUND_ERR,
+    return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR,
                           "Remove failed: contact not found");
   } else if (CONTACTS_ERROR_NONE != err) {
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
                           "Contacts record delete error");
   }
   return PlatformResult(ErrorCode::NO_ERROR);
@@ -427,8 +423,7 @@ PlatformResult AddressBookAddGroup(const JsonObject& args, JsonObject& out) {
 
   const JsonObject& group = FromJson<JsonObject>(args, "group");
   if (!IsNull(group, "id") || !IsNull(group, "addressBookId")) {
-    LoggerE("Group object is previously added");
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR,
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR,
                           "Group object is previously added");
   }
 
@@ -471,14 +466,13 @@ PlatformResult AddressBookGetGroup(const JsonObject& args, JsonObject& out) {
   long id = common::stol(FromJson<JsonString>(args, "id"));
 
   if (id < 0) {
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Incorrect group id");
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Incorrect group id");
   }
 
   contacts_record_h contacts_record = nullptr;
   int err = contacts_db_get_record(_contacts_group._uri, id, &contacts_record);
   if (CONTACTS_ERROR_NONE != err || nullptr == contacts_record) {
-    LoggerE("Group not exist");
-    return PlatformResult(ErrorCode::NOT_FOUND_ERR, "Group not exist");
+    return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Group not exist");
   }
 
   ContactUtil::ContactsRecordHPtr record(&contacts_record,
@@ -491,7 +485,7 @@ PlatformResult AddressBookGetGroup(const JsonObject& args, JsonObject& out) {
     if (status.IsError()) return status;
 
     if (address_book_id != addressbook_id) {
-      return PlatformResult(ErrorCode::NOT_FOUND_ERR,
+      return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR,
                             "No group in this address book.");
     }
   }
@@ -511,8 +505,7 @@ PlatformResult AddressBookUpdateGroup(const JsonObject& args, JsonObject&) {
   const JsonObject& group = FromJson<JsonObject>(args, "group");
 
   if (IsNull(group, "id") || IsNull(group, "addressBookId")) {
-    LoggerE("Group object is not added");
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR,
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR,
                           "Group object is not added");
   }
 
@@ -521,27 +514,24 @@ PlatformResult AddressBookUpdateGroup(const JsonObject& args, JsonObject&) {
   long group_addressbook_id =
       common::stol(FromJson<JsonString>(group, "addressBookId"));
   if (IsUnified(addressbook_id) && (addressbook_id != group_addressbook_id)) {
-    LoggerE("Wrong address book");
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Wrong address book");
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Wrong address book");
   }
 
   if (FromJson<bool>(group, "readOnly")) {
-    LoggerW("Group is readonly - cancel update");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
                           "Group is readonly - cancel update");
   }
 
   long group_id = common::stol(FromJson<JsonString>(group, "id"));
   if (group_id < 0) {
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Incorrect group id");
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Incorrect group id");
   }
 
   contacts_record_h contacts_record = nullptr;
   int err =
       contacts_db_get_record(_contacts_group._uri, group_id, &contacts_record);
   if (CONTACTS_ERROR_NONE != err || nullptr == contacts_record) {
-    LoggerE("Group not exist");
-    return PlatformResult(ErrorCode::NOT_FOUND_ERR, "Group not exist");
+    return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Group not exist");
   }
 
   status = ContactUtil::ErrorChecker(
@@ -556,8 +546,7 @@ PlatformResult AddressBookUpdateGroup(const JsonObject& args, JsonObject&) {
 
   err = contacts_db_update_record(contacts_record);
   if (CONTACTS_ERROR_INVALID_PARAMETER == err) {
-    LoggerE("Problem during db_update_record");
-    return PlatformResult(ErrorCode::NOT_FOUND_ERR,
+    return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR,
                           "Problem during db_update_record");
   }
   status = ContactUtil::ErrorChecker(err, "Problem during db_update_record");
@@ -573,7 +562,7 @@ PlatformResult AddressBookRemoveGroup(const JsonObject& args, JsonObject&) {
 
   long id = common::stol(FromJson<JsonString>(args, "id"));
   if (id < 0) {
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Incorrect group id");
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Incorrect group id");
   }
 
   int err;
@@ -582,7 +571,7 @@ PlatformResult AddressBookRemoveGroup(const JsonObject& args, JsonObject&) {
     contacts_record_h contacts_record = nullptr;
     err = contacts_db_get_record(_contacts_group._uri, id, &contacts_record);
     if (CONTACTS_ERROR_NONE != err || contacts_record == nullptr) {
-      return PlatformResult(ErrorCode::NOT_FOUND_ERR, "Group not exist");
+      return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Group not exist");
     }
 
     int group_addressbook_id = 0;
@@ -592,14 +581,14 @@ PlatformResult AddressBookRemoveGroup(const JsonObject& args, JsonObject&) {
     if (status.IsError()) return status;
 
     if (group_addressbook_id != addressbook_id) {
-      return PlatformResult(ErrorCode::UNKNOWN_ERR,
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
                             "Contact is not a member of this address book");
     }
   }
 
   err = contacts_db_delete_record(_contacts_group._uri, id);
   if (CONTACTS_ERROR_INVALID_PARAMETER == err) {
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
                           "Problem during db_delete_record");
   }
   status = ContactUtil::ErrorChecker(err, "Problem during db_delete_record");
@@ -685,8 +674,7 @@ PlatformResult AddressBookGetGroups(const JsonObject& args, JsonArray& out) {
     contacts_record_h contacts_record;
     err = contacts_list_get_current_record_p(groups_list, &contacts_record);
     if (CONTACTS_ERROR_NONE != err || nullptr == contacts_record) {
-      LoggerE("Fail to get group record");
-      return PlatformResult(ErrorCode::UNKNOWN_ERR, "Fail to get group record");
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Fail to get group record");
     }
 
     JsonValue group{JsonObject{}};
@@ -885,10 +873,10 @@ PlatformResult AddressBookStartListening(ContactInstance& instance, const JsonOb
                                           AddressBookListenerCallback, &instance);
 
   if (CONTACTS_ERROR_NONE != error_code) {
-    LoggerE("Error while registering listener to contacts db, code: %d",
-            error_code);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "Error while registering listener to contacts db");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                          "Error while registering listener to contacts db",
+                          ("Error while registering listener to contacts db, code: %d",
+                                      error_code));
   }
 
   instance.set_is_listening(true);
@@ -905,8 +893,7 @@ PlatformResult AddressBookStopListening(ContactInstance& instance) {
       _contacts_contact._uri, AddressBookListenerCallback, &instance);
 
   if (CONTACTS_ERROR_NONE != error_code) {
-    LoggerE("Error while removing listener");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
                           "Error while removing listener");
   }
 

diff --git a/src/contact/contact_instance.cc b/src/contact/contact_instance.cc
index 0959645ccb2f0f30f383981ac87021aa5a92f797..dca1d3ae7f7b046b169dfcb5fd05b6c4730e89b6 100755 (executable)
--- a/src/contact/contact_instance.cc
+++ b/src/contact/contact_instance.cc
@@ -98,7 +98,7 @@ void ContactInstance::AddressBookGet(const JsonValue& args, JsonObject& out) {
   if (status.IsSuccess())
     ReportSuccess(val, out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::AddressBookAdd(const JsonValue& args, JsonObject& out) {
@@ -108,7 +108,7 @@ void ContactInstance::AddressBookAdd(const JsonValue& args, JsonObject& out) {
   if (status.IsSuccess())
     ReportSuccess(val, out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::AddressBookAddBatch(const JsonValue& args,
@@ -124,7 +124,7 @@ void ContactInstance::AddressBookAddBatch(const JsonValue& args,
     if (status.IsSuccess())
       ReportSuccess(result, response->get<JsonObject>());
     else
-      ReportError(status, &response->get<JsonObject>());
+      LogAndReportError(status, &response->get<JsonObject>());
   };
 
   auto get_response =
@@ -153,7 +153,7 @@ void ContactInstance::AddressBookRemoveBatch(const JsonValue& args,
     if (status.IsSuccess())
       ReportSuccess(response->get<JsonObject>());
     else
-      ReportError(status, &response->get<JsonObject>());
+      LogAndReportError(status, &response->get<JsonObject>());
   };
 
   auto get_response =
@@ -182,7 +182,7 @@ void ContactInstance::AddressBookUpdateBatch(const JsonValue& args,
     if (status.IsSuccess())
       ReportSuccess(result, response->get<JsonObject>());
     else
-      ReportError(status, &response->get<JsonObject>());
+      LogAndReportError(status, &response->get<JsonObject>());
   };
 
   auto get_response =
@@ -206,7 +206,7 @@ void ContactInstance::AddressBookUpdate(const JsonValue& args,
   if (status.IsSuccess())
     ReportSuccess(val, out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::AddressBookRemove(const JsonValue& args,
@@ -217,7 +217,7 @@ void ContactInstance::AddressBookRemove(const JsonValue& args,
   if (status.IsSuccess())
     ReportSuccess(out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::AddressBookFind(const JsonValue& args, JsonObject& out) {
@@ -232,7 +232,7 @@ void ContactInstance::AddressBookFind(const JsonValue& args, JsonObject& out) {
     if (status.IsSuccess())
       ReportSuccess(result, response->get<JsonObject>());
     else
-      ReportError(status, &response->get<JsonObject>());
+      LogAndReportError(status, &response->get<JsonObject>());
   };
 
   auto get_response =
@@ -256,7 +256,7 @@ void ContactInstance::AddressBookAddGroup(const JsonValue& args,
   if (status.IsSuccess())
     ReportSuccess(val, out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::AddressBookGetGroup(const JsonValue& args,
@@ -267,7 +267,7 @@ void ContactInstance::AddressBookGetGroup(const JsonValue& args,
   if (status.IsSuccess())
     ReportSuccess(val, out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::AddressBookUpdateGroup(const JsonValue& args,
@@ -278,7 +278,7 @@ void ContactInstance::AddressBookUpdateGroup(const JsonValue& args,
   if (status.IsSuccess())
     ReportSuccess(out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::AddressBookRemoveGroup(const JsonValue& args,
@@ -289,7 +289,7 @@ void ContactInstance::AddressBookRemoveGroup(const JsonValue& args,
   if (status.IsSuccess())
     ReportSuccess(out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::AddressBookGetGroups(const JsonValue& args,
@@ -300,7 +300,7 @@ void ContactInstance::AddressBookGetGroups(const JsonValue& args,
   if (status.IsSuccess())
     ReportSuccess(val, out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::ContactManagerGetAddressBooks(const JsonValue& args,
@@ -315,7 +315,7 @@ void ContactInstance::ContactManagerGetAddressBooks(const JsonValue& args,
     if (status.IsSuccess())
       ReportSuccess(result, response->get<JsonObject>());
     else
-      ReportError(status, &response->get<JsonObject>());
+      LogAndReportError(status, &response->get<JsonObject>());
   };
 
   auto get_response =
@@ -339,7 +339,7 @@ void ContactInstance::ContactManagerGetAddressBook(const JsonValue& args,
   if (status.IsSuccess())
     ReportSuccess(val, out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::ContactManagerAddAddressBook(const JsonValue& args,
@@ -350,7 +350,7 @@ void ContactInstance::ContactManagerAddAddressBook(const JsonValue& args,
   if (status.IsSuccess())
     ReportSuccess(val, out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::ContactManagerRemoveAddressBook(const JsonValue& args,
@@ -361,7 +361,7 @@ void ContactInstance::ContactManagerRemoveAddressBook(const JsonValue& args,
   if (status.IsSuccess())
     ReportSuccess(val, out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::AddressBookStartListening(const JsonValue& args,
@@ -372,7 +372,7 @@ void ContactInstance::AddressBookStartListening(const JsonValue& args,
   if (status.IsSuccess())
     ReportSuccess(val, out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::AddressBookStopListening(const JsonValue& args,
@@ -382,7 +382,7 @@ void ContactInstance::AddressBookStopListening(const JsonValue& args,
   if (status.IsSuccess())
     ReportSuccess(val, out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::ContactManagerGet(const JsonValue& args,
@@ -393,7 +393,7 @@ void ContactInstance::ContactManagerGet(const JsonValue& args,
   if (status.IsSuccess())
     ReportSuccess(val, out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::ContactManagerUpdate(const JsonValue& args,
@@ -404,7 +404,7 @@ void ContactInstance::ContactManagerUpdate(const JsonValue& args,
   if (status.IsSuccess())
     ReportSuccess(out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::ContactManagerUpdateBatch(const JsonValue& args,
@@ -420,7 +420,7 @@ void ContactInstance::ContactManagerUpdateBatch(const JsonValue& args,
     if (status.IsSuccess())
       ReportSuccess(response->get<JsonObject>());
     else
-      ReportError(status, &response->get<JsonObject>());
+      LogAndReportError(status, &response->get<JsonObject>());
   };
 
   auto get_response =
@@ -444,7 +444,7 @@ void ContactInstance::ContactManagerRemove(const JsonValue& args,
   if (status.IsSuccess())
     ReportSuccess(out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::ContactManagerRemoveBatch(const JsonValue& args,
@@ -460,7 +460,7 @@ void ContactInstance::ContactManagerRemoveBatch(const JsonValue& args,
     if (status.IsSuccess())
       ReportSuccess(response->get<JsonObject>());
     else
-      ReportError(status, &response->get<JsonObject>());
+      LogAndReportError(status, &response->get<JsonObject>());
   };
 
   auto get_response =
@@ -488,7 +488,7 @@ void ContactInstance::ContactManagerFind(const JsonValue& args,
     if (status.IsSuccess()) {
       ReportSuccess(result, response->get<JsonObject>());
     } else {
-      ReportError(status, &response->get<JsonObject>());
+      LogAndReportError(status, &response->get<JsonObject>());
     }
   };
 
@@ -513,7 +513,7 @@ void ContactInstance::ContactManagerImportFromVCard(const JsonValue& args,
   if (status.IsSuccess())
     ReportSuccess(val, out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::ContactManagerStartListening(const JsonValue& args,
@@ -524,7 +524,7 @@ void ContactInstance::ContactManagerStartListening(const JsonValue& args,
   if (status.IsSuccess())
     ReportSuccess(val, out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::ContactManagerStopListening(const JsonValue& args,
@@ -535,7 +535,7 @@ void ContactInstance::ContactManagerStopListening(const JsonValue& args,
   if (status.IsSuccess())
     ReportSuccess(val, out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::PersonLink(const JsonValue& args, JsonObject& out) {
@@ -545,7 +545,7 @@ void ContactInstance::PersonLink(const JsonValue& args, JsonObject& out) {
   if (status.IsSuccess())
     ReportSuccess(out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 void ContactInstance::PersonUnlink(const JsonValue& args, JsonObject& out) {
@@ -555,7 +555,7 @@ void ContactInstance::PersonUnlink(const JsonValue& args, JsonObject& out) {
   if (status.IsSuccess())
     ReportSuccess(val, out);
   else
-    ReportError(status, &out);
+    LogAndReportError(status, &out);
 }
 
 }  // namespace contact

diff --git a/src/contact/contact_manager.cc b/src/contact/contact_manager.cc
index 971d99b020b63ca0a85a2477d593b012753df21e..a1dce5ab2702f085e52e2462d9eaa458517ac09a 100755 (executable)
--- a/src/contact/contact_manager.cc
+++ b/src/contact/contact_manager.cc
@@ -51,9 +51,9 @@ PlatformResult ContactManagerGetAddressBooks(const JsonObject& args,
   int error_code = contacts_db_get_all_records(_contacts_address_book._uri, 0,
                                                0, &address_book_list);
   if (CONTACTS_ERROR_NONE != error_code) {
-    LoggerE("Fail to get address book list, error: %d", error_code);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "Fail to get address book list");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                          "Fail to get address book list",
+                          ("Fail to get address book list, error: %d", error_code));
   }
 
   ContactUtil::ContactsListHPtr contacts_list_ptr(
@@ -62,16 +62,16 @@ PlatformResult ContactManagerGetAddressBooks(const JsonObject& args,
   int record_count = 0;
   error_code = contacts_list_get_count(*contacts_list_ptr, &record_count);
   if (CONTACTS_ERROR_NONE != error_code) {
-    LoggerE("Fail to get address book list count, error: %d", error_code);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "Fail to get address book list count");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                          "Fail to get address book list count",
+                          ("Fail to get address book list count, error: %d", error_code));
   }
 
   error_code = contacts_list_first(*contacts_list_ptr);
   if (CONTACTS_ERROR_NONE != error_code) {
-    LoggerE("Fail to get address book from list, error: %d", error_code);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "Fail to get address book from list");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                          "Fail to get address book from list",
+                          ("Fail to get address book from list, error: %d", error_code));
   }
 
   for (int i = 0; i < record_count; i++) {
@@ -134,9 +134,9 @@ PlatformResult ContactManagerGetAddressBook(const JsonObject& args,
                                           static_cast<int>(address_book_id),
                                           &contacts_record);
   if (CONTACTS_ERROR_NONE != error_code || nullptr == contacts_record) {
-    LoggerE("Fail to get addressbook record, error code: %d", error_code);
-    return PlatformResult(ErrorCode::NOT_FOUND_ERR,
-                          "Fail to get address book with given id");
+    return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR,
+                          "Fail to get address book with given id",
+                          ("Fail to get addressbook record, error code: %d", error_code));
   }
 
   ContactUtil::ContactsRecordHPtr contacts_record_ptr(
@@ -173,8 +173,8 @@ PlatformResult ContactManagerGetInternal(int person_id, JsonObject* out) {
   int error_code = contacts_db_get_record(_contacts_person._uri, person_id,
                                           &contacts_record);
   if (CONTACTS_ERROR_NONE != error_code) {
-    LoggerE("Person with id: %d, not found, error: %d", person_id, error_code);
-    return PlatformResult(ErrorCode::NOT_FOUND_ERR, "Person not found");
+    return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Person not found",
+                              ("Person with id: %d, not found, error: %d", person_id, error_code));
   }
 
   ContactUtil::ContactsRecordHPtr contacts_record_ptr(
@@ -197,17 +197,16 @@ PlatformResult ContactManagerAddAddressBook(const JsonObject& args,
   const JsonObject& addressBook = FromJson<JsonObject>(args, "addressBook");
 
   if (!IsNull(addressBook, "id")) {
-    LoggerW("AddressBook already exists");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "AddressBook already exists");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "AddressBook already exists");
   }
 
   contacts_record_h contacts_record;
   int ret =
       contacts_record_create(_contacts_address_book._uri, &contacts_record);
   if (CONTACTS_ERROR_NONE != ret) {
-    LoggerE("Failed to create address book record, error code : %d", ret);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "Failed to create address book record");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                          "Failed to create address book record",
+                          ("Failed to create address book record, error code : %d", ret));
   }
   ContactUtil::ContactsRecordHPtr contacts_record_ptr(
       &contacts_record, ContactUtil::ContactsDeleter);
@@ -233,9 +232,9 @@ PlatformResult ContactManagerAddAddressBook(const JsonObject& args,
   int address_book_id;
   ret = contacts_db_insert_record(*contacts_record_ptr, &address_book_id);
   if (CONTACTS_ERROR_NONE != ret) {
-    LoggerE("Failed to insert address book record, error code: %d", ret);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "Failed to insert address book record");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                          "Failed to insert address book record",
+                          ("Failed to insert address book record, error code: %d", ret));
   }
 
   out["id"] = picojson::value(std::to_string(address_book_id));
@@ -257,17 +256,17 @@ PlatformResult ContactManagerRemoveAddressBook(const JsonObject& args,
                                           static_cast<int>(address_book_id),
                                           &contacts_record);
   if (CONTACTS_ERROR_NONE != error_code || nullptr == contacts_record) {
-    LoggerE("Fail to get addressbook record, error code: %d", error_code);
-    return PlatformResult(ErrorCode::NOT_FOUND_ERR,
-                          "Fail to get address book with given id");
+    return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR,
+                          "Fail to get address book with given id",
+                          ("Fail to get addressbook record, error code: %d", error_code));
   }
 
   int ret = contacts_db_delete_record(_contacts_address_book._uri,
                                       static_cast<int>(address_book_id));
   if (CONTACTS_ERROR_NONE != ret) {
-    LOGE("Failed to delete address book record, error code : %d", ret);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "Failed to delete address book record");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                          "Failed to delete address book record",
+                          ("Failed to delete address book record, error code : %d", ret));
   }
 
   return PlatformResult(ErrorCode::NO_ERROR);
@@ -295,7 +294,7 @@ PlatformResult ContactManagerUpdate(const JsonObject& args, JsonObject&) {
                                           &contacts_record);
 
   if (CONTACTS_ERROR_NONE != error_code) {
-    return PlatformResult(ErrorCode::NOT_FOUND_ERR, "Person not found");
+    return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Person not found");
   }
 
   status = ContactUtil::ExportPersonToContactsRecord(contacts_record, person);
@@ -306,9 +305,9 @@ PlatformResult ContactManagerUpdate(const JsonObject& args, JsonObject&) {
 
   error_code = contacts_db_update_record(*contacts_record_ptr);
   if (CONTACTS_ERROR_NONE != error_code) {
-    LoggerE("error code: %d", error_code);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "Error during executing contacts_db_update_record()");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                          "Error during executing contacts_db_update_record()",
+                          ("error code: %d", error_code));
   }
 
   return PlatformResult(ErrorCode::NO_ERROR);
@@ -326,8 +325,8 @@ PlatformResult ContactManagerUpdateBatch(const JsonObject& args) {
   int err = 0;
   err = contacts_list_create(&contacts_list);
   if (CONTACTS_ERROR_NONE != err) {
-    LoggerE("list creation failed, code: %d", err);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "list creation failed");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "list creation failed",
+                              ("list creation failed, code: %d", err));
   }
   ContactUtil::ContactsListHPtr contacts_list_ptr(
       &contacts_list, ContactUtil::ContactsListDeleter);
@@ -339,7 +338,7 @@ PlatformResult ContactManagerUpdateBatch(const JsonObject& args) {
     contacts_record_h to_update = nullptr;
     err = contacts_db_get_record(_contacts_person._uri, personId, &to_update);
     if (CONTACTS_ERROR_NONE != err) {
-      return PlatformResult(ErrorCode::NOT_FOUND_ERR, "Person not found");
+      return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Person not found");
     }
     ContactUtil::ContactsRecordHPtr x(&to_update,
                                       ContactUtil::ContactsDeleter);
@@ -349,17 +348,17 @@ PlatformResult ContactManagerUpdateBatch(const JsonObject& args) {
 
     err = contacts_list_add(*contacts_list_ptr, *(x.release()));
     if (CONTACTS_ERROR_NONE != err) {
-      LoggerE("error during add record to list, code: %d", err);
-      return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                            "error during add record to list");
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                            "error during add record to list",
+                            ("error during add record to list, code: %d", err));
     }
   }
 
   err = contacts_db_update_records(*contacts_list_ptr);
   if (CONTACTS_ERROR_NONE != err) {
-    LoggerE("error code: %d", err);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "Error during executing contacts_db_update_record()");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                          "Error during executing contacts_db_update_record()",
+                          ("error code: %d", err));
   }
 
   return PlatformResult(ErrorCode::NO_ERROR);
@@ -373,14 +372,14 @@ PlatformResult ContactManagerRemove(const JsonObject& args, JsonObject&) {
   long person_id = common::stol(FromJson<JsonString>(args, "personId"));
 
   if (person_id < 0) {
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Negative person id");
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Negative person id");
   }
 
   int error_code = contacts_db_delete_record(_contacts_person._uri, person_id);
   if (CONTACTS_ERROR_NONE != error_code) {
-    LoggerE("Error during removing contact, error: %d", error_code);
-    return PlatformResult(ErrorCode::NOT_FOUND_ERR,
-                          "Error during removing contact");
+    return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR,
+                          "Error during removing contact",
+                          ("Error during removing contact, error: %d", error_code));
   }
 
   return PlatformResult(ErrorCode::NO_ERROR);
@@ -398,7 +397,7 @@ PlatformResult ContactManagerRemoveBatch(const JsonObject& args) {
   for (auto& item : batch_args) {
     long person_id = common::stol(item.get<std::string>());
     if (person_id < 0) {
-      return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Nagative contact id");
+      return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Nagative contact id");
     }
     ids[i] = person_id;
     i++;
@@ -406,9 +405,9 @@ PlatformResult ContactManagerRemoveBatch(const JsonObject& args) {
 
   int err = contacts_db_delete_records(_contacts_person._uri, ids, length);
   if (CONTACTS_ERROR_NONE != err) {
-    LoggerE("Error during removing contact, error: %d", err);
-    return PlatformResult(ErrorCode::NOT_FOUND_ERR,
-                          "Error during removing contact");
+    return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR,
+                          "Error during removing contact",
+                          ("Error during removing contact, error: %d", err));
   }
 
   return PlatformResult(ErrorCode::NO_ERROR);
@@ -494,7 +493,7 @@ PlatformResult ContactManagerFind(const JsonObject& args, JsonArray& out) {
           value = common::stol(JsonCast<std::string>(match_value));
         }
         if (value < 0) {
-          return PlatformResult(ErrorCode::INVALID_VALUES_ERR,
+          return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR,
                                 "Match value cannot be less than 0");
         }
         contacts_match_int_flag_e flag;
@@ -516,8 +515,7 @@ PlatformResult ContactManagerFind(const JsonObject& args, JsonArray& out) {
                                            "Failed contacts_filter_add_str");
         if (status.IsError()) return status;
       } else {
-        LoggerE("Invalid primitive type!");
-        return PlatformResult(ErrorCode::UNKNOWN_ERR,
+        return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
                               "Invalid primitive type!");
       }
       intermediate_filters[intermediate_filters.size() - 1].push_back(
@@ -720,7 +718,7 @@ PlatformResult ContactManagerFind(const JsonObject& args, JsonArray& out) {
           if (status.IsError()) return status;
         }
       } else {
-        return PlatformResult(ErrorCode::UNKNOWN_ERR,
+        return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
                               "Invalid primitive type!");
       }
       intermediate_filters[intermediate_filters.size() - 1].push_back(
@@ -738,7 +736,7 @@ PlatformResult ContactManagerFind(const JsonObject& args, JsonArray& out) {
 
     visitor.SetOnCompositeFilterEnd([&](CompositeFilterType type) {
       if (intermediate_filters.size() == 0) {
-        return PlatformResult(ErrorCode::UNKNOWN_ERR,
+        return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
                               "Reached stack size equal to 0!");
       }
 
@@ -772,7 +770,7 @@ PlatformResult ContactManagerFind(const JsonObject& args, JsonArray& out) {
               error_code, "Failed contacts_query_set_filter");
           if (status.IsError()) return status;
         } else {
-          return PlatformResult(ErrorCode::INVALID_VALUES_ERR,
+          return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR,
                                 "Invalid union type!");
         }
       }
@@ -789,8 +787,7 @@ PlatformResult ContactManagerFind(const JsonObject& args, JsonArray& out) {
     // Should compute only one filter always.
     if ((intermediate_filters.size() != 1) ||
         (intermediate_filters[0].size() != 1)) {
-      LoggerE("Bad filter evaluation!");
-      return PlatformResult(ErrorCode::UNKNOWN_ERR, "Bad filter evaluation!");
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Bad filter evaluation!");
     }
     // Filter is generated
     error_code = contacts_query_set_filter(contacts_query,
@@ -803,8 +800,7 @@ PlatformResult ContactManagerFind(const JsonObject& args, JsonArray& out) {
   const auto sort_mode_it = args.find("sortMode");
   if (args.end() != sort_mode_it) {
     if (!sort_mode_it->second.is<picojson::object>()) {
-      LoggerD("Failed to set sort mode.");
-      return PlatformResult(ErrorCode::TYPE_MISMATCH_ERR, "Failed to set sort mode");
+      return LogAndCreateResult(ErrorCode::TYPE_MISMATCH_ERR, "Failed to set sort mode");
     }
     const auto sort_mode = sort_mode_it->second;
     std::string attribute = sort_mode.get("attributeName").to_str();
@@ -877,11 +873,9 @@ PlatformResult ContactManagerImportFromVCard(const JsonObject& args,
 
   int err = contacts_vcard_parse_to_contacts(vcard_char_ptr, &contacts_list);
   if (CONTACTS_ERROR_INVALID_PARAMETER == err) {
-    LoggerE("Invalid vCard string");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Invalid vCard string");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Invalid vCard string");
   } else if (CONTACTS_ERROR_NONE != err) {
-    LoggerE("Fail to convert vCard from string");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
                           "Fail to convert vCard from string");
   }
 
@@ -892,16 +886,14 @@ PlatformResult ContactManagerImportFromVCard(const JsonObject& args,
   int record_count = 0;
   err = contacts_list_get_count(contacts_list, &record_count);
   if (CONTACTS_ERROR_NONE != err || 0 == record_count) {
-    LoggerE("Invalid vCard string.");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Invalid vCard string.");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Invalid vCard string.");
   }
 
   contacts_record_h contacts_record;
   contacts_list_first(contacts_list);
   err = contacts_list_get_current_record_p(contacts_list, &contacts_record);
   if (CONTACTS_ERROR_NONE != err || nullptr == contacts_record) {
-    LoggerE("Invalid vCard string.");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Invalid vCard string.");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Invalid vCard string.");
   }
 
   status = ContactUtil::ImportContactFromContactsRecord(contacts_record, &out);
@@ -1032,9 +1024,9 @@ PlatformResult ContactManagerStartListening(ContactInstance& instance, const Jso
       _contacts_person._uri, ContactManagerListenerCallback, &instance);
 
   if (CONTACTS_ERROR_NONE != error_code) {
-    LoggerE("contacts_db_add_changed_cb(_contacts_person._uri) error: %d",
-            error_code);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to start listening");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Failed to start listening",
+                          ("contacts_db_add_changed_cb(_contacts_person._uri) error: %d",
+                                      error_code));
   }
 
   return PlatformResult(ErrorCode::NO_ERROR);
@@ -1050,9 +1042,9 @@ PlatformResult ContactManagerStopListening(ContactInstance& instance, const Json
       _contacts_person._uri, ContactManagerListenerCallback, &instance);
 
   if (CONTACTS_ERROR_NONE != error_code) {
-    LoggerE("contacts_db_remove_changed_cb(_contacts_person._uri) error: %d",
-            error_code);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to stop listening");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Failed to stop listening",
+                          ("contacts_db_remove_changed_cb(_contacts_person._uri) error: %d",
+                                      error_code));
   }
 
   return PlatformResult(ErrorCode::NO_ERROR);

diff --git a/src/contact/contact_search_engine.cc b/src/contact/contact_search_engine.cc
index 68faf00386e501c82ec70c0e15f56a300d74d34d..f1297fdf8a896f9b50c25dc1c7abc2a501a51586 100644 (file)
--- a/src/contact/contact_search_engine.cc
+++ b/src/contact/contact_search_engine.cc
@@ -147,7 +147,7 @@ common::PlatformResult ContactSearchEngine::ApplyFilter(const picojson::value& f
   LoggerD("Entered");
 
   if (!filter.is<picojson::object>()) {
-    return PlatformResult(ErrorCode::TYPE_MISMATCH_ERR, "Failed to set filter");
+    return LogAndCreateResult(ErrorCode::TYPE_MISMATCH_ERR, "Failed to set filter");
   }
 
   common::FilterVisitor visitor;
@@ -207,7 +207,7 @@ PlatformResult ContactSearchEngine::SetSortMode(const picojson::value& sort_mode
   LoggerD("Entered");
 
   if (!sort_mode.is<picojson::object>()) {
-    return PlatformResult(ErrorCode::TYPE_MISMATCH_ERR, "Failed to set sort mode");
+    return LogAndCreateResult(ErrorCode::TYPE_MISMATCH_ERR, "Failed to set sort mode");
   }
 
   std::string attribute = sort_mode.get("attributeName").to_str();
@@ -215,8 +215,7 @@ PlatformResult ContactSearchEngine::SetSortMode(const picojson::value& sort_mode
   const auto iter = s_properties_map_.find(attribute);
   if (s_properties_map_.end() == iter) {
     std::string msg = "SortMode doesn't support attribute: " + attribute;
-    LoggerE("%s", msg.c_str());
-    return PlatformResult(ErrorCode::TYPE_MISMATCH_ERR, msg);
+    return LogAndCreateResult(ErrorCode::TYPE_MISMATCH_ERR, msg);
   }
 
   is_sort_mode_set_ = true;
@@ -292,8 +291,7 @@ PlatformResult ContactSearchEngine::ApplyAttributeFilter(
   const auto iter =  s_properties_map_.find(name);
   if (s_properties_map_.end() == iter) {
     std::string msg = "Unknown attribute name: " + name;
-    LoggerE("%s", msg.c_str());
-    return PlatformResult(ErrorCode::TYPE_MISMATCH_ERR, msg);
+    return LogAndCreateResult(ErrorCode::TYPE_MISMATCH_ERR, msg);
   }
 
   const auto& properties = iter->second;
@@ -411,8 +409,7 @@ PlatformResult ContactSearchEngine::ApplyAttributeRangeFilter(
   const auto iter =  s_properties_map_.find(name);
   if (s_properties_map_.end() == iter) {
     std::string msg = "Unknown attribute name: " + name;
-    LoggerE("%s", msg.c_str());
-    return PlatformResult(ErrorCode::TYPE_MISMATCH_ERR, msg);
+    return LogAndCreateResult(ErrorCode::TYPE_MISMATCH_ERR, msg);
   }
 
   LongSetPtr id_set = LongSetPtr(new LongSet());

diff --git a/src/contact/contact_util.cc b/src/contact/contact_util.cc
index 4697fcaee19af1ac2396bff8c9a35e8c444c3a25..3ce66d0b89726344c8098e67de23cb4ce44b4e04 100755 (executable)
--- a/src/contact/contact_util.cc
+++ b/src/contact/contact_util.cc
@@ -158,8 +158,7 @@ static const char kContactInstantMessageTypeCustom[] = "CUSTOM";
 PlatformResult ErrorChecker(int err, const char* message) {
   LoggerD("Enter");
   if (CONTACTS_ERROR_NONE != err) {
-    LoggerE("%s, error code: %i", message, err);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, message);
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, message);
   }
 
   return PlatformResult(ErrorCode::NO_ERROR);
@@ -170,9 +169,9 @@ PlatformResult GetStrFromRecord(contacts_record_h record,
   LoggerD("Enter");
   int err = contacts_record_get_str_p(record, property_id, value);
   if (CONTACTS_ERROR_NONE != err) {
-    LoggerE("Error during getting contact record, error code: %i", err);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "Error during getting contact record");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                          "Error during getting contact record",
+                          ("Error during getting contact record, error code: %i", err));
   }
 
   return PlatformResult(ErrorCode::NO_ERROR);
@@ -183,9 +182,9 @@ PlatformResult GetIntFromRecord(contacts_record_h record,
   LoggerD("Enter");
   int err = contacts_record_get_int(record, property_id, value);
   if (CONTACTS_ERROR_NONE != err) {
-    LoggerE("Error during getting contact record, error code: %i", err);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "Error during getting contact record");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                          "Error during getting contact record",
+                          ("Error during getting contact record, error code: %i", err));
   }
 
   return PlatformResult(ErrorCode::NO_ERROR);
@@ -196,9 +195,9 @@ PlatformResult GetBoolFromRecord(contacts_record_h record,
   LoggerD("Enter");
   int err = contacts_record_get_bool(record, property_id, value);
   if (CONTACTS_ERROR_NONE != err) {
-    LoggerE("Error during getting contact record, error code: %i", err);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "Error during getting contact record");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                          "Error during getting contact record",
+                          ("Error during getting contact record, error code: %i", err));
   }
 
   return PlatformResult(ErrorCode::NO_ERROR);
@@ -209,10 +208,9 @@ PlatformResult SetStrInRecord(contacts_record_h record,
   LoggerD("Enter");
   int err = contacts_record_set_str(record, property_id, value);
   if (CONTACTS_ERROR_NONE != err) {
-    LoggerE("Error during setting str contact record property, error code: %i",
-            err);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "Error during setting contact record");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                          "Error during setting contact record",
+                          ("Error during setting str contact record property, error code: %i", err));
   }
 
   return PlatformResult(ErrorCode::NO_ERROR);
@@ -223,9 +221,9 @@ PlatformResult SetIntInRecord(contacts_record_h record,
   LoggerD("Enter");
   int err = contacts_record_set_int(record, property_id, value);
   if (CONTACTS_ERROR_NONE != err) {
-    LoggerE("Error during getting contact record, error code: %i", err);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "Error during setting contact record");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                          "Error during setting contact record",
+                          ("Error during getting contact record, error code: %i", err));
   }
 
   return PlatformResult(ErrorCode::NO_ERROR);
@@ -236,9 +234,9 @@ PlatformResult SetBoolInRecord(contacts_record_h record,
   LoggerD("Enter");
   int err = contacts_record_set_bool(record, property_id, value);
   if (CONTACTS_ERROR_NONE != err) {
-    LoggerE("Error during getting contact record, error code: %i", err);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
-                          "Error during setting contact record");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
+                          "Error during setting contact record",
+                          ("Error during getting contact record, error code: %i", err));
   }
 
   return PlatformResult(ErrorCode::NO_ERROR);
@@ -250,8 +248,7 @@ PlatformResult ClearAllContactRecord(contacts_record_h contacts_record,
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   int record_count;
@@ -296,7 +293,7 @@ PlatformResult GetNumberOfChildRecord(contacts_record_h contacts_record,
   int err = contacts_record_get_child_record_count(contacts_record, property_id,
                                                    child_count);
   if (CONTACTS_ERROR_NONE != err && CONTACTS_ERROR_NO_DATA != err) {
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
                           "Problem during getting child count");
   }
 
@@ -309,8 +306,7 @@ PlatformResult ImportContactNameFromContactsRecord(
   LoggerD("Enter");
   JsonObject& out = *out_ptr;
   if (!contacts_record) {
-    LoggerW("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
   int count = 0;
   int err = contacts_record_get_child_record_count(contacts_record,
@@ -323,8 +319,7 @@ PlatformResult ImportContactNameFromContactsRecord(
   }
 
   if (count > 1) {
-    LoggerE("More than one ContactName for one Contact");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
                           "More than one ContactName for one Contact");
   }
   LoggerD("Contact name record count: %i", count);
@@ -475,8 +470,7 @@ PlatformResult ExportContactNameToContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerW("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   contacts_record_h contact_name = nullptr;
@@ -639,8 +633,7 @@ PlatformResult ImportContactEmailAddressFromContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   contacts_record_h child_record = nullptr;
@@ -722,8 +715,7 @@ PlatformResult ExportContactEmailAddressToContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   int err = contacts_record_create(_contacts_email._uri, &c_email_record_h);
@@ -809,8 +801,7 @@ PlatformResult ImportContactPhoneNumberFromContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   int err = contacts_record_get_child_record_at_p(
@@ -921,8 +912,7 @@ PlatformResult ExportContactPhoneNumberToContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   int err = contacts_record_create(_contacts_number._uri, &phone_record);
@@ -1033,8 +1023,7 @@ PlatformResult ImportContactOrganizationFromContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   contacts_record_h child_record = nullptr;
@@ -1107,8 +1096,7 @@ PlatformResult ExportContactOrganizationToContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   contacts_record_h organization_record = nullptr;
@@ -1193,8 +1181,7 @@ PlatformResult ImportContactWebSiteFromContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   contacts_record_h child_record = nullptr;
@@ -1239,8 +1226,7 @@ PlatformResult ExportContactWebSiteToContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   if (IsNull(in, "url")) {
@@ -1308,8 +1294,7 @@ PlatformResult ImportContactAnniversariesFromContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   contacts_record_h child_record = nullptr;
@@ -1365,8 +1350,7 @@ PlatformResult ExportContactAnniversariesToContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   int date = static_cast<int>(FromJson<double>(in, "date"));
@@ -1433,8 +1417,7 @@ PlatformResult ImportContactRelationshipFromContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   contacts_record_h child_record = nullptr;
@@ -1563,8 +1546,7 @@ PlatformResult ExportContactRelationshipToContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   contacts_record_h child_record = nullptr;
@@ -1662,8 +1644,7 @@ PlatformResult ImportContactInstantMessengerFromContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   contacts_record_h child_record = nullptr;
@@ -1759,8 +1740,7 @@ PlatformResult ExportContactInstantMessengerToContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   contacts_record_h child_record = nullptr;
@@ -1850,8 +1830,7 @@ PlatformResult ImportContactAddressFromContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   contacts_record_h child_record = nullptr;
@@ -1969,8 +1948,7 @@ PlatformResult ExportContactAddressToContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   contacts_record_h address_record = nullptr;
@@ -2100,8 +2078,7 @@ PlatformResult ImportContactNotesFromContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   contacts_record_h notes_record = nullptr;
@@ -2134,8 +2111,7 @@ PlatformResult ExportNotesToContactsRecord(contacts_record_h contacts_record,
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   int err = contacts_record_create(_contacts_note._uri, &notes_record);
@@ -2178,8 +2154,7 @@ PlatformResult ImportContactFromContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   int id = 0;
@@ -2405,8 +2380,7 @@ PlatformResult ExportContactToContactsRecord(contacts_record_h contacts_record,
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerW("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   //### ContactName: ###
@@ -2592,8 +2566,7 @@ PlatformResult ImportContactGroupFromContactsRecord(
   // contacts_record is protected by unique_ptr and its ownership is not passed
   // here
   if (!contacts_record) {
-    LoggerE("Contacts record is null");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null");
   }
 
   // id
@@ -2716,8 +2689,7 @@ PlatformResult ExportContactGroupToContactsRecord(
 PlatformResult ImportPersonFromContactsRecord(contacts_record_h record,
                                               JsonObject* out_ptr) {
   if (nullptr == record) {
-    LoggerW("Platform person record did not set");
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR,
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR,
                           "Platform person record did not set");
   }
 
@@ -2837,8 +2809,7 @@ PlatformResult ImportPersonFromContactsRecord(contacts_record_h record,
 PlatformResult ExportPersonToContactsRecord(contacts_record_h record,
                                             const JsonObject& args) {
   if (nullptr == record) {
-    LoggerE("Platform person object did not set");
-    return PlatformResult(ErrorCode::UNKNOWN_ERR,
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR,
                           "Platform person object did not set");
   }
 
@@ -2943,8 +2914,7 @@ PlatformResult CheckDBConnection() {
     LoggerI("Connection established!");
     _connected = true;
   } else {
-    LoggerE("DB connection error occured: %s", std::to_string(err).c_str());
-    return PlatformResult(
+    return LogAndCreateResult(
         ErrorCode::UNKNOWN_ERR,
         "DB connection error occured: " + std::to_string(err));
   }

diff --git a/src/contact/person.cc b/src/contact/person.cc
index 7166be4493be72a469546c39ecc2468d3f53b9c9..8c847186f93bc33e0be88aebb10ff45084a252ad 100755 (executable)
--- a/src/contact/person.cc
+++ b/src/contact/person.cc
@@ -53,8 +53,8 @@ PlatformResult PersonLink(const JsonObject& args, JsonObject&) {
   contacts_record = nullptr;
 
   if (CONTACTS_ERROR_NONE != err) {
-    LoggerW("Person was not found, error code: %d", err);
-    return PlatformResult(ErrorCode::NOT_FOUND_ERR, "Person not found");
+    return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Person not found",
+                              ("Person was not found, error code: %d", err));
   }
 
   err = contacts_person_link_person(person_id, id);
@@ -80,8 +80,8 @@ PlatformResult PersonUnlink(const JsonObject& args, JsonObject& out) {
   if (CONTACTS_ERROR_NONE != error_code) {
     contacts_record_destroy(contacts_record, true);
     contacts_record = nullptr;
-    LoggerW("Contact not found, error code: %d", error_code);
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Contact not found");
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Contact not found",
+                          ("Contact not found, error code: %d", error_code));
   }
 
   int contacts_person_id = 0;
@@ -96,9 +96,9 @@ PlatformResult PersonUnlink(const JsonObject& args, JsonObject& out) {
 
   long person_id = common::stol(FromJson<JsonString>(args, "personId"));
   if (contacts_person_id != person_id) {
-    LoggerW("Contact is not a member of person (wrong id's)");
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR,
-                          "Contact is not a member of person");
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR,
+                          "Contact is not a member of person",
+                          ("Contact is not a member of person (wrong id's)"));
   }
 
   int new_person_id = 0;
@@ -115,8 +115,8 @@ PlatformResult PersonUnlink(const JsonObject& args, JsonObject& out) {
   if (CONTACTS_ERROR_NONE != error_code) {
     contacts_record_destroy(contacts_record, true);
     contacts_record = nullptr;
-    LoggerW("Person not found, error code: %d", error_code);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Person not found");
+    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Person not found",
+                          ("Person not found, error code: %d", error_code));
   }
 
   status = ContactUtil::ImportPersonFromContactsRecord(contacts_record, &out);
@@ -133,9 +133,9 @@ PlatformResult PersonPropertyFromString(const std::string& name,
   LoggerD("Enter");
   auto iter = personPropertyMap.find(name);
   if (iter == personPropertyMap.end()) {
-    LoggerE("Invalid property name (not in map): %s", name.c_str());
-    return PlatformResult(ErrorCode::INVALID_VALUES_ERR,
-                          "Invalid property name");
+    return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR,
+                          "Invalid property name",
+                          ("Invalid property name (not in map): %s", name.c_str()));
   }
   (*person_prop).propertyId = iter->second.propertyId;
   (*person_prop).type = iter->second.type;