Release OpenProject 12.3.1

Author: oliverguenther

app/models/custom_option.rb

@@ -30,8 +30,6 @@
 # A custom option is a possible value for a given custom field
 # which is restricted to a set of specific values.
 class CustomOption < ApplicationRecord
-  acts_as_list
-
   belongs_to :custom_field, touch: true
 
   validates :value, presence: true, length: { maximum: 255 }

app/models/token/expirable_token.rb

@@ -22,7 +22,7 @@ module ExpirableToken
 
     included do
       # Set the expiration time
-      before_create :set_expiration_time
+      after_initialize :set_expiration_time, if: :new_record?
 
       # Remove outdated token
       after_save :delete_expired_tokens
@@ -34,7 +34,7 @@ def valid_plaintext?(input)
       end
 
       def expired?
-        expires_on && Time.now > expires_on
+        expires_on.nil? || Time.now > expires_on
       end
 
       def validity_time

app/models/user_preference.rb

@@ -33,6 +33,9 @@ class UserPreference < ApplicationRecord
 
   validates :user,
             presence: true
+
+  WORKDAYS_FROM_MONDAY_TO_FRIDAY = [1, 2, 3, 4, 5].freeze
+
   ##
   # Retrieve keys from settings, and allow accessing
   # as boolean with ? suffix
@@ -124,6 +127,10 @@ def daily_reminders
     super.presence || { enabled: true, times: ["08:00:00+00:00"] }.with_indifferent_access
   end
 
+  def workdays
+    super || WORKDAYS_FROM_MONDAY_TO_FRIDAY
+  end
+
   def immediate_reminders
     super.presence || { mentioned: false }.with_indifferent_access
   end

app/services/base_services/copy.rb

@@ -27,7 +27,7 @@
 #++
 
 module BaseServices
-  class Copy < ::BaseServices::BaseContracted
+  class Copy < ::BaseServices::Write
     alias_attribute(:source, :model)
 
     ##
@@ -39,7 +39,9 @@ def self.copy_dependencies
     ##
     # collect copyable associated modules
     def self.copyable_dependencies
