move-to-go 5.0.8 → 5.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0d3687ccb133122091d0b3fa42fd14ef58ab8f9
-  data.tar.gz: a621d4f97575b296c8274e2d90770a4c50b1b86d
+  metadata.gz: 6e9e05bc5cacd47a93cfcab58ba59379935ab673
+  data.tar.gz: 0f96da4e936571891779922478eb2963259ea1f0
 SHA512:
-  metadata.gz: 2628c3bf7350a2e882ea88d1e4c368093e2b9ac57b6751bb222c898dcd0d89083aa75578125f984e3299c7df781ef5f80d5de4323f89dd5bf7fb14b831346e75
-  data.tar.gz: bcfb26f06fab4f25758a546b35ad9d0668a74b27f4a4639a9280c44b23bc6cc2d7544f09552a7ac0ee67fba221a42008244e3cf8b14c9fc35f769457f7dd8c4d
+  metadata.gz: cc42acb7eedf6a8c9495a8cdd03d22f24bc78d0777b254b13bf2dc85b6b573aaa1e309a3011d7e49bbeeb110dcd9dbfb5895f35a87276dd59ab763a72c31d589
+  data.tar.gz: 5ead308750e781c528ba4392e79743935b06fff7d8c3fb2219693388a4195a6bc884a0cc011a2751dd3b3a779e1eb6de13a90666864508402e9d70b5a05c8e80

data/bin/move-to-go

@@ -138,7 +138,7 @@ class MoveToGoCommandLine < Thor
             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/organization.rb

@@ -69,6 +69,9 @@ module MoveToGo
         # :attr_accessor: central_phone_number
         immutable_accessor :central_phone_number
         ##
+        # :attr_accessor: source
+        immutable_accessor :source
+        ##
         # :attr_accessor: source_data
         immutable_accessor :source_data
         attr_accessor :rootmodel
@@ -269,6 +272,8 @@ module MoveToGo
             if !@source.nil?
                 if @source.id.nil? || @source.id == ""
                     error = "#{error}\nReference to source must have an id"
+                elsif @source.id !~ /^\d{1}\d*:{1}\d{1}\d*$/
+                    error = "#{error}\nInvalid source id '#{@source.id}', must have one ':' and only digits allowed, example '1:200010'"
                 end
             end
 

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

@@ -59,7 +59,7 @@ module MoveToGo
                     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 != nil ? val.downcase.strip : val = ''
+                val != nil ? val.to_s.downcase.strip : val = ''
                 }
             }
             .select { |k, v| v.size > 1 }

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

@@ -31,7 +31,7 @@ module MoveToGo
              {:id => :organizations, :type => :organizations},
              {:id => :deals, :type => :deals},
              {:id => :histories, :type => :histories},
-             {:id => :documents, :type => :documents},
+             {:id => :documents, :type => :documents}
             ]
         end
 
@@ -117,6 +117,12 @@ module MoveToGo
                 raise AlreadyAddedError, "Already added an organization with integration_id #{organization.integration_id}"
             end
 
+            if !organization.source.nil?
+                if !@organizations.find{|key,value| value.source.id == organization.source.id if !value.source.nil?}.nil?
+                    raise AlreadyAddedError, "Source id already exists, sourceId: #{organization.source.id}"
+                end
+            end
+
             @organizations[organization.integration_id] = organization
             organization.rootmodel = self
             organization.set_is_immutable

data/sources/excel-basic/.move-to-go/runner.rb

@@ -35,7 +35,6 @@ def convert_source
     if defined?(ORGANIZATION_SHEET)
         if excel_workbook.has_sheet?(ORGANIZATION_SHEET)
             organization_rows = excel_workbook.rows_for_sheet ORGANIZATION_SHEET
-            converter.organization_hook(row, organization, rootmodel) if defined? converter.organization_hook
         else
             puts "WARNING: can't find sheet '#{ORGANIZATION_SHEET}'"
         end
@@ -97,6 +96,7 @@ def convert_source
         organization_rows.each do |row|
             organization = converter.to_organization(row, rootmodel)
             rootmodel.add_organization(organization)
+            converter.organization_hook(row, organization, rootmodel) if defined? converter.organization_hook
         end
     end
 

data/sources/excel/.move-to-go/runner.rb

@@ -36,7 +36,6 @@ def convert_source
     if defined?(ORGANIZATION_SHEET)
         if excel_workbook.has_sheet?(ORGANIZATION_SHEET)
             organization_rows = excel_workbook.rows_for_sheet ORGANIZATION_SHEET
-            converter.organization_hook(row, organization, rootmodel) if defined? converter.organization_hook
         else
             puts "WARNING: can't find sheet '#{ORGANIZATION_SHEET}'"
         end
@@ -98,6 +97,7 @@ def convert_source
         organization_rows.with_progress().each do |row|
             organization = converter.to_organization(row, rootmodel)
             rootmodel.add_organization(organization)
+            converter.organization_hook(row, organization, rootmodel) if defined? converter.organization_hook
         end
     end
 

data/spec/organization_spec.rb

@@ -56,7 +56,7 @@ describe "Organization" do
         organization.validate.should eq ""
     end
 
