From: Hyunjin Park <hj.na.park@samsung.com>
Date: Tue, 19 Jan 2016 02:16:09 +0000 (+0900)
Subject: [contact] change timeUsed to usageCount
X-Git-Tag: submit/tizen/20160119.035442^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38ebd73cbacf8bd8c4a63003e105f3ba5973815d;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

[contact] change timeUsed to usageCount

Change-Id: I3eca7b235b74a50fb0ef6c9ba31f2722718e6cda
---

diff --git a/src/contact/contact_manager.cc b/src/contact/contact_manager.cc
index 5a6181a6..a2ea972c 100755
--- a/src/contact/contact_manager.cc
+++ b/src/contact/contact_manager.cc
@@ -451,7 +451,7 @@ PlatformResult ContactManagerFind(const JsonObject& args, JsonArray& out) {
 
     //As neither _contacts_person_usage nor _contacts_person cover all filter attributes
     //which result can be sorted it has to be checked which view can be used here.
-    if ("timesUsed" == attribute) {
+    if ("usageCount" == attribute) {
       error_code = contacts_query_create(_contacts_person_usage._uri, &contacts_query);
     } else {
       error_code = contacts_query_create(_contacts_person._uri, &contacts_query);
@@ -488,7 +488,7 @@ PlatformResult ContactManagerFind(const JsonObject& args, JsonArray& out) {
       contacts_filter_h contacts_filter = nullptr;
       int error_code = CONTACTS_ERROR_NONE;
 
-      if ("timesUsed" != name) {
+      if ("usageCount" != name) {
         error_code = contacts_filter_create(_contacts_person._uri, &contacts_filter);
       } else {
         error_code = contacts_filter_create(_contacts_person_usage._uri, &contacts_filter);
@@ -583,7 +583,7 @@ PlatformResult ContactManagerFind(const JsonObject& args, JsonArray& out) {
       contacts_filter_h contacts_filter = nullptr;
       int error_code = CONTACTS_ERROR_NONE;
 
-      if ("timesUsed" != name) {
+      if ("usageCount" != name) {
         error_code = contacts_filter_create(_contacts_person._uri, &contacts_filter);
       } else {
         error_code = contacts_filter_create(_contacts_person_usage._uri, &contacts_filter);
@@ -649,7 +649,7 @@ PlatformResult ContactManagerFind(const JsonObject& args, JsonArray& out) {
         if (initial_value_exists && end_value_exists) {
           contacts_filter_h sub_filter = NULL;
 
-          if ("timesUsed" != name) {
+          if ("usageCount" != name) {
             error_code = contacts_filter_create(_contacts_person._uri, &sub_filter);
           } else {
             error_code = contacts_filter_create(_contacts_person_usage._uri, &sub_filter);
@@ -726,7 +726,7 @@ PlatformResult ContactManagerFind(const JsonObject& args, JsonArray& out) {
         if (initial_value_exists && end_value_exists) {
           contacts_filter_h sub_filter = NULL;
 
-          if ("timesUsed" != name) {
+          if ("usageCount" != name) {
             error_code = contacts_filter_create(_contacts_person._uri, &sub_filter);
           } else {
             error_code = contacts_filter_create(_contacts_person_usage._uri, &sub_filter);
diff --git a/src/contact/contact_search_engine.cc b/src/contact/contact_search_engine.cc
index bc11b0be..136c18af 100644
--- a/src/contact/contact_search_engine.cc
+++ b/src/contact/contact_search_engine.cc
@@ -700,9 +700,9 @@ PlatformResult ContactSearchEngine::GetPersonUsage(int person_id, JsonObject* ou
     if (!status) {
       return status;
     }
-    out_ptr->insert(std::make_pair("timesUsed", JsonValue(static_cast<double>(times_used))));
+    out_ptr->insert(std::make_pair("usageCount", JsonValue(static_cast<double>(times_used))));
   } else {
-    out_ptr->insert(std::make_pair("timesUsed", JsonValue(static_cast<double>(0))));
+    out_ptr->insert(std::make_pair("usageCount", JsonValue(static_cast<double>(0))));
   }
 
   return PlatformResult(ErrorCode::NO_ERROR);
diff --git a/src/contact/contact_util.cc b/src/contact/contact_util.cc
index afbf98e5..6e91ef00 100755
--- a/src/contact/contact_util.cc
+++ b/src/contact/contact_util.cc
@@ -3037,7 +3037,7 @@ PlatformResult ImportPersonFromContactsUsageRecord(contacts_record_h record,
   JsonObject& arguments_obj = *out_ptr;
 
   int int_value = 0;
-  // timesUsed
+  // usageCount
   PlatformResult status = ContactUtil::GetIntFromRecord(
       record, _contacts_person_usage.times_used, &int_value);
 
@@ -3047,7 +3047,7 @@ PlatformResult ImportPersonFromContactsUsageRecord(contacts_record_h record,
   }
 
   arguments_obj.insert(
-      std::make_pair("timesUsed", JsonValue(static_cast<double>(int_value))));
+      std::make_pair("usageCount", JsonValue(static_cast<double>(int_value))));
 
   return PlatformResult(ErrorCode::NO_ERROR);
 }
diff --git a/src/contact/js/person.js b/src/contact/js/person.js
index 98839c9d..ea78e3d1 100755
--- a/src/contact/js/person.js
+++ b/src/contact/js/person.js
@@ -24,7 +24,7 @@ var Person = function(data) {
   var _hasEmail = false;
   var _isFavorite = false;
   var _displayContactId = '';
-  var _timesUsed = 0;
+  var _usageCount = 0;
 
   if (data.hasOwnProperty('id') && type_.isString(data.id)) {
     _id = data.id;
@@ -47,8 +47,8 @@ var Person = function(data) {
   if (data.hasOwnProperty('isFavorite') && type_.isBoolean(data.isFavorite)) {
     _isFavorite = data.isFavorite;
   }
-  if (data.hasOwnProperty('timesUsed') && type_.isNumber(data.timesUsed)) {
-    _timesUsed = data.timesUsed;
+  if (data.hasOwnProperty('usageCount') && type_.isNumber(data.usageCount)) {
+    _usageCount = data.usageCount;
   }
 
   Object.defineProperties(this, {
@@ -136,13 +136,13 @@ var Person = function(data) {
       },
       enumerable: true
     },
-    timesUsed: {
+    usageCount: {
       get: function() {
-        return _timesUsed;
+        return _usageCount;
       },
       set: function(v) {
         if (_editGuard.isEditEnabled()) {
-          _timesUsed = converter_.toLong(v, false);
+          _usageCount = converter_.toLong(v, false);
         }
       },
       enumerable: true
diff --git a/src/contact/person.cc b/src/contact/person.cc
index 579da2f4..7209e0d8 100755
--- a/src/contact/person.cc
+++ b/src/contact/person.cc
@@ -34,7 +34,7 @@ static const PersonPropertyMap personPropertyMap = {
     {"photoURI", {_contacts_person.image_thumbnail_path, kPrimitiveTypeString}},
     {"ringtoneURI", {_contacts_person.ringtone_path, kPrimitiveTypeString}},
     {"displayContactId", {_contacts_person.display_contact_id, kPrimitiveTypeId}},
-    {"timesUsed", {_contacts_person_usage.times_used, kPrimitiveTypeId}},
+    {"usageCount", {_contacts_person_usage.times_used, kPrimitiveTypeId}},
 };
 
 PlatformResult PersonLink(const JsonObject& args, JsonObject&) {