tyreshopper_sqs2cb 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be16a91ca6be18e6cb0138bf54bcd3d48e3e25c2
-  data.tar.gz: 39eea999d39a96ed273f18f7548b58a89884f594
+  metadata.gz: cff962d702de6839c46b2fc005d001a0fbcd5127
+  data.tar.gz: 1797dcdbbe5646e02ff4d9c0758dace32f5f4c2b
 SHA512:
-  metadata.gz: 2a2b3ef7b917d84e4048f4334b7dcd2d46e196e34984784fce5dd5cc919d698f36b62d97c822a8ab927ea6dbdb5c37632a5401b5d4080a5d061201af20a0d75c
-  data.tar.gz: b0559a4206f01a1faec59e2dc2abefd67752ca5d70c4abfe8ed9d83e1adca871fc2124aaf8ae0884efb3051680f71d7357fb57c3e428ddcafbaf90b458d20f32
+  metadata.gz: da9e42a533c48fed2528b87b618b1772dde32704a768263bc236147a90923a1f0271af19fd596866f42d3ac6eb0c56139795e80f6e5fa7aff3791b1c8ff0f04d
+  data.tar.gz: 99ed585f27028a60f3aed0bb1384c898596916fe5a6c23748b158002f5cf337cfa3df1a169883bd8b6b29da253735da24da0172d9f4d81cf5baababac223a9e9

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
+log

data/lib/tyreshopper_sqs2cb/version.rb

@@ -1,3 +1,3 @@
 module TyreshopperSqs2cb
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/tyreshopper_sqs2cb.rb

@@ -4,12 +4,15 @@ require 'json'
 require 'rest_client'
 require 'logger'
 require 'sqs2cb'
+require 'ap'
+require 'uri'
 
 module TyreshopperSqs2cb
   class MessageHandler
     def initialize
 
       logfile = ENV['TYRESHOPPER_SQS2CB_LOGFILE_PATH'].nil? ? STDOUT : File.open(ENV['TYRESHOPPER_SQS2CB_LOGFILE_PATH'], 'a')
+      logfile = STDOUT
       @logger = Logger.new logfile
 
 
@@ -31,6 +34,11 @@ module TyreshopperSqs2cb
       @options = options
       @logger.info "Tyreshopper Message received."
       @logger.debug message.body
+      puts "Sending..."
+
+      @caseBlocksAPIEndpoint = options[:case_blocks_api_endpoint]
+      @caseBlocksAPIToken = options[:caseblocks_api_token]
+
       send_to_caseblocks(JSON.parse(message.body))
 
     rescue JSON::ParserError => ex
@@ -46,13 +54,18 @@ module TyreshopperSqs2cb
     def send_to_caseblocks(msgHash)
       @logger.info "Sending to CaseBlocks"
 
+      puts "Sending order #{msgHash["case"]["title"]} to caseblocks..."
+
+      puts "Looking for customer..."
       customer = find_or_create_customer(msgHash)
-      msgHash["customer_ref"] = customer["customer_ref"]
-      msgHash["user_signed_in"] = msgHash["signed_in"]
 
-      response = post("#{@caseBlocksAPIEndpoint}/case_blocks/customers", msgHash.to_json, :content_type => :json, :accept => :json, "AUTH_TOKEN" => @caseBlocksAPIToken)
+      msgHash["case"]["customer_ref"] = customer["customer_ref"]
+
+      puts "Creating order in caseblocks..."
+      response = post("/case_blocks/tyre_shopper_orders", msgHash)
 
-      @logger.info "Received #{response.code} Location: #{response.headers[:location]}"
+      puts "Done."
+      @logger.info "Received #{response}"
     rescue RestClient::ExceptionWithResponse => ex
       if ex.response.nil?
         @logger.error "Received a bad response (null) from CaseBlocks. Re-raising."
@@ -66,59 +79,183 @@ module TyreshopperSqs2cb
     def find_or_create_customer(options)
 
       # find customer case type id
-      customer_case_type = get("/case_blocks/people_types")["people_types"].select{|type| type["code"] == "customer" }.first
+      order_details = options["case"]
 
       # if user was signed in then use member_id else use email
