added id, condition for empty list and replaced admission year by ses…

Created by: jaypratapsingh1

…sion as per the request

src/main/java/com/tarento/upsmf/examsAndAdmissions/model/dto/StudentExamInfoDTO.java

@@ -16,7 +16,8 @@ public class StudentExamInfoDTO {
     private String surname;
     private String enrollmentNumber;
     private String courseName;
-    private int admissionDate;
+    private String session;
     private int numberOfExams;
+    private Long id;
     private List<ExamInfoDto> exams;
 }

src/main/java/com/tarento/upsmf/examsAndAdmissions/service/StudentExamRegistrationService.java

@@ -262,11 +262,15 @@ public class StudentExamRegistrationService {
             dto.setSurname(student.getSurname());
             dto.setEnrollmentNumber(student.getEnrollmentNumber());
             dto.setCourseName(student.getCourse().getCourseName());
-            dto.setAdmissionDate(student.getAdmissionDate().getYear());
+            dto.setSession(student.getSession());
             dto.setNumberOfExams(unregisteredExams.size());
-            List<ExamInfoDto> exams = unregisteredExams.stream().map(exam ->
-                    new ExamInfoDto(exam.getId(), exam.getExamName())
-            ).collect(Collectors.toList());
+            dto.setId(student.getId());
+            List<ExamInfoDto> exams = Optional.of(unregisteredExams.stream()
+                            .map(exam -> new ExamInfoDto(exam.getId(), exam.getExamName()))
+                            .collect(Collectors.toList()))
+                    .filter(list -> !list.isEmpty())
+                    .orElseGet(() -> Collections.singletonList(new ExamInfoDto(0L, null)));
+
             dto.setExams(exams);
 
             resultDTOs.add(dto);