Skip to content

refactor: StudentIT #876

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.

Sign up for GitHub

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

Draft
kirisaki-vk wants to merge 6 commits into
base: preprod
Choose a base branch
from
Draft

refactor: StudentIT #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6033f38
chore: moved student1 to MockObjects
kirisaki-vk Apr 11, 2025
eaebfce
chore: fix tests asserts
kirisaki-vk Apr 11, 2025
c73865d
chore: moved student3 to MockedObjects
kirisaki-vk Apr 11, 2025
6e48bbc
chore: fixed failing tests
kirisaki-vk Apr 15, 2025
76cc372
chore: moved update tests to DirtyStudentIT
kirisaki-vk Apr 18, 2025
8cb4467
chore: moved update tests to DirtyStudentIT
kirisaki-vk Apr 18, 2025
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
16 changes: 0 additions & 16 deletions src/main/java/school/hei/haapi/endpoint/rest/controller/GradeController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,6 @@ public List<AwardedCourseExam> getAllGradesOfStudent(
return awardedCourseMapper.toRest(awardedCourses, student);
}

// @GetMapping(
// value = "/groups/{group_id}/awarded_courses/" +
// "{awarded_course_id}/exams/{exam_id}/grades")
// public ExamDetail getExamGrades(
// @PathVariable("group_id") String groupId,
// @PathVariable("awarded_course_id") String awardedCourseId,
// @PathVariable("exam_id") String examId) {
// List<Grade> grades =
// examService
// .getExamsByIdAndGroupIdAndAwardedCourseId(examId, awardedCourseId, groupId)
// .getGrades();
// Exam exam =
// examService.getExamsByIdAndGroupIdAndAwardedCourseId(examId, awardedCourseId, groupId);
// return gradeMapper.toRestExamDetail(exam, grades);
// }