-      if options["signed_in"]
-        case_type_matches = get("/case_blocks/search", {"query" => "member_id%3A#{options["member"]["member_id"]}"}).detect{|type| type["case_type_id"] == customer_case_type["id"]}
-
-        if case_type_matches.nil?
-
-          customer = {:customer => {
-            :case_type_id => customer_case_type["id"],
-            :people_type_id => customer_case_type["id"],
-            :address_1 => options["member"]["address1"],
-            :address_2 => options["member"]["address2"],
-            :county => options["member"]["county"],
-            :prefix => options["member"]["prefix"],
-            :first_name => options["member"]["first_name"],
-            :surname => options["member"]["surname"],
-            :postcode => options["member"]["postcode"],
-            :town => options["member"]["town"]
-            }}
-
-          # create customer
+      if order_details["signed_in"]
+
+        puts "Searching for customer on member_id #{order_details["member"]["member_id"]}..."
+
+        customer = {
+          "case_type_id" => customer_case_type_id,
+          "people_type_id" => customer_case_type_id,
+          "address_1" => order_details["member"]["address1"],
+          "address_2" => order_details["member"]["address2"],
+          "county" => order_details["member"]["county"],
+          "prefix" => order_details["member"]["prefix"],
+          "first_name" => order_details["member"]["first_name"],
+          "surname" => order_details["member"]["surname"],
+          "postcode" => order_details["member"]["postcode"],
+          "town" => order_details["member"]["town"],
+          "email" => order_details["member"]["email"],
+          "member_id" => order_details["member"]["member_id"].to_i,
+          }
+
+        cb_customer = find_customer(:member_id => order_details["member"]["member_id"])
+        if cb_customer.nil?
+          puts "Can't find customer by member_id, checking if the email is there..."
+
+          cb_customer = find_customer(:email => order_details["email"])
+
+          if cb_customer
+            puts "Found customer, need to update member_id and data"
+
+            cb_customer = ensure_taskslists_are_populated(cb_customer)
+            put("/case_blocks/customer/#{cb_customer["_id"]}", {"customer" => customer})
+
+            return cb_customer
+          else
+            puts "Unable to find customer"
+            puts "Creating new customer from member details..."
+
+            result = post("/case_blocks/customer", customer)["case"]
+            return result
+          end
         else
-          return case_type_matches.first
+          return cb_customer
         end
       else
-        case_type_matches = get("/case_blocks/search", {"query" => "email%3A#{options["email"]}"}).detect{|type| type["case_type_id"] == customer_case_type["id"]}
+        puts "Searching for customer on email #{order_details["email"]}..."
 
-        if case_type_matches.nil?
-          # create customer
+        cb_customer = find_customer(:email => order_details["email"])
 
+        if cb_customer
+          puts "Found customer"
+          return cb_customer
         else
-          return case_type_matches.first
+          puts "Unable to find customer"
+
+          name_parts = parse_name(order_details["customer"])
+
+          customer = {
+            :case_type_id => customer_case_type_id,
+            :people_type_id => customer_case_type_id,
+            :address_1 => order_details["address1"],
+            :address_2 => order_details["address2"],
+            :town => order_details["address3"],
+            :postcode => order_details["postcode"],
+
+            :prefix => name_parts[:prefix],
+            :first_name => name_parts[:first_name],
+            :surname => name_parts[:surname],
+            :email => order_details["email"],
+
+            }
+
+            puts "Creating new customer from order details..."
+            return post("/case_blocks/customer", customer)["case"]
         end
       end
+    end
+
+    private
+
+    def customer_case_type_id
+      @customer_case_type_id ||= get("/case_blocks/people_types")["people_types"].select{|type| type["code"] == "customer" }.first["id"]
+    end
+
+    def find_customer(query)
+
+      result = get("/case_blocks/search", {"query" => query.map{|k,v| "#{k}%3A#{v}"}.join(" AND ")})
+      matches = result.detect{|type| type["case_type_id"] == customer_case_type_id}
+
+      if !matches.nil? && matches["cases"].count > 0
+        return matches["cases"].first
+      else
+        return nil
+      end
+
+    end
+
+    def ensure_taskslists_are_populated(customer)
+      ap customer
+      # populate tasklists
+      tasklists = []
+      customer["tasklists"].each do |tasklist_id|
+        tasklists << get("/case_blocks/tasklists/#{tasklist_id}")
+      end
+
+      customer["tasklists"] = tasklists
+
+      return customer
+    end
+
+    def parse_name(full_name)
+      valid_prefix = %w(dr miss mr mrs ms professor sir)
+
+      parts = full_name.split(" ")
+
+      result = {:prefix => "", :first_name => "", :last_name => ""}
+
+      if valid_prefix.include?(parts[0].downcase)
+        result[:prefix] = titleize(parts.delete_at(0))
+      end
 
+      result[:first_name] = parts.delete_at(0)
+
+      result[:surname] = parts.join(" ")
+
+      return result
+    end
+    def titleize(str)
+      return str[0].upcase + str[1..-1].downcase
     end
 
     def get(path, query={})
