修改课表模块
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package com.yoyuzh.cqu;
|
||||
|
||||
import com.yoyuzh.auth.User;
|
||||
import com.yoyuzh.auth.UserRepository;
|
||||
import com.yoyuzh.config.CquApiProperties;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
@@ -11,9 +12,11 @@ import org.mockito.junit.jupiter.MockitoExtension;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.mockito.ArgumentMatchers.anyList;
|
||||
import static org.mockito.Mockito.verifyNoInteractions;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
@@ -28,6 +31,9 @@ class CquDataServiceTest {
|
||||
@Mock
|
||||
private GradeRepository gradeRepository;
|
||||
|
||||
@Mock
|
||||
private UserRepository userRepository;
|
||||
|
||||
@InjectMocks
|
||||
private CquDataService cquDataService;
|
||||
|
||||
@@ -35,7 +41,7 @@ class CquDataServiceTest {
|
||||
void shouldNormalizeScheduleFromRemoteApi() {
|
||||
CquApiProperties properties = new CquApiProperties();
|
||||
properties.setRequireLogin(false);
|
||||
cquDataService = new CquDataService(cquApiClient, courseRepository, gradeRepository, properties);
|
||||
cquDataService = new CquDataService(cquApiClient, courseRepository, gradeRepository, userRepository, properties);
|
||||
when(cquApiClient.fetchSchedule("2025-2026-1", "20230001")).thenReturn(List.of(Map.of(
|
||||
"courseName", "Java",
|
||||
"teacher", "Zhang",
|
||||
@@ -56,7 +62,7 @@ class CquDataServiceTest {
|
||||
void shouldPersistGradesForLoggedInUserWhenAvailable() {
|
||||
CquApiProperties properties = new CquApiProperties();
|
||||
properties.setRequireLogin(true);
|
||||
cquDataService = new CquDataService(cquApiClient, courseRepository, gradeRepository, properties);
|
||||
cquDataService = new CquDataService(cquApiClient, courseRepository, gradeRepository, userRepository, properties);
|
||||
User user = new User();
|
||||
user.setId(1L);
|
||||
user.setUsername("alice");
|
||||
@@ -83,4 +89,114 @@ class CquDataServiceTest {
|
||||
assertThat(response).hasSize(1);
|
||||
assertThat(response.get(0).grade()).isEqualTo(95D);
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldReturnPersistedScheduleWithoutCallingRemoteApiWhenRefreshIsDisabled() {
|
||||
CquApiProperties properties = new CquApiProperties();
|
||||
properties.setRequireLogin(true);
|
||||
cquDataService = new CquDataService(cquApiClient, courseRepository, gradeRepository, userRepository, properties);
|
||||
|
||||
User user = new User();
|
||||
user.setId(1L);
|
||||
user.setUsername("alice");
|
||||
|
||||
Course persisted = new Course();
|
||||
persisted.setUser(user);
|
||||
persisted.setCourseName("Java");
|
||||
persisted.setTeacher("Zhang");
|
||||
persisted.setClassroom("A101");
|
||||
persisted.setDayOfWeek(1);
|
||||
persisted.setStartTime(1);
|
||||
persisted.setEndTime(2);
|
||||
persisted.setSemester("2025-spring");
|
||||
persisted.setStudentId("20230001");
|
||||
|
||||
when(courseRepository.findByUserIdAndStudentIdAndSemesterOrderByDayOfWeekAscStartTimeAsc(1L, "20230001", "2025-spring"))
|
||||
.thenReturn(List.of(persisted));
|
||||
|
||||
List<CourseResponse> response = cquDataService.getSchedule(user, "2025-spring", "20230001", false);
|
||||
|
||||
assertThat(response).extracting(CourseResponse::courseName).containsExactly("Java");
|
||||
verifyNoInteractions(cquApiClient);
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldReturnLatestStoredSchoolDataFromPersistedUserContext() {
|
||||
CquApiProperties properties = new CquApiProperties();
|
||||
properties.setRequireLogin(true);
|
||||
cquDataService = new CquDataService(cquApiClient, courseRepository, gradeRepository, userRepository, properties);
|
||||
|
||||
User user = new User();
|
||||
user.setId(1L);
|
||||
user.setUsername("alice");
|
||||
user.setLastSchoolStudentId("20230001");
|
||||
user.setLastSchoolSemester("2025-spring");
|
||||
|
||||
Course course = new Course();
|
||||
course.setUser(user);
|
||||
course.setCourseName("Java");
|
||||
course.setTeacher("Zhang");
|
||||
course.setClassroom("A101");
|
||||
course.setDayOfWeek(1);
|
||||
course.setStartTime(1);
|
||||
course.setEndTime(2);
|
||||
course.setSemester("2025-spring");
|
||||
course.setStudentId("20230001");
|
||||
|
||||
Grade grade = new Grade();
|
||||
grade.setUser(user);
|
||||
grade.setCourseName("Java");
|
||||
grade.setGrade(95D);
|
||||
grade.setSemester("2025-spring");
|
||||
grade.setStudentId("20230001");
|
||||
|
||||
when(courseRepository.findByUserIdAndStudentIdAndSemesterOrderByDayOfWeekAscStartTimeAsc(1L, "20230001", "2025-spring"))
|
||||
.thenReturn(List.of(course));
|
||||
when(gradeRepository.findByUserIdAndStudentIdOrderBySemesterAscGradeDesc(1L, "20230001"))
|
||||
.thenReturn(List.of(grade));
|
||||
|
||||
LatestSchoolDataResponse response = cquDataService.getLatest(user);
|
||||
|
||||
assertThat(response.studentId()).isEqualTo("20230001");
|
||||
assertThat(response.semester()).isEqualTo("2025-spring");
|
||||
assertThat(response.schedule()).extracting(CourseResponse::courseName).containsExactly("Java");
|
||||
assertThat(response.grades()).extracting(GradeResponse::courseName).containsExactly("Java");
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldFallbackToMostRecentStoredSchoolDataWhenUserContextIsEmpty() {
|
||||
CquApiProperties properties = new CquApiProperties();
|
||||
properties.setRequireLogin(true);
|
||||
cquDataService = new CquDataService(cquApiClient, courseRepository, gradeRepository, userRepository, properties);
|
||||
|
||||
User user = new User();
|
||||
user.setId(1L);
|
||||
user.setUsername("alice");
|
||||
|
||||
Course latestCourse = new Course();
|
||||
latestCourse.setUser(user);
|
||||
latestCourse.setCourseName("Java");
|
||||
latestCourse.setTeacher("Zhang");
|
||||
latestCourse.setClassroom("A101");
|
||||
latestCourse.setDayOfWeek(1);
|
||||
latestCourse.setStartTime(1);
|
||||
latestCourse.setEndTime(2);
|
||||
latestCourse.setSemester("2025-spring");
|
||||
latestCourse.setStudentId("20230001");
|
||||
latestCourse.setCreatedAt(LocalDateTime.now());
|
||||
|
||||
when(courseRepository.findTopByUserIdOrderByCreatedAtDesc(1L)).thenReturn(Optional.of(latestCourse));
|
||||
when(gradeRepository.findTopByUserIdOrderByCreatedAtDesc(1L)).thenReturn(Optional.empty());
|
||||
when(courseRepository.findByUserIdAndStudentIdAndSemesterOrderByDayOfWeekAscStartTimeAsc(1L, "20230001", "2025-spring"))
|
||||
.thenReturn(List.of(latestCourse));
|
||||
when(gradeRepository.findByUserIdAndStudentIdOrderBySemesterAscGradeDesc(1L, "20230001"))
|
||||
.thenReturn(List.of());
|
||||
|
||||
LatestSchoolDataResponse response = cquDataService.getLatest(user);
|
||||
|
||||
assertThat(response.studentId()).isEqualTo("20230001");
|
||||
assertThat(response.semester()).isEqualTo("2025-spring");
|
||||
assertThat(user.getLastSchoolStudentId()).isEqualTo("20230001");
|
||||
assertThat(user.getLastSchoolSemester()).isEqualTo("2025-spring");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ class CquDataServiceTransactionTest {
|
||||
)
|
||||
));
|
||||
|
||||
List<GradeResponse> response = cquDataService.getGrades(user, "2025-spring", "2023123456");
|
||||
List<GradeResponse> response = cquDataService.getGrades(user, "2025-spring", "2023123456", true);
|
||||
|
||||
assertThat(response).hasSize(1);
|
||||
assertThat(response.get(0).courseName()).isEqualTo("Java");
|
||||
@@ -74,5 +74,9 @@ class CquDataServiceTransactionTest {
|
||||
.first()
|
||||
.extracting(Grade::getCourseName)
|
||||
.isEqualTo("Java");
|
||||
assertThat(userRepository.findById(user.getId()))
|
||||
.get()
|
||||
.extracting(User::getLastSchoolStudentId, User::getLastSchoolSemester)
|
||||
.containsExactly("2023123456", "2025-spring");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user