Merge branch 'develop' into 'departmentService-tests'

# Conflicts:
#   core/src/test/java/cz/muni/pa165/rest/CarComponentControllerTest.java

core/src/main/java/cz/muni/pa165/mappers/CarComponentMapper.java

@@ -14,6 +14,7 @@ import java.util.List;
 public interface CarComponentMapper {
 
     CarComponentDto mapToDto(CarComponent component);
+    CarComponent mapFromDto(CarComponentDto componentDto);
 
     CarComponent mapFromCreateDto(CarComponentCreateDto componentCreateDto);
 

core/src/test/java/cz/muni/pa165/rest/CarComponentControllerTest.java

@@ -4,7 +4,6 @@ import cz.muni.pa165.data.enums.ComponentTypeEnum;
 import cz.muni.pa165.facade.CarComponentFacade;
 import cz.muni.pa165.generated.core.model.CarComponentType;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,9 +16,10 @@ class CarComponentControllerTest {
     void testGetCarComponent() {
         log.debug("starting testGetCarComponent()");
 
-        carComponentController.getCarComponent(1L);
+        var carComponent = createAndPersistComponent();
 
-        Mockito.verify(mockFacade, Mockito.times(1)).findById(1L);
+        var carComponentFromDb = carComponentController.getCarComponent(carComponent.getId());
+        assertEquals(new ResponseEntity<>(carComponent, HttpStatus.OK), carComponentFromDb);
     }
 
     @Test