From bcce8235cc19dfa057fd18ec0f9a2ad347a02a0e Mon Sep 17 00:00:00 2001
From: Urban Rotnik <urban.rotnik@gmail.com>
Date: Tue, 14 Jan 2020 23:49:02 +0100
Subject: [PATCH] Add rescue block for setting default repository state

---
 ...itory_table_state_column_update_service.rb | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/app/services/repository_table_state_column_update_service.rb b/app/services/repository_table_state_column_update_service.rb
index 380775404..e32b0acee 100644
--- a/app/services/repository_table_state_column_update_service.rb
+++ b/app/services/repository_table_state_column_update_service.rb
@@ -28,33 +28,37 @@ class RepositoryTableStateColumnUpdateService
     raise ArgumentError, 'repository is empty' if repository.blank?
     raise ArgumentError, 'old_column_index is empty' if old_column_index.blank?
 
-    RepositoryTableState.where(
-      repository: repository
-    ).find_each do |table_state|
+    RepositoryTableState.where(repository: repository).find_each do |table_state|
       state = table_state.state
+      user = table_state.user
 
-      # Remove column from ColReorder, columns, length entries
-      state['columns'].delete_at(old_column_index)
-      state['ColReorder'].delete(old_column_index)
-      state['ColReorder'].map! do |index|
-        if index > old_column_index
-          index - 1
-        else
-          index
+      begin
+        # Remove column from ColReorder, columns, length entries
+        state['columns'].delete_at(old_column_index)
+        state['ColReorder'].delete(old_column_index)
+        state['ColReorder'].map! do |index|
+          if index > old_column_index
+            index - 1
+          else
+            index
+          end
         end
-      end
 
-      if state.dig('order', 0, 0) == old_column_index
-        # Fallback to default order if user had table ordered by
-        # the deleted column
-        state['order'] = Constants::REPOSITORY_TABLE_DEFAULT_STATE['order']
-      elsif state.dig('order', 0, 0) > old_column_index
-        state['order'][0][0] -= 1
-      end
+        if state.dig('order', 0, 0) == old_column_index
+          # Fallback to default order if user had table ordered by
+          # the deleted column
+          state['order'] = Constants::REPOSITORY_TABLE_DEFAULT_STATE['order']
+        elsif state.dig('order', 0, 0) > old_column_index
+          state['order'][0][0] -= 1
+        end
 
-      state['length'] = (state['length'] - 1)
-      state['time'] = (Time.now.to_f * 1_000).to_i
-      table_state.save
+        state['length'] = (state['length'] - 1)
+        state['time'] = (Time.now.to_f * 1_000).to_i
+        table_state.save
+      rescue NoMethodError => e
+        Rails.logger.error e.message
+        RepositoryTableStateService.new(user, repository).create_default_state
+      end
     end
   end
 end