-    it "will fail on validateion if it has a source with no sourceid" do
+    it "will fail on validation if it has a source with no sourceid" do
         # given
         organization.name =  "Lundalogik"
 
@@ -69,6 +69,72 @@ describe "Organization" do
         organization.validate.length.should be > 0
     end
 
+    it "will fail on source validation, only numbers" do
+        # given
+        organization.name =  "Lundalogik"
+
+        # when
+        organization.with_source do |source|
+            source.par_se('11234')
+        end
+
+        # then
+        organization.validate.length.should be > 0
+    end
+
+
+    it "will fail on source validation, begins with :" do
+        # given
+        organization.name =  "Lundalogik"
+
+        # when
+        organization.with_source do |source|
+            source.par_se(':11234')
+        end
+
+        # then
+        organization.validate.length.should be > 0
+    end
+
+    it "will fail on source validation, ends with :" do
+        # given
+        organization.name =  "Lundalogik"
+
+        # when
+        organization.with_source do |source|
+            source.par_se('11234:')
+        end
+
+        # then
+        organization.validate.length.should be > 0
+    end
+
+    it "will not fail on source validation, pattern 1" do
+        # given
+        organization.name =  "Lundalogik"
+
+        # when
+        organization.with_source do |source|
+            source.par_se('1:1234')
+        end
+
+        # then
+        organization.validate.length.should be == 0
+    end
+
+    it "will not fail on source validation, pattern 2" do
+        # given
+        organization.name =  "Lundalogik"
+
+        # when
+        organization.with_source do |source|
+            source.par_se('113:234')
+        end
+
+        # then
+        organization.validate.length.should be == 0
+    end
+
     it "will fail on validation if no name is specified" do
         # given
         organization.name = ""

data/spec/organizations_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 require 'move-to-go'
+require 'test/unit'
+include Test::Unit::Assertions
 
 describe MoveToGo::Organizations do
     it "should find duplicates based on name of the organizations" do
@@ -231,4 +233,112 @@ describe MoveToGo::Organizations do
         set_to_check.length.should eq 3
     end
 
+    it "should not allow duplicated integration ids" do
+        # given
+        model =  MoveToGo::RootModel.new
+
+        organization = MoveToGo::Organization.new
+        organization.name = "name1"
+        organization.integration_id = "1337"
+        model.add_organization(organization)
+
+        organization = MoveToGo::Organization.new
+        organization.name = "name2"
+        organization.integration_id = "1337"
+
+        assert_raise(MoveToGo::AlreadyAddedError) {
+            model.add_organization(organization)
+        }
+    end
+
+    it "should allow different integration ids" do
+        # given
+        model =  MoveToGo::RootModel.new
+
+        organization = MoveToGo::Organization.new
+        organization.name = "name1"
+        organization.integration_id = "1337"
+        model.add_organization(organization)
+
+        organization = MoveToGo::Organization.new
+        organization.name = "name2"
+        organization.integration_id = "1338"
+
+        assert_nothing_raised(MoveToGo::AlreadyAddedError) {
+            model.add_organization(organization)
+        }
+    end
+
+    it "should not allow duplicated source ids" do
+        # given
+        model =  MoveToGo::RootModel.new
+
+        organization = MoveToGo::Organization.new
+        organization.name = "name1"
+        organization.integration_id = "1337"
+        organization.with_source do |source|
+            source.par_se('1111')
+        end
+        model.add_organization(organization)
+
+        organization = MoveToGo::Organization.new
+        organization.name = "name2"
+        organization.integration_id = "1338"
+        organization.with_source do |source|
+            source.par_se('1111')
+        end
+
+        # when, then
+        assert_raise(MoveToGo::AlreadyAddedError) {
+            model.add_organization(organization)
+        }
+    end
+
+    it "should allow different source ids" do
+        # given
+        model =  MoveToGo::RootModel.new
+
+        organization = MoveToGo::Organization.new
+        organization.name = "name1"
+        organization.integration_id = "1337"
+        organization.with_source do |source|
+            source.par_se('1111')
+        end
+        model.add_organization(organization)
+
+        organization = MoveToGo::Organization.new
+        organization.name = "name2"
+        organization.integration_id = "1338"
+        organization.with_source do |source|
+            source.par_se('1112')
+        end
+
+        # when, then
+        assert_nothing_raised(MoveToGo::AlreadyAddedError) {
+            model.add_organization(organization)
+        }
+    end
+
+    it "Not all organization have source id" do
+        # given
+        model =  MoveToGo::RootModel.new
+
+        organization = MoveToGo::Organization.new
+        organization.name = "name1"
+        organization.integration_id = "1337"
+        model.add_organization(organization)
+
+        organization = MoveToGo::Organization.new
+        organization.name = "name2"
+        organization.integration_id = "1338"
+        organization.with_source do |source|
+            source.par_se('1112')
+        end
+
+        # when, then
+        assert_nothing_raised(MoveToGo::AlreadyAddedError) {
+            model.add_organization(organization)
+        }
+    end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: move-to-go
 version: !ruby/object:Gem::Version
-  version: 5.0.8
+  version: 5.0.9
 platform: ruby
 authors:
 - Petter Sandholdt
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso_country_codes