go_import 3.0.40 → 3.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59427aef6763d25193bcb19a34b834207e0a1afa
-  data.tar.gz: 171379596422ffb7b8bf31d2d071ebb05682db26
+  metadata.gz: c51550ffff27ad4fe7f57413acf77764bfd98c9c
+  data.tar.gz: 7aed552fb4339fce5e9419ec9153d60d6add44aa
 SHA512:
-  metadata.gz: b8e6aa91dec72dbffe0bcf9d430b78a51c28208c60758a3dd85f959dce032b50d7f0f95402c4996eec20cace636173d7010a23909df1008c03ee983a9c33cfaf
-  data.tar.gz: f3d1e0faa54a918fce9136b5247f8af2dd6d9d6b06dffb895d9d3550d87cc24a9ba92a069f59f7b7e9ce125a5ccf3959dd468f5cb94b741b9a8cb264469fcc9f
+  metadata.gz: 8d7028dc367f5d84904c731018c0d77d2951d7267649926e0066584ef0560f43fd797634a8c6f634d6c5de7e983d1dcb1bb3e4860d85040b077eb2de5e39cd35
+  data.tar.gz: b3bb492a053c4dee863714424af4d763d1a0c6c2d907416b6f7190356c6550b70d4842b10e4ba82ece600254aa66865b12ac88207b44d38c5541067d6974f427

data/bin/go-import

@@ -76,7 +76,7 @@ class GoImportCommandLine < Thor
             $stdout = File.new(options.log_to_file == "log_to_file" ? "go-import.log" : options.log_to_file, 'w')
             $stdout.sync = true
         end
-        max_file_size = options.max_file_size.nil? ? GoImport::File::DEFAULT_MAX_FILE_SIZE : options.max_file_size 
+        max_file_size = options.max_file_size.nil? ? GoImport::File::DEFAULT_MAX_FILE_SIZE : options.max_file_size
 
         if !is_valid_goimport_project?
             return
@@ -102,6 +102,7 @@ class GoImportCommandLine < Thor
             if options.ignore_invalid_files && model.documents.files.length > 0
                 log_and_remove_invalid_files model, max_file_size
             end
+            model.report_rootmodel_status()
 
             puts "Starting sharding of model..."
             sharder = GoImport::ShardHelper.new(options.shard_size)
@@ -111,14 +112,14 @@ class GoImportCommandLine < Thor
                 puts "Import is large and will be broken into #{models_to_serialize.length} files"
             end
 
-            models_to_serialize.each_with_index do |model, i| 
+            models_to_serialize.each_with_index do |model, i|
                 go_data_zip = options.output.nil? == true ? "go" : options.output
                 go_data_zip += "_#{i}.zip"
                 go_files = options.output_documents.nil? == true ? nil : ::File.basename(options.output_documents,File.extname(options.output_documents))
                 model.save_to_zip(go_data_zip, go_files)
                 puts "Source has been been converted into '#{go_data_zip}'."
                 puts "  - and files into '#{go_files}.zip'." if !go_files.nil?
-                if !warnings_msg.empty? 
+                if !warnings_msg.empty?
                     puts "WARNINGS: "
                     puts warnings_msg
                 end
@@ -205,4 +206,3 @@ class GoImportCommandLine < Thor
 end
 
 GoImportCommandLine.start(ARGV)
-

data/lib/go_import/model/organization.rb

@@ -37,10 +37,10 @@ module GoImport
             end
         end
     end
-    
+
     class Organization < CanBecomeImmutable
         include SerializeHelper, ModelHasCustomFields, ModelHasTags
-        
+
         immutable_accessor :id
         immutable_accessor :integration_id
         immutable_accessor :name
@@ -134,6 +134,7 @@ module GoImport
         def add_employee(val)
             @employees = [] if @employees == nil
             person = if val.is_a? Person then val else Person.new(val) end
+            person.set_organization_reference = self
             @employees.push(person)
 
             # *** TODO:
@@ -144,9 +145,9 @@ module GoImport
             # person after is has been added to the organization. We
             # must update the sources before we can set the person
             # immutable here.
-            
+
             #person.set_is_immutable
-            
+
             return person
         end
 
@@ -164,7 +165,7 @@ module GoImport
         # otherwise an InvalidRelationError error will be thrown.
         def relation=(relation)
             raise_if_immutable
-            
+
             if relation == Relation::NoRelation || relation == Relation::WorkingOnIt ||
                     relation == Relation::IsACustomer || relation == Relation::WasACustomer || relation == Relation::BeenInTouch
                 @relation = relation
@@ -174,10 +175,10 @@ module GoImport
                 raise InvalidRelationError
             end
         end
-        
+
         def relation_last_modified=(date)
             raise_if_immutable
