AMP-437 Added validation in controller

Author: vineetkapoor-hmcts

src/main/java/uk/gov/hmcts/cp/subscription/services/SubscriptionService.java

@@ -70,6 +70,7 @@ public ClientSubscription updateClientSubscription(final ClientSubscriptionReque
         return clientSubscriptionMapper.toDto(updatedClient, request.getEventTypes(), null);
     }
 
+    @Transactional(readOnly = true)
     public ClientSubscription getClientSubscription(final UUID clientId, final UUID subscriptionId) {
         log.info("getClientSubscription clientId:{} subscriptionId:{}", clientId, subscriptionId);
         final ClientEntity client = subscriptionValidationService.validateAndFetchClient(clientId, subscriptionId);
@@ -86,6 +87,7 @@ public void deleteClientSubscription(final UUID clientId, final UUID subscriptio
         clientRepository.delete(client);
     }
 
+    @Transactional(readOnly = true)
     public boolean hasAccess(final UUID subscriptionId,
                              final String eventType) {
         return clientEventRepository.countByClientSubscriptionAndEventName(subscriptionId, eventType) > 0;

src/main/java/uk/gov/hmcts/cp/subscription/services/SubscriptionValidationService.java

@@ -34,8 +34,8 @@ public void validateClientDoesNotExist(final UUID clientId) {
     }
 
     public void validateClientExists(final UUID clientId) {
-        if (clientRepository.existsById(clientId)) {
-            new EntityNotFoundException("Client not found for the provided clientId");
+        if (!clientRepository.existsById(clientId)) {
+            throw new EntityNotFoundException("Client not found for the provided clientId");
         }
     }
 

src/test/java/uk/gov/hmcts/cp/subscription/unit/services/SubscriptionServiceValidationTest.java

@@ -23,6 +23,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -70,6 +71,20 @@ void validateClientDoesNotExist_should_throw_conflict_when_client_already_exists
                 });
     }
 
+    @Test
+    void validateClientExists_should_pass_when_client_exists() {
+        when(clientRepository.existsById(clientId)).thenReturn(true);
+        assertDoesNotThrow(() -> validationService.validateClientExists(clientId));
+    }
+
+    @Test
+    void validateClientExists_should_throw_when_client_not_found() {
+        when(clientRepository.existsById(clientId)).thenReturn(false);
+        assertThatThrownBy(() -> validationService.validateClientExists(clientId))
+                .isInstanceOf(EntityNotFoundException.class)
+                .hasMessage("Client not found for the provided clientId");
+    }
+
     @Test
     void validateAndFetchClient_should_return_client_when_found() {
         when(clientRepository.findByClientIdAndSubscriptionId(clientId, subscriptionId)).thenReturn(Optional.of(clientEntity));