Browse Source

Temp fix. request tests

pull/2561/head
Manny Dinssa 2 years ago
parent
commit
e76be1361e
  1. 2
      app/models/merge_request.rb
  2. 6
      app/models/merge_request_organisation.rb

2
app/models/merge_request.rb

@ -24,7 +24,7 @@ class MergeRequest < ApplicationRecord
open_collection_period_start_date:, open_collection_period_start_date:,
) )
} }
scope :not_unsubmitted, -> { where.not(status: %w[merge_issues incomplete ready_to_merge processing]) } scope :merged, -> { where(status: "request_merged") }
def organisation_name_uniqueness def organisation_name_uniqueness
if Organisation.where("lower(name) = ?", new_organisation_name&.downcase).exists? if Organisation.where("lower(name) = ?", new_organisation_name&.downcase).exists?

6
app/models/merge_request_organisation.rb

@ -5,7 +5,7 @@ class MergeRequestOrganisation < ApplicationRecord
validates :merging_organisation, presence: { message: I18n.t("validations.merge_request.merging_organisation_id.blank") } validates :merging_organisation, presence: { message: I18n.t("validations.merge_request.merging_organisation_id.blank") }
validate :validate_merging_organisations validate :validate_merging_organisations
scope :not_unsubmitted, -> { joins(:merge_request).where.not(merge_requests: { status: %w[merge_issues incomplete ready_to_merge processing] }) } scope :merged, -> { joins(:merge_request).where(merge_requests: { status: "request_merged" }) }
scope :with_merging_organisation, ->(merging_organisation) { where(merging_organisation:) } scope :with_merging_organisation, ->(merging_organisation) { where(merging_organisation:) }
has_paper_trail has_paper_trail
@ -17,12 +17,12 @@ private
errors.add(:merging_organisation, I18n.t("validations.merge_request.organisation_part_of_another_merge")) errors.add(:merging_organisation, I18n.t("validations.merge_request.organisation_part_of_another_merge"))
end end
if MergeRequestOrganisation.not_unsubmitted.with_merging_organisation(merging_organisation).count.positive? if MergeRequestOrganisation.merged.with_merging_organisation(merging_organisation).count.positive?
errors.add(:merging_organisation, I18n.t("validations.merge_request.organisation_part_of_another_merge")) errors.add(:merging_organisation, I18n.t("validations.merge_request.organisation_part_of_another_merge"))
merge_request.errors.add(:merging_organisation, I18n.t("validations.merge_request.organisation_part_of_another_merge")) merge_request.errors.add(:merging_organisation, I18n.t("validations.merge_request.organisation_part_of_another_merge"))
end end
if MergeRequest.not_unsubmitted.where.not(id: merge_request_id).where(requesting_organisation: merging_organisation).count.positive? if MergeRequest.merged.where.not(id: merge_request_id).where(requesting_organisation: merging_organisation).count.positive?
errors.add(:merging_organisation, I18n.t("validations.merge_request.organisation_part_of_another_merge")) errors.add(:merging_organisation, I18n.t("validations.merge_request.organisation_part_of_another_merge"))
merge_request.errors.add(:merging_organisation, I18n.t("validations.merge_request.organisation_part_of_another_merge")) merge_request.errors.add(:merging_organisation, I18n.t("validations.merge_request.organisation_part_of_another_merge"))
end end

Loading…
Cancel
Save