Merge pull request #460 from af83/6360-workbenchimport-display

6360 Add checks on calendars during WorkbenchImport

1 files changed, 24 insertions, 3 deletions

diff --git a/app/workers/workbench_import_worker/object_state_updater.rb b/app/workers/workbench_import_worker/object_state_updater.rb
index 67bdc0654..1edc6b9a1 100644
--- a/app/workers/workbench_import_worker/object_state_updater.rb
+++ b/app/workers/workbench_import_worker/object_state_updater.rb
@@ -6,9 +6,10 @@ class WorkbenchImportWorker
       workbench_import.update( total_steps: count )
       update_spurious entry
       update_foreign_lines entry
+      update_missing_calendar entry
+      update_wrong_calendar entry
     end
 
-
     private
 
     def update_foreign_lines entry
@@ -19,7 +20,7 @@ class WorkbenchImportWorker
         message_attributes: {
           'source_filename' => workbench_import.file.file.file,
           'foreign_lines'   => entry.foreign_lines.join(', ')
-        }) 
+        })
     end
 
     def update_spurious entry
@@ -30,7 +31,27 @@ class WorkbenchImportWorker
         message_attributes: {
           'source_filename' => workbench_import.file.file.file,
           'spurious_dirs'   => entry.spurious.join(', ')
-        }) 
+        })
+    end
+
+    def update_missing_calendar entry
+      return unless entry.missing_calendar
+      workbench_import.messages.create(
+        criticity: :error,
+        message_key: 'missing_calendar_in_zip_file',
+        message_attributes: {
+          'source_filename' => entry.name
+        })
+    end
+
+    def update_wrong_calendar entry
+      return unless entry.wrong_calendar
+      workbench_import.messages.create(
+        criticity: :error,
+        message_key: 'wrong_calendar_in_zip_file',
+        message_attributes: {
+          'source_filename' => entry.name
+        })
     end
   end
 end