move-to-go 5.0.4 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c24f07f103ba93494bf92b7abbe1e68690e6421
-  data.tar.gz: 8299844ac4c5bb1045937ad10d4302c1ae2c5f23
+  metadata.gz: 91b6f9abf8f63efa4c4a49c64fa0ef214200fa78
+  data.tar.gz: 2842fa80a9fa1719c421924aae7e0250ea48bfe6
 SHA512:
-  metadata.gz: 3567f1361e0527c9282d9fc092249e4ca4d6575abbb6a28665a1c3bb7a3d53d63a56c2fcc197a965b3d9bca679469d65e47b6f14e6dfa8830cdd8f080e3c75b2
-  data.tar.gz: 79cce7943560bbb9df1266dc566b064b23e009baee749eaf7cb55dc4e49d279dc73f9bc2091e3b824c65912beedb16e2235d896622203c21e627e4cd94987987
+  metadata.gz: 72b34f0e942fd720e85eebe9e9ff0cc6bf72d1396524e489e76812387405d98ec6f3174034ca6ce739be4527a357edeffa7e5664f30f2dcc55feec5ff1f9c60c
+  data.tar.gz: adde6e214d1941b7299592517258d55a9bea6db8015b6020cc9ddbbb2ee78790e565f78b631c96acb714fd405d1159665f760cadebfee5e882f07efe47fde5d5

data/bin/move-to-go

@@ -106,6 +106,10 @@ class MoveToGoCommandLine < Thor
             end
             model.report_rootmodel_status()
 
+            puts "Checking for duplicate organizations..."
+            possible_duplicates = model.organizations.find_duplicates_by(:name, :organization_number)
+            puts "Found #{possible_duplicates.length} organization duplicate sets in rootmodel, based on name and organization number"
+                
             puts "Starting sharding of model..."
             sharder = MoveToGo::ShardHelper.new(options.shard_size)
             models_to_serialize = sharder.shard_model(model)

data/lib/move-to-go/model/deal.rb

@@ -114,34 +114,41 @@ module MoveToGo
         end
 
         def validate(labels = nil)
-            error = String.new
-            warnings = String.new
+            errors = []
+            warnings = []
 
             if @name.nil? || @name.empty?
-                error = "A name is required for deal.\n"
+                errors.push("A name is required for deal.")
             end
 
             if is_integer?(@value) && @value.to_i < 0
-                error = "The value must be positive for deal.\n"
+                errors.push("The value must be positive for deal.")
             end
 
             if !@status.nil? && @status.status_reference.nil?
-                error = "#{error}\nStatus must have a status reference."
+                errors.push("Status must have a status reference.")
             end
 
             if !@status.nil? && !@status.status_reference.nil? && @status.status_reference.validate.length > 0
-                error = "#{error}\n#{@status.status_reference.validate}"
+                val = @status.status_reference.validate
+                if val.length > 0
+                    errors.push(val)
+                end
             end
 
             if !@status.nil? && !@status.status_reference.nil? && (labels.nil? || (!labels.nil? && !labels.include?(@status.status_reference.label)))
-                warnings = "Deal status '#{@status.status_reference.label}' missing, add to settings"
+                warnings.push("Deal status '#{@status.status_reference.label}' missing, add to settings")
+            end
+
+            if @status == nil
+                warnings.push("No status set on deal (#{@integration_id}) '#{@name}', will be set to default status at import")
             end
 
-            if error.length > 0
-                error = "#{error}\n#{serialize()}"
+            if errors.length > 0
+                errors.push(serialize())
             end
 
-            return [error, warnings]
+            return [errors.join('\n'), warnings.join('\n')]
         end
 
         def with_status

data/lib/move-to-go/model/organization.rb

@@ -71,6 +71,7 @@ module MoveToGo
         ##
         # :attr_accessor: source_data
         immutable_accessor :source_data
+        attr_accessor :rootmodel
 
         # Sets/gets the date when this organization's relation was
         # changed. Default is Now.
@@ -80,7 +81,11 @@ module MoveToGo
         # you add custom values by using {#set_custom_value}
         attr_reader :custom_values
 
+        # You can read linked objects
+        attr_reader :deals, :histories, :documents
+
         def initialize(opt = nil)
+            @employees = []
             if !opt.nil?
                 serialize_variables.each do |myattr|
                     val = opt[myattr[:id]]
@@ -180,6 +185,18 @@ module MoveToGo
             end
         end
 
