Commit e651fecd authored by Ruksana Semeir's avatar Ruksana Semeir
Browse files

Added code for provisional id generation

1 merge request!192Added code for provisional id generation
Showing with 11 additions and 5 deletions
+11 -5
......@@ -37,10 +37,11 @@ public class StudentController {
public ResponseEntity<ResponseDto> getFilteredStudents(
@RequestParam(required = false) Long instituteId,
@RequestParam(required = false) Long courseId,
@RequestParam(required = false) String session,
@RequestParam(required = false) VerificationStatus verificationStatus) {
@RequestParam(required = false) String academicYear,
@RequestParam(required = false) VerificationStatus verificationStatus,
@RequestParam(required = false) Long examCycleId) {
ResponseDto response = studentService.getFilteredStudents(instituteId, courseId, session, verificationStatus);
ResponseDto response = studentService.getFilteredStudents(instituteId, courseId, academicYear, verificationStatus, examCycleId);
// return ResponseEntity.status(response.getResponseCode()).body(response);
return new ResponseEntity<>(response, HttpStatus.OK);
}
......
......@@ -189,10 +189,12 @@ public class StudentService {
}
private String generateProvisionalNumber(Student student) {
return student.getCourse().getCourseCode() + "-" + UUID.randomUUID().toString();
int hashCode = Math.abs(student.getMobileNo().hashCode());
int truncatedHashCode = hashCode % 100000000;
return String.valueOf(truncatedHashCode);
}
public ResponseDto getFilteredStudents(Long instituteId, Long courseId, String session, VerificationStatus verificationStatus) {
public ResponseDto getFilteredStudents(Long instituteId, Long courseId, String session, VerificationStatus verificationStatus, Long examCycleId) {
ResponseDto response = new ResponseDto(Constants.API_GET_FILTERED_STUDENTS);
try {
......@@ -216,6 +218,9 @@ public class StudentService {
if (verificationStatus != null) {
predicates.add(criteriaBuilder.equal(studentRoot.get("verificationStatus"), verificationStatus));
}
if (examCycleId != null){
predicates.add(criteriaBuilder.equal(studentRoot.get("exam"),examCycleId));
}
criteriaQuery.where(predicates.toArray(new Predicate[0]));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment