sasswillio 1.0.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 846da3f8ba8c1607855ba02d78c8d0b17557816e8d94c54ae812a1acbeec52a4
-  data.tar.gz: c3bfe454c65b4db675dc23c108c89bc1d5c90ea0de632799fcd8879cf8ff0d70
+  metadata.gz: ed8776bd99b624f0b72a7496031ec59444c2dbf69fb173b001a7fb87d9306985
+  data.tar.gz: c41657faff94c61927c77dbe268d48f66c54f412909ec4fd7e9c57a9b66d9893
 SHA512:
-  metadata.gz: 87a51d8bd34529a422cb001233335d37969275803b107d550cbf4e4657730598ce5c7139779b2b77cf3708e9f69bd72543684a1e06c25fafb28086e36834ff14
-  data.tar.gz: 17f7f0cda49481a995338a0d29641635d0ef71cfd4da6f017348b187ab3198b0421fc5c30e2b28ac30d8245d67062b46a046c8785fe486f878a3f93af49c0dc2
+  metadata.gz: aa2aa47605e86bf1f6b73ac9e2720e89c622876cb86e68ebfe5a764b14e6bc27e3ed32e0b7b8f6b5a14ef713ee9d4d3431708194e1339e962a7dea3913428f2c
+  data.tar.gz: fbe16687c5d1f91d626d39584889663f3ae788cb38ad3c0df06fcc45fbd45ddd1242203c368d86c036b0bb696790926e566333869e5fa55a363263c561b1cdfd

data/lib/sasswillio.rb

@@ -8,6 +8,7 @@ require 'twilio-ruby'
 # subaccount = Sasswillio.create_subaccount(@client, '423')
 # sms_pricing = Sasswillio.get_sms_pricing_for(@client, 'FR')
 # country_nums = Sasswillio.list_sms_enabled_phone_numbers_for_country(@client, {country_code: 'GB'})
+# numbers_with_pricing = Sasswillio.list_sms_enabled_phone_numbers_for_country_with_pricing(@client, {country_code: 'CA'})
 
 module Sasswillio
 
@@ -87,7 +88,7 @@ module Sasswillio
         in_region: options[:region],
         contains: "#{options[:contains]}*******"
       )
