Merge pull request #29 from januschung/alloffer

make allOffer to return jobApplication properly

src/main/java/com/tnite/jobwinner/service/InterviewService.java

@@ -74,7 +74,20 @@ public Flux<Interview> getInterviewByJobApplicationId(Integer jobApplicationId)
 	}
 
 	public Flux<Interview> allInterview() {
+//		return interviewRepository.findAll()
+//			.doOnComplete(() -> log.info("Retrieved all interviews"))
+//			.doOnError(e -> log.error("Failed to retrieve interviews", e));
 		return interviewRepository.findAll()
+			.flatMap(interview ->
+				jobApplicationRepository.findById(interview.getJobApplicationId())
+					.map(jobApplication -> {
+						interview.setJobApplication(jobApplication);
+						return interview;
+					})
+					.defaultIfEmpty(interview)  // If JobApplication not found, just return the offer without setting JobApplication
+					.doOnSuccess(o -> log.info("Retrieved interview with job application: {}", o))
+					.doOnError(e -> log.error("Failed to fetch job application for interview", e))
+			)
 			.doOnComplete(() -> log.info("Retrieved all interviews"))
 			.doOnError(e -> log.error("Failed to retrieve interviews", e));
 	}

src/test/java/com/tnite/jobwinner/service/InterviewServiceTest.java

@@ -134,6 +134,7 @@ void testGetInterview() {
 	@Test
 	void testAllInterview() {
 		when(interviewRepository.findAll()).thenReturn(Flux.just(interview1, interview2));
+		when(jobApplicationRepository.findById(1)).thenReturn(Mono.just(jobApplication));
 
 		Flux<Interview> result = interviewService.allInterview();
 
@@ -143,5 +144,6 @@ void testAllInterview() {
 			.verifyComplete();
 
 		verify(interviewRepository, times(1)).findAll();
+		verify(jobApplicationRepository, times(2)).findById(anyInt());
 	}
 }