go_import 3.0.13 → 3.0.14

data/bin/go-import

@@ -46,7 +46,16 @@ class GoImportCommandLine < Thor
            :desc => "Output will be created even if the import contains missing files",
            :type => :boolean,
            :required => false)
+    option(:log_to_file,
+           :desc => "Console output will be redirected to file",
+           :type => :string,
+           :required => false)
     def run_import()
+        if !options.log_to_file.nil?
+            $stdout = File.new(options.log_to_file == "log_to_file" ? "go-import.log" : options.log_to_file, 'w')
+            $stdout.sync = true
+        end
+
         if !is_valid_goimport_project?
             return
         end
@@ -91,13 +100,18 @@ class GoImportCommandLine < Thor
             puts "Trying to log files that can't be found..."
             file_log_header = "name;integration_id;path;organization.integrationid;organization.name;deal.integrationid;deal.name"
             file_log = ""
+            files_to_remove = []
             model.documents.files.each do |file|
                 if !::File.exists?(file.path_for_project)
                     file_log = "#{file_log}#{file.name};#{file.integration_id};#{file.path};#{file.organization.nil? ? '' : file.organization.integration_id};#{file.organization.nil? ? '' : file.organization.name};#{file.deal.nil? ? '' : file.deal.integration_id};#{file.deal.nil? ? '' : file.deal.name}\n"
-                    model.documents.files.delete file
+                    files_to_remove.push file
                 end
             end
 
+            files_to_remove.each do |file|
+                model.documents.files.delete file
+            end
+
             if file_log.length > 0
                 log_filename = 'go-import-missing-files.csv'
                 ::File.open(log_filename, 'w') { |f|

data/sources/easy/.go_import/runner.rb

@@ -80,16 +80,17 @@ def convert_source
         rootmodel.add_note(to_deal_note(row, rootmodel))
     end
 
-    # company documents
+    # documents
     if defined?(IMPORT_DOCUMENTS) && !IMPORT_DOCUMENTS.nil? && IMPORT_DOCUMENTS
         process_rows ORGANIZATION_DOCUMENT_FILE do |row|
             rootmodel.add_file(to_organization_document(row, rootmodel))
         end
 
         process_rows PROJECT_DOCUMENT_FILE do |row|
-            rootmodel.add_file(from_project_document_to_organization_document(row, includes, rootmodel))
+            rootmodel.add_file(to_deal_document(row, includes, rootmodel))
         end
     end
+
     return rootmodel
 end
 
@@ -187,7 +188,7 @@ def to_organization_document(row, rootmodel)
     return file
 end
 
-def from_project_document_to_organization_document(row, includes, rootmodel)
+def to_deal_document(row, includes, rootmodel)
     file = GoImport::File.new()
 
     file.integration_id = "d-#{row['idDocument']}"
@@ -199,13 +200,13 @@ def from_project_document_to_organization_document(row, includes, rootmodel)
         file.created_by = rootmodel.import_coworker
     end
 
-    organization_id = includes[row['idProject']]
-    org = rootmodel.find_organization_by_integration_id(organization_id)
-    if org.nil?
+    deal_id = includes[row['idProject']]
+    deal = rootmodel.find_deal_by_integration_id(deal_id)
+    if deal.nil?
         return nil
     end
 
-    file.organization = org
+    file.deal = deal
 
     return file
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: go_import
 version: !ruby/object:Gem::Version
-  version: 3.0.13
+  version: 3.0.14
   prerelease: 
 platform: ruby
 authors: