Merge pull request #32 from VishwajeetVT/trunk

New Tests  and code implementation

app-db-relationships/src/main/java/com/spring/relationship/one_to_one/service/EmployeeServiceImpl.java

@@ -79,11 +79,19 @@ public EmployeeResponse assignParkingLot(Long employeeId, String spotNumber) {
 
     @Override
     public EmployeeResponse removeParkingLot(Long employeeId) {
-        return null;
+        Employee employee = employeeRepository.findById(employeeId).orElseThrow(
+                () -> new EmployeeNotFoundException("Employee with id: "+employeeId+" not found")
+        );
+        employee.setParkingSpot(null);
+        Employee removedParkingSpot = employeeRepository.save(employee);
+        return EmployeeResponse.toEmployeeResponse(removedParkingSpot);
     }
 
     @Override
     public Optional<EmployeeResponse> findEmployeeWithParkingSpot(Long employeeId) {
-        return Optional.empty();
+        Employee employee = employeeRepository.findById(employeeId).orElseThrow(
+                () -> new EmployeeNotFoundException("Employee with id: "+employeeId+" not found")
+        );
+        return Optional.of(EmployeeResponse.toEmployeeResponse(employee));
     }
 }

app-db-relationships/src/test/java/com/spring/relationship/one_to_one/service/EmployeeServiceTest.java

@@ -152,4 +152,28 @@ void test_assign_parking_spot_to_employee_should_employee_response() {
         verify(parkingSpotRepository, times(1)).findBySpotNumber("A1");
         verify(employeeRepository, times(1)).save(any(Employee.class));
     }
+
+    @Test
+    void test_remove_parking_spot_assign_to_employee() {
+        when(employeeRepository.findById(1L)).thenReturn(Optional.of(employee));
+        when(employeeRepository.save(any(Employee.class))).thenReturn(employee);
+
+        EmployeeResponse employeeResponse = employeeService.removeParkingLot(1L);
+        assertNotNull(employeeResponse);
+        assertNull(employeeResponse.getSpotNumber());
+    }
+
+    @Test
+    void test_find_employee_with_parking_spot() {
+        parkingSpot.setEmployee(employee);
+        parkingSpot.setAssigned(true);
+        employee.setParkingSpot(parkingSpot);
+        when(employeeRepository.findById(1L)).thenReturn(Optional.of(employee));
+        when(parkingSpotRepository.findBySpotNumber("A1")).thenReturn(Optional.of(parkingSpot));
+
+        Optional<EmployeeResponse> employeeResponse = employeeService.findEmployeeWithParkingSpot(1L);
+        assertNotNull(employeeResponse);
+        assertEquals(employee.getEmployeeName(), employeeResponse.get().getEmployeeName());
+        assertEquals(employee.getParkingSpot().getSpotNumber(), employeeResponse.get().getSpotNumber());
+    }
 }