go_import 3.0.19 → 3.0.21

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmYyYzMzZmIyY2Y3MzdjYzQwNzBlMWU0M2Y3NmEyM2QzNWVmZDlmNQ==
+    NWU4ODY3ZjBlYWZjYTExMzE2NjExMmIxODYzZjZkOWJkODk5MDg3ZA==
   data.tar.gz: !binary |-
-    ODY1OGUxMzM0MGJjMTE5MDgzYmQ4OGVjNWUxODU3YjgxODU2OTI4Nw==
+    OWNlYzA4NjJmYmIzNDU1OTZlNzFiZGU1YWExNjYxNTM2MGQyMjUxMg==
 SHA512:
   metadata.gz: !binary |-
-    ODEwYjk5MTY3ODFlMjQxNmY5YTgwZjUyYzE1Mzk4ZjhiN2U0ZGNjZTc5MmY5
-    ZGMzMjgxNWM2YmY2NmMwMDc5NTYzN2E2MmQ2YjMxYTU1YjBhZWMwODgxNWEw
-    MGIwNmMzNGU4MmZiYTNlYjNmNzMwNTBhMGYzNTdkZjc4ZmIyZTg=
+    YzJlNjIxOTViMDhhN2Q0ZGVlMDc2YjA0YThkOGUyNjUyY2I2NmVlMDBjNjZj
+    Y2E2NTkzMDQwZjJjNWZkYjUzZmVhMTc5OTBiZDZlZTBjOTA0ZjM4ZWU3MmRh
+    ZDZiMzU0ZDkzZTI4YWQ1NDhkNmY3YTJhOWM2ZmI0YmZlN2U4ZTQ=
   data.tar.gz: !binary |-
-    ZmE4MThjNmI1MTJiNWI4YzgwYWM0NzA3MmRmMTQwMTliNGQ5MDE4NjQ4ZGJk
-    ZjUxZDllOWQ2MGY3MDFiYjUwMjQzZDJhNDJkNWU3YzgwZTE5ZGM1OWVlZjIz
-    YmFiYTc5ZmFkZDlkZDAxODMxODY3MDUyYjM3ZjgzNjAwOWZjZWU=
+    ODU4M2I5NmNlOWM5MTM1M2MwMmFhZjYzNDVhMTRlMWIzOTkwNjFmYmNhNjgz
+    YmFjYmQ0NDRkYTkzYTI1ZGQ0ZmM5MTI0YTY4NmEyYTZjYjEwMWYwNDJhMjcx
+    ZDg3Y2UyMDUwMTQ0YTkyZjFhNDI2NGQxZTA1MTM4ZDYwOTQ5MjU=

data/bin/go-import

@@ -23,7 +23,7 @@ class GoImportCommandLine < Thor
             puts "\t#{s}"
         end
 
-        puts "\nCreate a new project with 'go-import new' with one of these sources."
+        puts "\nCreate a new project with 'go-import new <PROJECT> <SOURCE>' with one of these sources."
         puts "Use 'go-import about <SOURCE>' for more information about a specific source."
     end
 

data/lib/go_import/email_helper.rb

@@ -4,7 +4,11 @@ module GoImport
     # The EmailHelper helps you validate email addresses.
     class EmailHelper
         def self.is_valid?(email)
-            return (email =~ EmailAddressValidation::Pattern) ? true : false
+            begin
+                return (email =~ EmailAddressValidation::Pattern) ? true : false
+            rescue
+                return false
+            end
         end
     end
 end

data/lib/go_import/model/rootmodel.rb

@@ -158,10 +158,11 @@ module GoImport
 
             deal = Deal.new(deal) if !deal.is_a?(Deal)
 
-            if find_deal_by_integration_id(deal.integration_id) != nil
+            if (!deal.integration_id.nil? && deal.integration_id.length > 0) &&
+               find_deal_by_integration_id(deal.integration_id) != nil
                 raise AlreadyAddedError, "Already added a deal with integration_id #{deal.integration_id}"
             end
-
+            
             if deal.responsible_coworker.nil?
                 deal.responsible_coworker = @import_coworker
             end

data/sources/salesforce/.go_import/runner.rb

@@ -7,7 +7,8 @@ require_relative("../converter")
 # EXPORT_FOLDER and other constants should be defined ../converter.rb
 
 USER_FILE = "User.csv"
-ORGANIZATION_FILE = "Account.csv"
+ORGANIZATION_ACCOUNT_FILE = "Account.csv"
+ORGANIZATION_LEAD_FILE = "Lead.csv"
 PERSON_FILE = "Contact.csv"
 DEAL_FILE = "Opportunity.csv"
 NOTE_FILE = "Note.csv"
