From abee54699d2cac06e3e4ab5505ec03d9263db619 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Mon, 12 Dec 2022 15:21:15 +0100
Subject: [PATCH] Fix label template error handling [SCI-7572]

---
 .../label_templates/repository_row_service.rb | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/services/label_templates/repository_row_service.rb b/app/services/label_templates/repository_row_service.rb
index 25dd5729e..2b27a6292 100644
--- a/app/services/label_templates/repository_row_service.rb
+++ b/app/services/label_templates/repository_row_service.rb
@@ -1,12 +1,10 @@
 # frozen_string_literal: true
-
 module LabelTemplates
+  class ColumnNotFoundError < StandardError; end
+  class LogoNotFoundError < StandardError; end
+  class LogoParamsError < StandardError; end
+
   class RepositoryRowService
-    class UnsupportedKeyError < StandardError; end
-
-    class ColumnNotFoundError < StandardError; end
-
-    class LogoNotFoundError < StandardError; end
 
     MAX_PRINTABLE_ITEM_NAME_LENGTH = 64
 
@@ -21,7 +19,9 @@ module LabelTemplates
       keys = @label_template.content.scan(/(?<=\{\{).*?(?=\}\})/).uniq
       label = keys.reduce(@label_template.content.dup) do |rendered_content, key|
         rendered_content.gsub!(/\{\{#{key}\}\}/, fetch_value(key))
-      rescue ColumnNotFoundError, LogoNotFoundError => e
+      rescue LabelTemplates::ColumnNotFoundError,
+             LabelTemplates::LogoNotFoundError,
+             LabelTemplates::LogoParamsError => e
         errors.push(e)
         rendered_content
       end
@@ -49,7 +49,7 @@ module LabelTemplates
       when /^c_(.*)/
         name = Regexp.last_match(1)
         unless @repository_columns.include?(name)
-          raise ColumnNotFoundError, I18n.t('label_templates.repository_row.errors.column_not_found')
+          raise LabelTemplates::ColumnNotFoundError, I18n.t('label_templates.repository_row.errors.column_not_found')
         end
 
         fetch_custom_column_value(name)
@@ -64,12 +64,12 @@ module LabelTemplates
       when /^LOGO/
         logo(key)
       else
-        raise ColumnNotFoundError, I18n.t('label_templates.repository_row.errors.column_not_found')
+        raise LabelTemplates::ColumnNotFoundError, I18n.t('label_templates.repository_row.errors.column_not_found')
       end
     end
 
     def logo(_key)
-      raise LogoNotFoundError, I18n.t('label_templates.repository_row.errors.logo_not_supported')
+      raise LabelTemplates::LogoNotFoundError, I18n.t('label_templates.repository_row.errors.logo_not_supported')
     end
   end
 end