Add eventType and startedAt fields to EventListDto and update convert…

…er (#176) * Add eventType and startedAt fields to EventListDto and update converter * Move fields eventType and startedAt fields closer to related fields
konturio · Dec 11, 2024 · b43c131 · b43c131
1 parent 0ca72fa
commit b43c131
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/main/java/io/kontur/disasterninja/dto/EventListDto.java b/src/main/java/io/kontur/disasterninja/dto/EventListDto.java
@@ -11,13 +11,15 @@ public class EventListDto {
 
     private UUID eventId;
     private String eventName;
+    private String eventType;
     private String description;
     private String location;
     private Severity severity;
     private Long affectedPopulation;
     private Double settledArea;
     private Long osmGaps;
     private Long loss;
+    private OffsetDateTime startedAt;
     private OffsetDateTime updatedAt;
     private List<String> externalUrls;
     private List<Double> bbox;

diff --git a/src/main/java/io/kontur/disasterninja/service/converter/EventListEventDtoConverter.java b/src/main/java/io/kontur/disasterninja/service/converter/EventListEventDtoConverter.java
@@ -14,6 +14,7 @@ public static EventListDto convert(EventApiEventDto event) {
         dto.setEventId(event.getEventId());
 
         dto.setEventName(eventName(event));
+        dto.setEventType(eventType(event));
         dto.setDescription(event.getDescription());
         dto.setLocation(event.getLocation());
         dto.setEpisodeCount(event.getEpisodeCount());
@@ -37,6 +38,7 @@ public static EventListDto convert(EventApiEventDto event) {
             }
         }
         dto.setUpdatedAt(event.getUpdatedAt());
+        dto.setStartedAt(event.getStartedAt());
 
         dto.setBbox(event.getBbox());
         dto.setCentroid(event.getCentroid());
@@ -77,4 +79,14 @@ protected static String eventName(EventApiEventDto event) {
         }
         return eventType.getName();
     }
+
+    protected static String eventType(EventApiEventDto event) {
+        EventType eventType;
+        try {
+            eventType = EventType.valueOf(event.getType());
+        } catch (IllegalArgumentException ex) {
+            eventType = EventType.OTHER;
+        }
+        return eventType.name();
+    }
 }