FINERACT-2502: Resolve the issue 403 Forbidden error when a client is missing a profile image

Signed-off-by: Bhoomi <bhoomi.bt22cse@pec.edu.in>

Author: ibhoomi16

fineract-document/src/main/java/org/apache/fineract/infrastructure/documentmanagement/exception/DocumentNotFoundException.java

@@ -18,9 +18,9 @@
  */
 package org.apache.fineract.infrastructure.documentmanagement.exception;
 
-import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
+import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
-public class DocumentNotFoundException extends AbstractPlatformDomainRuleException {
+public class DocumentNotFoundException extends AbstractPlatformResourceNotFoundException {
 
     public DocumentNotFoundException(final Long id) {
         super("error.msg.document.id.invalid", "Document with identifier " + id + " does not exist", id);

fineract-document/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/ImageReadPlatformServiceImpl.java

@@ -45,25 +45,21 @@ public class ImageReadPlatformServiceImpl implements ImageReadPlatformService {
 
     @Override
     public DocumentContent retrieveImage(final String entityType, final Long entityId) {
-        try {
-            return imageIdAdapters.stream().filter(imageIdAdapter -> imageIdAdapter.accept(entityType)).findFirst()
-                    .flatMap(imageIdAdapter -> imageIdAdapter.get(entityId))
-                    .flatMap(
-                            imageIdResult -> imageRepository.findById(imageIdResult.getId())
-                                    .map(image -> DocumentContent
-                                            .builder().fileName(
-                                                    FilenameUtils.getName(image.getLocation()))
-                                            .format(FilenameUtils.getExtension(image.getLocation()))
-                                            .displayName(imageIdResult.getDisplayName())
-                                            .contentType(
-                                                    contentDetectorManager
-                                                            .detect(ContentDetectorContext.builder()
-                                                                    .fileName(FilenameUtils.getName(image.getLocation())).build())
-                                                            .getMimeType())
-                                            .stream(storeService.download(image.getLocation())).build()))
-                    .orElseThrow(() -> new DocumentNotFoundException(entityType, entityId, -1L));
-        } catch (final Exception e) {
-            throw new DocumentInvalidRequestException(e);
-        }
+        return imageIdAdapters.stream().filter(imageIdAdapter -> imageIdAdapter.accept(entityType)).findFirst()
+                .flatMap(imageIdAdapter -> imageIdAdapter.get(entityId))
+                .flatMap(
+                        imageIdResult -> imageRepository.findById(imageIdResult.getId())
+                                .map(image -> DocumentContent
+                                        .builder().fileName(
+                                                FilenameUtils.getName(image.getLocation()))
+                                        .format(FilenameUtils.getExtension(image.getLocation()))
+                                        .displayName(imageIdResult.getDisplayName())
+                                        .contentType(
+                                                contentDetectorManager
+                                                        .detect(ContentDetectorContext.builder()
+                                                                .fileName(FilenameUtils.getName(image.getLocation())).build())
+                                                        .getMimeType())
+                                        .stream(storeService.download(image.getLocation())).build()))
+                .orElseThrow(() -> new DocumentNotFoundException(entityType, entityId, -1L));
     }
 }

fineract-document/src/test/java/org/apache/fineract/infrastructure/documentmanagement/service/ImageReadPlatformServiceImplTest.java

@@ -0,0 +1,74 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.infrastructure.documentmanagement.service;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import org.apache.fineract.infrastructure.contentstore.detector.ContentDetectorManager;
+import org.apache.fineract.infrastructure.contentstore.service.ContentStoreService;
+import org.apache.fineract.infrastructure.documentmanagement.adapter.EntityImageIdAdapter;
+import org.apache.fineract.infrastructure.documentmanagement.domain.ImageRepository;
+import org.apache.fineract.infrastructure.documentmanagement.exception.DocumentNotFoundException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class ImageReadPlatformServiceImplTest {
+
+    @Mock
+    private ImageRepository imageRepository;
+    @Mock
+    private ContentStoreService storeService;
+    @Mock
+    private ContentDetectorManager contentDetectorManager;
+    @Mock
+    private EntityImageIdAdapter imageIdAdapter;
+
+    private ImageReadPlatformServiceImpl imageReadPlatformService;
+
+    @BeforeEach
+    void setUp() {
+        List<EntityImageIdAdapter> imageIdAdapters = Collections.singletonList(imageIdAdapter);
+        imageReadPlatformService = new ImageReadPlatformServiceImpl(imageIdAdapters, storeService, imageRepository,
+                contentDetectorManager);
+    }
+
+    @Test
+    void testRetrieveImage_NotFound_ThrowsDocumentNotFoundException() {
+        // Arrange
+        String entityType = "clients";
+        Long entityId = 1L;
+
+        when(imageIdAdapter.accept(anyString())).thenReturn(true);
+        when(imageIdAdapter.get(entityId)).thenReturn(Optional.empty());
+
+        // Act & Assert
+        assertThrows(DocumentNotFoundException.class, () -> {
+            imageReadPlatformService.retrieveImage(entityType, entityId);
+        });
+    }
+}