-      return numbers.map{|n| {number: n.phone_number, capabilities: {**n.capabilities.transform_keys(&:to_sym), friendly_name: n.friendly_name}}}
+      return numbers.map{|n| {number: n.phone_number, friendly_name: n.friendly_name, capabilities: {**n.capabilities.transform_keys(&:to_sym)}}}
     rescue Twilio::REST::TwilioError => e
       return {
         error: true,
@@ -103,22 +104,61 @@ module Sasswillio
       numbers[:local] = twilio_client.available_phone_numbers(options[:country_code]).local.list(
         sms_enabled: true,
       )
+    rescue Twilio::REST::TwilioError => e
+      numbers[:local] = []
+    end
+
+    begin
       numbers[:mobile] = twilio_client.available_phone_numbers(options[:country_code]).mobile.list(
         sms_enabled: true,
       )
+    rescue Twilio::REST::TwilioError => e
+      numbers[:mobile] = []
+    end
+    transformed = Hash.new
+    transformed[:local_numbers] = numbers[:local].map{|n| {number: n.phone_number, friendly_name: n.friendly_name, capabilities: {**n.capabilities.transform_keys(&:to_sym)}}}
+    transformed[:mobile_numbers] = numbers[:mobile].map{|n| {number: n.phone_number, friendly_name: n.friendly_name, capabilities: {**n.capabilities.transform_keys(&:to_sym)}}}
+    return transformed
+  end
 
-      transformed = Hash.new
-      transformed[:local_numbers] = numbers[:local].map{|n| {number: n.phone_number, capabilities: {**n.capabilities.transform_keys(&:to_sym), friendly_name: n.friendly_name}}}
-      transformed[:mobile_numbers] = numbers[:mobile].map{|n| {number: n.phone_number, capabilities: {**n.capabilities.transform_keys(&:to_sym), friendly_name: n.friendly_name}}}
-      return transformed
+  def self.list_sms_enabled_phone_numbers_for_country_with_pricing(twilio_client, options = {country_code: 'CA'})
+    numbers_with_pricing = Hash.new
+    begin
+      available_nums = Sasswillio.list_sms_enabled_phone_numbers_for_country(twilio_client, options)
+      sms_pricing = Sasswillio.get_sms_pricing_for(twilio_client, options[:country_code])
+      phone_number_monthly_costs = Sasswillio.get_phone_number_pricing_for(twilio_client, options[:country_code])
+      available_nums.keys.each do |k|
+        numbers_with_pricing[k] = available_nums[k].map do |n|
+          if k == :local_numbers
+            {
+              **n,
+              sms_pricing: { 
+                inbound_cost: sms_pricing[:complete_pricing_for_country][:local_inbound],
+                average_outbound_cost: sms_pricing[:complete_pricing_for_country][:local_outbound_average]
+              },
+              monthly_cost: phone_number_monthly_costs.phone_number_prices.find{|c| c["number_type"] == 'local'} ? phone_number_monthly_costs.phone_number_prices.find{|c| c["number_type"] == 'local'}["current_price"] : nil
+            }
+          elsif k == :mobile_numbers
+            {
+              **n,
+              sms_pricing: { 
+                inbound_cost: sms_pricing[:complete_pricing_for_country][:mobile_inbound],
+                average_outbound_cost: sms_pricing[:complete_pricing_for_country][:mobile_outbound_average]
+              },
+              monthly_cost: phone_number_monthly_costs.phone_number_prices.find{|c| c["number_type"] == 'mobile'} ? phone_number_monthly_costs.phone_number_prices.find{|c| c["number_type"] == 'mobile'}["current_price"] : nil
+            }
+          end
+        end
+      end
+      return numbers_with_pricing
     rescue Twilio::REST::TwilioError => e
       return {
         error: true,
         errors: [e.message],
-        context: 'list sms enable phone numbers for country'
+        context: 'list sms enabled phone numbers for country with pricing'
       }
     end
-  end
+end
 
   def self.create_subaccount(twilio_client, options)
     begin

data/lib/sasswillio/formatter.rb

@@ -1,15 +1,28 @@
-
-# remove
-require 'pry'
-
 module Formatter
   def self.aggregate_sms_prices_obj(twilio_sms_pricing_res)
+    pricing_hash = Hash.new
+    phone_number_types = twilio_sms_pricing_res.inbound_sms_prices.map{|h| h["number_type"]}
+    phone_number_types.each do |type|
+      transformed_key_for_inbound = type + '_inbound'
+      transformed_key_for_outbound = type + '_outbound_average'
+      pricing_hash[transformed_key_for_inbound.to_sym] = twilio_sms_pricing_res.inbound_sms_prices.find{|n| n["number_type"] == type}
+      numerator = twilio_sms_pricing_res.outbound_sms_prices.map{|n| n["prices"].find{|i| i["number_type"] == type}}.compact.map{|n| n["current_price"].to_f}.inject{|sum, el| sum+el}
+      if numerator && numerator > 0
+        pricing_hash[transformed_key_for_outbound.to_sym] = numerator / twilio_sms_pricing_res.outbound_sms_prices.size
+      else 
+        pricing_hash[transformed_key_for_outbound.to_sym] = nil
+      end
+    end
+    
     local_price_inbound = twilio_sms_pricing_res.inbound_sms_prices.find{|n| n["number_type"] == 'local'}
-    local_price_outbound = twilio_sms_pricing_res.outbound_sms_prices.map{|n| n["prices"].find{|i| i["number_type"] == 'local'}}
+    local_price_outbound = twilio_sms_pricing_res.outbound_sms_prices.map{|n| n["prices"].find{|i| i["number_type"] == 'local'}}.compact
     return {
       inbound_sms_price_for_local_number: local_price_inbound ? local_price_inbound["current_price"] : 'no local numbers available, so no pricing',
       average_outbound_sms_price_for_local_number: local_price_outbound ? local_price_outbound.map{|n| n["current_price"].to_f}.inject{|sum, el| sum+el} / twilio_sms_pricing_res.outbound_sms_prices.size : 'no local numbers available, so no pricing',
       currency: twilio_sms_pricing_res.price_unit,
+      complete_pricing_for_country: {
+        **pricing_hash
+      }
     }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sasswillio
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Shashike J