From fefc2b0eba137e664f5919811d20dc08d43d5a21 Mon Sep 17 00:00:00 2001 From: dqunbp Date: Thu, 28 Sep 2023 09:07:50 +0300 Subject: [PATCH] Get event count from event api --- .../dto/eventapi/EventApiEventDto.java | 1 + .../service/converter/EventDtoConverter.java | 2 +- .../converter/EventListEventDtoConverter.java | 2 +- .../domain/EventApiConvertersTest.java | 25 +++++-------------- 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/src/main/java/io/kontur/disasterninja/dto/eventapi/EventApiEventDto.java b/src/main/java/io/kontur/disasterninja/dto/eventapi/EventApiEventDto.java index ac84ebe1..9665f7f9 100644 --- a/src/main/java/io/kontur/disasterninja/dto/eventapi/EventApiEventDto.java +++ b/src/main/java/io/kontur/disasterninja/dto/eventapi/EventApiEventDto.java @@ -27,4 +27,5 @@ public class EventApiEventDto { private String location; private List bbox = new ArrayList<>(); private List centroid = new ArrayList<>(); + private int episodeCount; } diff --git a/src/main/java/io/kontur/disasterninja/service/converter/EventDtoConverter.java b/src/main/java/io/kontur/disasterninja/service/converter/EventDtoConverter.java index e9c61f94..8db1815b 100644 --- a/src/main/java/io/kontur/disasterninja/service/converter/EventDtoConverter.java +++ b/src/main/java/io/kontur/disasterninja/service/converter/EventDtoConverter.java @@ -32,7 +32,7 @@ public static EventDto convert(EventApiEventDto event) { dto.setEventName(eventName(event)); dto.setDescription(event.getDescription()); dto.setLocation(event.getLocation()); - dto.setEpisodeCount(event.getEpisodes().size()); + dto.setEpisodeCount(event.getEpisodeCount()); List eventUrls = event.getUrls(); dto.setExternalUrls(eventUrls != null ? List.copyOf(eventUrls) : List.of()); diff --git a/src/main/java/io/kontur/disasterninja/service/converter/EventListEventDtoConverter.java b/src/main/java/io/kontur/disasterninja/service/converter/EventListEventDtoConverter.java index ae1b53df..024ab648 100644 --- a/src/main/java/io/kontur/disasterninja/service/converter/EventListEventDtoConverter.java +++ b/src/main/java/io/kontur/disasterninja/service/converter/EventListEventDtoConverter.java @@ -16,7 +16,7 @@ public static EventListDto convert(EventApiEventDto event) { dto.setEventName(eventName(event)); dto.setDescription(event.getDescription()); dto.setLocation(event.getLocation()); - dto.setEpisodeCount(event.getEpisodes().size()); + dto.setEpisodeCount(event.getEpisodeCount()); List eventUrls = event.getUrls(); dto.setExternalUrls(eventUrls != null ? List.copyOf(eventUrls) : List.of()); diff --git a/src/test/java/io/kontur/disasterninja/domain/EventApiConvertersTest.java b/src/test/java/io/kontur/disasterninja/domain/EventApiConvertersTest.java index 09021f59..6ad4eb83 100644 --- a/src/test/java/io/kontur/disasterninja/domain/EventApiConvertersTest.java +++ b/src/test/java/io/kontur/disasterninja/domain/EventApiConvertersTest.java @@ -39,6 +39,7 @@ private static EventApiEventDto testEvent() { episodes.add(episode); event.setEpisodes(episodes); + event.setEpisodeCount(1); return event; } @@ -121,23 +122,16 @@ public void eventDtoTestNames() { @Test public void eventDtoTestEpisodeCount() { EventApiEventDto event = testEvent(); - EventListDto dto = EventDtoConverter.convert(event); + EventDto dto = EventDtoConverter.convert(event); assertEquals(dto.getEpisodeCount(), 1); //1. with 0 episodes - List episodes = new ArrayList<>(); - event.setEpisodes(episodes); + event.setEpisodeCount(0); dto = EventDtoConverter.convert(event); assertEquals(dto.getEpisodeCount(), 0); //2. with 2 episodes - FeedEpisode episode1 = new FeedEpisode(); - FeedEpisode episode2 = new FeedEpisode(); - episode1.setType(EventType.OTHER.toString()); - episode2.setType(EventType.OTHER.toString()); - episodes.add(episode1); - episodes.add(episode2); - event.setEpisodes(episodes); + event.setEpisodeCount(2); dto = EventDtoConverter.convert(event); assertEquals(dto.getEpisodeCount(), 2); } @@ -220,19 +214,12 @@ public void eventListDtoTestEpisodeCount() { assertEquals(dto.getEpisodeCount(), 1); //1. with 0 episodes - List episodes = new ArrayList<>(); - event.setEpisodes(episodes); + event.setEpisodeCount(0); dto = EventListEventDtoConverter.convert(event); assertEquals(dto.getEpisodeCount(), 0); //2. with 2 episodes - FeedEpisode episode1 = new FeedEpisode(); - FeedEpisode episode2 = new FeedEpisode(); - episode1.setType(EventType.OTHER.toString()); - episode2.setType(EventType.OTHER.toString()); - episodes.add(episode1); - episodes.add(episode2); - event.setEpisodes(episodes); + event.setEpisodeCount(2); dto = EventListEventDtoConverter.convert(event); assertEquals(dto.getEpisodeCount(), 2); }