Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/remove validation #197

Merged
merged 1 commit into from
Apr 1, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions app/models/time_entry.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,23 @@ class TimeEntry < ApplicationRecord
validates :date, presence: true

validates :date, uniqueness: { scope: %i[user_id statement_of_work_id] }
validate :assignment_must_exist_in_period
# validate :assignment_must_exist_in_period

scope :active_in_period, ->(start_date, end_date) { where('date <= ? AND date >= ?', end_date, start_date) }

def assignment_must_exist_in_period
assignment_exists = Assignment.joins(:requirement)
.where(user_id:)
.where(requirements: { statement_of_work_id: })
.exists?(['? >= assignments.start_date AND ? <= assignments.end_date', date, date])

# If not, add an error.
return if assignment_exists

errors.add(:base,
"There is no valid assignment for the user
and statement of work in this period: #{user.name}
date:#{date} for the SOW: #{statement_of_work.name}
in the project #{statement_of_work.project.name}")
end
# def assignment_must_exist_in_period
# assignment_exists = Assignment.joins(:requirement)
# .where(user_id:)
# .where(requirements: { statement_of_work_id: })
# .exists?(['? >= assignments.start_date AND ? <= assignments.end_date', date, date])
#
# # If not, add an error.
# return if assignment_exists
#
# errors.add(:base,
# "There is no valid assignment for the user
# and statement of work in this period: #{user.name}
# date:#{date} for the SOW: #{statement_of_work.name}
# in the project #{statement_of_work.project.name}")
# end
end
Loading