added new endpoints

README.md

@@ -64,7 +64,38 @@ Check code style for tests:
 ./gradlew checkstyleTest
 ```
 
-## Installing Redis
+## Running Postgres and Redis using Docker (Desktop)
+
+Please note that this config is designed for the default Spring Datasource configuration, so there is no need to set
+DATASOURCE environment variables explicitly if you use this.
+
+...
+
+Install Docker Desktop if you are on Windows or macOS.
+
+On Linux feel free to choose between Docker Desktop or Docker Engine, but remember that the latter one will be lighter
+on your hardware, even though without a graphical user interface.
+
+After installing Docker, navigate to the `dokazovi-be` root directory and run (works on all systems):
+
+```bash
+$ docker-compose up -d
+```
+
+This will start next environment services:
+* Postgres, `localhost:5432`
+* Adminer (a simple admin panel for databases), `localhost:5433`
+* Redis, `localhost:6379`
+
+To shut the environment down, run in the same directory:
+
+```bash
+$ docker-compose down
+```
+
+You should also be able to use docker-compose from your IDE.
+
+## Installing Redis manually
 
 The easiest way to install latest Redis on Windows 10+ is using WSL2 -
 to do that, install Ubuntu 20.04 from Microsoft Store and run next commands:

docker-compose.yml

@@ -0,0 +1,30 @@
+version: "3.8"
+
+services:
+  postgres:
+    image: postgres
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_DB: dokazovi
+      POSTGRES_USER: dokazovi
+      POSTGRES_PASSWORD: dokazovi
+    volumes:
+      - "postgres:/var/lib/postgresql/data/"
+
+  adminer:
+    image: adminer
+    ports:
+      - "5433:8080"
+
+  redis:
+    image: redis
+    ports:
+      - "6379:6379"
+    command: redis-server --save 20 1 --loglevel warning
+    volumes:
+      - "redis:/data"
+
+volumes:
+  postgres: {}
+  redis: {}

src/main/java/com/softserveinc/dokazovi/controller/CityController.java

@@ -0,0 +1,41 @@
+package com.softserveinc.dokazovi.controller;
+
+import com.softserveinc.dokazovi.dto.city.CityDTO;
+import com.softserveinc.dokazovi.service.CityService;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import static com.softserveinc.dokazovi.controller.EndPoints.CITIES_BY_REGION;
+import static com.softserveinc.dokazovi.controller.EndPoints.CITY;
+
+@RestController
+@RequestMapping(CITY)
+@RequiredArgsConstructor
+public class CityController {
+
+    private final CityService cityService;
+
+    @GetMapping
+    @ApiOperation("Get all cities")
+    public ResponseEntity<List<CityDTO>> getAllCities() {
+        return ResponseEntity
+                .status(HttpStatus.OK)
+                .body(cityService.findAllCities());
+    }
+
+    @GetMapping(CITIES_BY_REGION)
+    @ApiOperation("Get list of cities by region")
+    public ResponseEntity<List<CityDTO>> getAllCitiesByRegion(@PathVariable Integer regionId) {
+        return ResponseEntity
+                .status(HttpStatus.OK)
+                .body(cityService.findAllCitiesByRegion(regionId));
+    }
+}

src/main/java/com/softserveinc/dokazovi/controller/EndPoints.java

@@ -42,6 +42,9 @@ public final class EndPoints {
     public static final String DIRECTION = "/direction";
     public static final String ORIGIN = "/origin";
     public static final String REGION = "/region";
+    public static final String REGION_BY_CITY = "/{cityId}";
+    public static final String CITY = "/city";
+    public static final String CITIES_BY_REGION = "/{regionId}";
     public static final String AUTH = "/auth";
     public static final String AUTH_VERIFICATION = "/verification";
     public static final String REFRESH_TOKEN = "/refreshtoken";
@@ -64,4 +67,4 @@ public final class EndPoints {
     public static String openApi(String api) {
         return api + "/**";
     }
-}
+}

src/main/java/com/softserveinc/dokazovi/controller/PostController.java

@@ -39,7 +39,7 @@
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Set;
 
@@ -278,10 +278,10 @@ public ResponseEntity<Page<PostDTO>> getAllPostsByDirectionsByPostTypesAndByOrig
 			@RequestParam(required = false, defaultValue = "") String author,
 			@ApiParam(value = "yyyy-MM-dd'T'HH:mm:ss")
 			@RequestParam(required = false)
-			@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
+			@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate,
 			@ApiParam(value = "yyyy-MM-dd'T'HH:mm:ss")
 			@RequestParam(required = false)
-			@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endDate) {
+			@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate) {
 
 		return ResponseEntity
 				.status(HttpStatus.OK)
@@ -322,10 +322,10 @@ public ResponseEntity<Page<PostDTO>> getAllPostsForUserByDirectionsByPostTypesAn
 			@RequestParam(required = false, defaultValue = "") String author,
 			@ApiParam(value = "yyyy-MM-dd'T'HH:mm:ss")
 			@RequestParam(required = false)
-			@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
+			@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate,
 			@ApiParam(value = "yyyy-MM-dd'T'HH:mm:ss")
 			@RequestParam(required = false)
-			@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endDate,
+			@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate,
 			@PathVariable("userId") Integer userId) {
 
 		return ResponseEntity

src/main/java/com/softserveinc/dokazovi/controller/RegionController.java

@@ -7,12 +7,14 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
 import static com.softserveinc.dokazovi.controller.EndPoints.REGION;
+import static com.softserveinc.dokazovi.controller.EndPoints.REGION_BY_CITY;
 
 /**
  * The Class RegionController responsible for handling requests for regions
@@ -36,4 +38,12 @@ public ResponseEntity<List<RegionDTO>> getAllRegions() {
 				.status(HttpStatus.OK)
 				.body(regionService.findAllRegions());
 	}
+
+	@GetMapping(REGION_BY_CITY)
+	@ApiOperation("Get region by city")
+	public ResponseEntity<RegionDTO> getRegionByCity(@PathVariable Integer cityId) {
+		return ResponseEntity
+				.status(HttpStatus.OK)
+				.body(regionService.findRegionByCity(cityId));
+	}
 }

src/main/java/com/softserveinc/dokazovi/dto/city/CityDTO.java

@@ -0,0 +1,13 @@
+package com.softserveinc.dokazovi.dto.city;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class CityDTO {
+
+    Integer id;
+    String name;
+    Integer regionId;
+}

src/main/java/com/softserveinc/dokazovi/mapper/CityMapper.java

@@ -1,6 +1,6 @@
 package com.softserveinc.dokazovi.mapper;
 
-
+import com.softserveinc.dokazovi.dto.city.CityDTO;
 import com.softserveinc.dokazovi.dto.post.PostUserInstitutionCityDTO;
 import com.softserveinc.dokazovi.dto.user.UserInstitutionCityDTO;
 import com.softserveinc.dokazovi.entity.CityEntity;
@@ -13,4 +13,5 @@ public interface CityMapper {
 
 	PostUserInstitutionCityDTO toPostUserInstitutionCityDTO(CityEntity cityEntity);
 
-}
+	CityDTO toCityDTO(CityEntity cityEntity);
+}

src/main/java/com/softserveinc/dokazovi/repositories/CityRepository.java

@@ -0,0 +1,11 @@
+package com.softserveinc.dokazovi.repositories;
+
+import com.softserveinc.dokazovi.entity.CityEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface CityRepository extends JpaRepository<CityEntity, Integer> {
+
+    List<CityEntity> findAllByRegionId(Integer id);
+}

src/main/java/com/softserveinc/dokazovi/repositories/RegionRepository.java

@@ -26,4 +26,6 @@ public interface RegionRepository extends JpaRepository<RegionEntity, Integer> {
 			+ "          WHERE INSTITUTION_ID IN (SELECT DISTINCT INSTITUTION_ID FROM DOCTORS)))")
 	@Modifying
 	void updateRegionsStatus();
+
+	RegionEntity findByCitiesId(Integer cityId);
 }

src/main/java/com/softserveinc/dokazovi/service/CityService.java

@@ -0,0 +1,12 @@
+package com.softserveinc.dokazovi.service;
+
+import com.softserveinc.dokazovi.dto.city.CityDTO;
+
+import java.util.List;
+
+public interface CityService {
+
+    List<CityDTO> findAllCities();
+
+    List<CityDTO> findAllCitiesByRegion(Integer regionId);
+}

src/main/java/com/softserveinc/dokazovi/service/PostService.java

@@ -9,7 +9,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.util.Set;
 
 public interface PostService {
@@ -27,7 +27,7 @@ Page<PostDTO> findAllByDirection(
 
 	Page<PostDTO> findAllByTypesAndStatusAndDirectionsAndOriginsAndTitleAndAuthor(
 			Set<Integer> directionIds, Set<Integer> typeIds, Set<Integer> originIds, Set<Integer> statuses,
-			String title, String author, Integer authorId, LocalDateTime startDate, LocalDateTime endDate,
+			String title, String author, Integer authorId, LocalDate startDate, LocalDate endDate,
 			Pageable pageable);
 
 	Page<PostDTO> findPostsByAuthorIdAndDirections(

src/main/java/com/softserveinc/dokazovi/service/RegionService.java

@@ -9,4 +9,6 @@ public interface RegionService {
 	List<RegionDTO> findAllRegions();
 
 	public void updateRegionsStatus();
+
+	RegionDTO findRegionByCity(Integer cityId);
 }

src/main/java/com/softserveinc/dokazovi/service/impl/CityServiceImpl.java

@@ -0,0 +1,33 @@
+package com.softserveinc.dokazovi.service.impl;
+
+import com.softserveinc.dokazovi.dto.city.CityDTO;
+import com.softserveinc.dokazovi.mapper.CityMapper;
+import com.softserveinc.dokazovi.repositories.CityRepository;
+import com.softserveinc.dokazovi.service.CityService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+public class CityServiceImpl implements CityService {
+
+    private final CityRepository cityRepository;
+    private final CityMapper cityMapper;
+
+    @Override
+    public List<CityDTO> findAllCities() {
+        return cityRepository.findAll().stream()
+                .map(cityMapper::toCityDTO)
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<CityDTO> findAllCitiesByRegion(Integer regionId) {
+        return cityRepository.findAllByRegionId(regionId).stream()
+                .map(cityMapper::toCityDTO)
+                .collect(Collectors.toList());
+    }
+}

src/main/java/com/softserveinc/dokazovi/service/impl/PostServiceImpl.java

@@ -107,7 +107,7 @@ public PostDTO saveFromUser(PostSaveFromUserDTO postDTO, UserPrincipal userPrinc
 	@Override
 	public Page<PostDTO> findAllByTypesAndStatusAndDirectionsAndOriginsAndTitleAndAuthor(
 			Set<Integer> directionIds, Set<Integer> typeIds, Set<Integer> originIds, Set<Integer> statuses,
-			String title, String author, Integer authorId, LocalDateTime startDate, LocalDateTime endDate,
+			String title, String author, Integer authorId, LocalDate startDate, LocalDate endDate,
 			Pageable pageable) {
 		boolean isAuthorIdNotSet = authorId == null;
 
@@ -126,15 +126,10 @@ public Page<PostDTO> findAllByTypesAndStatusAndDirectionsAndOriginsAndTitleAndAu
 			Sort sort = pageable.getSort().and(Sort.by("modified_at").descending());
 			pageable = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), sort);
 		}
-
-		Optional<LocalDateTime> startDate1 = Optional.ofNullable(startDate);
-		LocalDateTime startTime = startDate1
-				.orElse(LocalDateTime.of(LocalDate.EPOCH, LocalTime.MIN));
-		Timestamp startDateTimestamp = Timestamp.valueOf(startTime);
-		Optional<LocalDateTime> endDate1 = Optional.ofNullable(endDate);
-		LocalDateTime endTime = endDate1
-				.orElse(LocalDateTime.of(LocalDate.now(), LocalTime.MAX));
-		Timestamp endDateTimestamp = Timestamp.valueOf(endTime);
+		LocalDate startLocalDate = Optional.ofNullable(startDate).orElse(LocalDate.EPOCH);
+		LocalDate endLocalDate = Optional.ofNullable(endDate).orElse(LocalDate.now());
+		Timestamp startDateTimestamp = Timestamp.valueOf(startLocalDate.atStartOfDay());
+		Timestamp endDateTimestamp = Timestamp.valueOf(endLocalDate.atTime(LocalTime.MAX));
 		directionIds = validateValues(directionIds);
 		typeIds = validateValues(typeIds);
 		originIds = validateValues(originIds);

src/main/java/com/softserveinc/dokazovi/service/impl/RegionServiceImpl.java

@@ -1,6 +1,7 @@
 package com.softserveinc.dokazovi.service.impl;
 
 import com.softserveinc.dokazovi.dto.region.RegionDTO;
+import com.softserveinc.dokazovi.entity.RegionEntity;
 import com.softserveinc.dokazovi.mapper.RegionMapper;
 import com.softserveinc.dokazovi.repositories.RegionRepository;
 import com.softserveinc.dokazovi.service.RegionService;
@@ -47,4 +48,10 @@ public List<RegionDTO> findAllRegions() {
 	public void updateRegionsStatus() {
 		regionRepository.updateRegionsStatus();
 	}
+
+    @Override
+    public RegionDTO findRegionByCity(Integer cityId) {
+		RegionEntity regionEntity = regionRepository.findByCitiesId(cityId);
+		return regionMapper.toRegionDTO(regionEntity);
+    }
 }

src/main/java/com/softserveinc/dokazovi/service/impl/UserServiceImpl.java

@@ -106,7 +106,7 @@ public UserDTO findExpertById(Integer userId) {
 	public Page<UserDTO> findAllExperts(UserSearchCriteria userSearchCriteria, Pageable pageable) {
 
 		if (validateParameters(userSearchCriteria, HAS_NO_DIRECTIONS, HAS_NO_REGIONS, HAS_NO_USERNAME)) {
-			return userRepository.findDoctorsProfiles(pageable).map(userMapper::toUserDTO);
+			return userRepository.findAll(pageable).map(userMapper::toUserDTO);
 		}
 
 		final String name = userSearchCriteria.getUserName();