From 1b8c11798a6c1c8c91fe0980f2c653e785eccee4 Mon Sep 17 00:00:00 2001
From: keahorvath <keahorvath@outlook.com>
Date: Mon, 13 Mar 2023 20:23:37 +0100
Subject: [PATCH] small fixes

---
 backend/src/main/java/pdl/backend/ImageController.java      | 5 ++---
 backend/src/main/java/pdl/backend/ImageDao.java             | 2 +-
 backend/src/test/java/pdl/backend/ImageControllerTests.java | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/pdl/backend/ImageController.java b/backend/src/main/java/pdl/backend/ImageController.java
index a9ef950..8087761 100644
--- a/backend/src/main/java/pdl/backend/ImageController.java
+++ b/backend/src/main/java/pdl/backend/ImageController.java
@@ -65,16 +65,15 @@ public class ImageController {
     public ResponseEntity<?> addImage(@RequestParam("file") MultipartFile file, RedirectAttributes redirectAttributes) {
 
         String contentType = file.getContentType();
-        if (!contentType.equals(MediaType.IMAGE_JPEG.toString())) {
+        if (contentType != null && !contentType.equals(MediaType.IMAGE_JPEG.toString())) {
             return new ResponseEntity<>("Only JPEG file format supported", HttpStatus.UNSUPPORTED_MEDIA_TYPE);
         }
-
         try {
             imageDao.create(new Image(file.getOriginalFilename(), file.getBytes()));
         } catch (IOException e) {
             return new ResponseEntity<>("Failure to read file", HttpStatus.NO_CONTENT);
         }
-        return new ResponseEntity<>("Image uploaded", HttpStatus.OK);
+        return new ResponseEntity<>("Image uploaded", HttpStatus.CREATED);
     }
 
     @GetMapping(value = "/images", produces = "application/json")
diff --git a/backend/src/main/java/pdl/backend/ImageDao.java b/backend/src/main/java/pdl/backend/ImageDao.java
index b3deda7..7e8814b 100644
--- a/backend/src/main/java/pdl/backend/ImageDao.java
+++ b/backend/src/main/java/pdl/backend/ImageDao.java
@@ -19,7 +19,7 @@ public class ImageDao implements Dao<Image> {
 
     public ImageDao() {
         try {
-            final File folder = new File("backend/src/main/resources/images");
+            final File folder = new File("images");
             getAllImages(folder);
         } catch (final Exception e) {
             e.printStackTrace();
diff --git a/backend/src/test/java/pdl/backend/ImageControllerTests.java b/backend/src/test/java/pdl/backend/ImageControllerTests.java
index 13270b8..c9b2ed0 100644
--- a/backend/src/test/java/pdl/backend/ImageControllerTests.java
+++ b/backend/src/test/java/pdl/backend/ImageControllerTests.java
@@ -75,11 +75,11 @@ public class ImageControllerTests {
     @Test
     @Order(7)
     public void createImageShouldReturnSuccess() throws Exception {
-        final ClassPathResource imgFile = new ClassPathResource("test.jpg");
+        final ClassPathResource imgFile = new ClassPathResource("images/test.jpg");
         MockMultipartFile multipartFile = new MockMultipartFile("file", "test.jpg", "image/jpeg",
                 imgFile.getInputStream());
         this.mockMvc.perform(MockMvcRequestBuilders.multipart("/images").file(multipartFile)).andDo(print())
-                .andExpect(status().isOk());
+                .andExpect(status().isCreated());
     }
 
     @Test