+        def deals
+            @rootmodel.find_deals_for_organization(self)
+        end
+
+        def histories
+            @rootmodel.select_histories{|history| history.organization == self}
+        end
+
+        def documents(type)
+            @rootmodel.select_documents(type){|doc| doc.organization == self}
+        end
+
         # Sets the organization's relation to the specified value. The
         # relation must be a valid value from the Relation module
         # otherwise an InvalidRelationError error will be thrown.
@@ -266,5 +283,64 @@ module MoveToGo
 
             return error
         end
+
+        # Moves all data from an organization to this organization. The pillaged
+        # org is still kept as a empty shell of itself in the rootmodel 
+        def move_data_from(org)
+            flat_instance_variables_to_copy = [:@name, :@organization_number, :@email, :@web_site, :@central_phone_number]
+            class_instance_variables_to_copy = [:@visiting_address, :@postal_address, :@source_data]
+            org.instance_variables.each{ |variable|
+                
+                # Only change the value if it is empty
+                if flat_instance_variables_to_copy.include? variable
+                    if !self.instance_variable_get(variable)
+                        self.instance_variable_set(variable, org.instance_variable_get(variable))
+                    end
+
+                # Some of the instances variabels are classes
+                
+                elsif class_instance_variables_to_copy.include? variable
+                  
+                    class_instance = org.instance_variable_get(variable)
+                    class_instance.instance_variables.each { |sub_variable|
+                       
+                        #If there is no class, create one 
+                        if !self.instance_variable_get(variable)
+                            case variable
+                            when :@visit_address, :@postal_address
+                                klass = MoveToGo::Address.new
+                            when :@source_data
+                                klass = MoveToGo::SourceData.new
+                            end
+                            self.instance_variable_set(variable, klass)
+                        end
+                        if !self.instance_variable_get(variable).instance_variable_get(sub_variable)
+                            self.instance_variable_get(variable).instance_variable_set(
+                                sub_variable, class_instance.instance_variable_get(sub_variable)
+                            )
+                        end
+                    }
+                elsif variable == :@custom_values
+                    org.custom_values.each{ |custom_value|
+                        self.set_custom_value(custom_value.field, custom_value.value)
+                    }
+                end
+            }
+
+            self.with_postal_address do
+
+            end
+            
+            org.employees.each{ |person| self.add_employee(person)}
+    
+            org.deals.each{ |deal| deal.instance_variable_set("@customer", self)} # Object is "immutable" if using "="
+
+            org.histories.each{|history| history.instance_variable_set("@organization", self)}
+
+            org.documents(:file).each{|file| file.instance_variable_set("@organization", self)}
+
+            org.documents(:link).each{|history| history.instance_variable_set("@organization", self)}
+
+        end
     end
 end

data/lib/move-to-go/model/organizations.rb

@@ -0,0 +1,71 @@
+module MoveToGo
+    class Organizations < Hash
+    
+        def initialize(rootmodel)
+            @rootmodel = rootmodel
+        end
+
+        class DuplicateSet < Array
+            # Moves all data to the first organization and returns the remaining orgs
+            def merge_all!()
+                return self.map{ |org|
+                    if org != self.first
+                        self.first.move_data_from(org)
+                        org
+                    end
+                }
+                .flatten
+                .compact
+            end
+        end
+
+        class DuplicateSetArray < Array
+
+            def initialize(rootmodel, array)
+                @rootmodel = rootmodel
+                super(array)
+            end
+
+            def map_duplicates(&block)
+            
+                # Send the sets to the function that will decide to keep or remove them
+                # Can return Nil, a single org, empty array or an array of orgs. Compact and flatten to fix
+                self
+                    .map{ |duplicate_set| yield DuplicateSet.new duplicate_set}
+                    .flatten
+                    .compact
+            end
+            
+        end
+        
+        #Finds duplicates based on supplied fields. Returns an DuplicateSetArray
+        def find_duplicates_by(*raw_fields_to_check)
+            # map fields to instance variable name or to class. For example :name
+            # or "visiting_address.city" => [:visiting_address, :city]
+            fields_to_check = raw_fields_to_check.map{ |field|
+                fields = field.to_s.split(".")
+                case fields.length
+                    when 1 then :"@#{field}"
+                    when 2 then [:"@#{fields[0]}",:"@#{fields[1]}"]
+                    else raise
+                end
+            } 
+            # Find all posible duplicates and collect them to sets.
+            possible_duplicate_sets = self
+                .values
+                .group_by{ |org|
+                    fields_to_check.map{ |field|
+                    case field # Some fields (Address) are accually class objects, check what we are dealing with
+                        when Symbol then val = org.instance_variable_get(field)
+                        when Array then val = org.instance_variable_get(field[0]).instance_variable_get(field[1])
+                    end
+                    val.downcase.strip
+                    }
+                }
+                .select { |k, v| v.size > 1 }
+                .values
+
+            return DuplicateSetArray.new(@rootmodel, possible_duplicate_sets)
+        end
+    end
+end

