GO-49 Do not submit message unless requested signatures present

app/controllers/message_drafts_controller.rb

@@ -13,7 +13,6 @@ def submit
     if @message.submit
       redirect_to message_thread_path(@message.thread), notice: "Správa bola zaradená na odoslanie"
     else
-      # TODO FIX: Tato hlaska sa zobrazuje aj ked je object oznaceny ako to_be_signed, ale nebol este podpisany
       redirect_to message_thread_path(@message.thread), alert: @message.not_submittable_errors.join(', ')
     end
   end

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)
+        MessageThreadsTag.where(message_thread: message_threads, tag: Current.tenant.tags.signature_requesting).exists?
+      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?
+    MessageObjectsTag.where(message_object: objects, tag: tenant.tags.signature_requesting).exists?
+  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/tag.rb

@@ -37,6 +37,7 @@ class Tag < ApplicationRecord
   scope :simple, -> { where(type: SimpleTag.to_s) }
   scope :visible, -> { where(visible: true) }
   scope :signing_tags, -> { where(type: ["SignedTag", "SignedByTag", "SignatureRequestedTag", "SignatureRequestedFromTag"]) }
+  scope :signature_requesting, -> { where(type: ["SignatureRequestedTag", "SignatureRequestedFromTag"]) }
   scope :archived, -> { where(type: ArchivedTag.to_s) }
 
   after_update_commit ->(tag) { EventBus.publish(:tag_renamed, tag) if previous_changes.key?("name") }

test/fixtures/message_object_data.yml

@@ -12,6 +12,10 @@ draft_two:
   message_object: ssd_main_general_draft_two_form
   blob: <GeneralAgenda xmlns="http://schemas.gov.sk/form/App.GeneralAgenda/1.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><subject>predmet</subject><text>text</text></GeneralAgenda>
 
+draft_three:
+  message_object: ssd_main_draft_to_be_signed2_draft_form
+  blob: <GeneralAgenda xmlns="http://schemas.gov.sk/form/App.GeneralAgenda/1.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><subject>predmet</subject><text>text</text></GeneralAgenda>
+
 empty_draft:
   message_object: ssd_main_empty_draft_form
   blob: <GeneralAgenda xmlns="http://schemas.gov.sk/form/App.GeneralAgenda/1.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><subject></subject><text></text></GeneralAgenda>

test/fixtures/message_objects.yml

@@ -70,7 +70,7 @@ ssd_main_draft_to_be_signed_draft_two_form:
 ssd_main_draft_to_be_signed2_draft_form:
   message: ssd_main_draft_to_be_signed2_draft
   name: MyString
-  mimetype: MyString
+  mimetype: application/x-eform-xml
   object_type: FORM
 
 ssd_main_draft_to_be_signed3_draft_one_form:

test/fixtures/messages.yml

@@ -216,7 +216,7 @@ ssd_main_draft_to_be_signed_draft_two:
   author: basic
 
 ssd_main_draft_to_be_signed2_draft:
-  type: MessageDraft
+  type: Upvs::MessageDraft
   uuid: <%= SecureRandom.uuid %>
   title: MyStringDraft3
   html_visualization: MyString
@@ -225,6 +225,13 @@ ssd_main_draft_to_be_signed2_draft:
   replyable: false
   metadata:
     status: created
+    sktalk_class: EGOV_APPLICATION
+    posp_id: App.GeneralAgenda
+    posp_version: 1.9
+    message_type: App.GeneralAgenda
+    correlation_id: <%= SecureRandom.uuid %>
+    recipient_uri:
+      ico://sk/12345678
   author: basic
 
 ssd_main_draft_to_be_signed3_draft:

test/models/message_object_test.rb

@@ -206,6 +206,15 @@ class MessageObjectTest < ActiveSupport::TestCase
     assert_not object.message.thread.tags.include?(tenant.signed_tag!)
   end
 
+  test "before_destroy callback deletes SignatureRequested Tag from message thread (if no more objects with SignatureRequestedFromTag present)" do
+    message_object = message_objects(:ssd_main_draft_to_be_signed2_draft_form)
+    message_thread = message_object.message.thread
+
+    message_object.destroy
+
+    assert_equal false, message_thread.tags.reload.include?(message_thread.tenant.signature_requested_tag!)
+  end
+
   test "before_destroy callback keeps object related tags for message thread (if another objects with the tag present in the message)" do
     tenant = tenants(:ssd)
     signer = users(:basic_two)

test/system/message_drafts_test.rb

@@ -56,4 +56,19 @@ class MessageDraftsTest < ApplicationSystemTestCase
     refute_selector(thread_in_listing_selector(thread_general))
     refute_selector(thread_in_listing_selector(thread_issue))
   end
+
+  test "message is not submitted and flash message is shown when user tries to send message without requested signatures present" do
+    message_thread = message_threads(:ssd_main_draft_to_be_signed2)
+    message_draft = messages(:ssd_main_draft_to_be_signed2_draft)
+
+    visit message_thread_path(message_thread)
+
+    within("#upvs_message_draft_#{message_draft.id}") do
+      assert_button "Odoslať"
+
+      click_button "Odoslať"
+    end
+
+    assert_text "Pred odoslaním podpíšte všetky dokumenty na podpis"
+  end
 end