43 events gallery of photos

.gitignore

@@ -38,3 +38,6 @@ out/
 
 ### VS Code ###
 .vscode/
+
+### Static Content
+static/

src/main/kotlin/pt/up/fe/ni/website/backend/controller/ErrorController.kt

@@ -12,12 +12,12 @@ import org.springframework.security.access.AccessDeniedException
 import org.springframework.security.core.AuthenticationException
 import org.springframework.web.bind.MethodArgumentNotValidException
 import org.springframework.web.bind.annotation.ExceptionHandler
-import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.ResponseStatus
 import org.springframework.web.bind.annotation.RestController
 import org.springframework.web.bind.annotation.RestControllerAdvice
 import org.springframework.web.multipart.MaxUploadSizeExceededException
 import org.springframework.web.multipart.support.MissingServletRequestPartException
+import org.springframework.web.servlet.NoHandlerFoundException
 import pt.up.fe.ni.website.backend.config.Logging
 
 data class SimpleError(
@@ -32,7 +32,7 @@ data class CustomError(val errors: List<SimpleError>)
 @RestControllerAdvice
 class ErrorController(private val objectMapper: ObjectMapper) : ErrorController, Logging {
 
-    @RequestMapping("/**")
+    @ExceptionHandler(NoHandlerFoundException::class)
     @ResponseStatus(HttpStatus.NOT_FOUND)
     fun endpointNotFound(): CustomError = wrapSimpleError("invalid endpoint")
 

src/main/kotlin/pt/up/fe/ni/website/backend/controller/EventController.kt

@@ -75,15 +75,15 @@ class EventController(private val service: EventService) {
         @PathVariable idAccount: Long
     ) = service.removeTeamMemberById(idEvent, idAccount)
 
-    @PutMapping("/{idEvent}/gallery/addImage", consumes = ["multipart/form-data"])
+    @PutMapping("/{idEvent}/gallery", consumes = ["multipart/form-data"])
     fun addGalleryImage(
         @PathVariable idEvent: Long,
         @RequestParam
         @ValidImage
         image: MultipartFile
-    ) = service.addGalleryImage(idEvent, image)
+    ) = service.addGalleryImage(idEvent, image, EventService.IMAGE_FOLDER)
 
-    @PutMapping("/{idEvent}/gallery/removeImage")
+    @DeleteMapping("/{idEvent}/gallery")
     fun removeGalleryImage(
         @PathVariable idEvent: Long,
         @RequestPart imageUrl: String

src/main/kotlin/pt/up/fe/ni/website/backend/service/ErrorMessages.kt

@@ -46,7 +46,7 @@ object ErrorMessages {
 
     fun roleNotFound(id: Long): String = "role not found with id $id"
 
-    fun imageNotFound(imageName: String): String = "image not found with name $imageName"
+    fun fileNotFound(fileName: String): String = "file not found with name $fileName"
 
     fun userAlreadyHasRole(roleId: Long, userId: Long): String = "user $userId already has role $roleId"
 

src/main/kotlin/pt/up/fe/ni/website/backend/service/activity/AbstractActivityService.kt

@@ -5,8 +5,6 @@ import org.springframework.stereotype.Service
 import org.springframework.web.multipart.MultipartFile
 import pt.up.fe.ni.website.backend.dto.entity.ActivityDto
 import pt.up.fe.ni.website.backend.model.Activity
-import pt.up.fe.ni.website.backend.model.Event
-import pt.up.fe.ni.website.backend.model.Project
 import pt.up.fe.ni.website.backend.repository.ActivityRepository
 import pt.up.fe.ni.website.backend.service.AccountService
 import pt.up.fe.ni.website.backend.service.ErrorMessages
@@ -18,10 +16,10 @@ abstract class AbstractActivityService<T : Activity>(
     protected val accountService: AccountService,
     protected val fileUploader: FileUploader
 ) {
+    fun getAll() = repository.findAll().toList()
 
-    fun getActivityById(id: Long): T =
-        repository.findByIdOrNull(id)
-            ?: throw NoSuchElementException(ErrorMessages.activityNotFound(id))
+    fun getActivityById(id: Long): T = repository.findByIdOrNull(id)
+        ?: throw NoSuchElementException(ErrorMessages.activityNotFound(id))
 
     fun <U : ActivityDto<T>> createActivity(dto: U, imageFolder: String): T {
         repository.findBySlug(dto.slug)?.let {
@@ -85,17 +83,9 @@ abstract class AbstractActivityService<T : Activity>(
         return repository.save(activity)
     }
 
-    fun addGalleryImage(activityId: Long, image: MultipartFile): Activity {
+    fun addGalleryImage(activityId: Long, image: MultipartFile, imageFolder: String): Activity {
         val activity = getActivityById(activityId)
 
-        var imageFolder = "activities"
-
-        if (activity is Event) {
-            imageFolder = EventService.IMAGE_FOLDER
-        } else if (activity is Project) {
-            imageFolder = ProjectService.IMAGE_FOLDER
-        }
-
         val fileName = fileUploader.buildFileName(image, activity.title)
         val imageName = fileUploader.uploadImage(imageFolder + "/gallery", fileName, image.bytes)
 
@@ -107,10 +97,11 @@ abstract class AbstractActivityService<T : Activity>(
     fun removeGalleryImage(activityId: Long, imageName: String): Activity {
         val activity = getActivityById(activityId)
 
-        val imageRemoved = activity.gallery.remove(imageName)
-
-        if (!imageRemoved) {
-            throw NoSuchElementException(ErrorMessages.imageNotFound(imageName))
+        if (activity.gallery.contains(imageName)) {
+            fileUploader.deleteImage(imageName)
+            activity.gallery.remove(imageName)
+        } else {
+            throw NoSuchElementException(ErrorMessages.fileNotFound(imageName))
         }
 
         return repository.save(activity)

src/main/kotlin/pt/up/fe/ni/website/backend/service/upload/CloudinaryFileUploader.kt

@@ -20,4 +20,11 @@ class CloudinaryFileUploader(private val basePath: String, private val cloudinar
 
         return result["url"]?.toString() ?: ""
     }
+
+    override fun deleteImage(fileName: String) {
+        cloudinary.uploader().destroy(
+            fileName,
+            null
+        )
+    }
 }

src/main/kotlin/pt/up/fe/ni/website/backend/service/upload/FileUploader.kt

@@ -6,6 +6,7 @@ import pt.up.fe.ni.website.backend.utils.extensions.filenameExtension
 
 abstract class FileUploader {
     abstract fun uploadImage(folder: String, fileName: String, image: ByteArray): String
+    abstract fun deleteImage(fileName: String)
 
     fun buildFileName(photoFile: MultipartFile, prefix: String = ""): String {
         val limitedPrefix = prefix.take(100) // File name length has a limit of 256 characters

src/main/kotlin/pt/up/fe/ni/website/backend/service/upload/StaticFileUploader.kt

@@ -11,4 +11,11 @@ class StaticFileUploader(private val storePath: String, private val servePath: S
 
         return "$servePath/$folder/$fileName"
     }
+
+    override fun deleteImage(fileName: String) {
+        val storedFileName = fileName.replace(servePath, storePath)
+        val file = File(storedFileName)
+
+        if (file.exists()) file.delete()
+    }
 }

src/main/resources/application.properties

@@ -32,9 +32,14 @@ upload.provider=static
 upload.cloudinary-base-path=website
 upload.cloudinary-url=GET_YOURS_AT_CLOUDINARY_DASHBOARD
 # Folder in which files will be stored
-upload.static-path=classpath:static
+upload.static-path=file:static
 # URL that will serve static content
-upload.static-serve=http://localhost:3000/static
+upload.static-serve=http://localhost:8080/static
+
+# Files are served in the following path
+spring.mvc.static-path-pattern=/static/**
+# Add NoHandlerFoundException as an exception
+spring.mvc.throw-exception-if-no-handler-found=true
 
 # Cors Origin
 cors.allow-origin = http://localhost:3000

src/test/kotlin/pt/up/fe/ni/website/backend/controller/AuthControllerTest.kt

@@ -244,8 +244,8 @@ class AuthControllerTest @Autowired constructor(
     inner class CheckPermissions {
         private val testPermissions = listOf(Permission.CREATE_ACCOUNT, Permission.CREATE_ACTIVITY)
         private val testActivity = Project(
-            "Test Activity", "Test Description", mutableListOf(), mutableListOf(), "test slug", "test image", false,
-            emptyList(), null, "test target audience"
+            "Test Activity", "Test Description", mutableListOf(), mutableListOf(), "test slug", "test image",
+            mutableListOf(), false, emptyList(), null, "test target audience"
         )
         private val testRole = Role("MEMBER", Permissions(testPermissions), false)
         private val testPerActivityRole = PerActivityRole(Permissions(listOf(Permission.EDIT_ACTIVITY)))

src/test/kotlin/pt/up/fe/ni/website/backend/controller/EventControllerTest.kt

@@ -813,7 +813,7 @@ internal class EventControllerTest @Autowired constructor(
     }
 
     @NestedTest
-    @DisplayName("PUT /events/{idEvent}/gallery/addImage")
+    @DisplayName("PUT /events/{idEvent}/gallery")
     inner class AddGalleryImage {
 
         private val uuid: UUID = UUID.randomUUID()
@@ -839,7 +839,7 @@ internal class EventControllerTest @Autowired constructor(
         fun `should add an image`() {
             val expectedImagePath = "${uploadConfigProperties.staticServe}/events/gallery/${testEvent.title}-$uuid.jpeg"
 
-            mockMvc.multipartBuilder("/events/${testEvent.id}/gallery/addImage")
+            mockMvc.multipartBuilder("/events/${testEvent.id}/gallery")
                 .asPutMethod()
                 .addFile("image", contentType = MediaType.IMAGE_JPEG_VALUE)
                 .perform()
@@ -865,7 +865,7 @@ internal class EventControllerTest @Autowired constructor(
         fun `should fail if event does not exist`() {
             val unexistentID = 5
 
-            mockMvc.multipartBuilder("/events/$unexistentID/gallery/addImage")
+            mockMvc.multipartBuilder("/events/$unexistentID/gallery")
                 .asPutMethod()
                 .addFile("image", contentType = MediaType.IMAGE_JPEG_VALUE)
                 .perform()
@@ -879,7 +879,7 @@ internal class EventControllerTest @Autowired constructor(
 
         @Test
         fun `should fail if image in wrong format`() {
-            mockMvc.multipartBuilder("/events/${testEvent.id}/gallery/addImage")
+            mockMvc.multipartBuilder("/events/${testEvent.id}/gallery")
                 .asPutMethod()
                 .addFile("image", filename = "image.gif", contentType = MediaType.IMAGE_JPEG_VALUE)
                 .perform()
@@ -892,8 +892,9 @@ internal class EventControllerTest @Autowired constructor(
         }
     }
 
+    @Nested
     @NestedTest
-    @DisplayName("PUT /events/{idEvent}/gallery/removeImage")
+    @DisplayName("DELETE /events/{idEvent}/gallery")
     inner class RemoveGalleryImage {
 
         private val uuid: UUID = UUID.randomUUID()
@@ -921,8 +922,8 @@ internal class EventControllerTest @Autowired constructor(
 
         @Test
         fun `should remove an image`() {
-            mockMvc.multipartBuilder("/events/${testEvent.id}/gallery/removeImage")
-                .asPutMethod()
+            mockMvc.multipartBuilder("/events/${testEvent.id}/gallery")
+                .asDeleteMethod()
                 .addPart("imageUrl", mockImageUrl)
                 .perform()
                 .andExpectAll(
@@ -946,8 +947,8 @@ internal class EventControllerTest @Autowired constructor(
         fun `should fail if event does not exist`() {
             val unexistentID = 5
 
-            mockMvc.multipartBuilder("/events/$unexistentID/gallery/removeImage")
-                .asPutMethod()
+            mockMvc.multipartBuilder("/events/$unexistentID/gallery")
+                .asDeleteMethod()
                 .addPart("imageUrl", mockImageUrl)
                 .perform()
                 .andExpectAll(
@@ -962,15 +963,15 @@ internal class EventControllerTest @Autowired constructor(
         fun `should fail if image does not exist`() {
             val wrongImageUrl = "${uploadConfigProperties.staticServe}/gallery/Another${testEvent.title}-$uuid.jpeg"
 
-            mockMvc.multipartBuilder("/events/${testEvent.id}/gallery/removeImage")
-                .asPutMethod()
+            mockMvc.multipartBuilder("/events/${testEvent.id}/gallery")
+                .asDeleteMethod()
                 .addPart("imageUrl", wrongImageUrl)
                 .perform()
                 .andExpectAll(
                     status().isNotFound,
                     content().contentType(MediaType.APPLICATION_JSON),
                     jsonPath("$.errors.length()").value(1),
-                    jsonPath("$.errors[0].message").value("image not found with name $wrongImageUrl")
+                    jsonPath("$.errors[0].message").value("file not found with name $wrongImageUrl")
                 )
         }
     }

src/test/kotlin/pt/up/fe/ni/website/backend/utils/mockmvc/MockMvcMultipartBuilder.kt

@@ -49,6 +49,16 @@ class MockMvcMultipartBuilder(
         return this
     }
 
+    fun asDeleteMethod(): MockMvcMultipartBuilder {
+        multipart.with(
+            {
+                it.method = "DELETE"
+                it
+            }
+        )
+        return this
+    }
+
     fun perform(): ResultActions {
         return mockMvc.perform(multipart)
     }