flapjack 0.8.4 → 0.8.5

data/lib/flapjack/gateways/web/views/contacts.html.erb

@@ -20,3 +20,8 @@
     <% end %>
   </table>
 <% end %>
+
+<a href="/edit_contacts"/>
+  Edit contacts
+  <span class="label label-danger">beta</span>
+</a>

data/lib/flapjack/gateways/web/views/edit_contacts.html.erb

@@ -1,12 +1,13 @@
 <%
   require_css 'select2'
+  require_css 'select2-bootstrap'
 
   require_js  'underscore'
   require_js  'jquery-1.10.2'
-  require_js  'select2'
   require_js  'backbone'
   require_js  'backbone.jsonapi'
   require_js  'bootstrap.min'
+  require_js  'select2'
   require_js  'contacts'
 %>
 
@@ -19,25 +20,71 @@
 <script type="text/template" id="contact-list-item-template">
   <td><@- first_name @></td>
   <td><@- last_name @></td>
-  <td><@- email @></td>
+  <td>
+    <button type="button" class="close button delete delete-contact" aria-hidden="true">&minus;</button>
+  </td>
 </script>
 
-<div id="data-api-url" data-api-url="<%= @api_url %>">
-    <div class="page-header">
-      <h2>Edit Contacts</h2>
+<script type="text/template" id="contact-entities-list-item-template">
+  <td><@- name @></td>
+  <td><button type="button" class="close button delete delete-entity" aria-hidden="true">&minus;</button></td>
+</script>
+
+<script type="text/template" id="contact-media-list-item-template">
+  <td>
+    <@- labels[type] @>
+  </td>
+  <td>
+    <input type="text" data-attr="address" class="form-control" value="<@- address @>">
+  </td>
+  <td>
+    <input type="text" data-attr="interval" class="form-control" value="<@- interval @>">
+  </td>
+  <td>
+    <input type="text" data-attr="rollup_threshold" class="form-control" value="<@- rollup_threshold @>">
+  </td>
+</script>
+
+<script type="text/template" id="contact-template">
+  <div class="form-group">
+    <label class="col-sm-3 control-label" for="contact_first_name">First name</label>
+    <div class="col-sm-9">
+      <input type="text" autofocus="autofocus" name="contact_first_name" class="form-control" value="<@- first_name @>">
+    </div>
+  </div>
+  <div class="form-group">
+    <label class="col-sm-3 control-label" for="contact_last_name">Last name</label>
+    <div class="col-sm-9">
+      <input type="text" name="contact_last_name" class="form-control" value="<@- last_name @>">
     </div>
-    <div id="container">
-      <table class="table">
-        <thead>
-          <tr>
-            <th>First Name</th>
-            <th>Last Name</th>
-            <th>Email</th>
-          </tr>
-        </thead>
-        <tbody id="contactList">
-        </tbody>
-      </table>
+  </div>
+</script>
+
+<script type="text/template" id="contact-entity-chooser">
+  <input type="hidden" id="entityChooser" style="width: 440px">
+  <button id="add-contact-entity" type="button" class="btn btn-default btn-xs">
+    <i class="fa fa-plus-square"></i>
+    &nbsp;
+    Add Entities
+  </button>
+</script>
+
+<div id="data-api-url" data-api-url="<%= @api_url %>">
+  <div class="page-header">
+    <h2>Edit Contacts</h2>
+  </div>
+  <div id="container">
+    <table class="table">
+      <thead>
+        <tr>
+          <th>First Name</th>
+          <th>Last Name</th>
+          <th>&nbsp;</th>
+        </tr>
+      </thead>
+      <tbody id="contactList">
+      </tbody>
+    </table>
 
 <!-- Modal -->
 <div class="modal fade" id="contactModal" tabindex="-1" role="dialog" aria-labelledby="contactModalLabel" aria-hidden="true">
@@ -50,30 +97,39 @@
       <div class="modal-body">
 
         <form action="/contacts" method="post" role="form" class="form-horizontal">
