Merge branch 'develop' into seeders

.gitignore

@@ -7,6 +7,7 @@ build/
 !**/src/main/**/build/
 !**/src/test/**/build/
 docs/
+static/
 
 ### STS ###
 .apt_generated
@@ -38,3 +39,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

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

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

@@ -88,4 +88,18 @@ class ProjectController(private val service: ProjectService) {
         @PathVariable idProject: Long,
         @PathVariable idAccount: Long
     ) = service.removeHallOfFameMemberById(idProject, idAccount)
+
+    @PutMapping("/{idProject}/gallery", consumes = ["multipart/form-data"])
+    fun addGalleryImage(
+        @PathVariable idProject: Long,
+        @RequestParam
+        @ValidImage
+        image: MultipartFile
+    ) = service.addGalleryImage(idProject, image, ProjectService.IMAGE_FOLDER)
+
+    @DeleteMapping("/{idProject}/gallery")
+    fun removeGalleryImage(
+        @PathVariable idProject: Long,
+        @RequestPart imageUrl: String
+    ) = service.removeGalleryImage(idProject, imageUrl)
 }

src/main/kotlin/pt/up/fe/ni/website/backend/dto/entity/ActivityDto.kt

@@ -8,7 +8,7 @@ abstract class ActivityDto<T : Activity>(
     val title: String,
     val description: String,
     val teamMembersIds: List<Long>?,
-    val slug: String?,
+    val slug: String,
     var image: String?,
     @JsonIgnore
     var imageFile: MultipartFile? = null

src/main/kotlin/pt/up/fe/ni/website/backend/dto/entity/EventDto.kt

@@ -7,7 +7,7 @@ class EventDto(
     title: String,
     description: String,
     teamMembersIds: List<Long>?,
-    slug: String?,
+    slug: String,
     image: String?,
 
     val registerUrl: String?,

src/main/kotlin/pt/up/fe/ni/website/backend/dto/entity/PostDto.kt

@@ -6,5 +6,5 @@ class PostDto(
     val title: String,
     val body: String,
     val thumbnailPath: String,
-    val slug: String?
+    val slug: String
 ) : EntityDto<Post>()

src/main/kotlin/pt/up/fe/ni/website/backend/dto/entity/ProjectDto.kt

@@ -6,7 +6,7 @@ class ProjectDto(
     title: String,
     description: String,
     teamMembersIds: List<Long>?,
-    slug: String?,
+    slug: String,
     image: String?,
 
     val isArchived: Boolean = false,

src/main/kotlin/pt/up/fe/ni/website/backend/model/Activity.kt

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
 import jakarta.persistence.CascadeType
 import jakarta.persistence.Column
+import jakarta.persistence.ElementCollection
 import jakarta.persistence.Entity
 import jakarta.persistence.FetchType
 import jakarta.persistence.GeneratedValue
@@ -38,11 +39,14 @@ abstract class Activity(
 
     @Column(unique = true)
     @field:Size(min = Constants.Slug.minSize, max = Constants.Slug.maxSize)
-    open val slug: String? = null,
+    open val slug: String,
 
     @field:NotBlank
     open var image: String,
 
+    @ElementCollection(fetch = FetchType.EAGER)
+    open val gallery: MutableList<String> = mutableListOf(),
+
     @Id
     @GeneratedValue
     open val id: Long? = null

src/main/kotlin/pt/up/fe/ni/website/backend/model/Event.kt

@@ -15,8 +15,9 @@ class Event(
     description: String,
     teamMembers: MutableList<Account> = mutableListOf(),
     associatedRoles: MutableList<PerActivityRole> = mutableListOf(),
-    slug: String? = null,
+    slug: String,
     image: String,
+    gallery: MutableList<String> = mutableListOf(),
 
     @field:NullOrNotBlank
     @field:URL
@@ -33,4 +34,4 @@ class Event(
     val category: String?,
 
     id: Long? = null
-) : Activity(title, description, teamMembers, associatedRoles, slug, image, id)
+) : Activity(title, description, teamMembers, associatedRoles, slug, image, gallery, id)

src/main/kotlin/pt/up/fe/ni/website/backend/model/Post.kt

@@ -44,5 +44,5 @@ class Post(
 
     @Column(unique = true)
     @field:Size(min = Constants.Slug.minSize, max = Constants.Slug.maxSize)
-    val slug: String? = null
+    val slug: String
 )

src/main/kotlin/pt/up/fe/ni/website/backend/model/Project.kt

@@ -18,8 +18,9 @@ class Project(
     description: String,
     teamMembers: MutableList<Account> = mutableListOf(),
     associatedRoles: MutableList<PerActivityRole> = mutableListOf(),
-    slug: String? = null,
+    slug: String,
     image: String,
+    gallery: MutableList<String> = mutableListOf(),
 
     var isArchived: Boolean = false,
 
@@ -48,4 +49,4 @@ class Project(
     val timeline: List<@Valid TimelineEvent> = emptyList(),
 
     id: Long? = null
-) : Activity(title, description, teamMembers, associatedRoles, slug, image, id)
+) : Activity(title, description, teamMembers, associatedRoles, slug, image, gallery, id)

src/main/kotlin/pt/up/fe/ni/website/backend/repository/ActivityRepository.kt

@@ -6,5 +6,5 @@ import pt.up.fe.ni.website.backend.model.Activity
 
 @Repository
 interface ActivityRepository<T : Activity> : CrudRepository<T, Long> {
-    fun findBySlug(slug: String?): T?
+    fun findBySlug(slug: String): T?
 }

src/main/kotlin/pt/up/fe/ni/website/backend/repository/PostRepository.kt

@@ -6,5 +6,5 @@ import pt.up.fe.ni.website.backend.model.Post
 
 @Repository
 interface PostRepository : JpaRepository<Post, Long> {
-    fun findBySlug(slug: String?): Post?
+    fun findBySlug(slug: String): Post?
 }

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

@@ -46,6 +46,8 @@ object ErrorMessages {
 
     fun roleNotFound(id: Long): String = "role not found with id $id"
 
+    fun fileNotFound(fileName: String): String = "file not found with name $fileName"
+
     fun userAlreadyHasRole(roleId: Long, userId: Long): String = "user $userId already has role $roleId"
 
     fun userNotInRole(roleId: Long, userId: Long): String = "user $userId doesn't have role $roleId"

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

@@ -2,6 +2,7 @@ package pt.up.fe.ni.website.backend.service.activity
 
 import org.springframework.data.repository.findByIdOrNull
 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.repository.ActivityRepository
@@ -26,7 +27,7 @@ abstract class AbstractActivityService<T : Activity>(
         }
 
         dto.imageFile?.let {
-            val fileName = fileUploader.buildFileName(it, dto.title)
+            val fileName = fileUploader.buildFileName(it, dto.slug)
             dto.image = fileUploader.uploadImage(imageFolder, fileName, it.bytes)
         }
 
@@ -51,7 +52,7 @@ abstract class AbstractActivityService<T : Activity>(
         if (imageFile == null) {
             dto.image = activity.image
         } else {
-            val fileName = fileUploader.buildFileName(imageFile, dto.title)
+            val fileName = fileUploader.buildFileName(imageFile, dto.slug)
             dto.image = fileUploader.uploadImage(imageFolder, fileName, imageFile.bytes)
         }
 
@@ -76,13 +77,33 @@ abstract class AbstractActivityService<T : Activity>(
     fun removeTeamMemberById(idActivity: Long, idAccount: Long): T {
         val activity = getActivityById(idActivity)
         if (!accountService.doesAccountExist(idAccount)) {
-            throw NoSuchElementException(
-                ErrorMessages.accountNotFound(
-                    idAccount
-                )
-            )
+            throw NoSuchElementException(ErrorMessages.accountNotFound(idAccount))
         }
         activity.teamMembers.removeIf { it.id == idAccount }
         return repository.save(activity)
     }
+
+    fun addGalleryImage(activityId: Long, image: MultipartFile, imageFolder: String): Activity {
+        val activity = getActivityById(activityId)
+
+        val fileName = fileUploader.buildFileName(image, activity.slug)
+        val imageName = fileUploader.uploadImage("$imageFolder/gallery", fileName, image.bytes)
+
+        activity.gallery.add(imageName)
+
+        return repository.save(activity)
+    }
+
+    fun removeGalleryImage(activityId: Long, imageName: String): Activity {
+        val activity = getActivityById(activityId)
+
+        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,12 @@ class CloudinaryFileUploader(private val basePath: String, private val cloudinar
 
         return result["url"]?.toString() ?: ""
     }
+
+    override fun deleteImage(fileName: String) {
+        // Here, fileName is the publicId in Cloudinary, which would be the path to the file
+        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

@@ -21,7 +21,7 @@ server.error.whitelabel.enabled=false
 # Jackson
 spring.jackson.default-property-inclusion=non_null
 spring.jackson.deserialization.fail-on-null-creator-properties=true
-spring.jackson.date-format=dd-MM-yyyy
+spring.jackson.date-format=dd-MM-yyyy HH:mm
 spring.jackson.time-zone=Europe/Lisbon
 
 # Auth Config
@@ -36,9 +36,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)))