wix-hive-ruby 0.9.1 → 0.9.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTMwNjE2ZGUzMTJlZjIyYWZhMzE0MWI1NDg5NTExYzFlMjVmNTQ2MA==
-  data.tar.gz: !binary |-
-    MWI3MDdkOTNjZGY0YjIyMDY4OWI0YTI2MmE1N2VlNTMwYzM4OGEwNw==
+SHA1:
+  metadata.gz: b9c0a428e9d239062e4bed3ecd09e30c80d5e221
+  data.tar.gz: 7456a654728360f4c7ecc7d265aab7c862beced0
 SHA512:
-  metadata.gz: !binary |-
-    MzNlODc2Mjg5OTQ1YTZkMTQyMjNhNDY0OTY3ZTZjMmI5MzE1OTg1NWQzZTk4
-    Njg2NDg5ZTQ0MjM0NjllMmY1YmFlZjQ5YjcwMzk5MjZmODdhZDk3NjU3NTIw
-    ZGJjYzc1NzRhYWU4NjFlMzM0Y2MwN2RiMWMyNzlmOGI0MGVkMGY=
-  data.tar.gz: !binary |-
-    Y2IzOTg2ODE5ODk1MmIxOTA4MDlmNDFmZTMwZTM1MGQ3N2QyYzczYTAyZWI4
-    OGM2MDIwOTliNDZiNGI2NjM2NzUwZmQ0NDgyZDZmZmJiNGMwODg1MWIyNjgy
-    ZTdjMTFhN2EzYjEwZWU2NjhjNDU5NjcxODZjYTI2NmQ3ZDgyNjc=
+  metadata.gz: 17922239717fc4db75d6c06a2190491e5a3ab903abd80d4bfca7ecccaf8ec9478c2d6fabdc7e53f070a5d29a926214a5914524a0935d599bc97154611491ce07
+  data.tar.gz: fef830329b8e23d4284a3af80adc5c6822a5c70cb535ae708bfdca4ef38464d60cac0849f6c2a3fc27721c8d87aefd10ad91e8cd5916e0751274c08e749a75ee

data/README.md

