diff --git a/images/1.svg b/images/1.svg deleted file mode 100644 index 58831d8..0000000 --- a/images/1.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/100.svg b/images/100.svg deleted file mode 100644 index 58831d8..0000000 --- a/images/100.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/images/ceh.jpg b/images/ceh.jpg deleted file mode 100644 index 5730af8..0000000 Binary files a/images/ceh.jpg and /dev/null differ diff --git a/images/cir.jpg b/images/cir.jpg deleted file mode 100644 index 6088e55..0000000 Binary files a/images/cir.jpg and /dev/null differ diff --git a/images/dev.jpg b/images/dev.jpg deleted file mode 100644 index 618e18a..0000000 Binary files a/images/dev.jpg and /dev/null differ diff --git a/images/eleon.jpg b/images/eleon.jpg deleted file mode 100644 index 304b374..0000000 Binary files a/images/eleon.jpg and /dev/null differ diff --git a/images/inn.jpg b/images/inn.jpg deleted file mode 100644 index 16531a5..0000000 Binary files a/images/inn.jpg and /dev/null differ diff --git a/images/mar.jpg b/images/mar.jpg deleted file mode 100644 index 108b59b..0000000 Binary files a/images/mar.jpg and /dev/null differ diff --git a/images/mav.jpg b/images/mav.jpg deleted file mode 100644 index 574749c..0000000 Binary files a/images/mav.jpg and /dev/null differ diff --git a/images/naut.jpg b/images/naut.jpg deleted file mode 100644 index b0bf978..0000000 Binary files a/images/naut.jpg and /dev/null differ diff --git a/images/orange.jpg b/images/orange.jpg deleted file mode 100644 index 4318a06..0000000 Binary files a/images/orange.jpg and /dev/null differ diff --git a/images/papa.jpg b/images/papa.jpg deleted file mode 100644 index 6641fc1..0000000 Binary files a/images/papa.jpg and /dev/null differ diff --git a/images/resp.jpg b/images/resp.jpg deleted file mode 100644 index 3ecc182..0000000 Binary files a/images/resp.jpg and /dev/null differ diff --git a/images/scope.jpg b/images/scope.jpg deleted file mode 100644 index 3e1ca69..0000000 Binary files a/images/scope.jpg and /dev/null differ diff --git a/images/shish.jpg b/images/shish.jpg deleted file mode 100644 index eb3c3be..0000000 Binary files a/images/shish.jpg and /dev/null differ diff --git a/images/vesna.jpg b/images/vesna.jpg deleted file mode 100644 index 53f2146..0000000 Binary files a/images/vesna.jpg and /dev/null differ diff --git a/images/vr.jpg b/images/vr.jpg deleted file mode 100644 index ab2d540..0000000 Binary files a/images/vr.jpg and /dev/null differ diff --git a/src/main/java/ru/nsu/fit/directors/establishmentservice/controller/ArticleController.java b/src/main/java/ru/nsu/fit/directors/establishmentservice/controller/ArticleController.java index b973999..3ea035a 100644 --- a/src/main/java/ru/nsu/fit/directors/establishmentservice/controller/ArticleController.java +++ b/src/main/java/ru/nsu/fit/directors/establishmentservice/controller/ArticleController.java @@ -40,12 +40,6 @@ public ResponseEntity> handleException(BaseException except return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST); } - @ExceptionHandler(SecurityException.class) - public ResponseEntity> handleException(SecurityException exception) { - BaseResponse response = new BaseResponse<>("Пользователь не вошел в аккаунт", "SecurityException"); - return new ResponseEntity<>(response, HttpStatus.FORBIDDEN); - } - @Override public boolean supports( @NonNull MethodParameter returnType, diff --git a/src/main/java/ru/nsu/fit/directors/establishmentservice/service/ImageServiceImpl.java b/src/main/java/ru/nsu/fit/directors/establishmentservice/service/ImageServiceImpl.java index e769547..a2bc78b 100644 --- a/src/main/java/ru/nsu/fit/directors/establishmentservice/service/ImageServiceImpl.java +++ b/src/main/java/ru/nsu/fit/directors/establishmentservice/service/ImageServiceImpl.java @@ -50,7 +50,6 @@ public void saveImages(Set photos, Establishment establishment) { .map(photo -> getByLink(photo.getImage()).setEstablishment(establishment)) .toList(); imageRepository.saveAll(savedPhotos); - log.info("Was saved {}", photos); } @Override diff --git a/src/main/java/ru/nsu/fit/directors/establishmentservice/service/SpotServiceImpl.java b/src/main/java/ru/nsu/fit/directors/establishmentservice/service/SpotServiceImpl.java index 83e0ff2..5d11446 100644 --- a/src/main/java/ru/nsu/fit/directors/establishmentservice/service/SpotServiceImpl.java +++ b/src/main/java/ru/nsu/fit/directors/establishmentservice/service/SpotServiceImpl.java @@ -30,25 +30,18 @@ public class SpotServiceImpl implements SpotService { @Override public List getSpotsByEstablishment(Long establishmentId) { - log.info("Getting spots by establishment"); - log.info("EstablishmentID: " + establishmentId); Establishment establishment = establishmentRepository.findById(establishmentId).orElseThrow(); return spotMapper.toDtoList(spotRepository.findByEstablishment(establishment)); } @Override public SpotDto getSpotById(Long spotId) { - log.info("Getting spot by id"); - log.info("SpotID: " + spotId); return spotMapper.modelToDto(spotRepository.findById(spotId) .orElseThrow(() -> new SpotNotFoundException(spotId))); } @Override public void createSpot(Long localId, Long establishmentId) { - log.info("Saving new spot"); - log.info("LocalID: " + localId); - log.info("EstablishmentID: " + establishmentId); spotRepository.save( new Spot().setLocalId(localId).setEstablishment(establishmentRepository.getReferenceById(establishmentId)) ); @@ -64,7 +57,6 @@ public void saveSpots(List spots, Long establishmentId) { @Override public TimelineDto getSpotTimeline(Long localId, Long establishmentId) { - log.info("Getting spot timeline"); Establishment establishment = establishmentRepository.findById(establishmentId) .orElseThrow(() -> new EstablishmentNotFoundException(establishmentId)); diff --git a/src/main/java/ru/nsu/fit/directors/establishmentservice/service/WorkingHoursServiceImpl.java b/src/main/java/ru/nsu/fit/directors/establishmentservice/service/WorkingHoursServiceImpl.java index 6534763..6bede05 100644 --- a/src/main/java/ru/nsu/fit/directors/establishmentservice/service/WorkingHoursServiceImpl.java +++ b/src/main/java/ru/nsu/fit/directors/establishmentservice/service/WorkingHoursServiceImpl.java @@ -40,10 +40,8 @@ public class WorkingHoursServiceImpl implements WorkingHoursService { @Override public void saveWorkingHours(Set responseWorkingHoursDto, Establishment establishment) { - log.info("Saving working hours"); Map workingHoursMap = new HashMap<>(); for (RequestWorkingHoursDto dto : responseWorkingHoursDto) { - log.info("Saving {}", dto); for (String day : dto.getDays()) { WorkingHours workingHours = mapper.map(dto, WorkingHours.class); workingHours.setDayOfWeek(DayOfWeek.getDayByString(day)); diff --git a/src/test/java/ru/nsu/fit/directors/establishmentservice/EstablishmentReviewTest.java b/src/test/java/ru/nsu/fit/directors/establishmentservice/EstablishmentReviewTest.java new file mode 100644 index 0000000..234a6ae --- /dev/null +++ b/src/test/java/ru/nsu/fit/directors/establishmentservice/EstablishmentReviewTest.java @@ -0,0 +1,22 @@ +package ru.nsu.fit.directors.establishmentservice; + +import com.github.springtestdbunit.annotation.DatabaseSetup; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; + +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@DisplayName("Проверка работы с отзывами") +@DatabaseSetup("/database/establishment/default_establishment.xml") +class EstablishmentReviewTest extends EstablishmentServiceApplicationTests { + + @Test + @DisplayName("Получение отзывов") + @DatabaseSetup("/database/review/review_list.xml") + void getReviewsTest() throws Exception { + mockMvc.perform(MockMvcRequestBuilders.get("/establishment/review?establishmentId=100")) + .andExpect(status().is2xxSuccessful()) + .andExpect(responseFromPath("http/response/review/review_list_response.json")); + } +} diff --git a/src/test/resources/database/review/review_list.xml b/src/test/resources/database/review/review_list.xml new file mode 100644 index 0000000..aa71c64 --- /dev/null +++ b/src/test/resources/database/review/review_list.xml @@ -0,0 +1,21 @@ + + + + + diff --git a/src/test/resources/http/response/review/review_list_response.json b/src/test/resources/http/response/review/review_list_response.json new file mode 100644 index 0000000..b5da7c7 --- /dev/null +++ b/src/test/resources/http/response/review/review_list_response.json @@ -0,0 +1,17 @@ +{ + "result": [ + { + "username": "Петров", + "text": "Отличное заведение!", + "score": 5, + "answer": "Спасибо за отзыв! Помогаете нам расти и становиться лучше!" + }, + { + "username": "Лера", + "text": "Это отвратительно!", + "score": 2, + "answer": "Мы вас ненавидим!" + } + ], + "exception": null +}