-          <div class="form-group">
-            <label class="col-sm-3 control-label" for="contact_first_name">First name</label>
-            <div class="col-sm-9">
-              <input type="text" name="contact_first_name" class="form-control" value="">
-            </div>
-          </div>
-          <div class="form-group">
-            <label class="col-sm-3 control-label" for="contact_last_name">Last name</label>
-            <div class="col-sm-9">
-              <input type="text" name="contact_last_name" class="form-control" value="">
-            </div>
-          </div>
-          <div class="form-group">
-            <label class="col-sm-3 control-label" for="contact_email">Email</label>
-            <div class="col-sm-9">
-              <input type="text" name="contact_email" class="form-control" value="">
-            </div>
+
+          <div class="modal-footer">
+            <button type="button" class="btn btn-success" id="contactAccept">Create Contact</button>
           </div>
         </form><!-- form-horizontal-->
 
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        <button type="button" class="btn btn-success">Create Contact</button>
+        <table class="table">
+          <thead>
+            <tr>
+              <th style="width: 15%">Media</th>
+              <th style="width: 65%">Address</th>
+              <th style="width: 10%">Interval</th>
+              <th style="width: 10%">Rollup</th>
+            </tr>
+          </thead>
+          <tbody id="contactMediaList">
+          </tbody>
+        </table>
+
+        <div id="entityAdd">
+        </div>
+
+        <table class="table" style="margin-top: 1em">
+          <thead>
+            <tr>
+              <th>Entities</th>
+              <th>&nbsp;</th>
+            </tr>
+          </thead>
+          <tbody id="contactEntityList">
+          </tbody>
+        </table>
+
       </div>
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->

data/lib/flapjack/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

data/spec/lib/flapjack/gateways/jsonapi/contact_methods_spec.rb

@@ -76,25 +76,32 @@ describe 'Flapjack::Gateways::JSONAPI::ContactMethods', :sinatra => true, :logge
   it "returns all the contacts" do
     expect(Flapjack::Data::Contact).to receive(:entities_jsonapi).
       with([contact.id], :redis => redis).and_return([[], {}])
+    expect(contact).to receive(:media).and_return({})
     expect(contact).to receive(:linked_entity_ids=).with(nil)
-    expect(contact).to receive(:to_json).and_return(contact_core.to_json)
+    expect(contact).to receive(:linked_media_ids=).with(nil)
+    expect(contact).to receive(:to_jsonapi).and_return(contact_core.to_json)
     expect(Flapjack::Data::Contact).to receive(:all).with(:redis => redis).
       and_return([contact])
 
     aget '/contacts'
     expect(last_response).to be_ok
-    expect(last_response.body).to eq({:contacts => [contact_core]}.to_json)
+    expect(last_response.body).to eq({:contacts => [contact_core], :linked => {'entities' => [], 'media' => []}}.to_json)
   end
 
   it "returns the core information of a specified contact" do
-    expect(contact).to receive(:entities).and_return([])
-    expect(contact).to receive(:to_json).and_return(contact_core.to_json)
+    #expect(contact).to receive(:entities).and_return([])
+    expect(Flapjack::Data::Contact).to receive(:entities_jsonapi).
+      with([contact.id], :redis => redis).and_return([[], {}])    
+    expect(contact).to receive(:media).and_return({})
+    expect(contact).to receive(:linked_entity_ids=).with(nil)
+    expect(contact).to receive(:linked_media_ids=).with(nil)
+    expect(contact).to receive(:to_jsonapi).and_return(contact_core.to_json)
     expect(Flapjack::Data::Contact).to receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
     aget "/contacts/#{contact.id}"
     expect(last_response).to be_ok
-    expect(last_response.body).to eq({:contacts => [contact_core]}.to_json)
+    expect(last_response.body).to eq({:contacts => [contact_core], :linked => {'entities' => [], 'media' => []}}.to_json)
   end
 
   it "does not return information for a contact that does not exist" do