@@ -17,10 +18,10 @@ def process_rows(filename)
         puts "Error: Cant find the file '#{filename}'."
         raise
     end
-    
+
     f = File.open(filename, 'r')
     data = f.read.encode("UTF-8", "ISO-8859-1")
-    rows = GoImport::CsvHelper::text_to_hashes(data)
+    rows = GoImport::CsvHelper::text_to_hashes(data, ',')
     rows.each do |row|
         yield row
     end
@@ -70,7 +71,7 @@ def to_coworker(row)
     if row['IsActive'] == '1' && row['UserType'] == 'Standard'
         coworker = GoImport::Coworker.new
 
-        coworker.id = row['Email']
+        coworker.email = row['Email']
         coworker.integration_id = row['Id']
         coworker.first_name = row['FirstName']
         coworker.last_name = row['LastName']
@@ -81,13 +82,14 @@ def to_coworker(row)
     return coworker
 end
 
-def to_organization(row, rootmodel)
+def account_to_organization(row, rootmodel)
     if row['IsDeleted'] != '0'
         return nil
     end
 
     organization = GoImport::Organization.new
 
+    organization.relation = GoImport::Relation::IsACustomer
     organization.integration_id = row['Id']
     organization.name = row['Name']
     organization.set_tag(row['Type'])
@@ -99,42 +101,134 @@ def to_organization(row, rootmodel)
         address.street = row['BillingStreet']
         address.zip_code = row['BillingPostalCode']
         address.city = row['BillingCity']
-        address.country_code = row['BillingCountry']
+        address.country_code = get_country_code(row['BillingCountry'])
     end
 
     organization.with_visit_address do |address|
         address.street = row['ShippingStreet']
         address.zip_code = row['ShippingPostalCode']
         address.city = row['ShippingCity']
-        address.country_code = row['ShippingCountry']
+        address.country_code = get_country_code(row['ShippingCountry'])
     end
 
+    organization.set_tag row['Industry']
+    
     organization.responsible_coworker =
         rootmodel.find_coworker_by_integration_id(row['OwnerId'])
 
     return organization
 end
 
-def add_person_to_organization(row, rootmodel)
-    if row['IsDeleted'] == 0
-        org = rootmodel.find_organization_by_integration_id(row['AccountId'])
+def lead_to_organization(row, rootmodel, converter)
+    if row['IsDeleted'] != '0'
+        return nil
+    end
+
+    if row['IsConverted'] == '1'
+        return nil
+    end
+
+    organization = GoImport::Organization.new
+
+    if converter.respond_to?(:get_relation_for_lead)
+        relation = converter.get_relation_for_lead        
+        
+        if !relation.nil?
+            organization.relation = relation
+        else
+            organization.relation = GoImport::Relation::WorkingOnIt
+        end
+    end
+
+    use_default_lead_tag = true
+    if converter.respond_to?(:get_tags_for_lead)
+        tags = converter.get_tags_for_lead(row['Status'])
         
-        if !org.nil?
-            person = GoImport::Person.new
-            add_employee(person)
-
-            person.integration_id = row['Id']
-            person.first_name = row['FirstName']
-            person.last_name = row['LastName']
-
-            person.direct_phone_number = row['Phone']
-            person.fax_phone_number = row['Fax']
-            person.mobile_phone_number = row['MobilePhone']
-            person.home_phone_number = row['HomePhone']
-            person.position = row['Title']
-            person.email = row['Email']
+        if !tags.nil?
+            if tags.is_a?(String)
+                organization.set_tag tags
+                use_default_lead_tag = false
+            elsif tags.is_a?(Array)
+                tags.each do |tag|
+                    organization.set_tag tag
+                end
+                use_default_lead_tag = false
+            end
         end
     end
