From a5665ade0303b6524635624a1c91299223ec8944 Mon Sep 17 00:00:00 2001 From: lucas-phillips28 Date: Mon, 19 May 2025 16:38:19 +0100 Subject: [PATCH 1/2] feat: update asset creation to use capture session id for storage container on ingest assets --- .../java/uk/gov/hmcts/reform/preapi/media/MediaKind.java | 2 +- .../uk/gov/hmcts/reform/preapi/media/MediaKindTest.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/preapi/media/MediaKind.java b/src/main/java/uk/gov/hmcts/reform/preapi/media/MediaKind.java index 5470ab4e22..90797917f6 100644 --- a/src/main/java/uk/gov/hmcts/reform/preapi/media/MediaKind.java +++ b/src/main/java/uk/gov/hmcts/reform/preapi/media/MediaKind.java @@ -419,7 +419,7 @@ public void startLiveEvent(CaptureSessionDTO captureSession) { getLiveEventMk(liveEventName); try { - createAsset(liveEventName, captureSession, captureSession.getBookingId().toString(), false); + createAsset(liveEventName, captureSession, captureSession.getId().toString(), false); } catch (ConflictException e) { mediaKindClient.deleteLiveEvent(liveEventName); throw e; diff --git a/src/test/java/uk/gov/hmcts/reform/preapi/media/MediaKindTest.java b/src/test/java/uk/gov/hmcts/reform/preapi/media/MediaKindTest.java index c54880766f..c55d814f2e 100644 --- a/src/test/java/uk/gov/hmcts/reform/preapi/media/MediaKindTest.java +++ b/src/test/java/uk/gov/hmcts/reform/preapi/media/MediaKindTest.java @@ -333,7 +333,13 @@ void startLiveEventSuccess() { verify(mockClient, times(1)).putLiveEvent(any(), any()); verify(mockClient, times(1)).getLiveEvent(any()); - verify(mockClient, times(1)).putAsset(any(), any()); + + ArgumentCaptor captor = ArgumentCaptor.forClass(MkAsset.class); + verify(mockClient, times(1)).putAsset(eq(liveEventName), captor.capture()); + assertThat(captor.getValue().getName()).isEqualTo(liveEventName); + assertThat(captor.getValue().getProperties().getStorageAccountName()) + .isEqualTo(captureSession.getId().toString()); + verify(mockClient, times(1)).putLiveOutput(any(), any(), any()); verify(mockClient, times(1)).startLiveEvent(any()); verify(mockClient, times(1)).getStreamingLocator(any()); From 548a28c16865478323130cfb7567d0bc9ed90049 Mon Sep 17 00:00:00 2001 From: lucas-phillips28 Date: Thu, 22 May 2025 09:35:45 +0100 Subject: [PATCH 2/2] fix: test --- .../uk/gov/hmcts/reform/preapi/media/MediaKindTest.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/test/java/uk/gov/hmcts/reform/preapi/media/MediaKindTest.java b/src/test/java/uk/gov/hmcts/reform/preapi/media/MediaKindTest.java index c55d814f2e..f8024fd806 100644 --- a/src/test/java/uk/gov/hmcts/reform/preapi/media/MediaKindTest.java +++ b/src/test/java/uk/gov/hmcts/reform/preapi/media/MediaKindTest.java @@ -333,13 +333,7 @@ void startLiveEventSuccess() { verify(mockClient, times(1)).putLiveEvent(any(), any()); verify(mockClient, times(1)).getLiveEvent(any()); - - ArgumentCaptor captor = ArgumentCaptor.forClass(MkAsset.class); - verify(mockClient, times(1)).putAsset(eq(liveEventName), captor.capture()); - assertThat(captor.getValue().getName()).isEqualTo(liveEventName); - assertThat(captor.getValue().getProperties().getStorageAccountName()) - .isEqualTo(captureSession.getId().toString()); - + verify(mockClient, times(1)).putAsset(eq(liveEventName), any()); verify(mockClient, times(1)).putLiveOutput(any(), any(), any()); verify(mockClient, times(1)).startLiveEvent(any()); verify(mockClient, times(1)).getStreamingLocator(any());