data/lib/move-to-go/model/rootmodel.rb

@@ -43,7 +43,7 @@ module MoveToGo
 
         def initialize()
             @settings = Settings.new
-            @organizations = {}
+            @organizations = Organizations.new self
             @coworkers = {}
             @migrator_coworker = Coworker.new
             @migrator_coworker.integration_id = "migrator"
@@ -118,11 +118,41 @@ module MoveToGo
             end
 
             @organizations[organization.integration_id] = organization
+            organization.rootmodel = self
             organization.set_is_immutable
 
             return organization
         end
 
+        def remove_organization(organization)
+            if organization.nil?
+                return nil
+            end
+
+            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 to remove an organization"
+            end
+
+            find_deals_for_organization(organization)
+                .each{|deal| @deals.delete(deal.integration_id)}
+
+            select_histories{|history| history.organization == organization}
+                .each{|history| @histories.delete(history.integration_id)}
+
+            select_documents(:file){|file| file.organization == organization}
+                .each{|file| @documents.files.delete(file.integration_id)}
+
+            select_documents(:link){|history| history.organization == organization}
+                .each{|history| @documents.links.delete(history.integration_id)}
+
+            @organizations.delete(organization.integration_id)
+
+        end
+
         # Adds the specifed deal object to the model.
         # @example Add a deal from a new deal
         #    deal = MoveToGo::Deal.new
@@ -421,6 +451,16 @@ module MoveToGo
           return result
         end
 
+        # Finds a history based on one of its property.
+        # Returns all found matching history
+        # @example Finds a history on its name
+        #      rm.select_history {|history| history.text == "hello!" }
+        def select_histories(report_result=!!configuration[:report_result], &block)
+          result = select(@histories.values.flatten, &block)
+          report_failed_to_find_object("history") 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
@@ -432,6 +472,17 @@ module MoveToGo
           return result
         end
 