+    if use_default_lead_tag == true
+        organization.set_tag 'lead'
+        organization.set_tag row['Status']        
+    end
+    
+    organization.responsible_coworker =
+        rootmodel.find_coworker_by_integration_id(row['OwnerId'])
+    
+    organization.name = row['Company']
+    organization.with_postal_address do |address|
+        address.street = row['Street']
+        address.zip_code = row['PostalCode']
+        address.city = row['City']
+        address.country_code = get_country_code(row['Country'])
+    end
+    organization.web_site = row['WebSite']
+
+    organization.set_tag row['Industry']
+
+    person = GoImport::Person.new
+    organization.add_employee(person)
+    person.first_name = row['FirstName']
+    person.last_name = row['LastName']
+    person.position = row['Title']
+    person.direct_phone_number = row['Phone']
+    person.mobile_phone_number = row['MobilePhone']
+    person.email = row['Email']
+
+    return organization
+end
+
+def get_country_code(country)
+    country_code = ''
+
+    case country.downcase
+    when 'sverige'
+        country_code = 'se'
+    when 'sweden'
+        country_code = 'se'
+    when 'norge'
+        country_code = 'no'
+    when 'norway'
+        country_code = 'no'
+    when 'danmark'
+        country_code = 'dk'
+    when 'denmark'
+        country_code = 'dk'
+    end
+    
+    return country_code
+end
+
+def add_person_to_organization(row, rootmodel)
+    if row['IsDeleted'] != '0'
+        return
+    end
+
+    org = rootmodel.find_organization_by_integration_id(row['AccountId'])
+    if !org.nil?
+        person = GoImport::Person.new
+        org.add_employee(person)
+        
+        person.integration_id = row['Id']
+        person.first_name = row['FirstName']
+        person.last_name = row['LastName']
+        
+        person.direct_phone_number = row['Phone']
+        person.fax_phone_number = row['Fax']
+        person.mobile_phone_number = row['MobilePhone']
+        person.home_phone_number = row['HomePhone']
+        person.position = row['Title']
+        person.email = row['Email']
+    end
 end
 
 def to_deal(row, rootmodel, converter)
@@ -161,7 +255,11 @@ def to_deal(row, rootmodel, converter)
 
         if !status.nil?
             deal.status = status
+        else
+            deal.status = row['StageName']
         end
+    else
+        deal.status = row['StageName']
     end
     
     return deal
@@ -188,8 +286,34 @@ def to_note(row, rootmodel)
     return note
 end
 
+def get_deal_statuses_from_opportunites()
+    puts "Trying to get deal statuses..."
+    statuses = []
+
+    process_rows(DEAL_FILE) do |row|
+        status = {
+            :label => row['StageName'],
+            :integration_id => row['StageName'],
+        }
+
+        if row['IsClosed'] == '1'
+            if row['IsWon'] == '1'
+                status[:assessment] = GoImport::DealState::PositiveEndState
+            else
+                status[:assessment] = GoImport::DealState::NegativeEndState
+            end
+        end
+
+        if !statuses.any? {|s| s[:label] == status[:label]}
+            statuses.push status
+        end
+    end
+
+    return statuses
+end
+
 def convert_source
-    puts "Trying to convert Superoffice to LIME Go..."
+    puts "Trying to convert Salesforce to LIME Go..."
 
     converter = Converter.new
 
@@ -201,7 +325,9 @@ def convert_source
     end
 
     rootmodel = GoImport::RootModel.new
-    converter.configure(rootmodel)
+    if converter.respond_to?(:configure)
+        converter.configure(rootmodel)
+    end    
     
     # We know have the Salesforce export zip file in
     # export_zip_files[0]. We should unzip the file to a temp folder
@@ -218,10 +344,18 @@ def convert_source
                     entry.extract
                 end
             end
+        end        
+
+        deal_statuses = get_deal_statuses_from_opportunites()
+        rootmodel.settings.with_deal do |deal|
+            deal_statuses.each do |status|
+                deal.add_status({ :label => status[:label],
+                                  :integration_id => status[:integration_id],
+                                  :assessment => status[:assessment]
+                                })
+            end
         end
 
-        #puts 'sleep a while'
-        #sleep 5
         
         puts "Trying to import users..."
         process_rows(USER_FILE) do |row|
@@ -229,8 +363,11 @@ def convert_source
         end
 
         puts "Trying to import organizations..."
-        process_rows(ORGANIZATION_FILE) do |row|
-            rootmodel.add_organization(to_organization(row, rootmodel))
+        process_rows(ORGANIZATION_ACCOUNT_FILE) do |row|
+            rootmodel.add_organization(account_to_organization(row, rootmodel))
+        end
+        process_rows(ORGANIZATION_LEAD_FILE) do |row|
+            rootmodel.add_organization(lead_to_organization(row, rootmodel, converter))
         end
 
         puts "Trying to import persons..."

data/sources/salesforce/converter.rb

@@ -37,39 +37,61 @@ FILES_FOLDER_AT_CUSTOMER = "m:\\documents\\"
 class Converter
     # Configure your root model, add custom fields and deal statuses.
     def configure(rootmodel)
-        # add custom field to your model here. Custom fields can be
-        # added to organization, deal and person. Valid types are
-        # :String and :Link. If no type is specified :String is used
-        # as default.
+        # add custom field and deal statuses to your model
+        # here. Custom fields can be added to organization, deal and
+        # person. Valid types are :String and :Link. If no type is
+        # specified :String is used as default.
+
+        # You dont have to add the Stages for Opportunities here since
+        # they are automagically added.
+
+        
 #        rootmodel.settings.with_organization do |organization|
 #            organization.set_custom_field( { :integrationid => 'external_url', :title => 'Link to external system', :type => :Link } )
 #        end
