Added project missing fields

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

@@ -29,22 +29,27 @@ class AccountController(private val service: AccountService) {
     @GetMapping("/{id}")
     fun getAccountById(@PathVariable id: Long) = service.getAccountById(id)
 
-    @PostMapping("/changePassword/{id}")
-    fun changePassword(@PathVariable id: Long, @RequestBody dto: ChangePasswordDto): Map<String, String> {
-        service.changePassword(id, dto)
-        return emptyMap()
+    @PostMapping("/new", consumes = ["multipart/form-data"])
+    fun createAccount(
+        @RequestPart account: CreateAccountDto,
+        @RequestParam
+        @ValidImage
+        photo: MultipartFile?
+    ): Account {
+        account.photoFile = photo
+        return service.createAccount(account)
     }
 
-    @PutMapping("/{id}")
+    @PutMapping("/{id}", consumes = ["multipart/form-data"])
     fun updateAccountById(
         @PathVariable id: Long,
-        @RequestPart dto: UpdateAccountDto,
+        @RequestPart account: UpdateAccountDto,
         @RequestParam
         @ValidImage
         photo: MultipartFile?
     ): Account {
-        dto.photoFile = photo
-        return service.updateAccountById(id, dto)
+        account.photoFile = photo
+        return service.updateAccountById(id, account)
     }
 
     @DeleteMapping("/{id}")
@@ -53,14 +58,9 @@ class AccountController(private val service: AccountService) {
         return emptyMap()
     }
 
-    @PostMapping("/new", consumes = ["multipart/form-data"])
-    fun createAccount(
-        @RequestPart dto: CreateAccountDto,
-        @RequestParam
-        @ValidImage
-        photo: MultipartFile?
-    ): Account {
-        dto.photoFile = photo
-        return service.createAccount(dto)
+    @PostMapping("/changePassword/{id}")
+    fun changePassword(@PathVariable id: Long, @RequestBody dto: ChangePasswordDto): Map<String, String> {
+        service.changePassword(id, dto)
+        return emptyMap()
     }
 }

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

@@ -17,6 +17,7 @@ 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 pt.up.fe.ni.website.backend.config.Logging
 
 data class SimpleError(
@@ -67,6 +68,12 @@ class ErrorController(private val objectMapper: ObjectMapper) : ErrorController,
         return CustomError(errors)
     }
 
+    @ExceptionHandler(MissingServletRequestPartException::class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    fun missingPart(e: MissingServletRequestPartException): CustomError {
+        return wrapSimpleError("required", param = e.requestPartName)
+    }
+
     @ExceptionHandler(HttpMessageNotReadableException::class)
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     fun invalidRequestBody(e: HttpMessageNotReadableException): CustomError {
@@ -119,7 +126,7 @@ class ErrorController(private val objectMapper: ObjectMapper) : ErrorController,
     @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
     fun unexpectedError(e: Exception): CustomError {
         logger.error(e.message)
-        return wrapSimpleError("unexpected error: " + e.message)
+        return wrapSimpleError("unexpected error")
     }
 
     @ExceptionHandler(AccessDeniedException::class)

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

@@ -1,18 +1,24 @@
 package pt.up.fe.ni.website.backend.controller
 
+import org.springframework.validation.annotation.Validated
 import org.springframework.web.bind.annotation.DeleteMapping
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.PutMapping
-import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
+import org.springframework.web.bind.annotation.RequestPart
 import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.multipart.MultipartFile
 import pt.up.fe.ni.website.backend.dto.entity.EventDto
+import pt.up.fe.ni.website.backend.model.Event
 import pt.up.fe.ni.website.backend.service.activity.EventService
+import pt.up.fe.ni.website.backend.utils.validation.ValidImage
 
 @RestController
 @RequestMapping("/events")
+@Validated
 class EventController(private val service: EventService) {
     @GetMapping
     fun getAllEvents() = service.getAllEvents()
@@ -26,20 +32,34 @@ class EventController(private val service: EventService) {
     @GetMapping("/{eventSlug}**")
     fun getEvent(@PathVariable eventSlug: String) = service.getEventBySlug(eventSlug)
 
-    @PostMapping("/new")
-    fun createEvent(@RequestBody dto: EventDto) = service.createEvent(dto)
+    @PostMapping("/new", consumes = ["multipart/form-data"])
+    fun createEvent(
+        @RequestPart event: EventDto,
+        @RequestParam
+        @ValidImage
+        image: MultipartFile
+    ): Event {
+        event.imageFile = image
+        return service.createEvent(event)
+    }
 
     @DeleteMapping("/{id}")
     fun deleteEventById(@PathVariable id: Long): Map<String, String> {
         service.deleteEventById(id)
         return emptyMap()
     }
 
-    @PutMapping("/{id}")
+    @PutMapping("/{id}", consumes = ["multipart/form-data"])
     fun updateEventById(
         @PathVariable id: Long,
-        @RequestBody dto: EventDto
-    ) = service.updateEventById(id, dto)
+        @RequestPart event: EventDto,
+        @RequestParam
+        @ValidImage
+        image: MultipartFile?
+    ): Event {
+        event.imageFile = image
+        return service.updateEventById(id, event)
+    }
 
     @PutMapping("/{idEvent}/addTeamMember/{idAccount}")
     fun addTeamMemberById(

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

@@ -1,18 +1,24 @@
 package pt.up.fe.ni.website.backend.controller
 
+import org.springframework.validation.annotation.Validated
 import org.springframework.web.bind.annotation.DeleteMapping
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.PutMapping
-import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
+import org.springframework.web.bind.annotation.RequestPart
 import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.multipart.MultipartFile
 import pt.up.fe.ni.website.backend.dto.entity.ProjectDto
+import pt.up.fe.ni.website.backend.model.Project
 import pt.up.fe.ni.website.backend.service.activity.ProjectService
+import pt.up.fe.ni.website.backend.utils.validation.ValidImage
 
 @RestController
 @RequestMapping("/projects")
+@Validated
 class ProjectController(private val service: ProjectService) {
 
     @GetMapping
@@ -24,20 +30,34 @@ class ProjectController(private val service: ProjectService) {
     @GetMapping("/{projectSlug}**")
     fun getProjectBySlug(@PathVariable projectSlug: String) = service.getProjectBySlug(projectSlug)
 
-    @PostMapping("/new")
-    fun createNewProject(@RequestBody dto: ProjectDto) = service.createProject(dto)
+    @PostMapping("/new", consumes = ["multipart/form-data"])
+    fun createProject(
+        @RequestPart project: ProjectDto,
+        @RequestParam
+        @ValidImage
+        image: MultipartFile
+    ): Project {
+        project.imageFile = image
+        return service.createProject(project)
+    }
 
     @DeleteMapping("/{id}")
     fun deleteProjectById(@PathVariable id: Long): Map<String, String> {
         service.deleteProjectById(id)
         return emptyMap()
     }
 
-    @PutMapping("/{id}")
+    @PutMapping("/{id}", consumes = ["multipart/form-data"])
     fun updateProjectById(
         @PathVariable id: Long,
-        @RequestBody dto: ProjectDto
-    ) = service.updateProjectById(id, dto)
+        @RequestPart project: ProjectDto,
+        @RequestParam
+        @ValidImage
+        image: MultipartFile?
+    ): Project {
+        project.imageFile = image
+        return service.updateProjectById(id, project)
+    }
 
     @PutMapping("/{id}/archive")
     fun archiveProjectById(@PathVariable id: Long) = service.archiveProjectById(id)

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

@@ -0,0 +1,15 @@
+package pt.up.fe.ni.website.backend.dto.entity
+
+import com.fasterxml.jackson.annotation.JsonIgnore
+import org.springframework.web.multipart.MultipartFile
+import pt.up.fe.ni.website.backend.model.Activity
+
+abstract class ActivityDto<T : Activity>(
+    val title: String,
+    val description: String,
+    val teamMembersIds: List<Long>?,
+    val slug: String?,
+    var image: String?,
+    @JsonIgnore
+    var imageFile: MultipartFile? = null
+) : EntityDto<T>()

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

@@ -4,5 +4,6 @@ import pt.up.fe.ni.website.backend.model.CustomWebsite
 
 class CustomWebsiteDto(
     val url: String,
-    val iconPath: String?
+    val iconPath: String?,
+    val label: String?
 ) : EntityDto<CustomWebsite>()

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

@@ -6,7 +6,9 @@ import jakarta.persistence.Entity
 import jakarta.validation.ConstraintViolationException
 import jakarta.validation.Validator
 import kotlin.reflect.KClass
+import kotlin.reflect.full.findAnnotation
 import kotlin.reflect.full.hasAnnotation
+import kotlin.reflect.full.isSubclassOf
 import kotlin.reflect.jvm.jvmErasure
 import pt.up.fe.ni.website.backend.config.ApplicationContextUtils
 
@@ -57,9 +59,13 @@ abstract class EntityDto<T : Any> {
         // The use of suppress is explained at https://github.com/NIAEFEUP/website-niaefeup-backend/pull/20#discussion_r985236224
         @Suppress("UNCHECKED_CAST")
         private fun <T : Any> getTypeConversionClass(clazz: KClass<out EntityDto<T>>): KClass<T>? {
-            val thisType = clazz.supertypes.first { it.classifier == EntityDto::class }
+            val superType = clazz.supertypes.firstOrNull { it.jvmErasure.isSubclassOf(EntityDto::class) } ?: return null
+            val conversionClassArg =
+                superType.arguments.firstOrNull {
+                    it.type?.jvmErasure?.findAnnotation<Entity>() != null
+                } ?: return getTypeConversionClass(superType.jvmErasure as KClass<out EntityDto<T>>)
 
-            return thisType.arguments.firstOrNull()?.type?.jvmErasure as KClass<T>?
+            return conversionClassArg.type?.jvmErasure as KClass<T>?
         }
 
         /**

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

@@ -4,13 +4,14 @@ import pt.up.fe.ni.website.backend.model.Event
 import pt.up.fe.ni.website.backend.model.embeddable.DateInterval
 
 class EventDto(
-    val title: String,
-    val description: String,
-    val teamMembersIds: List<Long>?,
+    title: String,
+    description: String,
+    teamMembersIds: List<Long>?,
+    slug: String?,
+    image: String?,
+
     val registerUrl: String?,
     val dateInterval: DateInterval,
     val location: String?,
-    val category: String?,
-    val thumbnailPath: String,
-    val slug: String?
-) : EntityDto<Event>()
+    val category: String?
+) : ActivityDto<Event>(title, description, teamMembersIds, slug, image)

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

@@ -3,11 +3,18 @@ package pt.up.fe.ni.website.backend.dto.entity
 import pt.up.fe.ni.website.backend.model.Project
 
 class ProjectDto(
-    val title: String,
-    val description: String,
-    var hallOfFameIds: List<Long>?,
-    val teamMembersIds: List<Long>?,
+    title: String,
+    description: String,
+    teamMembersIds: List<Long>?,
+    slug: String?,
+    image: String?,
+
     val isArchived: Boolean = false,
     val technologies: List<String> = emptyList(),
-    val slug: String?
-) : EntityDto<Project>()
+    val slogan: String?,
+    val targetAudience: String,
+    val github: String?,
+    val links: List<CustomWebsiteDto>?,
+    val timeline: List<TimelineEventDto>?,
+    val hallOfFameIds: List<Long>?
+) : ActivityDto<Project>(title, description, teamMembersIds, slug, image)

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

@@ -0,0 +1,9 @@
+package pt.up.fe.ni.website.backend.dto.entity
+
+import java.util.Date
+import pt.up.fe.ni.website.backend.model.TimelineEvent
+
+class TimelineEventDto(
+    val date: Date,
+    val description: String
+) : EntityDto<TimelineEvent>()

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

@@ -14,6 +14,7 @@ import jakarta.persistence.JoinColumn
 import jakarta.persistence.OneToMany
 import jakarta.persistence.OrderColumn
 import jakarta.validation.Valid
+import jakarta.validation.constraints.NotBlank
 import jakarta.validation.constraints.Size
 import pt.up.fe.ni.website.backend.model.constants.ActivityConstants as Constants
 
@@ -41,6 +42,9 @@ abstract class Activity(
     @field:Size(min = Constants.Slug.minSize, max = Constants.Slug.maxSize)
     open val slug: String? = null,
 
+    @field:NotBlank
+    open var image: String,
+
     @Id
     @GeneratedValue
     open val id: Long? = null

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

@@ -19,6 +19,9 @@ class CustomWebsite(
     @field:URL
     val iconPath: String?,
 
+    @field:NullOrNotBlank
+    val label: String?,
+
     @Id @GeneratedValue
     val id: Long? = null
 )

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

@@ -1,10 +1,8 @@
 package pt.up.fe.ni.website.backend.model
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import jakarta.persistence.Embedded
 import jakarta.persistence.Entity
 import jakarta.validation.Valid
-import jakarta.validation.constraints.NotEmpty
 import jakarta.validation.constraints.Size
 import org.hibernate.validator.constraints.URL
 import pt.up.fe.ni.website.backend.model.constants.EventConstants as Constants
@@ -18,6 +16,7 @@ class Event(
     teamMembers: MutableList<Account> = mutableListOf(),
     associatedRoles: MutableList<PerActivityRole> = mutableListOf(),
     slug: String? = null,
+    image: String,
 
     @field:NullOrNotBlank
     @field:URL
@@ -33,10 +32,5 @@ class Event(
     @field:Size(min = Constants.Category.minSize, max = Constants.Category.maxSize)
     val category: String?,
 
-    @JsonProperty(required = true)
-    @field:NotEmpty
-    @field:URL
-    val thumbnailPath: String,
-
     id: Long? = null
-) : Activity(title, description, teamMembers, associatedRoles, slug, id)
+) : Activity(title, description, teamMembers, associatedRoles, slug, image, id)