-      uri = Uri.parse("#{@caseBlocksAPIEndpoint}#{path}")
+      uri = URI.parse("#{@caseBlocksAPIEndpoint}#{path}")
 
       query.each do |k, v|
         uri.query = [uri.query, "#{k}=#{v}"].compact.join('&')
       end
       uri.query = [uri.query, "auth_token=#{@caseBlocksAPIToken}"].compact.join('&')
-      return RestClient.get(uri.to_s, :content_type => :json, :accept => :json, "AUTH_TOKEN" => @caseBlocksAPIToken)
+      ap " === GETing to #{uri.to_s} ==="
+      return JSON.parse(RestClient.get(uri.to_s, :content_type => :json, :accept => :json, "AUTH_TOKEN" => @caseBlocksAPIToken))
     end
 
-    def post(uri, data)
-      uri = Uri.parse("#{@caseBlocksAPIEndpoint}#{path}")
+    def post(path, data, options={})
+      uri = URI.parse("#{@caseBlocksAPIEndpoint}#{path}")
+
+      options = {:content_type => :json, :accept => :json, "AUTH_TOKEN" => @caseBlocksAPIToken}.merge(options)
+
+      uri.query = [uri.query, "auth_token=#{@caseBlocksAPIToken}"].compact.join('&')
+      ap " === POSTing to #{uri.to_s} ==="
+      #ap data
+      return JSON.parse(RestClient.post(uri.to_s, data.to_json, options))
+    end
+
+    def put(path, data, options={})
+      uri = URI.parse("#{@caseBlocksAPIEndpoint}#{path}")
+
+      options = {:content_type => :json, :accept => :json, "AUTH_TOKEN" => @caseBlocksAPIToken}.merge(options)
+
+      uri.query = [uri.query, "auth_token=#{@caseBlocksAPIToken}"].compact.join('&')
+      ap " === PUTing to #{uri.to_s} ==="
+      #ap data
+      return JSON.parse(RestClient.put(uri.to_s, data.to_json, options))
+    end
+
+    def patch(path, data, options={})
+      uri = URI.parse("#{@caseBlocksAPIEndpoint}#{path}")
+
+      options = {:content_type => :json, :accept => :json, "AUTH_TOKEN" => @caseBlocksAPIToken}.merge(options)
 
       uri.query = [uri.query, "auth_token=#{@caseBlocksAPIToken}"].compact.join('&')
-      return RestClient.get(uri.to_s, data.to_json, :content_type => :json, :accept => :json, "AUTH_TOKEN" => @caseBlocksAPIToken)
+      ap " === PATCHing to #{uri.to_s} ==="
+      #ap data
+      return JSON.parse(RestClient.patch(uri.to_s, data.to_json, options))
     end
+
+
+
   end
 end

data/spec/lib/tyreshopper_sqs2cb/message_handler_spec.rb

@@ -7,5 +7,46 @@ describe TyreshopperSqs2cb::MessageHandler do
   end
 
   context "handling message" do