-
-        rootmodel.settings.with_deal do |deal|
-            deal.add_status({:label => "1. Kvalificering", :integration_id => "qualification"})
-            deal.add_status({:label => "Vunnen", :integration_id => "won",
-                                :assessment => GoImport::DealState::PositiveEndState })
-            deal.add_status({:label => "Lost", :integration_id => "Lost",
-                                :assessment => GoImport::DealState::NegativeEndState })
-        end
     end
 
     def get_deal_status_from_salesforce_stage(salesforce_deal_stage)
         # When deals are added to LIME Go this method is called for
         # each deal. The deal's stage from Salesforce is supplied as
         # an argument and this method should return a status for the
-        # deal in LIME Go. The returned value is probably an
-        # integration_id of a deal status that has been added in the
-        # configure(rootmodel) method.
-        deal_status = nil
+        # deal in LIME Go. The returned value is probably a label of a
+        # deal status that has been added in the configure(rootmodel)
+        # method. If nil is returned, the default status will be the
+        # same as in Salesforce (ie salesforce_deal_stage)
+
+        # deal_status = nil
+        
+        # case salesforce_deal_stage
+        # when 'Prospecting'
+        #     deal_status = '1. Kvalificering'
+        # when 'Closed Won'
+        #     deal_status = 'Vunnen'
+        # end
+
+        # return deal_status
+    end
+
+    def get_relation_for_lead()
+        # Returns the relation that converted leads should have. By
+        # default leads will get the relation WorkingOnIt.
+        
+        return GoImport::Relation::WorkingOnIt
+    end
+
+    def get_tags_for_lead(lead_status)
+        # Returns the tag or tags that converted leads should
+        # have. Return either a string or an array of
+        # strings. lead_status is the status value from Salesforce.
+
+        # If no tag is returned, the default is 'lead' and the status. 
+
+        # if lead_status == 'Qualified'
+        #     return ['lead', 'qualified']
+        # else
+        #     return 'lead'
+        # end
         
-        case salesforce_deal_stage
-        when 'Prospecting'
-            deal_status = '1. Kvalificering'
-        when 'Closed Won'
-            deal_status = 'Vunnen'
-        end
-
-        return deal_status
+        # return nil
     end
 end

data/spec/helpers/csv_helper_spec.rb

@@ -1,3 +1,4 @@
+# coding: iso-8859-1
 require 'spec_helper'
 require 'go_import'
 
@@ -26,4 +27,19 @@ And a new line\"")
         v.should include({"id"=>"1","navn"=>"Bj\u{00F6}rk
 And a new line"})
     end
+
+    it "should handled values with ," do
+        # given
+        str = "id,name,text
+1,lundalogik,\"hej, hopp\""
+
+        # when
+        v = GoImport::CsvHelper.text_to_hashes(str)
+
+        # then
+        v.should include({
+                             "id" => "1",
+                             "name" => "lundalogik",
+                             "text" => "hej, hopp"})
+    end
 end

data/spec/helpers/email_helper_spec.rb

@@ -1,3 +1,4 @@
+# coding: iso-8859-1
 require 'spec_helper'
 require 'go_import'
 
@@ -29,4 +30,8 @@ describe GoImport::EmailHelper do
     it "should not validate an invalid address" do
         GoImport::EmailHelper.is_valid?("hubbabubba").should eq false
     end
+
+    it "should not validate an address with swedish chars" do
+        GoImport::EmailHelper.is_valid?("info.bor�s@example.se").should eq false
+    end
 end

data/spec/rootmodel_spec.rb

@@ -183,6 +183,21 @@ describe "RootModel" do
         rootmodel.deals.length.should eq 1
     end
 
+    it "will add two deal without integration id" do
+        # given
+        deal1 = GoImport::Deal.new
+        deal1.name = "The big deal"
+        deal2 = GoImport::Deal.new
+        deal2.name = "The even bigger deal"
+
+        # when
+        rootmodel.add_deal(deal1)
+        rootmodel.add_deal(deal2)
+
+        # then
+        rootmodel.deals.length.should eq 2
+    end    
+
     it "can add a note from hash" do
         rootmodel.add_note({
                                :integration_id => "123key",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: go_import
 version: !ruby/object:Gem::Version
-  version: 3.0.19
+  version: 3.0.21
 platform: ruby
 authors:
 - Oskar Gewalli
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso_country_codes