-      copy_dependencies.map do |service_cls|
+      copy_dependencies
+        .flat_map { |dependency| [dependency] + dependency.copy_dependencies }
+        .map do |service_cls|
         {
           identifier: service_cls.identifier,
           name_source: -> { service_cls.human_name },
@@ -61,33 +63,30 @@ def initialize(user:, source: nil, model: nil, contract_class: nil, contract_opt
     end
 
     def call(params)
-      User.execute_as(user) do
-        prepare(params)
-        perform(params)
-      end
-    end
+      prepare_state(params)
 
-    def after_validate(params, _call)
-      # Initialize the target resource to copy into
-      call = initialize_copy(source, params)
+      super
+    end
 
+    def persist(call)
       # Return only the unsaved copy
       return call if params[:attributes_only]
 
-      # Try to save the result or return its errors
-      copy_instance = call.result
-      unless copy_instance.save
-        return ServiceResult.failure(result: copy_instance, errors: copy_instance.errors)
-      end
-
-      self.class.copy_dependencies.each do |service_cls|
-        next if skip_dependency?(params, service_cls)
+      super.tap do |super_call|
+        copy_instance = super_call.result
+        self.class.copy_dependencies.each do |service_cls|
+          next if skip_dependency?(params, service_cls)
 
-        call.merge! call_dependent_service(service_cls, target: copy_instance, params:),
-                    without_success: true
+          super_call.merge! call_dependent_service(service_cls, target: copy_instance, params:),
+                            without_success: true
+        end
       end
+    end
+
+    def after_perform(call)
+      return call if params[:attributes_only]
 
-      call
+      super
     end
 
     protected
@@ -110,7 +109,7 @@ def skip_dependency?(_params, _dependency_cls)
     #
     # Note that for dependent copy services to be called
     # this will already be present.
-    def prepare(_params)
+    def prepare_state(_params)
       # Retain the source project itself
       state.source = source
     end
@@ -124,8 +123,8 @@ def call_dependent_service(service_cls, target:, params:)
         .call(params:)
     end
 
-    def initialize_copy(source, params)
-      raise NotImplementedError
+    def instance(_params)
+      source.class.new
     end
 
     def default_contract_class

app/services/copy/concerns/copy_attachments.rb

@@ -6,21 +6,28 @@ module CopyAttachments
       def copy_attachments(container_type, from_id:, to_id:)
         Attachment
           .where(container_type:, container_id: from_id)
-          .find_each do |old_attachment|
-          copied = old_attachment.dup
-          old_attachment.file.copy_to(copied)
+          .find_each do |source|
 
-          copied.author = user
-          copied.container_type = old_attachment.container_type
-          copied.container_id = to_id
+          copy = Attachment
+                   .new(attachment_copy_attributes(source, to_id))
+          source.file.copy_to(copy)
 
-          unless copied.save
-            Rails.logger.error { "Attachments ##{old_attachment.id} could not be copied: #{copied.errors.full_messages} " }
+          unless copy.save
+            Rails.logger.error { "Attachments ##{source.id} could not be copy: #{copy.errors.full_messages} " }
           end
         rescue StandardError => e
-          Rails.logger.error { "Failed to copy attachments from ##{from_container_id} to ##{to_container_id}: #{e}" }
+          Rails.logger.error { "Failed to copy attachments from ##{from_id} to ##{to_id}: #{e}" }
         end
       end
+
+      def attachment_copy_attributes(source, to_id)
+        source
+          .dup
+          .attributes
+          .except('file')
+          .merge('author_id' => user.id,
+                 'container_id' => to_id)
+      end
     end
   end
 end

app/services/copy/dependency.rb

@@ -47,6 +47,13 @@ def self.human_name
       identifier.capitalize
     end
 
+    ##
+    # Dependencies the current dependency itself supports.
+    # The most common case for this are attachment services.
+    def self.copy_dependencies
+      []
+    end
+
     def initialize(source:, target:, user:)
       @source = source
       @target = target

app/services/grids/copy_service.rb

@@ -51,14 +51,8 @@ def initialize(user:, source:, contract_class: ::EmptyContract)
 
     protected
 
-    def initialize_copy(source, params)
-      grid = source.dup
-
-      initialize_new_grid! grid, source, params
-
-      ServiceResult.new success: grid.save, result: grid
+    def set_attributes_params(_params)
+      source.dup.attributes
     end
-
-    def initialize_new_grid!(_new_grid, _original_grid, _params); end
   end
 end

app/services/projects/copy/attachment_copier.rb

@@ -0,0 +1,57 @@
+#  OpenProject is an open source project management software.
+#  Copyright (C) 2010-2022 the OpenProject GmbH
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License version 3.
+#
+#  OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#  Copyright (C) 2006-2013 Jean-Philippe Lang
+#  Copyright (C) 2010-2013 the ChiliProject Team
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+#  See COPYRIGHT and LICENSE files for more details.
+
+module Projects::Copy
+  # Can be included in case the dependent service needs to be listed in the copy_dependency section for:
+  # * Being an option in the UI
+  # * Calculating the count
+  # but does not really need to do anything beyond that.
+  #
+  # This is currently employed to turn the attachment dependent services into NoCreate services as attachment
+  # handling has been moved into the create services e.g. of WorkPackage and WikiPage.
+  module AttachmentCopier
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def attachment_dependent_service(service_const = nil)
+        @attachment_dependent_service = service_const if service_const
+
+        @attachment_dependent_service
+      end
+
+      def copy_dependencies
+        super + [attachment_dependent_service]
+      end
+    end
+
+    protected
+
+    def copy_attachments?
+      (params.dig(:params, :only) || [])
+        .any? { |k| k.to_s == self.class.attachment_dependent_service.identifier }
+    end
+  end
+end

app/services/projects/copy/dependency.rb

@@ -41,7 +41,7 @@ def source_count
     # Check whether this dependency should be copied
     # as it was selected
     def self.should_copy?(params, check)
-      return true unless params[:only].present?
+      return true if params[:only].blank?
 
       params[:only].any? { |key| key.to_sym == check }
     end

app/services/projects/copy/no_copier.rb

@@ -0,0 +1,42 @@
+#  OpenProject is an open source project management software.
+#  Copyright (C) 2010-2022 the OpenProject GmbH
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License version 3.
+#
+#  OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+#  Copyright (C) 2006-2013 Jean-Philippe Lang
+#  Copyright (C) 2010-2013 the ChiliProject Team
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+#  See COPYRIGHT and LICENSE files for more details.
+
+module Projects::Copy
+  # Can be included in case the dependent service needs to be listed in the copy_dependency section for:
+  # * Being an option in the UI
+  # * Calculating the count
+  # but does not really need to do anything beyond that.
+  #
+  # This is currently employed to turn the attachment dependent services into NoCreate services as attachment
+  # handling has been moved into the create services e.g. of WorkPackage and WikiPage.
+  module NoCopier
+    protected
+
+    def copy_dependency(params:)
+      # Not actually doing any copying.
+    end
+  end
+end

app/services/projects/copy/wiki_dependent_service.rb

@@ -28,6 +28,10 @@
 
 module Projects::Copy
   class WikiDependentService < Dependency
+    include AttachmentCopier
+
+    attachment_dependent_service ::Projects::Copy::WikiPageAttachmentsDependentService
+
     def self.human_name
       I18n.t(:label_wiki_page_plural)
     end
@@ -74,7 +78,8 @@ def copy_wiki_page(source_page, new_parent_id)
                      .new(user:, model: source_page, contract_class: WikiPages::CopyContract)
                      .call(wiki: target.wiki,
                            parent_id: new_parent_id,
-                           send_notifications: ActionMailer::Base.perform_deliveries)
+                           send_notifications: ActionMailer::Base.perform_deliveries,
+                           copy_attachments: copy_attachments?)
 
       if service_call.success?
         service_call.result

app/services/projects/copy/wiki_page_attachments_dependent_service.rb

@@ -28,7 +28,7 @@
 
 module Projects::Copy
   class WikiPageAttachmentsDependentService < Dependency
-    include ::Copy::Concerns::CopyAttachments
+    include ::Projects::Copy::NoCopier
 
     def self.human_name
       I18n.t(:label_wiki_page_attachments)
@@ -37,16 +37,5 @@ def self.human_name
     def source_count
       source.wiki && source.wiki.pages.joins(:attachments).count('attachments.id')
     end
-
-    protected
-
-    def copy_dependency(params:)
-      # If no wiki pages copied, we cannot copy their attachments
-      return unless state.wiki_page_id_lookup
-
-      state.wiki_page_id_lookup.each do |old_id, new_id|
-        copy_attachments('WikiPage', from_id: old_id, to_id: new_id)
-      end
-    end
   end
 end

app/services/projects/copy/work_package_attachments_dependent_service.rb

@@ -1,6 +1,6 @@
-#-- copyright
+#--copyright
 # OpenProject is an open source project management software.
-# Copyright (C) 2012-2022 the OpenProject GmbH
+# Copyright (C) 2010-2022 the OpenProject GmbH
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License version 3.
@@ -28,7 +28,7 @@
 
 module Projects::Copy
   class WorkPackageAttachmentsDependentService < Dependency
-    include ::Copy::Concerns::CopyAttachments
+    include ::Projects::Copy::NoCopier
 
     def self.human_name
       I18n.t(:label_work_package_attachments)
@@ -37,16 +37,5 @@ def self.human_name
     def source_count
       source.work_packages.joins(:attachments).count('attachments.id')
     end
-
-    protected
-
-    def copy_dependency(params:)
-      # If no work packages were copied, we cannot copy their attachments
-      return unless state.work_package_id_lookup
-
-      state.work_package_id_lookup.each do |old_wp_id, new_wp_id|
-        copy_attachments('WorkPackage', from_id: old_wp_id, to_id: new_wp_id)
-      end
-    end
   end
 end