unassign should only retrieve approved assignments

ucdavis · Dec 17, 2024 · d44d5b8 · d44d5b8
1 parent 393d49b
commit d44d5b8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/...api/components/registrarReconciliationReport/RegistrarReconciliationReportController.java b/...api/components/registrarReconciliationReport/RegistrarReconciliationReportController.java
@@ -188,7 +188,7 @@ public TeachingAssignment unAssignInstructor(@PathVariable long sectionGroupId,
 			return null;
 		}
 
-		TeachingAssignment teachingAssignment = teachingAssignmentService.findOneBySectionGroupAndInstructorAndTermCode(sectionGroup, instructorToAssign, sectionGroup.getTermCode());
+		TeachingAssignment teachingAssignment = teachingAssignmentService.findOneBySectionGroupAndInstructorAndTermCodeAndApprovedTrue(sectionGroup, instructorToAssign, sectionGroup.getTermCode());
 
 		// When an academicCoordinator unapproves a teachingAssignment made by an academicCoordinator, delete instead of updating
 		if (!teachingAssignment.isFromInstructor()) {

diff --git a/src/main/java/edu/ucdavis/dss/ipa/repositories/TeachingAssignmentRepository.java b/src/main/java/edu/ucdavis/dss/ipa/repositories/TeachingAssignmentRepository.java
@@ -13,6 +13,7 @@
 
 public interface TeachingAssignmentRepository extends CrudRepository<TeachingAssignment, Long> {
 	TeachingAssignment findOneBySectionGroupAndInstructorAndTermCode(SectionGroup sectionGroup, Instructor instructor, String termCode);
+	TeachingAssignment findOneBySectionGroupAndInstructorAndTermCodeAndApprovedTrue(SectionGroup sectionGroup, Instructor instructor, String termCode);
 
 	TeachingAssignment findOneByInstructorIdAndScheduleIdAndTermCodeAndBuyoutAndAndCourseReleaseAndSabbaticalAndInResidenceAndWorkLifeBalanceAndLeaveOfAbsenceAndSabbaticalInResidenceAndJointAppointmentAndInterdisciplinaryTeachingAndWorkLoadCredit(
 			Long instructorId, Long scheduleId, String termCode, Boolean buyout, Boolean courseRelease, Boolean sabbatical, Boolean inResidence, Boolean workLifeBalance, Boolean leaveOfAbsence, Boolean sabbaticalInResidence, Boolean jointAppointment, Boolean interdisciplinaryTeaching, Boolean workLoadCredit);

diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/TeachingAssignmentService.java b/src/main/java/edu/ucdavis/dss/ipa/services/TeachingAssignmentService.java
@@ -22,6 +22,8 @@ public interface TeachingAssignmentService {
 
 	TeachingAssignment findOneBySectionGroupAndInstructorAndTermCode(SectionGroup sectionGroup, Instructor instructor, String termCode);
 
+	TeachingAssignment findOneBySectionGroupAndInstructorAndTermCodeAndApprovedTrue(SectionGroup sectionGroup, Instructor instructor, String termCode);
+
 	TeachingAssignment findOrCreateOneBySectionGroupAndInstructor(SectionGroup sectionGroup, Instructor instructor);
 
 	List<TeachingAssignment> findByScheduleIdAndInstructorId(long scheduleId, long instructorId);

diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTeachingAssignmentService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTeachingAssignmentService.java
@@ -57,6 +57,9 @@ public void delete(Long id) {
 	public TeachingAssignment findOneBySectionGroupAndInstructorAndTermCode(SectionGroup sectionGroup, Instructor instructor, String termCode) {
 		return teachingAssignmentRepository.findOneBySectionGroupAndInstructorAndTermCode(sectionGroup, instructor, termCode);
 	}
+	public TeachingAssignment findOneBySectionGroupAndInstructorAndTermCodeAndApprovedTrue(SectionGroup sectionGroup, Instructor instructor, String termCode) {
+		return teachingAssignmentRepository.findOneBySectionGroupAndInstructorAndTermCodeAndApprovedTrue(sectionGroup, instructor, termCode);
+	}
 
 	@Override
 	public TeachingAssignment findOneById(Long id) {