baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Reuse existing scopes

pull/2561/head
Manny Dinssa 2 years ago
parent
716f949168
commit
d5eac2decb
1 changed files with 2 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      app/models/merge_request.rb

8
app/models/merge_request.rb
Unescape View File

@ -16,15 +16,11 @@ class MergeRequest < ApplicationRecord
enum status: STATUS enum status: STATUS
scope :not_merged, -> { where.not(status: "request_merged") } scope :not_merged, -> { where.not(status: "request_merged") }
scope :merged, -> { where(status: "request_merged") }
scope :visible, lambda { scope :visible, lambda {
open_collection_period_start_date = FormHandler.instance.start_date_of_earliest_open_collection_period open_collection_period_start_date = FormHandler.instance.start_date_of_earliest_open_collection_period
where( merged.where("merge_requests.merge_date >= ?", open_collection_period_start_date).or(not_merged)
"(merge_requests.status != :merged_status) OR (merge_requests.status = :merged_status AND merge_requests.merge_date >= :open_collection_period_start_date)",
merged_status: 4,
open_collection_period_start_date:,
)
} }
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?

Write Preview
Loading…
Cancel
Save