+      before(:each) do
+        @awsAccessKeyId = ENV['AWS_ACCESS_KEY']
+        @awsSecretAccessKey = ENV['AWS_SECRET_ACCESS_KEY']
+        @caseBlocksAPIEndpoint = ENV['CB_API_ENDPOINT']
+        @caseBlocksAPIToken = ENV['CB_API_TOKEN']
+        @caseBlocksQueue = ENV['CB_QUEUE']
+        @usePatchCommand = (@caseBlocksQueue =~ /patch/)
+        @stop = false
+
+        @options = {:use_patch_command => @usePatchCommand, :case_blocks_api_endpoint => @caseBlocksAPIEndpoint, :caseblocks_api_token => @caseBlocksAPIToken}
+      end
+
+    context "when signed out" do
+      before(:each) do
+        @json = '{"case":{"signed_in":false,"member":{"email": "stewart@rockwellcottage.com"},"title":"TZ672449","case_type_id":1,"case_type":"tyre-shopper-order","current_state":"Requiring action Risk","order_number":"TZ672449","order_date":"2015-02-24T16:02:44Z","customer":"Mr Stewart McKee","vrn":"YT55 NFO","address1":"Rockwell Cottage","address2":"Main Road","address3":"Cardross","postcode":"G82 5PA","daytime_telephone":"+447968115250","evening_telephone":"+447968115250","email":"stewart@rockwellcottage.com","market_opt_in":false,"payment_type":"Creditcard","transaction_reference":"TZ672449","card_number":"1111","account_holder":"Stewart","streamline_risk_assessment":"0","tyre_shopper_risk_assessment":"37","tyre_shopper_risk_assessment_notes":"Customer name isn''t an exact match of the Streamline cardholder name\nEmail is Hotmail, Yahoo or Gmail\nEmail used in last 6 months\nVRN used in last 6 months\nNumber used in last 6 months\nAlternative phone number used in last 6 months\n","order_source":"TyreShopper","fitting_date":"2015-02-27T00:00:00Z","am_pm":"PM","stock_check":true,"phone_number":"01625 424461","branch_number":"050","mobile_fitting":false,"name":"Macclesfield","line_items":[{"qty":"1","sku":"2055516BU1WX2","price":36.575,"size":"2055516","speed_rating":"W","load_index":94,"description":"WESTLAKE SA05 94W XL"},{"qty":"1","sku":"free_tyre_guarantee","price":0,"size":null,"speed_rating":null,"load_index":0,"description":"Free tyre guarantee"}],"operational_stock":true}}'
+      end
+      it "does what it says on the tin" do
+
+        message = OpenStruct.new(:body => @json)
+
+        handler = TyreshopperSqs2cb::MessageHandler.new
+
+        puts "handling message...."
+        handler.handle_received_message(message, @options);
+      end
+    end
+
+    context "when signed in" do
+      before(:each) do
+        @json = '{"case":{"title":"TZ362794","case_type_id":1,"case_type":"tyre-shopper-order","current_state":"Ready for dataflex","order_number":"TZ362794","order_date":"2015-02-26T09:52:47Z","customer":"Mr Stewart McKee","vrn":"YT55 NFO","address1":"Rockwell Cottage","address2":"Main Road","address3":"Cardross","postcode":"G82 5PA","daytime_telephone":"+447968115250","evening_telephone":"+447968115250","email":"stewart@rockwellcottage.com","market_opt_in":false,"payment_type":"PayPal","transaction_reference":null,"card_number":null,"account_holder":null,"streamline_risk_assessment":"0","tyre_shopper_risk_assessment":"0","tyre_shopper_risk_assessment_notes":null,"order_source":"TyreShopper","fitting_date":"2015-02-28T00:00:00Z","am_pm":"PM","stock_check":true,"signed_in":true,"member":{"member_id":"20","group_id":"8","username":"stewart@rockwellcottage.com","screen_name":"stewart@rockwellcottage.com","email":"stewart@rockwellcottage.com","url":"","location":"","occupation":null,"interests":null,"last_visit":"1424703620","last_activity":"1424944270","join_date":"1424700057","first_name":"Stewart","surname":"McKee","opt_in":"","address1":"Rockwell Cottage","address2":"Main Road","town":"Cardross","county":"","daytime_telephone":"+447968115250","postcode":"G82 5PA","evening_telephone":"+447968115250","prefix":"Mr"},"phone_number":"0141 551 8244","branch_number":"102","mobile_fitting":false,"name":"Alexandra Parade","line_items":[{"qty":"1","sku":"2055516BU1WX2","price":36.575,"size":"2055516","speed_rating":"W","load_index":94,"description":"WESTLAKE SA05 94W XL"},{"qty":"1","sku":"free_tyre_guarantee","price":0,"size":null,"speed_rating":null,"load_index":0,"description":"Free tyre guarantee"}],"operational_stock":true}}'
+      end
+      it "does what it says on the tin" do
+
+        message = OpenStruct.new(:body => @json)
+
+        handler = TyreshopperSqs2cb::MessageHandler.new
+
+        puts "handling message...."
+        handler.handle_received_message(message, @options);
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -3,14 +3,6 @@ Bundler.setup
 
 require 'tyreshopper_sqs2cb' # and any other gems you need
 
-ENV['AWS_ACCESS_KEY'] = "access_key"
-ENV['AWS_SECRET_ACCESS_KEY'] = "secret_key"
-ENV['CB_API_ENDPOINT'] = "http://localhost:8888/"
-ENV['CB_API_TOKEN'] = "token"
-ENV['CB_QUEUE'] = "cb_queue"
-ENV['SQS2CB_LOGFILE_PATH'] = "log/sqs2cb.log"
-ENV['TYRESHOPPER_SQS2CB_LOGFILE_PATH'] = "log/tyreshopper_sqs2cb.log"
-
 RSpec.configure do |config|
   # some (optional) config here
 end

data/tyreshopper_sqs2cb.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "awesome_print"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tyreshopper_sqs2cb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Stewart McKee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqs2cb
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Tyreshopper specific handling of data to send to CaseBlocks
 email:
 - stewart@theizone.co.uk