@@ -22,6 +22,7 @@ A Ruby interface to the Wix Hive API.
      * **[Response Errors](#response-errors)**
      * **[Other Errors](#other-errors)**
    * **[Contacts API](#contacts-api)**
+     * **[Concurrency Control](#concurrency-control)**
      * **[client.new_contact](#clientnew_contact)**
      * **[client.contact](#clientcontact)**
      * **[client.update_contact (PENDING)](#clientupdate_contact-pending)**
@@ -314,6 +315,19 @@ Hive::SignatureError
 
 ### Contacts API
 
+#### Concurrency Control
+The contacts add and update methods have a concurrency control mechanism associated with them. The mechanism is based on the ``modifiedAt`` request parameter. This parameter needs to have the same value as the underlying contact that is being updated. 
+For example: let us assume we have a contact with ``id=1`` and ``modifiedAt=2014-10-01T14:43:48.560+03:00`` and we want to update the email field. What we would need to do is execute the following method:
+``` ruby
+   new_email = Hive::Email.new
+   new_email.tag = 'work_new'
+   new_email.email = 'alex_new@example.com'
+   new_email.emailStatus = 'optOut'
+
+   client.add_contact_email('1', new_email, '2014-10-01T14:43:48.560+03:00')
+```
+So lets think about the concurrency now. Let assume we have two update email requests that come in the same time and they get processed sequentially. First one would get processed and update the contact email and in the same time the contacts’ ``modifiedAt`` will change. Second request gets processed but it will fail with a concurrency validation error because it is trying to perform an update operation on a old version of the contact object. And the system knows that by comparing the two ``modifiedAt`` parameters (one from the DB and the one provided).
+
 #### client.new_contact
 
 **Example:**
@@ -351,7 +365,7 @@ client.contact(CONTACT_ID)
    contact.add_url(url: 'wix.com', tag: 'site')
 
    # PENDING
-   client.update_contact(CONTACT_ID, contact)
+   client.update_contact(CONTACT_ID, contact, MODIFIED_AT)
 ```
 
 #### client.contacts_tags (PENDING)
@@ -372,7 +386,7 @@ client.contacts_subscribers
 
 **Example:**
 ``` ruby
-client.update_contact_name(CONTACT_ID, Hive::Name.new(first: 'New_Name'))
+client.update_contact_name(CONTACT_ID, Hive::Name.new(first: 'New_Name'), MODIFIED_AT)
 ```
 
 #### client.update_contact_company
@@ -382,14 +396,14 @@ client.update_contact_name(CONTACT_ID, Hive::Name.new(first: 'New_Name'))
 company = Hive::Company.new
    company.name = 'New_Company'
 
-   client.update_contact_company(CONTACT_ID, company)
+   client.update_contact_company(CONTACT_ID, company, MODIFIED_AT)
 ```
 
 #### client.update_contact_picture
 
 **Example:**
 ``` ruby
-client.update_contact_picture(CONTACT_ID, 'wix.com/example.jpg')
+client.update_contact_picture(CONTACT_ID, 'wix.com/example.jpg', MODIFIED_AT)
 ```
 
 #### client.update_contact_address
@@ -400,7 +414,7 @@ updated_address = Hive::Address.new
    updated_address.tag = 'work'
    updated_address.address = '1625 Larimer St.'
 
-   client.update_contact_address(CONTACT_ID, ADDRESS_ID, updated_address)
+   client.update_contact_address(CONTACT_ID, ADDRESS_ID, updated_address, MODIFIED_AT)
 ```
 
 #### client.update_contact_email
@@ -412,7 +426,7 @@ updated_email = Hive::Email.new
    updated_email.email = 'alex@example.com'
    updated_email.emailStatus = 'optOut'
 
-   client.update_contact_email(CONTACT_ID, EMAIL_ID, updated_email)
+   client.update_contact_email(CONTACT_ID, EMAIL_ID, updated_email, MODIFIED_AT)
 ```
 
 #### client.update_contact_phone
@@ -423,7 +437,7 @@ updated_phone = Hive::Phone.new
    updated_phone.tag = 'work'
    updated_phone.phone = '18006666'
 
-   client.update_contact_phone(CONTACT_ID, PHONE_ID, updated_phone)
+   client.update_contact_phone(CONTACT_ID, PHONE_ID, updated_phone, MODIFIED_AT)
 ```
 
 #### client.update_contact_date
@@ -434,7 +448,7 @@ date = Hive::Date.new
    date.date = Time.now.iso8601(3)
    date.tag = 'update'
 
-   client.update_contact_date(CONTACT_ID, DATE_ID, date)
+   client.update_contact_date(CONTACT_ID, DATE_ID, date, MODIFIED_AT)
 ```
 
 #### client.update_contact_note (PENDING)
@@ -445,7 +459,7 @@ note = Hive::Note.new
    note.content = 'Note'
    note.modifiedAt = Time.now.iso8601(3)
 
-   client.update_contact_phone(CONTACT_ID, NOTE_ID, note)
+   client.update_contact_phone(CONTACT_ID, NOTE_ID, note, MODIFIED_AT)
 ```
 
 #### client.update_contact_custom (PENDING)
@@ -456,7 +470,7 @@ custom = Hive::Custom.new
    custom.field = 'custom_update'
    custom.value = 'custom_value'
 
-   client.update_contact_phone(CONTACT_ID, CUSTOM_ID, custom)
+   client.update_contact_phone(CONTACT_ID, CUSTOM_ID, custom, MODIFIED_AT)
 ```
 
 #### client.add_contact_address
@@ -467,7 +481,7 @@ new_address = Hive::Address.new
    new_address.tag = 'work'
    new_address.address = '1625 Larimer St.'
 
-   client.add_contact_address(CONTACT_ID, new_address)
+   client.add_contact_address(CONTACT_ID, new_address, MODIFIED_AT)
 ```
 
 #### client.add_contact_email
@@ -479,7 +493,7 @@ new_email = Hive::Email.new
    new_email.email = 'alex_new@example.com'
    new_email.emailStatus = 'optOut'
 
-   client.add_contact_email(CONTACT_ID, new_email)
+   client.add_contact_email(CONTACT_ID, new_email, MODIFIED_AT)
 ```
 
 #### client.add_contact_phone
@@ -490,7 +504,7 @@ new_phone = Hive::Phone.new
    new_phone.tag = 'work_new'
    new_phone.phone = '18006666'
 
-   client.add_contact_phone(CONTACT_ID, new_phone)
+   client.add_contact_phone(CONTACT_ID, new_phone, MODIFIED_AT)
 ```
 
 #### client.add_contact_note
@@ -499,7 +513,7 @@ new_phone = Hive::Phone.new
 note = Hive::Note.new
    note.content = 'Note'
 
-   client.add_contact_note(CONTACT_ID, note)
+   client.add_contact_note(CONTACT_ID, note, MODIFIED_AT)
 ```
 
 #### client.add_contact_custom
@@ -510,7 +524,7 @@ custom = Hive::Custom.new
    custom.field = 'custom_update'
    custom.value = 'custom_value'
 
-   client.add_contact_custom(CONTACT_ID, custom)
+   client.add_contact_custom(CONTACT_ID, custom, MODIFIED_AT)
 ```
 
 #### client.add_contact_tags (PENDING)
@@ -519,7 +533,7 @@ custom = Hive::Custom.new
 ``` ruby
 tags = ['tag1/tag', 'tag2/tag']
 
-   client.add_contact_tags(CONTACT_ID, tags)
+   client.add_contact_tags(CONTACT_ID, tags, MODIFIED_AT)
 ```
 
 #### client.add_contact_activity

data/e2e/activities_api_spec.rb

@@ -81,7 +81,7 @@ describe 'Activities API' do
           type: FACTORY::CONVERSION_COMPLETE.type,
           locationUrl: 'http://www.wix.com',
           details: {summary: 'test', additionalInfoUrl: 'http://www.wix.com'},
-          info: {conversionType: 'PAGEVIEW'})
+          info: {conversionType: 'PAGEVIEW', messageId: '12345', metadata: [{ name: 'a', value: 'b' }] })
 
       new_activity_result = client.new_activity(session_id, activity)
 
@@ -89,7 +89,7 @@ describe 'Activities API' do
     end
 
     it 'E_COMMERCE_PURCHASE' do
-      coupon = {total: '1', title: 'Dis'}
+      coupon = {total: '1', formattedTotal: 1, title: 'Dis'}
       tax = {total: 1, formattedTotal: 1}
       shipping = {total: 1, formattedTotal: 1}
       payment = {total: '1', subtotal: '1', formattedTotal: '1.0', formattedSubtotal: '1.0', currency: 'EUR', coupon: coupon, tax: tax, shipping: shipping}
@@ -120,9 +120,10 @@ describe 'Activities API' do
     end
 
     it 'MESSAGING_SEND' do
-      recipient = {method: 'EMAIL', destination: {name: {first: 'Alex'}, target: 'localhost'}}
+      conversion_target = { conversionType:'FAN', metadata: [ { name: 'wix', value: '124'} ] }
+      recipient = {method: 'EMAIL', destination: {name: {first: 'Alex'}, target: 'localhost', contactId: '1234'}}
 
-      send = FACTORY::MESSAGING_SEND.klass.new(recipient: recipient)
+      send = FACTORY::MESSAGING_SEND.klass.new(messageId: '1111', recipient: recipient, conversionTarget: conversion_target)
 
       activity = Hive::Activity.new(
           type: FACTORY::MESSAGING_SEND.type,
@@ -135,12 +136,24 @@ describe 'Activities API' do
       expect(new_activity_result.activityId).to be_truthy
     end
 
+    it 'MUSIC_ALBUM_PLAYED' do
+      activity = Hive::Activity.new(
+          type: FACTORY::MUSIC_ALBUM_PLAYED.type,
+          locationUrl: 'http://www.wix.com',
+          details: {summary: 'test', additionalInfoUrl: 'http://www.wix.com'},
+          info: { album: { name: 'Wix', id: '1234' }, artist: {name: 'WIx', id: 'id_123'}  })
+
+      new_activity_result = client.new_activity(session_id, activity)
+
+      expect(new_activity_result.activityId).to be_truthy
+    end
+
     it 'MUSIC_ALBUM_FAN' do
       activity = Hive::Activity.new(
           type: FACTORY::MUSIC_ALBUM_FAN.type,
           locationUrl: 'http://www.wix.com',
           details: {summary: 'test', additionalInfoUrl: 'http://www.wix.com'},
-          info: { album: { name: 'Wix', id: '1234' } })
+          info: { album: { name: 'Wix', id: '1234' }, artist: {name: 'WIx', id: 'id_123'}  })
 
       new_activity_result = client.new_activity(session_id, activity)
 
@@ -152,7 +165,7 @@ describe 'Activities API' do
           type: FACTORY::MUSIC_ALBUM_SHARE.type,
           locationUrl: 'http://www.wix.com',
           details: {summary: 'test', additionalInfoUrl: 'http://www.wix.com'},
-          info: { album: { name: 'Wix', id: '1234' }, sharedTo: 'FACEBOOK' })
+          info: { album: { name: 'Wix', id: '1234' }, sharedTo: 'FACEBOOK', artist: {name: 'WIx', id: 'id_123'} })
 
       new_activity_result = client.new_activity(session_id, activity)
 
@@ -164,7 +177,7 @@ describe 'Activities API' do
           type: FACTORY::MUSIC_TRACK_LYRICS.type,
           locationUrl: 'http://www.wix.com',
           details: {summary: 'test', additionalInfoUrl: 'http://www.wix.com'},
-          info: { album: { name: 'Wix', id: '1234' }, track: { name: 'Wix', id: '1234' } })
+          info: { album: { name: 'Wix', id: '1234' }, track: { name: 'Wix', id: '1234' }, artist: {name: 'WIx', id: 'id_123'}})
 
       new_activity_result = client.new_activity(session_id, activity)
 
@@ -188,7 +201,7 @@ describe 'Activities API' do
           type: FACTORY::MUSIC_TRACK_PLAYED.type,
           locationUrl: 'http://www.wix.com',
           details: {summary: 'test', additionalInfoUrl: 'http://www.wix.com'},
-          info: { album: { name: 'Wix', id: '1234' }, track: { name: 'Wix', id: '1234' } })
+          info: { album: { name: 'Wix', id: '1234' }, track: { name: 'Wix', id: '1234' }, artist: {name: 'WIx', id: 'id_123'} })
 
       new_activity_result = client.new_activity(session_id, activity)
 
@@ -200,7 +213,7 @@ describe 'Activities API' do
           type: FACTORY::MUSIC_TRACK_SKIP.type,
           locationUrl: 'http://www.wix.com',
           details: {summary: 'test', additionalInfoUrl: 'http://www.wix.com'},
-          info: { album: { name: 'Wix', id: '1234' }, track: { name: 'Wix', id: '1234' } })
+          info: { album: { name: 'Wix', id: '1234' }, track: { name: 'Wix', id: '1234' }, artist: {name: 'WIx', id: 'id_123'} })
 
       new_activity_result = client.new_activity(session_id, activity)
 
@@ -212,7 +225,7 @@ describe 'Activities API' do
           type: FACTORY::MUSIC_TRACK_SHARE.type,
           locationUrl: 'http://www.wix.com',
           details: {summary: 'test', additionalInfoUrl: 'http://www.wix.com'},
-          info: { album: { name: 'Wix', id: '1234' }, track: { name: 'Wix', id: '1234' }, sharedTo: 'FACEBOOK' })
+          info: { album: { name: 'Wix', id: '1234' }, track: { name: 'Wix', id: '1234' }, sharedTo: 'FACEBOOK', artist: {name: 'WIx', id: 'id_123'} })
 
       new_activity_result = client.new_activity(session_id, activity)
 
@@ -220,7 +233,6 @@ describe 'Activities API' do
     end
 
     it 'HOTELS_CONFIRMATION' do
-      pending 'HAPI-36'
       guest = { total: 1, adults: 1, children: 0 }
 
       day_ago = (Time.now - (60 * 60 * 24)).iso8601(3)
@@ -240,7 +252,6 @@ describe 'Activities API' do
     end
 
     it 'HOTELS_CANCEL' do
-      pending 'HAPI-36'
       refund = {kind: 'FULL', total: 1, currency: 'EUR', destination: 'NYC'}
 
       guest = { total: 1, adults: 1, children: 0 }
@@ -274,8 +285,7 @@ describe 'Activities API' do
 
       tax = {name: 'VAT', total: 1, currency: 'EUR'}
 
-      # TODO: @Alex: Currency is a int in the schema.
-      rate = {date: Time.now.iso8601(3), subtotal: '1', total: '1', currency: '1', tax: tax}
+      rate = {date: Time.now.iso8601(3), subtotal: '1', total: '1', currency: 'EUR', taxes: [tax]}
 
       name = {prefix: 'prefix', first: 'Wix', middle: 'middle', last: 'Cool', suffix: 'suffix'}
 
@@ -283,14 +293,13 @@ describe 'Activities API' do
 
       bed = {kind: 'KING', sleeps: 1}
 
-      # TODO: @Alex: Amenities missing in the schema room object.
-      #room = {id: 1, beds: [bed], maxOccupancy: 1}
+      room = {id: 1, beds: [bed], maxOccupancy: 1, amenities: ['fridge']}
 
       activity = Hive::Activity.new(
           type: FACTORY::HOTELS_PURCHASE.type,
           locationUrl: 'http://www.wix.com',
           details: {summary: 'test', additionalInfoUrl: 'http://www.wix.com'},
-          info: { source: 'GUEST', guests: guest, stay: stay, invoice: invoice, rates: [rate], payment: payment, customer: customer, rooms: [] })
+          info: { source: 'GUEST', guests: guest, stay: stay, invoice: invoice, rates: [rate], payment: payment, customer: customer, rooms: [room] })
 
 
       new_activity_result = client.new_activity(session_id, activity)
@@ -320,11 +329,28 @@ describe 'Activities API' do
     end
 
     it 'SCHEDULER_APPOINTMENT' do
+      name = {prefix:'sir', first:'mix', middle:'a', last:'lot', suffix:'Sr.'}
+
+      location = {address:'123 meep st.',
+                  city:'meepsville',
+                  region:'meep',
+                  postalCode:'124JKE',
+                  country:'USSMEEP',
+                  url:'http://www.wix.com'}
+
+      info = { title:'my appointment', description:'write these tests', location: location,
+               time: {start:'2014-09-10T15:21:42.662Z', end:'2014-09-10T15:23:09.062Z', timezone:'ET'},
+               attendees:[ { contactId:'1234', name: name,
+                               phone:'555-2234', email:'a@a.com', notes:'things and stuff', self: true},
+                          { contactId:'1246', name: name,
+                               phone:'554-2234', email:'b@a.com', notes:'things and stuff'} ]
+      }
+
       activity = Hive::Activity.new(
           type: FACTORY::SCHEDULER_APPOINTMENT.type,
           locationUrl: 'http://www.wix.com',
           details: {summary: 'test', additionalInfoUrl: 'http://www.wix.com'},
-          info: { title: 'test', description: 'test' })
+          info: info)
 
       new_activity_result = client.new_activity(session_id, activity)
 

data/e2e/contacts_api_spec.rb

@@ -21,13 +21,14 @@ describe 'Contacts API' do
     contact.add_address(tag: 'home', address: '28208 N Inca St.', neighborhood: 'LODO', city: 'Denver', region: 'CO', country: 'US', postalCode: '80202')
     contact.add_date(date: Time.now.iso8601(3), tag: 'E2E')
     contact.add_url(url: 'wix.com', tag: 'site')
-    contact.add_note(content: 'alex')
+    contact.add_note(content: 'alex', modifiedAt: Time.now.iso8601(3))
     contact.add_custom(field: 'custom1', value: 'custom')
     expect(client.new_contact(contact)).to include :contactId
   end
 
   it '.contact' do
-    expect(client.contact(create_base_contact)).to be_a Hive::Contact
+    contact_id, _modified_at = create_base_contact
+    expect(client.contact(contact_id)).to be_a Hive::Contact
   end
 
   context '.contacts' do
@@ -134,9 +135,9 @@ describe 'Contacts API' do
   it '.update_contact_name' do
     base_contact.name.first = 'Old_Name'
 
-    contact_id = create_base_contact
+    contact_id, modified_at = create_base_contact
 
-    update_response = client.update_contact_name(contact_id, Hive::Name.new(first: 'New_Name'))
+    update_response = client.update_contact_name(contact_id, Hive::Name.new(first: 'New_Name'), modified_at)
 
     expect(update_response.name.first).to eq 'New_Name'
   end
@@ -146,12 +147,12 @@ describe 'Contacts API' do
     base_contact.company.name = 'Old_Company'
     base_contact.company.role = 'CEO'
 
-    contact_id  = create_base_contact
+    contact_id, modified_at = create_base_contact
 
     company = Hive::Company.new
     company.name = 'New_Company'
 
-    update_response = client.update_contact_company(contact_id, company)
+    update_response = client.update_contact_company(contact_id, company, modified_at)
 
     expect(update_response.company.name).to eq 'New_Company'
   end
@@ -159,11 +160,11 @@ describe 'Contacts API' do
   it '.update_contact_picture' do
     base_contact.picture = 'http://wix.com/img1.jpg'
 
-    contact_id = create_base_contact
+    contact_id, modified_at = create_base_contact
 
     updated_picture = 'wix.com'
 
-    update_response = client.update_contact_picture(contact_id, updated_picture)
+    update_response = client.update_contact_picture(contact_id, updated_picture, modified_at)
 
     expect(update_response.picture).to eq updated_picture
   end
@@ -171,20 +172,20 @@ describe 'Contacts API' do
   it '.update_contact_address' do
     base_contact.add_address(tag: 'home', address: '28208 N Inca St.', neighborhood: 'LODO', city: 'Denver', region: 'CO', country: 'US', postalCode: '80202')
 
-    contact = client.contact(create_base_contact)
+    contact = create_base_contact_and_return
 
     updated_address = Hive::Address.new
     updated_address.tag = 'work'
     updated_address.address = '1625 Larimer St.'
 
-    update_response = client.update_contact_address(contact.id, contact.addresses.first.id, updated_address)
+    update_response = client.update_contact_address(contact.id, contact.addresses.first.id, updated_address, contact.modifiedAt)
 
     expect(update_response.addresses.first.tag).to eq updated_address.tag
     expect(update_response.addresses.first.address).to eq updated_address.address
   end
 
   it '.update_contact_email' do
-    contact = client.contact(create_base_contact)
+    contact = create_base_contact_and_return
 
     expect(contact.emails).not_to be_empty
 
@@ -193,20 +194,20 @@ describe 'Contacts API' do
     updated_email.email = 'alex@example.com'
     updated_email.emailStatus = 'optOut'
 
-    update_response = client.update_contact_email(contact.id, contact.emails.first.id, updated_email)
+    update_response = client.update_contact_email(contact.id, contact.emails.first.id, updated_email, contact.modifiedAt)
 
     expect(update_response.emails.first.tag).to eq updated_email.tag
     expect(update_response.emails.first.email).to eq updated_email.email
   end
 
   it '.update_contact_phone' do
-    contact = client.contact(create_base_contact)
+    contact = create_base_contact_and_return
 
     updated_phone = Hive::Phone.new
     updated_phone.tag = 'work'
     updated_phone.phone = '18006666'
 
-    update_response = client.update_contact_phone(contact.id, contact.phones.first.id, updated_phone)
+    update_response = client.update_contact_phone(contact.id, contact.phones.first.id, updated_phone, contact.modifiedAt)
 
     expect(update_response.phones.first.tag).to eq updated_phone.tag
     expect(update_response.phones.first.phone).to eq updated_phone.phone
@@ -215,13 +216,13 @@ describe 'Contacts API' do
   it '.update_contact_date' do
     base_contact.add_date(date: Time.now.iso8601(3), tag: 'E2E')
 
-    contact = client.contact(create_base_contact)
+    contact = create_base_contact_and_return
 
     date = Hive::Date.new
     date.date = Time.now.iso8601(3)
     date.tag = 'update'
 
-    update_response = client.update_contact_date(contact.id, contact.dates.first.id, date)
+    update_response = client.update_contact_date(contact.id, contact.dates.first.id, date, contact.modifiedAt)
 
     expect(update_response.dates.first.tag).to eq date.tag
     #Ignore timezones and all just compare the int values.
@@ -229,31 +230,31 @@ describe 'Contacts API' do
   end
 
   it '.update_contact_note' do
-    pending 'CE-2301'
-    #base_contact.add_note(content: 'content', modifiedAt: Time.now.iso8601(3))
-    contact = client.contact(create_base_contact)
+    base_contact.add_note(content: 'content', modifiedAt: Time.now.iso8601(3))
+    contact = create_base_contact_and_return
 
     note = Hive::Note.new
     note.content = 'Note'
     note.modifiedAt = Time.now.iso8601(3)
 
-    update_response = client.update_contact_phone(contact.id, contact.notes.first.id, note)
+    update_response = client.update_contact_note(contact.id, contact.notes.first.id, note, contact.modifiedAt)
 
-    expect(update_response.notes.first.content).to eq note
+    expect(update_response.notes.first.content).to eq note.content
+    expect(update_response.notes.first.modifiedAt.to_i).to eq note.modifiedAt.to_i
   end
 
   it '.update_contact_custom' do
-    pending 'CE-2301'
-    contact = client.contact(create_base_contact)
+    base_contact.add_custom(field: 'custom', value: 'custom')
+    contact = create_base_contact_and_return
 
     custom = Hive::Custom.new
     custom.field = 'custom_update'
     custom.value = 'custom_value'
 
-    update_response = client.update_contact_phone(contact.id, contact.custom.first.id, custom)
+    update_response = client.update_contact_custom(contact.id, contact.custom.first.id, custom, contact.modifiedAt)
 
     expect(update_response.custom.first.field).to eq custom.field
-    expect(update_response.custom.first.content).to eq custom.value
+    expect(update_response.custom.first.value).to eq custom.value
   end
 
   it '.add_contact_address' do
@@ -261,7 +262,9 @@ describe 'Contacts API' do
     new_address.tag = 'work'
     new_address.address = '1625 Larimer St.'
 
-    add_response = client.add_contact_address(create_base_contact, new_address)
+    contact_id, modified_at = create_base_contact
+
+    add_response = client.add_contact_address(contact_id, new_address, modified_at)
 
     expect(add_response.addresses.last.tag).to eq new_address.tag
     expect(add_response.addresses.last.address).to eq new_address.address
@@ -273,7 +276,9 @@ describe 'Contacts API' do
     new_email.email = 'alex_new@example.com'
     new_email.emailStatus = 'optOut'
 
-    add_response = client.add_contact_email(create_base_contact, new_email)
+    contact_id, modified_at = create_base_contact
+
+    add_response = client.add_contact_email(contact_id, new_email, modified_at)
 
     expect(add_response.emails.last.tag).to eq new_email.tag
     expect(add_response.emails.last.email).to eq new_email.email
@@ -284,7 +289,9 @@ describe 'Contacts API' do
     new_phone.tag = 'work_new'
     new_phone.phone = '18006666'
 
-    add_response = client.add_contact_phone(create_base_contact, new_phone)
+    contact_id, modified_at = create_base_contact
+
+    add_response = client.add_contact_phone(contact_id, new_phone, modified_at)
 
     expect(add_response.phones.last.tag).to eq new_phone.tag
     expect(add_response.phones.last.phone).to eq new_phone.phone
@@ -293,11 +300,14 @@ describe 'Contacts API' do
   it '.add_contact_note' do
     note = Hive::Note.new
     note.content = 'Note'
+    note.modifiedAt = Time.now.iso8601(3)
 
-    add_response = client.add_contact_note(create_base_contact, note)
+    contact_id, modified_at = create_base_contact
+
+    add_response = client.add_contact_note(contact_id, note, modified_at)
 
     expect(add_response.notes.last.content).to eq note.content
-    expect(add_response.notes.last.modifiedAt).to eq note.modifiedAt
+    expect(add_response.notes.last.modifiedAt.to_i).to eq note.modifiedAt.to_i
   end
 
   it '.add_contact_custom' do
@@ -305,7 +315,9 @@ describe 'Contacts API' do
     custom.field = 'custom_update'
     custom.value = 'custom_value'
 
-    add_response = client.add_contact_custom(create_base_contact, custom)
+    contact_id, modified_at = create_base_contact
+
+    add_response = client.add_contact_custom(contact_id, custom, modified_at)
 
     expect(add_response.custom.last.field).to eq custom.field
     expect(add_response.custom.last.value).to eq custom.value
@@ -315,13 +327,15 @@ describe 'Contacts API' do
     pending 'CE-2312'
     tags = ['crazy/tag', 'lalala/tag']
 
-    add_response = client.add_contact_tags(create_base_contact, tags)
+    contact_id, modified_at = create_base_contact
+
+    add_response = client.add_contact_tags(contact_id, tags, modified_at)
 
     expect(add_response.tags).to include tags
   end
 
   it '.add_contact_activity' do
-    contact_id = create_base_contact
+    contact_id, _modified_at = create_base_contact
 
     activity = Hive::Activity.new(
         type: FACTORY::MUSIC_ALBUM_FAN.type,
@@ -336,7 +350,7 @@ describe 'Contacts API' do
   end
 
   it '.contact_activities' do
-    contact_id = create_base_contact
+    contact_id, _modified_at = create_base_contact
 
     activity = Hive::Activity.new(
         type: FACTORY::MUSIC_ALBUM_FAN.type,
@@ -360,6 +374,14 @@ describe 'Contacts API' do
 
     expect(create_response).to include :contactId
 
-    create_response[:contactId]
+    [create_response[:contactId], client.contact(create_response[:contactId]).modifiedAt]
+  end
+
+  def create_base_contact_and_return
+    create_response = client.new_contact(base_contact)
+
+    expect(create_response).to include :contactId
+
+    client.contact(create_response[:contactId])
   end
 end