@GetMapping(value = "/exams/{exam_id}/students/{student_id}/grade")
public StudentGrade getGradeOfStudentInOneExam(
@PathVariable("exam_id") String examId, @PathVariable("student_id") String studentId) {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/school/hei/haapi/endpoint/event/AnnouncementSendInitServiceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import static org.mockito.Mockito.verify;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
import static school.hei.haapi.endpoint.rest.model.Scope.GLOBAL;
import static school.hei.haapi.integration.conf.TestUtils.anAvailableRandomPort;
import static school.hei.haapi.integration.conf.utils.TestUtils.anAvailableRandomPort;

import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/school/hei/haapi/endpoint/event/LetterEventIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
import static school.hei.haapi.integration.conf.TestUtils.anAvailableRandomPort;
import static school.hei.haapi.integration.conf.utils.TestUtils.anAvailableRandomPort;

import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/school/hei/haapi/endpoint/event/StudentsWithOverdueReminderServiceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
import static school.hei.haapi.integration.conf.TestUtils.anAvailableRandomPort;
import static school.hei.haapi.integration.conf.utils.TestUtils.anAvailableRandomPort;

import java.util.List;
import org.junit.jupiter.api.Test;
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/school/hei/haapi/endpoint/rest/validator/CreateMpbsValidatorIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import static org.junit.Assert.assertTrue;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
import static school.hei.haapi.endpoint.rest.model.MobileMoneyType.ORANGE_MONEY;
import static school.hei.haapi.integration.StudentIT.student1;
import static school.hei.haapi.integration.conf.TestUtils.anAvailableRandomPort;
import static school.hei.haapi.integration.conf.TestUtils.setUpCognito;
import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service;
import static school.hei.haapi.integration.conf.utils.MockObjects.student1;
import static school.hei.haapi.integration.conf.utils.TestUtils.anAvailableRandomPort;
import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito;
import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/school/hei/haapi/endpoint/rest/validator/CreateStudentWorkFileValidatorIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import static org.junit.Assert.assertTrue;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
import static school.hei.haapi.endpoint.rest.model.ProfessionalExperienceFileTypeEnum.WORKER_STUDENT;
import static school.hei.haapi.integration.StudentIT.student1;
import static school.hei.haapi.integration.conf.TestUtils.anAvailableRandomPort;
import static school.hei.haapi.integration.conf.TestUtils.setUpCognito;
import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service;
import static school.hei.haapi.integration.conf.utils.MockObjects.student1;
import static school.hei.haapi.integration.conf.utils.TestUtils.anAvailableRandomPort;
import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito;
import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service;

import java.time.Instant;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -20,7 +20,7 @@
import school.hei.haapi.endpoint.rest.client.ApiClient;
import school.hei.haapi.integration.conf.AbstractContextInitializer;
import school.hei.haapi.integration.conf.MockedThirdParties;
import school.hei.haapi.integration.conf.TestUtils;
import school.hei.haapi.integration.conf.utils.TestUtils;
import school.hei.haapi.model.exception.ApiException;

@SpringBootTest(webEnvironment = RANDOM_PORT)
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/school/hei/haapi/integration/AdminIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package school.hei.haapi.integration;

import static school.hei.haapi.integration.conf.TestUtils.*;
import static school.hei.haapi.integration.conf.utils.TestUtils.*;

import org.junit.jupiter.api.BeforeEach;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.testcontainers.junit.jupiter.Testcontainers;
import school.hei.haapi.endpoint.rest.client.ApiClient;
import school.hei.haapi.integration.conf.FacadeITMockedThirdParties;
import school.hei.haapi.integration.conf.TestUtils;
import school.hei.haapi.integration.conf.utils.TestUtils;
import software.amazon.awssdk.services.eventbridge.EventBridgeClient;

@Testcontainers
Expand Down
40 changes: 20 additions & 20 deletions src/test/java/school/hei/haapi/integration/AnnouncementIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@
import static school.hei.haapi.endpoint.rest.model.ReactionEnum.UNCHECK;
import static school.hei.haapi.endpoint.rest.model.Scope.TEACHER;
import static school.hei.haapi.integration.ManagerIT.manager1;
import static school.hei.haapi.integration.StudentIT.student1;
import static school.hei.haapi.integration.conf.TestUtils.ADMIN1_TOKEN;
import static school.hei.haapi.integration.conf.TestUtils.ANNOUNCEMENT1_ID;
import static school.hei.haapi.integration.conf.TestUtils.ANNOUNCEMENT2_ID;
import static school.hei.haapi.integration.conf.TestUtils.ANNOUNCEMENT3_ID;
import static school.hei.haapi.integration.conf.TestUtils.ANNOUNCEMENT4_ID;
import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN;
import static school.hei.haapi.integration.conf.TestUtils.MONITOR1_TOKEN;
import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN;
import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN;
import static school.hei.haapi.integration.conf.TestUtils.announcementEspeciallyForG1;
import static school.hei.haapi.integration.conf.TestUtils.announcementForAll;
import static school.hei.haapi.integration.conf.TestUtils.announcementForManager;
import static school.hei.haapi.integration.conf.TestUtils.announcementForTeacher;
import static school.hei.haapi.integration.conf.TestUtils.assertThrowsForbiddenException;
import static school.hei.haapi.integration.conf.TestUtils.createAnnouncementWithGroupTarget;
import static school.hei.haapi.integration.conf.TestUtils.expectedAnnouncementCreated1;
import static school.hei.haapi.integration.conf.TestUtils.setUpCognito;
import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service;
import static school.hei.haapi.integration.conf.utils.MockObjects.student1;
import static school.hei.haapi.integration.conf.utils.TestUtils.ADMIN1_TOKEN;
import static school.hei.haapi.integration.conf.utils.TestUtils.ANNOUNCEMENT1_ID;
import static school.hei.haapi.integration.conf.utils.TestUtils.ANNOUNCEMENT2_ID;
import static school.hei.haapi.integration.conf.utils.TestUtils.ANNOUNCEMENT3_ID;
import static school.hei.haapi.integration.conf.utils.TestUtils.ANNOUNCEMENT4_ID;
import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN;
import static school.hei.haapi.integration.conf.utils.TestUtils.MONITOR1_TOKEN;
import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN;
import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN;
import static school.hei.haapi.integration.conf.utils.TestUtils.announcementEspeciallyForG1;
import static school.hei.haapi.integration.conf.utils.TestUtils.announcementForAll;
import static school.hei.haapi.integration.conf.utils.TestUtils.announcementForManager;
import static school.hei.haapi.integration.conf.utils.TestUtils.announcementForTeacher;
import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsForbiddenException;
import static school.hei.haapi.integration.conf.utils.TestUtils.createAnnouncementWithGroupTarget;
import static school.hei.haapi.integration.conf.utils.TestUtils.expectedAnnouncementCreated1;
import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito;
import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service;

import java.time.Instant;
import java.util.List;
Expand All @@ -41,7 +41,7 @@
import school.hei.haapi.endpoint.rest.model.Announcement;
import school.hei.haapi.endpoint.rest.model.ReactToAnnouncementRequest;
import school.hei.haapi.integration.conf.FacadeITMockedThirdParties;
import school.hei.haapi.integration.conf.TestUtils;
import school.hei.haapi.integration.conf.utils.TestUtils;

@Testcontainers
@AutoConfigureMockMvc
Expand Down
34 changes: 28 additions & 6 deletions src/test/java/school/hei/haapi/integration/AttendanceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,23 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import static school.hei.haapi.endpoint.rest.model.AttendanceStatus.UNCHECKED;
import static school.hei.haapi.endpoint.rest.model.EventType.COURSE;
import static school.hei.haapi.integration.StudentIT.*;
import static school.hei.haapi.integration.StudentIT.student1;
import static school.hei.haapi.integration.StudentIT.student2;
import static school.hei.haapi.integration.conf.TestUtils.*;
import static school.hei.haapi.integration.GroupIT.group1;
import static school.hei.haapi.integration.conf.utils.MockObjects.student1;
import static school.hei.haapi.integration.conf.utils.MockObjects.student2;
import static school.hei.haapi.integration.conf.utils.MockObjects.student3;
import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN;
import static school.hei.haapi.integration.conf.utils.TestUtils.ORGANIZER1_TOKEN;
import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_ID;
import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN;
import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsApiException;
import static school.hei.haapi.integration.conf.utils.TestUtils.awardedCourse1;
import static school.hei.haapi.integration.conf.utils.TestUtils.course1;
import static school.hei.haapi.integration.conf.utils.TestUtils.course2;
import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito;
import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service;
import static school.hei.haapi.integration.conf.utils.TestUtils.someCreatableEvent;
import static school.hei.haapi.integration.conf.utils.TestUtils.teacher1;
import static school.hei.haapi.integration.conf.utils.TestUtils.teacher4;
import static school.hei.haapi.model.User.Status.ENABLED;

import java.time.Instant;
Expand All @@ -22,9 +35,18 @@
import school.hei.haapi.endpoint.rest.api.EventsApi;
import school.hei.haapi.endpoint.rest.client.ApiClient;
import school.hei.haapi.endpoint.rest.client.ApiException;
import school.hei.haapi.endpoint.rest.model.*;
import school.hei.haapi.endpoint.rest.model.AttendanceMovementType;
import school.hei.haapi.endpoint.rest.model.AttendanceStatus;
import school.hei.haapi.endpoint.rest.model.AwardedCourse;
import school.hei.haapi.endpoint.rest.model.CourseSession;
import school.hei.haapi.endpoint.rest.model.CreateAttendanceMovement;
import school.hei.haapi.endpoint.rest.model.Event;
import school.hei.haapi.endpoint.rest.model.EventParticipant;
import school.hei.haapi.endpoint.rest.model.PlaceEnum;
import school.hei.haapi.endpoint.rest.model.StudentAttendance;
import school.hei.haapi.endpoint.rest.model.StudentAttendanceMovement;
import school.hei.haapi.integration.conf.FacadeITMockedThirdParties;
import school.hei.haapi.integration.conf.TestUtils;
import school.hei.haapi.integration.conf.utils.TestUtils;
import school.hei.haapi.model.User;
import school.hei.haapi.repository.UserRepository;
import school.hei.haapi.service.UserService;
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/school/hei/haapi/integration/AwardedCourseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static school.hei.haapi.integration.StudentIT.student1;
import static school.hei.haapi.integration.conf.TestUtils.*;
import static school.hei.haapi.integration.conf.utils.MockObjects.student1;
import static school.hei.haapi.integration.conf.utils.TestUtils.*;

import java.util.List;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -15,7 +15,7 @@
import school.hei.haapi.endpoint.rest.client.ApiException;
import school.hei.haapi.endpoint.rest.model.AwardedCourse;
import school.hei.haapi.integration.conf.FacadeITMockedThirdParties;
import school.hei.haapi.integration.conf.TestUtils;
import school.hei.haapi.integration.conf.utils.TestUtils;

@Testcontainers
@AutoConfigureMockMvc
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/school/hei/haapi/integration/CommentIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static school.hei.haapi.endpoint.rest.model.OrderDirection.ASC;
import static school.hei.haapi.integration.StudentIT.student1;
import static school.hei.haapi.integration.conf.TestUtils.*;
import static school.hei.haapi.integration.conf.utils.MockObjects.student1;
import static school.hei.haapi.integration.conf.utils.TestUtils.*;

import java.util.List;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -16,7 +16,7 @@
import school.hei.haapi.endpoint.rest.client.ApiException;
import school.hei.haapi.endpoint.rest.model.Comment;
import school.hei.haapi.integration.conf.FacadeITMockedThirdParties;
import school.hei.haapi.integration.conf.TestUtils;
import school.hei.haapi.integration.conf.utils.TestUtils;

@Testcontainers
@AutoConfigureMockMvc
Expand Down
30 changes: 15 additions & 15 deletions src/test/java/school/hei/haapi/integration/CourseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static school.hei.haapi.integration.StudentIT.student1;
import static school.hei.haapi.integration.conf.TestUtils.COURSE1_ID;
import static school.hei.haapi.integration.conf.TestUtils.MANAGER1_TOKEN;
import static school.hei.haapi.integration.conf.TestUtils.STUDENT1_TOKEN;
import static school.hei.haapi.integration.conf.TestUtils.TEACHER1_TOKEN;
import static school.hei.haapi.integration.conf.TestUtils.assertThrowsApiException;
import static school.hei.haapi.integration.conf.TestUtils.course1;
import static school.hei.haapi.integration.conf.TestUtils.course2;
import static school.hei.haapi.integration.conf.TestUtils.course3;
import static school.hei.haapi.integration.conf.TestUtils.createCourse;
import static school.hei.haapi.integration.conf.TestUtils.isBefore;
import static school.hei.haapi.integration.conf.TestUtils.setUpCognito;
import static school.hei.haapi.integration.conf.TestUtils.setUpS3Service;
import static school.hei.haapi.integration.conf.TestUtils.someCreatableCourseList;
import static school.hei.haapi.integration.conf.utils.MockObjects.student1;
import static school.hei.haapi.integration.conf.utils.TestUtils.COURSE1_ID;
import static school.hei.haapi.integration.conf.utils.TestUtils.MANAGER1_TOKEN;
import static school.hei.haapi.integration.conf.utils.TestUtils.STUDENT1_TOKEN;
import static school.hei.haapi.integration.conf.utils.TestUtils.TEACHER1_TOKEN;
import static school.hei.haapi.integration.conf.utils.TestUtils.assertThrowsApiException;
import static school.hei.haapi.integration.conf.utils.TestUtils.course1;
import static school.hei.haapi.integration.conf.utils.TestUtils.course2;
import static school.hei.haapi.integration.conf.utils.TestUtils.course3;
import static school.hei.haapi.integration.conf.utils.TestUtils.createCourse;
import static school.hei.haapi.integration.conf.utils.TestUtils.isBefore;
import static school.hei.haapi.integration.conf.utils.TestUtils.setUpCognito;
import static school.hei.haapi.integration.conf.utils.TestUtils.setUpS3Service;
import static school.hei.haapi.integration.conf.utils.TestUtils.someCreatableCourseList;

import java.util.List;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -29,7 +29,7 @@
import school.hei.haapi.endpoint.rest.model.Course;
import school.hei.haapi.endpoint.rest.model.CourseDirection;
import school.hei.haapi.integration.conf.FacadeITMockedThirdParties;
import school.hei.haapi.integration.conf.TestUtils;
import school.hei.haapi.integration.conf.utils.TestUtils;

@Testcontainers
@AutoConfigureMockMvc
Expand Down
Loading