Review comments

hmcts · Mar 3, 2025 · e681b68 · e681b68
1 parent bc80adb
commit e681b68
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 36 deletions.
diff --git a/src/main/java/uk/gov/hmcts/darts/event/service/EventService.java b/src/main/java/uk/gov/hmcts/darts/event/service/EventService.java
@@ -5,7 +5,6 @@
 import uk.gov.hmcts.darts.event.model.AdminGetEventResponseDetails;
 import uk.gov.hmcts.darts.event.model.AdminGetVersionsByEventIdResponseResult;
 
-import java.util.List;
 import java.util.Set;
 
 public interface EventService {
@@ -15,8 +14,6 @@ public interface EventService {
 
     EventEntity getEventByEveId(Integer eveId);
 
-    List<EventEntity> getEventVersionsForEveIdExcludingEventIdZero(Integer eveId);
-
     EventEntity saveEvent(EventEntity eventEntity);
 
     Set<EventEntity> getAllCourtCaseEventVersions(CourtCaseEntity courtCase);

diff --git a/src/main/java/uk/gov/hmcts/darts/event/service/impl/EventServiceImpl.java b/src/main/java/uk/gov/hmcts/darts/event/service/impl/EventServiceImpl.java
@@ -44,23 +44,12 @@ public EventEntity getEventByEveId(Integer eveId) {
                                                      String.format("Event with id %s not found", eveId)));
     }
 
-    @Override
-    public List<EventEntity> getEventVersionsForEveIdExcludingEventIdZero(Integer eveId) {
-        EventEntity event = getEventByEveId(eveId);
-        List<EventEntity> events = eventRepository.findAllByEventIdExcludingEventIdZero(event.getEventId());
-
-        if (events.isEmpty()) {
-            // must be event id zero (XHIBIT issue) so return the event itself so it is added as the current event
-            events.add(event);
-        }
-        return events;
-    }
-
     List<EventEntity> getRelatedEvents(Integer eveId) {
         EventEntity event = getEventByEveId(eveId);
 
         List<String> caseNumbers = event.getEventLinkedCaseEntities().stream()
             .map(EventLinkedCaseEntity::getCaseNumber)
+            .distinct()
             .toList();
         return eventRepository.findAllByRelatedEvents(
             event.getId(), event.getEventId(), caseNumbers);

diff --git a/src/test/java/uk/gov/hmcts/darts/event/service/impl/EventServiceImplTest.java b/src/test/java/uk/gov/hmcts/darts/event/service/impl/EventServiceImplTest.java
@@ -68,26 +68,6 @@ void positiveGetEventEntityByIdNotFound() {
         verify(eventRepository, times(1)).findById(1);
     }
 
-    @Test
-    void getEventVersionsForEveId() {
-        EventEntity event = mock(EventEntity.class);
-        when(eventRepository.findById(1)).thenReturn(Optional.of(event));
-        when(eventRepository.findAllByEventIdExcludingEventIdZero(event.getEventId())).thenReturn(List.of(event));
-        assertThat(eventService.getEventVersionsForEveIdExcludingEventIdZero(1)).isEqualTo(List.of(event));
-        verify(eventRepository, times(1)).findById(1);
-        verify(eventRepository, times(1)).findAllByEventIdExcludingEventIdZero(event.getEventId());
-    }
-
-    @Test
-    void getEventVersionsForEveIdNotFound() {
-        when(eventRepository.findById(1)).thenReturn(Optional.empty());
-
-        assertThatThrownBy(() -> eventService.getEventVersionsForEveIdExcludingEventIdZero(1))
-            .isInstanceOf(DartsApiException.class)
-            .hasFieldOrPropertyWithValue("error", CommonApiError.NOT_FOUND);
-        verify(eventRepository, times(1)).findById(1);
-    }
-
     @Test
     void positiveSaveEvent() {
         EventEntity event = mock(EventEntity.class);
@@ -141,7 +121,7 @@ void positiveAllAssociatedCasesAnonymisedFalse() {
     @Test
     void adminGetVersionsByEventId_shouldReturnEvent() {
         List<EventEntity> eventEntities = List.of(mock(EventEntity.class), mock(EventEntity.class), mock(EventEntity.class));
-       doReturn(eventEntities).when(eventService).getRelatedEvents(123);
+        doReturn(eventEntities).when(eventService).getRelatedEvents(123);
 
         AdminGetVersionsByEventIdResponseResult responseDetails = mock(AdminGetVersionsByEventIdResponseResult.class);
         when(eventMapper.mapToAdminGetEventVersionsResponseForId(any())).thenReturn(responseDetails);