GO-49 Do not submit message unless requested signatures present

app/controllers/message_threads/bulk/message_drafts_controller.rb

@@ -9,10 +9,12 @@ def submit
         message_threads = message_thread_policy_scope.where(id: ids).includes(:messages)
         message_threads.transaction do
           submission_results = SubmitMessageDraftsAction.run(message_threads)
-          if submission_results
-            redirect_back fallback_location: message_threads_path, notice: "Správy vo vláknach boli zaradené na odoslanie", status: 303
-          else
+          if submission_results.none?(true)
+            redirect_back fallback_location: message_threads_path, alert: "Vo vláknach sa našli správy, ktoré neboli podpísané všetkými podpismi", status: 303 and return if any_missing_signature?(message_threads)
             redirect_back fallback_location: message_threads_path, alert: "Vo vláknach sa nenašli žiadne správy na odoslanie", status: 303
+          else
+            redirect_back fallback_location: message_threads_path, alert: "Správy, ktoré neboli podpísané všetkými podpismi neboli zaradené na odoslanie", status: 303 and return if any_missing_signature?(message_threads)
+            redirect_back fallback_location: message_threads_path, notice: "Správy vo vláknach boli zaradené na odoslanie", status: 303
           end
         end
       end
@@ -41,6 +43,10 @@ def destroy
       def message_thread_policy_scope
         policy_scope(MessageThread)
       end
+
+      def any_missing_signature?(message_threads)
+        message_threads.any? { |thread| thread.any_objects_with_requested_signature? }
+      end
     end
   end
 end

app/models/message.rb

@@ -96,6 +96,10 @@ def authorized?
     metadata["delivery_notification"] && metadata["authorized"] == true
   end
 
+  def any_objects_with_requested_signature?
+    objects.any? { |message_object| message_object.tags.where(type: SignatureRequestedFromTag.to_s).any? }
+  end
+
   # TODO remove UPVS stuff from core domain
   def form
     ::Upvs::Form.find_by(

app/models/message_draft.rb

@@ -107,15 +107,15 @@ def created_from_template?
   end
 
   def submittable?
-    form_object.content.present? && objects.to_be_signed.all? { |o| o.is_signed? } && correctly_created? && valid?(:validate_data)
+    form_object&.content&.present? && objects.to_be_signed.all? { |o| o.is_signed? } && correctly_created? && valid?(:validate_data) && !any_objects_with_requested_signature?
   end
 
   def not_submittable_errors
     return [] if submittable?
 
     errors = []
     errors << 'Vyplňte obsah správy' unless form_object.content.present?
-    errors << 'Pred odoslaním podpíšte všetky dokumenty na podpis' unless objects.to_be_signed.all? { |o| o.is_signed? }
+    errors << 'Pred odoslaním podpíšte všetky dokumenty na podpis' if (objects.to_be_signed.any? { |o| !o.is_signed? } || any_objects_with_requested_signature?)
     errors << 'Obsah správy nie je validný' if invalid? || !valid?(:validate_data)
     errors << 'Správu bude možné odoslať až po ukončení validácie' if being_validated?
 

app/models/message_object.rb

@@ -153,11 +153,11 @@ def thread
 
   def remove_object_related_tags_from_thread
     tags.each do |tag|
-      message.thread.unassign_tag(tag) unless other_thread_objects_include_tag?(tag)
+      thread.unassign_tag(tag) unless other_thread_objects_include_tag?(tag)
     end
 
-    message.thread.unassign_tag(message.tenant.signed_tag!) unless message.thread.tags.reload.where(type: SignedByTag.to_s).any?
-    message.thread.unassign_tag(message.tenant.signature_requested_tag!) unless message.thread.tags.reload.where(type: SignatureRequestedFromTag.to_s).any?
+    thread.unassign_tag(message.tenant.signed_tag!) unless thread.tags.reload.where(type: SignedByTag.to_s).any?
+    thread.unassign_tag(message.tenant.signature_requested_tag!) unless thread.tags.reload.where(type: SignatureRequestedFromTag.to_s).any?
   end
 
   def other_thread_objects_include_tag?(tag)

app/models/message_thread.rb

@@ -167,6 +167,10 @@ def unassign_tag(tag)
     message_threads_tags.find_by(tag: tag)&.destroy
   end
 
+  def any_objects_with_requested_signature?
+    messages.any? { |message| message.any_objects_with_requested_signature? }
+  end
+
   private
 
   def has_tag?(tag)