Issue 286 by SAASVUUV · Pull Request #562 · gems-uff/sapos

SAASVUUV · 2025-06-06T20:37:46Z

No description provided.

…In addition, create start_date and end_date to course_class

JoaoFelipe · 2025-06-16T20:25:01Z

+    class_enrollments.each do |class_enrollment|
+      course_class = class_enrollment.course_class
+      unless course_class.end_date < self.start_date || course_class.start_date > self.end_date
+        class_enrollment.delete


Me parece estranho ter um delete dentro de um validate. Acho que seria melhor num after_update ou after_create

…, now it's a after_commit function, not a validate function of enrollment hold

…in class_enrolments and class_enrollment_requests

… and other to search for class_enrollments in a period. Cancel_class_enrollments is deleted

JoaoFelipe · 2025-08-24T02:32:20Z

A validação de class enrollment request incomodando um pouco. Me parece razoável ter essa validação, mas se a matricula vai estar trancada para o período seguinte, não deveria ser possível nem abrir a tela de inscrição de disciplina.

O que está acontecendo com o PR é aparecer o link para inscrição, deixar o aluno selecionar disciplinas, mas na hora de enviar, aparece erro da seguinte forma:

Acho que pode manter a validação, mas também editar a tela a seguir para avisar algo como "Sua matrícula está trancada. Entre em contato com a secretaria caso queira destrancar para esta inscrição" ou algo assim.

…llment_request form when the enroll is held

…ollment_requests

Copilot

Pull request overview

This PR (Issue 286) extends the “enrollment hold” concept across the enrollment flow: it blocks class enrollments/requests that overlap a hold period, invalidates existing class enrollment requests when a hold is created for the same semester, and updates the student enrollment UI + translations to reflect the held state.

Changes:

Add EnrollmentHold validations/callbacks to (a) prevent creating holds that overlap existing class enrollments and (b) invalidate class enrollment requests for the same semester.
Enforce “held enrollment” validation in ClassEnrollment and ClassEnrollmentRequest, and surface held status in the student enrollment UI (styles + message).
Add model + feature specs and new pt-BR i18n keys for the new validations/messages.

Reviewed changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated 12 comments.

Show a summary per file

File	Description
spec/models/enrollment_hold_spec.rb	Adds coverage for blocking holds when class enrollments exist in the hold period.
spec/models/class_enrollment_spec.rb	Adds validation spec ensuring class enrollments can’t be created during a hold.
spec/models/class_enrollment_request_spec.rb	Adds validation spec ensuring class enrollment requests can’t be created during a hold.
spec/features/enrollment_holds_spec.rb	Feature spec for invalidating requests when a hold is created via UI.
spec/factories/factory_enrollment.rb	Adjusts default `admission_date` used by many tests.
config/locales/student_enrollment.pt-BR.yml	Adds student-facing message when enrollment is held.
config/locales/enrollment_hold.pt-BR.yml	Adds validation message for “class enrollments exist in hold period”.
config/locales/class_enrollment_request.pt-BR.yml	Adds labels and held-validation message for requests.
config/locales/class_enrollment.pt-BR.yml	Adds label + held-validation message for enrollments.
app/views/student_enrollment/_show_enroll.html.erb	Changes UI to show a held banner/message and disable enrollment links while held.
app/models/enrollment_hold.rb	Implements overlap checks, request invalidation, and date-range hold detection.
app/models/course_class.rb	Adds `start_date`/`end_date` helpers based on year/semester.
app/models/class_enrollment_request.rb	Adds hold validation to block requests in held periods.
app/models/class_enrollment.rb	Adds hold validation to block enrollments in held periods.
app/controllers/class_enrollment_requests_controller.rb	Changes flash handling on set_status failure to show validation errors.
app/assets/stylesheets/custom/student_enrollment.scss	Adds held-state styling.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-26T21:27:33Z

      "M#{number}"
    end
-    admission_date { 5.days.ago.to_date }
+    admission_date { 10.days.ago.to_date }


Setting the default admission_date to 10.days.ago is still date-dependent and can fall after YearSemester.current.semester_begin (e.g., during most of the first semester), which makes creating an EnrollmentHold for the current semester fail the existing before_admission_date validation. Consider using a deterministic default (e.g., relative to YearSemester.current.semester_begin) or a trait so tests opt into a recent admission date explicitly.

