Fix image functionality

Author: darwin-s

src/main/java/com/darwin/simplestore/controllers/ImageController.java

@@ -65,16 +65,4 @@ public ResponseEntity<Void> updateImage(@PathVariable final Long imageId, @Reque
         imageService.updateImage(imageDto);
         return ResponseEntity.ok().build();
     }
-
-    /**
-     * Delete an image
-     * @param imageId The id of the image
-     * @return Response object
-     * @throws ResourceNotFoundException If the image could not be found
-     */
-    @DeleteMapping("/{imageId}")
-    public ResponseEntity<Void> deleteImage(@PathVariable final Long imageId) throws ResourceNotFoundException {
-        imageService.deleteImage(imageId);
-        return ResponseEntity.ok().build();
-    }
 }

src/main/java/com/darwin/simplestore/entities/Product.java

@@ -30,7 +30,7 @@ public class Product {
     @Enumerated(EnumType.STRING)
     private ProductCategory category;
 
-    @OneToOne(fetch = FetchType.LAZY)
+    @OneToOne(fetch = FetchType.LAZY, orphanRemoval = true, cascade = CascadeType.ALL)
     @JoinColumn(name = "image_id", referencedColumnName = "id", nullable = true)
     private Image image;
 }

src/main/java/com/darwin/simplestore/services/ImageService.java

@@ -53,19 +53,6 @@ public void updateImage(final ImageDto imageDto) throws ResourceNotFoundExceptio
         imageRepository.save(image);
     }
 
-    /**
-     * Delete an image
-     * @param id The id of the image
-     * @throws ResourceNotFoundException If the requested image does not exist
-     */
-    public void deleteImage(final Long id) throws ResourceNotFoundException {
-        if (!imageRepository.existsById(id)) {
-            throw new ResourceNotFoundException("No image found with id: " + id);
-        }
-
-        imageRepository.deleteById(id);
-    }
-
     /**
      * Convert a new image DTO to n entity
      * @param newImageDto The new image DTO

src/main/java/com/darwin/simplestore/services/ProductService.java

@@ -9,6 +9,7 @@
 import com.darwin.simplestore.exceptions.ResourceNotFoundException;
 import com.darwin.simplestore.repositories.ImageRepository;
 import com.darwin.simplestore.repositories.ProductRepository;
+import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -157,6 +158,7 @@ public void setImage(final Long productId, final Long imageId) throws ResourceNo
      * @return The image DTO
      * @throws ResourceNotFoundException If the product could not be found
      */
+    @Transactional
     public Optional<ImageDto> getImage(final Long productId) throws ResourceNotFoundException {
         final Product product = productRepository.findById(productId).orElseThrow(() -> new ResourceNotFoundException("Product with id " + productId + " does not exist"));
 

src/test/java/com/darwin/simplestore/controllers/ImageControllerTest.java

@@ -72,10 +72,4 @@ public void testUpdateImage() throws Exception {
                 .content(objectMapper.writeValueAsString(new NewImageDto("base64"))))
                 .andExpect(status().isOk());
     }
-
-    @Test
-    public void testDeleteImage() throws Exception {
-        mvc.perform(delete("/images/1"))
-                .andExpect(status().isOk());
-    }
 }

src/test/java/com/darwin/simplestore/services/ImageServiceTest.java

@@ -94,23 +94,4 @@ public void testUpdateImageException() {
 
         verify(imageRepository, times(1)).existsById(anyLong());
     }
-
-    @Test
-    public void testDeleteImage() {
-        when(imageRepository.existsById(anyLong())).thenReturn(true);
-
-        assertDoesNotThrow(() -> imageService.deleteImage(image.getId()));
-
-        verify(imageRepository, times(1)).existsById(anyLong());
-        verify(imageRepository, times(1)).deleteById(anyLong());
-    }
-
-    @Test
-    public void testDeleteImageException() {
-        when(imageRepository.existsById(anyLong())).thenReturn(false);
-
-        assertThrowsExactly(ResourceNotFoundException.class, () -> imageService.deleteImage(image.getId()));
-
-        verify(imageRepository, times(1)).existsById(anyLong());
-    }
 }