Appease the rubocop gods

opf · Dec 20, 2024 · cbf9b44 · cbf9b44
1 parent 88c037c
commit cbf9b44
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/app/models/types/pattern_mapper.rb b/app/models/types/pattern_mapper.rb
@@ -30,7 +30,7 @@
 
 module Types
   class PatternMapper
-    TOKEN_REGEX = /{{[0-9A-z_]+}}/
+    TOKEN_REGEX = /{{[0-9A-Za-z_]+}}/
 
     MAPPING = {
       type: ->(wp) { wp.type.name },

diff --git a/app/services/work_packages/create_service.rb b/app/services/work_packages/create_service.rb
@@ -35,6 +35,7 @@ class WorkPackages::CreateService < BaseServices::BaseCallable
   attr_reader :user, :contract_class
 
   def initialize(user:, contract_class: WorkPackages::CreateContract)
+    super()
     @user = user
     @contract_class = contract_class
   end
@@ -54,10 +55,8 @@ def create(attributes, work_package)
       if result.success
         work_package.attachments = work_package.attachments_replacements if work_package.attachments_replacements
         work_package.save
+
         set_templated_subject(work_package)
-        work_package.save
-      else
-        false
       end
 
     if result.success?
@@ -68,18 +67,17 @@ def create(attributes, work_package)
       end
 
       set_user_as_watcher(work_package)
-    else
-      result.success = false
     end
 
     result
   end
 
   def set_templated_subject(work_package)
-    return unless work_package.type&.replacement_patterns_defined?
-    return unless work_package.type.enabled_patterns[:subject]
+    return true unless work_package.type&.replacement_patterns_defined?
+    return true unless work_package.type.enabled_patterns[:subject]
 
     work_package.subject = work_package.type.enabled_patterns[:subject].resolve(work_package)
+    work_package.save
   end
 
   def set_attributes(attributes, work_package)