Suggested change

admission_date { 10.days.ago.to_date }

admission_date { YearSemester.current.semester_begin - 1.day }

Copilot · 2026-03-26T21:27:33Z

+            @destroy_later << cer = FactoryBot.create(:enrollment_request, enrollment: e)
+            class_enrollment_request.enrollment_request = cer


In this spec, cer is used as a variable name for an EnrollmentRequest, but elsewhere cer commonly reads as ClassEnrollmentRequest. Renaming the local to enrollment_request (or similar) would reduce confusion when reading failures.

Suggested change

@destroy_later << cer = FactoryBot.create(:enrollment_request, enrollment: e)

class_enrollment_request.enrollment_request = cer

@destroy_later << enrollment_request = FactoryBot.create(:enrollment_request, enrollment: e)

class_enrollment_request.enrollment_request = enrollment_request

Copilot · 2026-03-26T21:27:33Z

+  def invalidate_enrollment_requests
+    enrollment_requests = EnrollmentRequest.where(enrollment: self.enrollment)
+    enrollment_requests.each do |enrollment_request|
+      if self.year == enrollment_request.year && self.semester == enrollment_request.semester
+        enrollment_request.class_enrollment_requests.each do |class_enrollment_request|
+          class_enrollment_request.set_status!(ClassEnrollmentRequest::INVALID)
+        end
+      end
+    end
+  end


invalidate_enrollment_requests runs on every create/update and will invalidate requests even when the hold is being deactivated (active toggled to false) or when the updated record should not apply. It should likely be gated on active == true (and/or on relevant changes like year/semester/number_of_semesters) to avoid unintended invalidations.

Copilot · 2026-03-26T21:27:34Z

+  def verify_class_enrollments
+    class_enrollments = ClassEnrollment.where(enrollment: self.enrollment)
+    class_enrollments.each do |class_enrollment|
+      course_class = class_enrollment.course_class
+      unless course_class.end_date < self.start_date || course_class.start_date > self.end_date
+        errors.add(:base, :class_enrollments_exist)
+      end
+    end


verify_class_enrollments also ignores the active flag. As written, it will prevent saving an inactive hold even though inactive holds are treated elsewhere as not in effect; consider skipping this validation when active is false (or clarify intended behavior).

Copilot · 2026-03-26T21:27:35Z

+  def self.hold_in_date(enrollment, course_start, course_end)
+    enrollment_holds = EnrollmentHold.where(enrollment: enrollment)
+    unless enrollment_holds.empty?
+      enrollment_holds.each do |hold|
+        return true unless course_end < hold.start_date || course_start > hold.end_date
+      end
+    end
+    false


hold_in_date currently checks all holds for the enrollment, including active = false. The rest of the codebase treats inactive holds as not applicable (e.g., enrollment hold search filters by active = true), so this will incorrectly block enrollments/requests when a hold is inactive. Filter to active holds (or explicitly decide how inactive holds should behave).

Copilot · 2026-03-26T21:27:35Z

+    enrollment_requests = EnrollmentRequest.where(enrollment: self.enrollment)
+    enrollment_requests.each do |enrollment_request|
+      if self.year == enrollment_request.year && self.semester == enrollment_request.semester
+        enrollment_request.class_enrollment_requests.each do |class_enrollment_request|
+          class_enrollment_request.set_status!(ClassEnrollmentRequest::INVALID)
+        end


invalidate_enrollment_requests does an N+1 iteration (EnrollmentRequest.where(...).each then class_enrollment_requests.each). This can be reduced to a single query by scoping to the relevant year/semester in SQL and eager-loading (or updating) the associated class_enrollment_requests, which will matter if an enrollment has many requests.

Suggested change

enrollment_requests = EnrollmentRequest.where(enrollment: self.enrollment)

enrollment_requests.each do |enrollment_request|

if self.year == enrollment_request.year && self.semester == enrollment_request.semester

enrollment_request.class_enrollment_requests.each do |class_enrollment_request|

class_enrollment_request.set_status!(ClassEnrollmentRequest::INVALID)

end