@@ -106,6 +113,7 @@ describe 'Flapjack::Gateways::JSONAPI::ContactMethods', :sinatra => true, :logge
   end
 
   it "creates a contact with supplied ID" do
+    #FIXME: I think media should be removed from this interface
     contact_data = {
       "id"         => "0362",
       "first_name" => "John",
@@ -136,7 +144,7 @@ describe 'Flapjack::Gateways::JSONAPI::ContactMethods', :sinatra => true, :logge
     expect(Flapjack::Data::Contact).to receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
     expect(contact).to receive(:update)
-    expect(contact).to receive(:to_json).and_return('{"sausage": "good"}')
+    expect(contact).to receive(:to_jsonapi).and_return('{"sausage": "good"}')
 
     aput "/contacts/21", {:contacts => [{'sausage' => 'good'}]}.to_json,
       {'CONTENT_TYPE' => JSON_REQUEST_MIME}
@@ -164,142 +172,6 @@ describe 'Flapjack::Gateways::JSONAPI::ContactMethods', :sinatra => true, :logge
     expect(last_response.status).to eq(422)
   end
 
-  it "replaces contacts with a submitted list" do
-    contacts = {'contacts' =>
-      [{"id" => "0362",
-        "first_name" => "John",
-        "last_name" => "Smith",
-        "email" => "johns@example.dom",
-        "media" => {"email"  => "johns@example.dom",
-                    "jabber" => "johns@conference.localhost"}},
-       {"id" => "0363",
-        "first_name" => "Jane",
-        "last_name" => "Jones",
-        "email" => "jane@example.dom",
-        "media" => {"email" => "jane@example.dom"}}
-      ]
-    }
-
-    expect(Flapjack::Data::Semaphore).to receive(:new).
-      with("contact_mass_update", {:redis => redis, :expiry => 30}).and_return(semaphore)
-    expect(Flapjack::Data::Contact).to receive(:all).with(:redis => redis).and_return([])
-    expect(Flapjack::Data::Contact).to receive(:add).twice
-    expect(semaphore).to receive(:release).and_return(true)
-
-    apost "/contacts_atomic", contacts.to_json, {'CONTENT_TYPE' => JSON_REQUEST_MIME}
-    expect(last_response.status).to eq(204)
-  end
-
-  it "does not replace contacts if the data is improperly formatted" do
-    expect(Flapjack::Data::Contact).not_to receive(:add)
-
-    apost "/contacts_atomic", {'contacts' => ["Hello", "again"]}.to_json,
-      {'CONTENT_TYPE' => JSON_REQUEST_MIME}
-    expect(last_response.status).to eq(422)
-  end
-
-  it "does not replace contacts if they don't contain an id in the source" do
-    contacts = {'contacts' =>
-      [{"id" => "0362",
-        "first_name" => "John",
-        "last_name" => "Smith",
-        "email" => "johns@example.dom",
-        "media" => {"email"  => "johns@example.dom",
-                    "jabber" => "johns@conference.localhost"}},
-       {"first_name" => "Jane",
-        "last_name" => "Jones",
-        "email" => "jane@example.dom",
-        "media" => {"email" => "jane@example.dom"}}
-      ]
-    }
-
-    expect(Flapjack::Data::Semaphore).to receive(:new).
-      with("contact_mass_update", {:redis => redis, :expiry => 30}).and_return(semaphore)
-    expect(Flapjack::Data::Contact).to receive(:all).with(:redis => redis).and_return([])
-    expect(Flapjack::Data::Contact).to receive(:add)
-    expect(semaphore).to receive(:release).and_return(true)
-
-    apost "/contacts_atomic", contacts.to_json, {'CONTENT_TYPE' => JSON_REQUEST_MIME}
-    expect(last_response.status).to eq(204)
-  end
-
-  it "updates a contact in a bulk replacement list if it is already present" do
-    contacts = {'contacts' =>
-      [{"id" => "0362",
-        "first_name" => "John",
-        "last_name" => "Smith",
-        "email" => "johns@example.dom",
-        "media" => {"email"  => "johns@example.dom",
-                    "jabber" => "johns@conference.localhost"}},
-       {"id" => "0363",
-        "first_name" => "Jane",
-        "last_name" => "Jones",
-        "email" => "jane@example.dom",
-        "media" => {"email" => "jane@example.dom"}}
-      ]
-    }
-
-    expect(Flapjack::Data::Semaphore).to receive(:new).
-      with("contact_mass_update", {:redis => redis, :expiry => 30}).and_return(semaphore)
-    existing = double(Flapjack::Data::Contact)
-    expect(existing).to receive(:id).and_return("0363")
-    expect(existing).to receive(:update).with(contacts['contacts'][1])
-
-    expect(Flapjack::Data::Contact).to receive(:all).with(:redis => redis).and_return([existing])
-    expect(Flapjack::Data::Contact).to receive(:add).with(contacts['contacts'][0], :redis => redis)
-    expect(semaphore).to receive(:release).and_return(true)
-
-    apost "/contacts_atomic", contacts.to_json, {'CONTENT_TYPE' => JSON_REQUEST_MIME}
-    expect(last_response.status).to eq(204)
-  end
-
-  it "deletes a contact not found in a bulk update list" do
-    contacts = {'contacts' =>
-      [{"id" => "0363",
-        "first_name" => "Jane",
-        "last_name" => "Jones",
-        "email" => "jane@example.dom",
-        "media" => {"email" => "jane@example.dom"}}
-      ]
-    }
-
-    expect(Flapjack::Data::Semaphore).to receive(:new).
-      with("contact_mass_update", {:redis => redis, :expiry => 30}).and_return(semaphore)
-    existing = double(Flapjack::Data::Contact)
-    expect(existing).to receive(:id).twice.and_return("0362")
-    expect(existing).to receive(:delete!)
-
-    expect(Flapjack::Data::Contact).to receive(:all).with(:redis => redis).and_return([existing])
-    expect(Flapjack::Data::Contact).to receive(:add).with(contacts['contacts'][0], :redis => redis)
-    expect(semaphore).to receive(:release).and_return(true)
-
-    apost "/contacts_atomic", contacts.to_json, {'CONTENT_TYPE' => JSON_REQUEST_MIME}
-    expect(last_response.status).to eq(204)
-  end
-
-  it "lists a contact's notification rules" do
-    notification_rule_2 = double(Flapjack::Data::NotificationRule, :id => '2', :contact_id => '21')
-    expect(notification_rule).to receive(:to_json).and_return('"rule_1"')
-    expect(notification_rule_2).to receive(:to_json).and_return('"rule_2"')
-    notification_rules = [ notification_rule, notification_rule_2 ]
-
-    expect(contact).to receive(:notification_rules).and_return(notification_rules)
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
-
-    aget "/contacts/#{contact.id}/notification_rules"
-    expect(last_response).to be_ok
-    expect(last_response.body).to eq('["rule_1","rule_2"]')
-  end
-
-  it "does not list notification rules for a contact that does not exist" do
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
-
-    aget "/contacts/#{contact.id}/notification_rules"
-    expect(last_response.status).to eq(404)
-  end
-
   it "returns a specified notification rule" do
     expect(notification_rule).to receive(:to_json).and_return('"rule_1"')
     expect(Flapjack::Data::NotificationRule).to receive(:find_by_id).
@@ -349,14 +221,6 @@ describe 'Flapjack::Gateways::JSONAPI::ContactMethods', :sinatra => true, :logge
     expect(last_response.status).to eq(404)
   end
 
-  it "does not create a notification_rule if a rule id is provided" do
-    expect(contact).not_to receive(:add_notification_rule)
-
-    apost "/notification_rules", {"notification_rules" => [notification_rule_data.merge(:id => 1)]}.to_json,
-      {'CONTENT_TYPE' => JSON_REQUEST_MIME}
-    expect(last_response.status).to eq(422)
-  end
-
   # PUT /notification_rules/RULE_ID
   it "updates a notification rule" do
     expect(Flapjack::Data::Contact).to receive(:find_by_id).
@@ -431,400 +295,24 @@ describe 'Flapjack::Gateways::JSONAPI::ContactMethods', :sinatra => true, :logge
     expect(last_response.status).to eq(404)
   end
 
-  # GET /contacts/CONTACT_ID/media
-  it "returns the media of a contact" do
-    expect(contact).to receive(:media).and_return(media)
-    expect(contact).to receive(:media_intervals).and_return(media_intervals)
-    expect(contact).to receive(:media_rollup_thresholds).and_return(media_rollup_thresholds)
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
-    result = Hash[ *(media.keys.collect {|m|
-      [m, {'address'          => media[m],
-           'interval'         => media_intervals[m],
-           'rollup_threshold' => media_rollup_thresholds[m] }]
-      }).flatten(1)].to_json
-
-    aget "/contacts/#{contact.id}/media"
-    expect(last_response).to be_ok
-    expect(last_response.body).to eq(result)
-  end
-
-  it "does not return the media of a contact if the contact is not present" do
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
-
-    aget "/contacts/#{contact.id}/media"
-    expect(last_response.status).to eq(404)
-  end
-
-  # GET /contacts/CONTACT_ID/media/MEDIA
-  it "returns the specified media of a contact" do
-    expect(contact).to receive(:media).and_return(media)
-    expect(contact).to receive(:media_intervals).and_return(media_intervals)
-    expect(contact).to receive(:media_rollup_thresholds).and_return(media_rollup_thresholds)
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
-
-    result = {
-      'address'          => media['sms'],
-      'interval'         => media_intervals['sms'],
-      'rollup_threshold' => media_rollup_thresholds['sms'],
-    }
-
-    aget "/contacts/#{contact.id}/media/sms"
-    expect(last_response).to be_ok
-    expect(last_response.body).to eq(result.to_json)
-  end
-
-  it "does not return the media of a contact if the contact is not present" do
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
-
-    aget "/contacts/#{contact.id}/media/sms"
-    expect(last_response.status).to eq(404)
-  end
-
-  it "does not return the media of a contact if the media is not present" do
-    expect(contact).to receive(:media).and_return(media)
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
-
-    aget "/contacts/#{contact.id}/media/telepathy"
-    expect(last_response.status).to eq(404)
-  end
-
-  # PUT, DELETE /contacts/CONTACT_ID/media/MEDIA
-  it "creates/updates a media of a contact" do
-    # as far as API is concerned these are the same -- contact.rb spec test
-    # may distinguish between them
-    alt_media = media.merge('sms' => '04987654321')
-    alt_media_intervals = media_intervals.merge('sms' => '200')
-    alt_media_rollup_thresholds = media_rollup_thresholds.merge('sms' => '5')
-
-    expect(contact).to receive(:set_address_for_media).with('sms', '04987654321')
-    expect(contact).to receive(:set_interval_for_media).with('sms', '200')
-    expect(contact).to receive(:set_rollup_threshold_for_media).with('sms', '5')
-    expect(contact).to receive(:media).and_return(alt_media)
-    expect(contact).to receive(:media_intervals).and_return(alt_media_intervals)
-    expect(contact).to receive(:media_rollup_thresholds).and_return(alt_media_rollup_thresholds)
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
-
-    result = {'address'          => alt_media['sms'],
-              'interval'         => alt_media_intervals['sms'],
-              'rollup_threshold' => alt_media_rollup_thresholds['sms']}
-
-    aput "/contacts/#{contact.id}/media/sms", :address => '04987654321',
-      :interval => '200', :rollup_threshold => '5'
-    expect(last_response).to be_ok
-    expect(last_response.body).to eq(result.to_json)
-  end
-
-  it "updates a contact's pagerduty media credentials" do
-    result = {'service_key' => "flapjacktest@conference.jabber.sausage.net",
-              'subdomain'   => "sausage.pagerduty.com",
-              'username'    => "sausage@example.com",
-              'password'    => "sausage"}
-
-    expect(contact).to receive(:set_pagerduty_credentials).with(result)
-    expect(contact).to receive(:pagerduty_credentials).and_return(result)
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
-
-    aput "/contacts/#{contact.id}/media/pagerduty", :service_key => result['service_key'],
-      :subdomain => result['subdomain'], :username => result['username'],
-      :password => result['password']
-
-    expect(last_response).to be_ok
-    expect(last_response.body).to eq(result.to_json)
-  end
-
-  it "does not create a media of a contact that's not present" do
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
-
-    aput "/contacts/#{contact.id}/media/sms", :address => '04987654321', :interval => '200'
-    expect(last_response.status).to eq(404)
-  end
-
-  it "does not create a media of a contact if no address is provided" do
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
-
-    aput "/contacts/#{contact.id}/media/sms", :interval => '200'
-    expect(last_response.status).to eq(422)
-  end
-
-  it "creates a media of a contact even if no interval is provided" do
-    alt_media = media.merge('sms' => '04987654321')
-    alt_media_intervals = media_intervals.merge('sms' => nil)
-    alt_media_rollup_thresholds = media_rollup_thresholds.merge('sms' => nil)
-
-    expect(contact).to receive(:set_address_for_media).with('sms', '04987654321')
-    expect(contact).to receive(:set_interval_for_media).with('sms', nil)
-    expect(contact).to receive(:set_rollup_threshold_for_media).with("sms", nil)
-    expect(contact).to receive(:media).and_return(alt_media)
-    expect(contact).to receive(:media_intervals).and_return(alt_media_intervals)
-    expect(contact).to receive(:media_rollup_thresholds).and_return(alt_media_rollup_thresholds)
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
-
-    aput "/contacts/#{contact.id}/media/sms", :address => '04987654321'
-    expect(last_response).to be_ok
-  end
-
-  it "deletes a media of a contact" do
-    expect(contact).to receive(:remove_media).with('sms')
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
-
-    adelete "/contacts/#{contact.id}/media/sms"
-    expect(last_response.status).to eq(204)
-  end
-
-  it "does not delete a media of a contact that's not present" do
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
-
-    adelete "/contacts/#{contact.id}/media/sms"
-    expect(last_response.status).to eq(404)
-  end
-
-  # GET /contacts/CONTACT_ID/timezone
-  it "returns the timezone of a contact" do
-    expect(contact).to receive(:timezone).and_return(::ActiveSupport::TimeZone.new('Australia/Sydney'))
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
-
-    aget "/contacts/#{contact.id}/timezone"
-    expect(last_response).to be_ok
-    expect(last_response.body).to eq('"Australia/Sydney"')
-  end
-
-  it "doesn't get the timezone of a contact that doesn't exist" do
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
-
-    aget "/contacts/#{contact.id}/timezone"
-    expect(last_response.status).to eq(404)
-  end
-
-  # PUT /contacts/CONTACT_ID/timezone
-  it "sets the timezone of a contact" do
-    expect(contact).to receive(:timezone=).with('Australia/Perth')
-    expect(contact).to receive(:timezone).and_return(ActiveSupport::TimeZone.new('Australia/Perth'))
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
-
-    aput "/contacts/#{contact.id}/timezone", {:timezone => 'Australia/Perth'}
-    expect(last_response).to be_ok
-  end
-
-  it "doesn't set the timezone of a contact who can't be found" do
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
-
-    aput "/contacts/#{contact.id}/timezone", {:timezone => 'Australia/Perth'}
-    expect(last_response.status).to eq(404)
-  end
-
-  # DELETE /contacts/CONTACT_ID/timezone
-  it "deletes the timezone of a contact" do
-    expect(contact).to receive(:timezone=).with(nil)
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
-
-    adelete "/contacts/#{contact.id}/timezone"
-    expect(last_response.status).to eq(204)
-  end
-
-  it "does not delete the timezone of a contact that's not present" do
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
-
-    adelete "/contacts/#{contact.id}/timezone"
-    expect(last_response.status).to eq(404)
-  end
-
-  it "sets a single tag on a contact and returns current tags" do
-    expect(contact).to receive(:add_tags).with('web')
-    expect(contact).to receive(:tags).and_return(['web'])
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
-
-    apost "contacts/#{contact.id}/tags", {:tags => ['web']}.to_json, {'CONTENT_TYPE' => JSON_REQUEST_MIME}
-    expect(last_response).to be_ok
-    expect(last_response.body).to eq({:tags => ['web']}.to_json)
-  end
-
-  it "does not set a single tag on a contact that's not found" do
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
-
-    apost "contacts/#{contact.id}/tags", {:tags => ['web']}.to_json, {'CONTENT_TYPE' => JSON_REQUEST_MIME}
-    expect(last_response.status).to eq(404)
-  end
+  it "returns the media of a contact"
 
-  it "sets multiple tags on a contact and returns current tags" do
-    expect(contact).to receive(:add_tags).with('web', 'app')
-    expect(contact).to receive(:tags).and_return(['web', 'app'])
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
+  it "returns the specified media of a contact"
 
-    apost "contacts/#{contact.id}/tags", {:tags => ['web', 'app']}.to_json, {'CONTENT_TYPE' => JSON_REQUEST_MIME}
-    expect(last_response).to be_ok
-    expect(last_response.body).to eq({:tags => ['web', 'app']}.to_json)
-  end
+  it "does not return the media of a contact if the media is not present"
 
-  it "does not set multiple tags on a contact that's not found" do
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
+  it "creates/updates a media of a contact"
 
-    apost "contacts/#{contact.id}/tags", {:tags => ['web', 'app']}.to_json, {'CONTENT_TYPE' => JSON_REQUEST_MIME}
-    expect(last_response.status).to eq(404)
-  end
+  it "updates a contact's pagerduty media credentials"
 
-  it "removes a single tag from a contact" do
-    expect(contact).to receive(:delete_tags).with('web')
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
+  it "does not create a media of a contact that's not present"
 
-    adelete "contacts/#{contact.id}/tags", {:tags => ['web']}.to_json, {'CONTENT_TYPE' => JSON_REQUEST_MIME}
-    expect(last_response.status).to eq(204)
-  end
+  it "does not create a media of a contact if no address is provided"
 
-  it "does not remove a single tag from a contact that's not found" do
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
+  it "creates a media of a contact even if no interval is provided"
 
-    adelete "contacts/#{contact.id}/tags", {:tags => ['web']}.to_json, {'CONTENT_TYPE' => JSON_REQUEST_MIME}
-    expect(last_response.status).to eq(404)
-  end
-
-  it "removes multiple tags from a contact" do
-    expect(contact).to receive(:delete_tags).with('web', 'app')
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
-
-    adelete "contacts/#{contact.id}/tags", {:tags => ['web', 'app']}.to_json, {'CONTENT_TYPE' => JSON_REQUEST_MIME}
-    expect(last_response.status).to eq(204)
-  end
-
-  it "does not remove multiple tags from a contact that's not found" do
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
-
-    adelete "contacts/#{contact.id}/tags", {:tags => ['web', 'app']}.to_json, {'CONTENT_TYPE' => JSON_REQUEST_MIME}
-    expect(last_response.status).to eq(404)
-  end
-
-  it "gets all tags on a contact" do
-    expect(contact).to receive(:tags).and_return(['web', 'app'])
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
-
-    aget "contacts/#{contact.id}/tags"
-    expect(last_response).to be_ok
-    expect(last_response.body).to eq({"tags"=>['web', 'app']}.to_json)
-  end
-
-  it "does not get all tags on a contact that's not found" do
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
-
-    aget "contacts/#{contact.id}/tags"
-    expect(last_response.status).to eq(404)
-  end
-
-  it "gets all entity tags for a contact" do
-    entity_1 = double(Flapjack::Data::Entity)
-    expect(entity_1).to receive(:name).and_return('entity_1')
-    entity_2 = double(Flapjack::Data::Entity)
-    expect(entity_2).to receive(:name).and_return('entity_2')
-    tag_data = [{:entity => entity_1, :tags => ['web']},
-                {:entity => entity_2, :tags => ['app']}]
-    expect(contact).to receive(:entities).with(:tags => true).
-      and_return(tag_data)
-
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
-
-    aget "contacts/#{contact.id}/entity_tags"
-    expect(last_response).to be_ok
-    tag_response = {'entity_1' => ['web'],
-                    'entity_2' => ['app']}
-    expect(last_response.body).to eq(tag_response.to_json)
-  end
-
-  it "does not get all entity tags for a contact that's not found" do
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
-
-    aget "contacts/#{contact.id}/entity_tags"
-    expect(last_response.status).to eq(404)
-  end
-
-  it "adds tags to multiple entities for a contact" do
-    entity_1 = double(Flapjack::Data::Entity)
-    expect(entity_1).to receive(:name).twice.and_return('entity_1')
-    expect(entity_1).to receive(:add_tags).with('web')
-    entity_2 = double(Flapjack::Data::Entity)
-    expect(entity_2).to receive(:name).twice.and_return('entity_2')
-    expect(entity_2).to receive(:add_tags).with('app')
-
-    entities = [{:entity => entity_1}, {:entity => entity_2}]
-    expect(contact).to receive(:entities).and_return(entities)
-    tag_data = [{:entity => entity_1, :tags => ['web']},
-                {:entity => entity_2, :tags => ['app']}]
-    expect(contact).to receive(:entities).with(:tags => true).and_return(tag_data)
-
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
-
-    apost "contacts/#{contact.id}/entity_tags",
-      :entity => {'entity_1' => ['web'], 'entity_2' => ['app']}
-    expect(last_response).to be_ok
-    tag_response = {'entity_1' => ['web'],
-                    'entity_2' => ['app']}
-    expect(last_response.body).to  eq(tag_response.to_json)
-  end
-
-  it "does not add tags to multiple entities for a contact that's not found" do
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
-
-    apost "contacts/#{contact.id}/entity_tags",
-      :entity => {'entity_1' => ['web'], 'entity_2' => ['app']}
-    expect(last_response.status).to eq(404)
-  end
-
-  it "deletes tags from multiple entities for a contact" do
-    entity_1 = double(Flapjack::Data::Entity)
-    expect(entity_1).to receive(:name).and_return('entity_1')
-    expect(entity_1).to receive(:delete_tags).with('web')
-    entity_2 = double(Flapjack::Data::Entity)
-    expect(entity_2).to receive(:name).and_return('entity_2')
-    expect(entity_2).to receive(:delete_tags).with('app')
-
-    entities = [{:entity => entity_1}, {:entity => entity_2}]
-    expect(contact).to receive(:entities).and_return(entities)
-
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
-
-    adelete "contacts/#{contact.id}/entity_tags",
-      :entity => {'entity_1' => ['web'], 'entity_2' => ['app']}
-    expect(last_response.status).to eq(204)
-  end
-
-  it "does not delete tags from multiple entities for a contact that's not found" do
-    expect(Flapjack::Data::Contact).to receive(:find_by_id).
-      with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
-
-    adelete "contacts/#{contact.id}/entity_tags",
-      :entity => {'entity_1' => ['web'], 'entity_2' => ['app']}
-    expect(last_response.status).to eq(404)
-  end
+  it "deletes a media of a contact"
 
+  it "does not delete a media of a contact that's not present"
 
 end