Moved the open_tickets to the Account rather than the Ticket class

Author: SLsthompson

CHANGELOG.textile

@@ -3,6 +3,7 @@
 * Substantially rewrote the ObjectFilter class.  ObjectFilters used to be hashes which made it easy to manipulate their content incorrectly. The new implementation has a strict interface that makes it harder to manipulate filters incorrectly.
 * Added a model for Virtual Server Image Templates (SoftLayer::ImageTemplate) - VirtualServerOrder now requires an instance of this class rather than allowing you to provide just the global_id of an image
 * Added a model for data centers (SoftLayer::Datacenter). Bare Metal, Bare Metal Package, and Virtual server orders now use an instance of Datacenter to identify where their servers will be provisioned. The routines in those classes which used to provide lists of valid data center names now return data center objects.
+* The routine to retreive the open tickets on an account has been moved from the Ticket class to a dynamic property of an account
 
 *2.1.1*
 * Virtual server upgrades no longer raise exceptions

lib/softlayer/Account.rb

@@ -4,8 +4,6 @@
 # For licensing information see the LICENSE.md file in the project root.
 #++
 
-
-
 module SoftLayer
   class Account < SoftLayer::ModelBase
     include ::SoftLayer::DynamicAttribute
@@ -111,6 +109,19 @@ class Account < SoftLayer::ModelBase
       end
     end
 
+    sl_dynamic_attr :open_tickets do |open_tickets|
+      open_tickets.should_update? do
+        @last_open_tickets_update ||= Time.at(0)
+        (Time.now - @last_open_tickets_update) > 5 * 60  # update every 5 minutes
+      end
+
+      open_tickets.to_update do
+        @last_open_tickets_update ||= Time.now
+        open_tickets_data = self.service.object_mask(SoftLayer::Ticket.default_object_mask).getOpenTickets
+        open_tickets_data.collect { |ticket_data| SoftLayer::Ticket.new(self.softlayer_client, ticket_data) }
+      end
+    end
+
     def service
       softlayer_client["Account"].object_with_id(self.id)
     end

lib/softlayer/Ticket.rb

@@ -4,8 +4,6 @@
 # For licensing information see the LICENSE.md file in the project root.
 #++
 
-
-
 module SoftLayer
 	class Ticket < SoftLayer::ModelBase
 
@@ -85,7 +83,7 @@ def self.default_object_mask
           'awaitingUserResponseFlag',   # This comes in from the server as a Boolean value
           'serverAdministrationFlag',   # This comes in from the server as an integer :-(
         ]
-      }
+      }.to_sl_object_mask
 		end
 
     ##
@@ -104,29 +102,6 @@ def self.ticket_subjects(client = nil)
 			@ticket_subjects
 		end
 
-    ##
-    # Returns the set of currently open tickets
-    #
-    # Options should contain:
-    #
-    # <b>+:client+</b> - the client in which to search for the ticket
-    #
-    # If a client is not provided then the routine will search Client::default_client
-    # If Client::default_client is also nil the routine will raise an error.
-    def self.open_tickets(options = {})
-      softlayer_client = options[:client] || Client.default_client
-      raise "#{__method__} requires a client but none was given and Client::default_client is not set" if !softlayer_client
-
-      if options.has_key?(:object_mask)
-        object_mask = options[:object_mask]
-      else
-        object_mask = default_object_mask.to_sl_object_mask
-      end
-
-      open_tickets_data = softlayer_client["Account"].object_mask(object_mask).getOpenTickets
-      open_tickets_data.collect { |ticket_data| new(softlayer_client, ticket_data) }
-    end
-
     ##
     # Find the ticket with the given ID and return it
     #

spec/Account_spec.rb

@@ -4,8 +4,6 @@
 # For licensing information see the LICENSE.md file in the project root.
 #++
 
-
-
 $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
 
 require 'rubygems'
@@ -81,6 +79,21 @@
       expect(test_account.officePhone).to eq "555.123.4567"
     end
   end
+  
+  it "fetches a list of open tickets" do
+    mock_client = SoftLayer::Client.new(:username => "fakeuser", :api_key => "fake_api_key")
+    account_service = mock_client["Account"]
+
+    expect(account_service).to receive(:call_softlayer_api_with_params).with(:getOpenTickets, instance_of(SoftLayer::APIParameterFilter),[]) do
+      fixture_from_json("test_tickets")
+    end
+
+    test_account = SoftLayer::Account.new(mock_client, fixture_from_json("test_account"))
+    open_tickets = nil
+    expect { open_tickets = test_account.open_tickets }.to_not raise_error
+    ticket_ids = open_tickets.collect { |ticket| ticket.id }
+    expect(ticket_ids.sort).to eq [12345, 12346, 12347, 12348, 12349].sort
+  end
 
   describe "relationship to servers" do
     it "should respond to a request for servers" do

spec/Ticket_spec.rb

@@ -4,8 +4,6 @@
 # For licensing information see the LICENSE.md file in the project root.
 #++
 
-
-
 $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
 
 require 'rubygems'
@@ -19,17 +17,6 @@
     SoftLayer::Ticket.instance_eval { @ticket_subjects = nil }
   end
 
-  it "fetches a list of open tickets" do
-    mock_client = SoftLayer::Client.new(:username => "fakeuser", :api_key => "fake_api_key")
-    account_service = mock_client["Account"]
-
-    expect(account_service).to receive(:call_softlayer_api_with_params).with(:getOpenTickets, instance_of(SoftLayer::APIParameterFilter),[]) do
-      fixture_from_json("test_tickets")
-    end
-
-    SoftLayer::Ticket.open_tickets(:client => mock_client)
-  end
-
 	it "retrieves ticket subjects from API once" do
     fakeTicketSubjects = fixture_from_json("ticket_subjects")