enrollment_requests = EnrollmentRequest.where(

enrollment: enrollment,

year: year,

semester: semester

).includes(:class_enrollment_requests)

enrollment_requests.each do |enrollment_request|

enrollment_request.class_enrollment_requests.each do |class_enrollment_request|

class_enrollment_request.set_status!(ClassEnrollmentRequest::INVALID)

SAASVUUV added 4 commits June 6, 2025 14:56

ISSUE #286: Create the functionality that cancels the class_enrollments

5611190

ISSUE #286: Add some errors when tries to create a class_enrollment. …

f0bb9bd

…In addition, create start_date and end_date to course_class

ISSUE #286: Modify the locales

d0abd17

ISSUE #286: Adjust the specs

0448632

JoaoFelipe reviewed Jun 16, 2025

View reviewed changes

SAASVUUV and others added 12 commits June 17, 2025 21:42

ISSUE #286: fix the occurrency of function to cancel enrollment class…

c823107

…, now it's a after_commit function, not a validate function of enrollment hold

Merge branch 'main' into issue_286

045b278

Merge branch 'develop' into issue_286

c92a9a0

Merge branch 'main' into issue_286

f3dd533

Fix enrollment_factory for tests

e631869

Adding wait for ajax to fix tests

50dc999

Waiting for ajax in every link click

bafc588

ISSUE #286: Add the function hold_in_date to verify enrollment_holds …

46e865e

…in class_enrolments and class_enrollment_requests

ISSUE #286: Create the function to verify holds in determinated dates…

56c3bd4

… and other to search for class_enrollments in a period. Cancel_class_enrollments is deleted

ISSUE #286: Fix the spec due to the new additions

80b2b3c

Merge branch 'main' into issue_286

1a991b6

Merge branch 'develop' into issue_286

0d55603

JoaoFelipe added staging-ready and removed staging-ready labels Aug 23, 2025

SAASVUUV added 7 commits August 25, 2025 20:21

ISSUE #286: Fix class_enroll message, preventing access to class_enro…

4c73b8c

…llment_request form when the enroll is held

ISSUE #286: Detailing error in admin's class_enrollment_request screen

5ab944e

Merge branch 'main' into issue_286

45069cb

Merge branch 'main' into issue_286

e0e6f66

Merge branch 'main' into issue_286

a00e170

ISSUE #286: When enrollment_hold is created, it invalidates class_enr…

609324f

…ollment_requests

Fix spec

cc222a7

leomurta requested a review from Copilot March 26, 2026 21:21

Copilot started reviewing on behalf of leomurta March 26, 2026 21:21 View session

Copilot AI reviewed Mar 26, 2026

View reviewed changes

SAASVUUV added 7 commits March 30, 2026 15:18

ISSUE #286: Fix code by sugestions of copilot

b49e6d3

Merge branch 'main' into issue_286

ee7604e

Merge branch 'main' into issue_286

2d27e86

ISSUE #286: Remove active flag from enrollment_hold

c08d1dd

ISSUE #286: new search function that returns enrollments_hold actually

d313172

Merge branch 'main' of https://github.com/gems-uff/sapos

90c6053

Merge branch 'main' into issue_286

767c872

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue 286#562

Issue 286#562
SAASVUUV wants to merge 30 commits intodevelopfrom
issue_286

SAASVUUV commented Jun 6, 2025

Uh oh!

JoaoFelipe Jun 16, 2025

Uh oh!

JoaoFelipe commented Aug 24, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI Mar 26, 2026

Uh oh!

Copilot AI Mar 26, 2026

Uh oh!

Copilot AI Mar 26, 2026

Uh oh!

Copilot AI Mar 26, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Mar 26, 2026

Uh oh!

Copilot AI Mar 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	admission_date { 10.days.ago.to_date }
	admission_date { YearSemester.current.semester_begin - 1.day }

		@destroy_later << cer = FactoryBot.create(:enrollment_request, enrollment: e)
		class_enrollment_request.enrollment_request = cer

Conversation

SAASVUUV commented Jun 6, 2025

Uh oh!

JoaoFelipe Jun 16, 2025

Choose a reason for hiding this comment

Uh oh!

JoaoFelipe commented Aug 24, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants