Get event count from event api

konturio · Sep 28, 2023 · fefc2b0 · fefc2b0
1 parent 78bd4d4
commit fefc2b0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 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
@@ -27,4 +27,5 @@ public class EventApiEventDto {
     private String location;
     private List<Double> bbox = new ArrayList<>();
     private List<Double> 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
@@ -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<String> 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
@@ -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<String> 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
@@ -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<FeedEpisode> 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<FeedEpisode> 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);
     }