+        # Finds a document based on one of its property.
+        # Returns all found matching document
+        # @example Finds a document on its name
+        #      rm.find_document(:file) {|document| document.name == "Important Tender" }
+        def select_documents(type, report_result=!!configuration[:report_result], &block)
+          result = select(@documents.files, &block) if type == :file
+          result = select(@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
@@ -624,6 +675,14 @@ module MoveToGo
           " Documents:     #{nbr_of_documents}"
         end
 
+        # Maps organization duplicates from the rootmodel, only returned 
+        def map_organization_duplicates!(fields_to_check=[:name], &block)
+            dc = MoveToGo::DuplicateChecker.new(fields_to_check, self)
+            dc.map_organization_duplicates! do |duplicate_set| 
+                yield duplicate_set 
+            end
+        end
+
         private
         # returns all items from the object array with duplicate integration ids.
         # To get all organizations with the same integration_id use

data/spec/organizations_spec.rb

@@ -0,0 +1,208 @@
+require 'spec_helper'
+require 'move-to-go'
+
+describe MoveToGo::Organizations do
+    it "should find duplicates based on name of the organizations" do
+        # given
+        model =  MoveToGo::RootModel.new
+
+        organization = MoveToGo::Organization.new
+        organization.name = "Lundalogik AB"
+        organization.integration_id = "1337"
+        model.add_organization(organization)
+
+        (1..3).each do |n|
+            organization = MoveToGo::Organization.new
+            organization.name = "Ankeborgs bibliotek"
+            organization.integration_id = n.to_s
+            model.add_organization(organization)
+        end
+
+        set_to_check = []
+        model.organizations
+            .find_duplicates_by(:name)
+            .each do |duplicate_set|
+                set_to_check = duplicate_set
+            end
+        # when, the
+        set_to_check.length.should eq 3
+    end
+
+    it "should not find duplicates based on name and integration id of the organizations" do
+        # given
+        model =  MoveToGo::RootModel.new
+
+        (1..3).each do |n|
+            organization = MoveToGo::Organization.new
+            organization.name = "Ankeborgs bibliotek"
+            organization.integration_id = n.to_s
+            model.add_organization(organization)
+        end
+
+        set_to_check = []
+        model.organizations
+            .find_duplicates_by(:name, :integration_id)
+            .each do |duplicate_set|
+                set_to_check = duplicate_set
+            end
+        # when, the
+        set_to_check.length.should eq 0
+    end
+
+    it "should work with address" do
+        # given
+        model =  MoveToGo::RootModel.new
+
+        (1..3).each do |n|
+            organization = MoveToGo::Organization.new
+            organization.name = "Ankeborgs bibliotek"
+            organization.integration_id = n.to_s
+            organization.with_postal_address do |address|
+                address.city = "Lund"
+            end
+            model.add_organization(organization)
+        end
+
+        set_to_check = []
+        model.organizations
+            .find_duplicates_by("name", "postal_address.city")
+            .map do |duplicate_set|
+                set_to_check = duplicate_set
+            end
+        # when, the
+        set_to_check.length.should eq 3
+    end
+
+    it "should find duplicates based on name of the organizations" do
+        # given
+        model =  MoveToGo::RootModel.new
+
+        organization = MoveToGo::Organization.new
+        organization.name = "Lundalogik AB"
+        organization.integration_id = "1337"
+        model.add_organization(organization)
+
+        (1..3).each do |n|
+            organization = MoveToGo::Organization.new
+            organization.name = "Ankeborgs bibliotek"
+            organization.integration_id = n.to_s
+            model.add_organization(organization)
+        end
+
+        set_to_check = []
+        model.organizations
+            .find_duplicates_by(:name)
+            .map do |duplicate_set|
+                set_to_check = duplicate_set
+            end
+        # when, the
+        set_to_check.length.should eq 3
+    end
+
+    it "should work with a single organization in rootmodel" do
+        # given
+        model =  MoveToGo::RootModel.new
+
+        organization = MoveToGo::Organization.new
+        organization.name = "Lundalogik AB"
+        organization.integration_id = "1337"
+        model.add_organization(organization)
+
+        set_to_check = []
+        model.organizations
+            .find_duplicates_by(:name)
+            .map do |duplicate_set|
+                set_to_check = duplicate_set
+            end
+        # when, the
+        set_to_check.length.should eq 0
+    end
+
+    it "should be able to merge duplicates" do
+        # given
+        model =  MoveToGo::RootModel.new
+
+        (1..3).each do |n|
+            organization = MoveToGo::Organization.new
+            organization.name = "Ankeborgs bibliotek"
+            organization.integration_id = n.to_s
+            model.add_organization(organization)
+            
+            person = MoveToGo::Person.new
+            person.first_name = "Kalle"
+            organization.add_employee(person)
+
+            deal = MoveToGo::Deal.new
+            deal.name = "Big deal"
+            deal.integration_id = n.to_s
+            deal.customer = organization
+            model.add_deal(deal)
+
+            note = MoveToGo::History.new
+            note.text = "Hello"
+            note.organization = organization
+            model.add_history(note)
+
+        end
+
+        model.organizations
+            .find_duplicates_by(:name)
+            .map_duplicates{ |duplicate_set|
+                duplicate_set.merge_all!
+            }
+            .each{ |duplicate_org|
+                model.remove_organization(duplicate_org)
+            }
+
+        # when, the
+        model.organizations.values.length.should eq 1
+        model.organizations.values.first.employees.length.should eq 3
+        model.organizations.values.first.deals.length.should eq 3
+        model.organizations.values.first.histories.length.should eq 3
+    end
+
+    it "should be able to merge fields of an organizations to empty fields on another organization" do
+        # given
+        model =  MoveToGo::RootModel.new
+
+        model.settings.with_organization do |setting|
+           setting.set_custom_field({:integration_id=>"link_to_bi_system", :title=>"Link to BI system"})
+        end
+
+        org1 = MoveToGo::Organization.new
+        org1.name = "Lundalogik AB"
+        org1.integration_id = "1337"
+        org1.email = "info@lundalogik.se"
+        model.add_organization(org1)
+
+        org2 = MoveToGo::Organization.new
+        org2.name = "Lundalogik AB"
+        org2.organization_number = "123"
+        org2.integration_id = "123"
+        org2.email = "inbox@lundalogik.com"
+        org2.with_postal_address do |address|
+            address.city = "Lund"
+            address.street = "Sankt Lars"
+        end
+        org2.set_custom_value("link_to_bi_system", "https")
+
+        model.add_organization(org2)
+
+        model.organizations
+            .find_duplicates_by(:name)
+            .map_duplicates do |duplicate_set|
+                master_org = duplicate_set.find {|org| org.integration_id == "1337"}
+                org_to_be_merged = duplicate_set.find {|org| org.integration_id == "123"}
+                master_org.move_data_from(org_to_be_merged)
+            end
+        
+        org = model.find_organization_by_integration_id("1337")
+        # when, the
+        org.organization_number.should eq "123"
+        org.email.should eq "info@lundalogik.se"
+        org.postal_address.city.should eq "Lund"
+        org.postal_address.street.should eq "Sankt Lars"
+        org.custom_values.first.value.should eq "https"
+    end
+
+end

data/spec/rootmodel_spec.rb

@@ -994,4 +994,97 @@ describe "RootModel" do
         # then
         result.should eq []
     end
+
+    it "should delete an organization and its linked objects" do
+        # given
+        org = MoveToGo::Organization.new
+        org.name = "Lundalogik"
+        org.integration_id = "1"
+        person = MoveToGo::Person.new
+        person.first_name = "Kalle"
+        person.email = "kalle@kula.se"
+        person.position = "Chief"
+        org.add_employee(person)
+        rootmodel.add_organization(org)
+
+
+        deal = MoveToGo::Deal.new
+        deal.name = "Bigger Deal"
+        deal.value = 1234
+        deal.integration_id = "2"
+        deal.customer = org
+        rootmodel.add_deal deal
+
+
+        note = MoveToGo::History.new
+        note.text = "Hello"
+        note.organization = org
+        note.deal = deal
+        rootmodel.add_history(note)
+
+        rootmodel.remove_organization(org)
+
+        # when
+        result = rootmodel.organizations.length + rootmodel.deals.length + rootmodel.histories.length
+
+        # then
+        result.should eq 0
+    end
+
+    it "should only delete what it needs to delete when deleting an organization and its linked objects" do
+        # given
+        org = MoveToGo::Organization.new
+        org.name = "Lundalogik"
+        org.integration_id = "1"
+        person = MoveToGo::Person.new
+        person.first_name = "Kalle"
+        person.email = "kalle@kula.se"
+        person.position = "Chief"
+        org.add_employee(person)
+        rootmodel.add_organization(org)
+
+        deal = MoveToGo::Deal.new
+        deal.name = "Bigger Deal"
+        deal.value = 1234
+        deal.integration_id = "1"
+        deal.customer = org
+        rootmodel.add_deal deal
+
+        note = MoveToGo::History.new
+        note.text = "Hello"
+        note.organization = org
+        note.deal = deal
+        rootmodel.add_history(note)
+
+        org = MoveToGo::Organization.new
+        org.name = "Lundalogik Stockholm"
+        org.integration_id = "2"
+        person = MoveToGo::Person.new
+        person.first_name = "Kalle"
+        person.email = "kalle@kula.se"
+        person.position = "Chief"
+        org.add_employee(person)
+        rootmodel.add_organization(org)
+
+        deal = MoveToGo::Deal.new
+        deal.name = "Bigger Deal"
+        deal.value = 1234
+        deal.integration_id = "2"
+        deal.customer = org
+        rootmodel.add_deal deal
+
+        note = MoveToGo::History.new
+        note.text = "Hello"
+        note.organization = org
+        note.deal = deal
+        rootmodel.add_history(note)
+
+        rootmodel.remove_organization(org)
+
+        # when
+        result = rootmodel.organizations.length + rootmodel.deals.length + rootmodel.histories.length
+
+        # then
+        result.should eq 3
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: move-to-go
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.6
 platform: ruby
 authors:
 - Petter Sandholdt
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso_country_codes
@@ -205,6 +205,7 @@ files:
 - lib/move-to-go/model/history_classification.rb
 - lib/move-to-go/model/link.rb
 - lib/move-to-go/model/organization.rb
+- lib/move-to-go/model/organizations.rb
 - lib/move-to-go/model/person.rb
 - lib/move-to-go/model/referencetosource.rb
 - lib/move-to-go/model/relation.rb
@@ -311,6 +312,7 @@ files:
 - spec/history_spec.rb
 - spec/link_spec.rb
 - spec/organization_spec.rb
+- spec/organizations_spec.rb
 - spec/person_spec.rb
 - spec/rootmodel_spec.rb
 - spec/spec_helper.rb
@@ -356,6 +358,7 @@ test_files:
 - spec/helpers/xsd_validate_spec.rb
 - spec/history_spec.rb
 - spec/link_spec.rb
+- spec/organizations_spec.rb
 - spec/organization_spec.rb
 - spec/person_spec.rb
 - spec/rootmodel_spec.rb