-            
+
             begin
                 @relation_last_modified = @relation != Relation::NoRelation ? Date.parse(date).strftime("%Y-%m-%d") : nil
             rescue

data/lib/go_import/model/person.rb

@@ -28,11 +28,11 @@ module GoImport
         end
     end
 
-    class Person < CanBecomeImmutable    
+    class Person < CanBecomeImmutable
         include SerializeHelper, ModelHasCustomFields, ModelHasTags
 
         immutable_accessor :id
-        immutable_accessor :integration_id        
+        immutable_accessor :integration_id
         immutable_accessor :first_name
         immutable_accessor :last_name
         immutable_accessor :direct_phone_number
@@ -60,7 +60,7 @@ module GoImport
             set_tag 'Import'
         end
 
-        def organization=(org)
+        def set_organization_reference=(org)
             @organization = OrganizationReference.from_organization(org)
         end
 

data/lib/go_import/model/rootmodel.rb

@@ -22,7 +22,7 @@ module GoImport
         # default.
         attr_accessor :configuration
 
-        attr_reader :documents
+        attr_reader :documents, :persons
 
         def serialize_variables
             [
@@ -57,6 +57,10 @@ module GoImport
             configure
         end
 
+        def persons
+          return @organizations.collect{|k, o| o.employees}.flatten.compact
+        end
+
         # Adds the specifed coworker object to the model.
 
         # @example Add a coworker from a new coworker
@@ -79,7 +83,7 @@ module GoImport
                 raise IntegrationIdIsRequiredError, "An integration id is required for a coworker."
             end
 
-            if find_coworker_by_integration_id(coworker.integration_id) != nil
+            if find_coworker_by_integration_id(coworker.integration_id, false) != nil
                 raise AlreadyAddedError, "Already added a coworker with integration_id #{coworker.integration_id}"
             end
 
@@ -103,12 +107,12 @@ module GoImport
             if !organization.is_a?(Organization)
                 raise ArgumentError.new("Expected an organization")
             end
-            
+
             if organization.integration_id.nil? || organization.integration_id.length == 0
                 raise IntegrationIdIsRequiredError, "An integration id is required for an organization."
             end
 
-            if find_organization_by_integration_id(organization.integration_id) != nil
+            if find_organization_by_integration_id(organization.integration_id, false) != nil
                 raise AlreadyAddedError, "Already added an organization with integration_id #{organization.integration_id}"
             end
 
@@ -137,10 +141,10 @@ module GoImport
                 raise IntegrationIdIsRequiredError, "An integration id is required for a deal."
             end
 
-            if find_deal_by_integration_id(deal.integration_id) != nil
+            if find_deal_by_integration_id(deal.integration_id, false) != nil
                 raise AlreadyAddedError, "Already added a deal with integration_id #{deal.integration_id}"
             end
-            
+
             if !configuration[:allow_deals_without_responsible] && deal.responsible_coworker.nil?
                 deal.responsible_coworker = @import_coworker
             end
@@ -158,6 +162,13 @@ module GoImport
                 configuration[:allow_deals_without_responsible] =
                     config_value.downcase == "true" || config_value == "1"
             end
+
+            if defined?(REPORT_RESULT)
+                config_value = REPORT_RESULT.to_s
+
+                configuration[:report_result] =
+                    config_value.downcase == "true" || config_value == "1"
+            end
         end
 
         # Adds the specifed note object to the model.
@@ -182,15 +193,15 @@ module GoImport
             if note.integration_id.nil? || note.integration_id.length == 0
                 note.integration_id = @notes.length.to_s
             end
-            
-            if find_note_by_integration_id(note.integration_id) != nil
+
+            if find_note_by_integration_id(note.integration_id, false) != nil
                 raise AlreadyAddedError, "Already added a note with integration_id #{note.integration_id}"
             end
 
             if note.created_by.nil?
                 note.created_by = @import_coworker
             end
-            
+
             @notes[note.integration_id] = note
             note.set_is_immutable
 
@@ -209,35 +220,40 @@ module GoImport
             return @documents.add_file(file)
         end
 
-        def find_coworker_by_integration_id(integration_id)
+        def find_coworker_by_integration_id(integration_id, report_result=!!configuration[:report_result])
             if @coworkers.has_key?(integration_id)
                 return @coworkers[integration_id]
             else
+                report_failed_to_find_object("coworker", ":#{integration_id}") if report_result
                 return nil
             end
         end
 
-        def find_organization_by_integration_id(integration_id)
+        def find_organization_by_integration_id(integration_id, report_result=!!configuration[:report_result])
             if @organizations.has_key?(integration_id)
                 return @organizations[integration_id]
             else
+                report_failed_to_find_object("organization", ":#{integration_id}") if report_result
                 return nil
             end
 
         end
 
-        def find_person_by_integration_id(integration_id)
+        def find_person_by_integration_id(integration_id, report_result=!!configuration[:report_result])
             return nil if @organizations.nil?
             @organizations.each do |key, organization|
                 person = organization.find_employee_by_integration_id(integration_id)
                 return person if person
             end
+            report_failed_to_find_object("person", ":#{integration_id}") if report_result
+            return nil
         end
 
-        def find_note_by_integration_id(integration_id)
+        def find_note_by_integration_id(integration_id, report_result=!!configuration[:report_result])
             if @notes.has_key?(integration_id)
                 return @notes[integration_id]
             else
+                report_failed_to_find_object("note", ":#{integration_id}") if report_result
                 return nil
             end
         end
@@ -249,18 +265,122 @@ module GoImport
             deals = @deals.values.select do |deal|
                 !deal.customer.nil? && deal.customer.integration_id == organization.integration_id
             end
-
             return deals
         end
 
-        def find_deal_by_integration_id(integration_id)
+        def find_deal_by_integration_id(integration_id, report_result=!!configuration[:report_result])
             if @deals.has_key?(integration_id)
                 return @deals[integration_id]
             else
+                report_failed_to_find_object("deal", ":#{integration_id}") if report_result
                 return nil
             end
         end
 
+        # Finds a organization based on one of its property.
+        # Returns the first found matching organization
+        # Method is much slower then using find_organization_by_integration_id
+        # @example Finds a organization on its name
+        #      rm.find_organization {|org| org.name == "Lundalogik" }
+        def find_organization(report_result=!!configuration[:report_result], &block)
+          result = find(@organizations.values.flatten, &block)
+          report_failed_to_find_object("organization") if result.nil? and report_result
+          return result
+        end
+
+        # Finds organizations based on one of their property.
+        # Returns all matching organizations
+        # @example Selects organizations on their names
+        #      rm.select_organizations {|org| org.name == "Lundalogik" }
+        def select_organizations(report_result=!!configuration[:report_result], &block)
+          result = select(@organizations.values.flatten, &block)
+          report_failed_to_find_object("organization") if result.empty? and report_result
+          return result
+        end
+
+        # Finds a person based on one of its property.
+        # Returns the first found matching person
+        # @example Finds a person on its name
+        #      rm.find_person {|person| person.first_name == "Kalle" }
+        def find_person(report_result=!!configuration[:report_result], &block)
+          result = find(persons, &block)
+          report_failed_to_find_object("person") if result.nil? and report_result
+          return result
+        end
+
+        # Finds persons based on one of their property.
+        # Returns all matching persons
+        # @example Selects persons on their names
+        #      rm.select_person {|p| p.first_name == "Kalle" }
+        def select_persons(report_result=!!configuration[:report_result], &block)
+          result = select(persons, &block)
+          report_failed_to_find_object("person") if result.empty? and report_result
+          return result
+        end
+
+        # Finds a deal based on one of its property.
+        # Returns the first found matching deal
+        # Method is much slower then using find_deal_by_integration_id
+        # @example Finds a deal on its name
+        #      rm.find_deal {|deal| deal.value == 120000 }
+        def find_deal(report_result=!!configuration[:report_result], &block)
+          result = find(@deals.values.flatten, &block)
+          report_failed_to_find_object("person") if result.nil? and report_result
+          return result
+        end
+
+        # Finds deals based on one of their property.
+        # Returns all matching deals
+        # @example Selects deals on their names
+        #      rm.select_deals {|deal| deal.name == "Big Deal" }
+        def select_deals(report_result=!!configuration[:report_result], &block)
+          result = select(@deals.values.flatten, &block)
+          report_failed_to_find_object("deal") if result.empty? and report_result
+          return result
+        end
+
+        # Finds a coworker based on one of its property.
+        # Returns the first found matching coworker
+        # @example Finds a coworker on its name
+        #      rm.find_coworker {|coworker| coworker.email == "kalle@kula.se" }
+        def find_coworker(report_result=!!configuration[:report_result], &block)
+          result = find(@coworkers.values.flatten, &block)
+          report_failed_to_find_object("coworker") if result.nil? and report_result
+          return result
+        end
+
+        # Finds coworkers based on one of their property.
+        # Returns all matching coworkers
+        # @example Selects coworkers on their names
+        #      rm.select_coworkers {|coworker| coworker.email == "kalle@kula.se" }
+        def select_coworkers(report_result=!!configuration[:report_result], &block)
+          result = select(@coworkers, &block)
+          report_failed_to_find_object("coworker") if result.empty? and report_result
+          return result
+        end
+
+
+        # Finds a note based on one of its property.
+        # Returns the first found matching note
+        # @example Finds a note on its name
+        #      rm.find_note {|note| note.text == "hello!" }
+        def find_note(report_result=!!configuration[:report_result], &block)
+          result = find(@notes.values.flatten, &block)
+          report_failed_to_find_object("note") if result.nil? and report_result
+          return result
+        end
+
+        # Finds a document based on one of its property.
+        # Returns the first found matching document
+        # @example Finds a document on its name
+        #      rm.find_document(:file) {|document| document.name == "Important Tender" }
+        def find_document(type, report_result=!!configuration[:report_result], &block)
+          result = find(@documents.files, &block) if type == :file
+          result = find(@documents.links, &block) if type == :link
+          report_failed_to_find_object("document") if result.nil? and report_result
+          return result
+        end
+
         # Returns a string describing problems with the data. For
         # instance if integration_id for any entity is not unique.
         def sanity_check
@@ -377,7 +497,7 @@ module GoImport
             end
             serialize_to_file(go_data_file)
             create_zip(zip_filename, go_data_file, documents.files)
-            
+
             if !files_filename.nil?
                 go_files_file = Tempfile.new('go-files')
                 puts "Creating go.xml file with documents information..."
@@ -393,7 +513,7 @@ module GoImport
                     ::File.delete files_zip_filename
                 end
                 create_zip(files_zip_filename, go_files_file, documents.files)
-            end            
+            end
         end
 
         def create_zip(filename, xml, files)
@@ -436,6 +556,17 @@ module GoImport
             end
         end
 
+        def report_rootmodel_status
+          #nbr_of_persons = @organizations.collect{|k, o| o.employees}.flatten.compact.length
+          nbr_of_documents = @documents.files.length + @documents.links.length
+          puts "Rootmodel contains:\n" \
+          " Organizations: #{@organizations.length}\n" \
+          " Persons:       #{persons.length}\n" \
+          " Deals:         #{@deals.length}\n" \
+          " Notes:         #{@notes.length}\n" \
+          " Documents:     #{nbr_of_documents}"
+        end
+
         private
         # returns all items from the object array with duplicate integration ids.
         # To get all organizations with the same integration_id use
@@ -452,5 +583,33 @@ module GoImport
                 obj.integration_id != nil && !obj.integration_id.empty?
             end
         end
+
+        # Prints a warning text if a find-function returns nil
+        def report_failed_to_find_object(object, search_string="")
+          c = caller_locations(2).first
+          puts "Warning: #{c.label}:#{c.lineno}: Failed to find #{object}#{search_string}"
+        end
+
+        def find(array)
+          result = nil
+          array.each do |obj|
+            if yield(obj)
+              result = obj
+              break
+            end
+          end
+          return result
+        end
+
+        def select(array)
+          result = []
+          array.each do |obj|
+            if yield(obj)
+              result.push obj
+            end
+          end
+          return result
+        end
+
     end
 end

data/lib/go_import/phone_helper.rb

@@ -33,6 +33,7 @@ module GoImport
         #    source = "046 - 270 48 00/ 031-712 44 00"
         #    number1, number2 = GoImport::PhoneHelper.parse_numbers(source, '/')
         def self.parse_numbers(number_string, delimiters = ',', strict_mode = false)
+            return nil if number_string.nil?
             numbers = []
 
             if delimiters.is_a?(Array)

data/lib/go_import/shard_helper.rb

@@ -1,17 +1,17 @@
 module GoImport
     class ShardHelper
-            
+
             attr_accessor :shards, :current_shard_count, :current_shard
-            
+
             def initialize(shard_size = nil)
                 @shard_size = shard_size || 25000
                 setup()
             end
 
             def shard_model(model)
-                @current_shard.configuration = model.configuration
+                @current_shard.settings = model.settings
 
-                model.coworkers.each{ |key, coworker| 
+                model.coworkers.each{ |key, coworker|
                     if coworker.integration_id != "import"
                         add_coworker(coworker)
                     end
@@ -61,7 +61,7 @@ module GoImport
                     @current_shard_count += org.employees.length
                 end
                 @current_shard.add_organization(org)
-                @current_shard_count += 1 
+                @current_shard_count += 1
             end
 
             private
@@ -74,16 +74,16 @@ module GoImport
             def add_file(file)
                 check_or_create_new_chard()
                 @current_shard.add_file(file)
-                @current_shard_count += 1 
+                @current_shard_count += 1
             end
 
             private
             def add_link(link)
                 check_or_create_new_chard()
                 @current_shard.add_link(link)
-                @current_shard_count += 1 
+                @current_shard_count += 1
             end
-            
+
             private
             def check_or_create_new_chard()
                 if @current_shard_count > @shard_size