Code cleanup and improvements (#906)

* File upload improvements

* Optimize imports

* Run automated code cleanup

Author: Isti01

backend/src/main/kotlin/hu/bme/sch/cmsch/addon/indulasch/IndulaschIntegrationService.kt

@@ -37,7 +37,7 @@ data class IndulaschTextWidgetDto(
 
 @Service
 @ConditionalOnBean(QrFightComponent::class)
-open class IndulaschIntegrationService(
+class IndulaschIntegrationService(
     private val qrFightComponent: QrFightComponent,
     private val objectMapper: ObjectMapper
 ) {
@@ -51,7 +51,7 @@ open class IndulaschIntegrationService(
         .build()
 
     @Async
-    open fun setTextOnWidget(widgetData: IndulaschTextWidgetDto){
+    fun setTextOnWidget(widgetData: IndulaschTextWidgetDto){
         if(qrFightComponent.indulaschApiKey.getValue().isEmpty() || qrFightComponent.indulaschKioskId.getValue().isEmpty()) return
         val response: String? = indulaschApi.patch()
             .uri { uriBuilder ->

backend/src/main/kotlin/hu/bme/sch/cmsch/addon/nova/NovaIntegrationService.kt

@@ -34,7 +34,7 @@ const val CV_TAG = "cv"
     havingValue = "true",
     matchIfMissing = false
 )
-open class NovaIntegrationService(
+class NovaIntegrationService(
     private val responseRepository: ResponseRepository,
     private val formRepository: FormRepository,
     private val userRepository: UserRepository,
@@ -48,7 +48,7 @@ open class NovaIntegrationService(
 
     @Retryable(value = [ SQLException::class ], maxAttempts = 5, backoff = Backoff(delay = 500L, multiplier = 1.5))
     @Transactional(readOnly = false, isolation = Isolation.SERIALIZABLE)
-    open fun updateSubmissions(emails: List<String>): Int {
+    fun updateSubmissions(emails: List<String>): Int {
         val form = formRepository.findAll().firstOrNull { it.selected }
 
         if (form == null) {
@@ -76,7 +76,7 @@ open class NovaIntegrationService(
 
     @Retryable(value = [ SQLException::class ], maxAttempts = 5, backoff = Backoff(delay = 500L, multiplier = 1.5))
     @Transactional(readOnly = true, isolation = Isolation.READ_COMMITTED)
-    open fun fetchSubmissions(): List<FilledOutFormDto> {
+    fun fetchSubmissions(): List<FilledOutFormDto> {
         val form = formRepository.findAll().firstOrNull { it.selected }
 
         if (form == null) {
@@ -153,7 +153,7 @@ open class NovaIntegrationService(
 
     @Retryable(value = [ SQLException::class ], maxAttempts = 5, backoff = Backoff(delay = 500L, multiplier = 1.5))
     @Transactional(readOnly = false, isolation = Isolation.SERIALIZABLE)
-    open fun setPaymentStatus(email: String, status: Boolean, rejectionMessage: String?) {
+    fun setPaymentStatus(email: String, status: Boolean, rejectionMessage: String?) {
         val form = formRepository.findAll().firstOrNull { it.selected }
         if (form == null) {
             log.info("[NOVA/VALID-USERS] Form not found with non empty url")
@@ -175,7 +175,7 @@ open class NovaIntegrationService(
 
     @Retryable(value = [ SQLException::class ], maxAttempts = 5, backoff = Backoff(delay = 500L, multiplier = 1.5))
     @Transactional(readOnly = false, isolation = Isolation.SERIALIZABLE)
-    open fun setDetailsStatus(email: String, status: Boolean, rejectionMessage: String?) {
+    fun setDetailsStatus(email: String, status: Boolean, rejectionMessage: String?) {
         val form = formRepository.findAll().firstOrNull { it.selected }
         if (form == null) {
             log.info("[NOVA/VALID-USERS] Form not found with non empty url")
@@ -197,7 +197,7 @@ open class NovaIntegrationService(
 
     @Retryable(value = [ SQLException::class ], maxAttempts = 5, backoff = Backoff(delay = 500L, multiplier = 1.5))
     @Transactional(readOnly = false, isolation = Isolation.SERIALIZABLE)
-    open fun setAvatarStatus(email: String, status: Boolean, rejectionMessage: String?) {
+    fun setAvatarStatus(email: String, status: Boolean, rejectionMessage: String?) {
         val user = userRepository.findByEmail(email).orElse(null) ?: return
 
         taskRepository.ifPresent { tasks ->
@@ -220,7 +220,7 @@ open class NovaIntegrationService(
 
     @Retryable(value = [ SQLException::class ], maxAttempts = 5, backoff = Backoff(delay = 500L, multiplier = 1.5))
     @Transactional(readOnly = false, isolation = Isolation.SERIALIZABLE)
-    open fun setCvStatus(email: String, status: Boolean, rejectionMessage: String?) {
+    fun setCvStatus(email: String, status: Boolean, rejectionMessage: String?) {
         val user = userRepository.findByEmail(email).orElse(null) ?: return
 
         taskRepository.ifPresent { tasks ->

backend/src/main/kotlin/hu/bme/sch/cmsch/admin/dashboard/DashboardPage.kt

@@ -4,8 +4,12 @@ import com.fasterxml.jackson.dataformat.csv.CsvMapper
 import com.fasterxml.jackson.dataformat.csv.CsvSchema
 import hu.bme.sch.cmsch.component.ComponentBase
 import hu.bme.sch.cmsch.component.login.CmschUser
-import hu.bme.sch.cmsch.service.*
+import hu.bme.sch.cmsch.service.AdminMenuEntry
+import hu.bme.sch.cmsch.service.AdminMenuService
+import hu.bme.sch.cmsch.service.AuditLogService
+import hu.bme.sch.cmsch.service.PermissionValidator
 import hu.bme.sch.cmsch.util.getUser
+import hu.bme.sch.cmsch.util.urlEncode
 import jakarta.annotation.PostConstruct
 import jakarta.servlet.http.HttpServletResponse
 import org.springframework.http.MediaType
@@ -15,10 +19,7 @@ import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.ResponseBody
-import org.thymeleaf.util.StringUtils
 import java.io.ByteArrayOutputStream
-import java.net.URLEncoder
-import java.nio.charset.StandardCharsets
 
 abstract class DashboardPage(
     var view: String,
@@ -151,19 +152,15 @@ abstract class DashboardPage(
         return outputStream.toByteArray()
     }
 
-    fun encodeMessage(message: String): String {
-        return URLEncoder.encode(message, StandardCharsets.UTF_8)
-    }
-
     companion object {
         fun dashboardPage(view: String, card: Int = -1, message: String? = null): String {
             val anchor = if (card >= 0) "#${card}" else ""
             return if (message == null) {
                 "redirect:/admin/control/$view$anchor"
             } else {
-                "redirect:/admin/control/$view?card=$card&message=${URLEncoder.encode(message, StandardCharsets.UTF_8)}${anchor}"
+                "redirect:/admin/control/$view?card=$card&message=${message.urlEncode()}${anchor}"
             }
         }
     }
 
-}
+}

backend/src/main/kotlin/hu/bme/sch/cmsch/component/ComponentApiBase.kt

@@ -5,14 +5,14 @@ import hu.bme.sch.cmsch.model.RoleType
 import hu.bme.sch.cmsch.service.*
 import hu.bme.sch.cmsch.setting.SettingType
 import hu.bme.sch.cmsch.util.getUser
+import jakarta.annotation.PostConstruct
 import org.slf4j.LoggerFactory
 import org.springframework.security.core.Authentication
 import org.springframework.ui.Model
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.multipart.MultipartRequest
-import jakarta.annotation.PostConstruct
 
 abstract class ComponentApiBase(
     val adminMenuService: AdminMenuService,

backend/src/main/kotlin/hu/bme/sch/cmsch/component/RealEntityController.kt

@@ -1,9 +1,9 @@
 package hu.bme.sch.cmsch.component
 
-import org.springframework.data.repository.CrudRepository as CrudRepository
+import org.springframework.data.repository.CrudRepository
 
 interface RealEntityController {
 
     val repo: CrudRepository<*, Int>
 
-}
+}

backend/src/main/kotlin/hu/bme/sch/cmsch/component/admission/AdmissionByFormController.kt

@@ -9,10 +9,10 @@ import hu.bme.sch.cmsch.controller.admin.SimpleEntityPage
 import hu.bme.sch.cmsch.model.IdentifiableEntity
 import hu.bme.sch.cmsch.service.AdminMenuService
 import hu.bme.sch.cmsch.service.AuditLogService
-import hu.bme.sch.cmsch.service.StorageService
 import hu.bme.sch.cmsch.service.ImportService
 import hu.bme.sch.cmsch.service.StaffPermissions.PERMISSION_EXPORT_ADMISSION
 import hu.bme.sch.cmsch.service.StaffPermissions.PERMISSION_VALIDATE_ADMISSION
+import hu.bme.sch.cmsch.service.StorageService
 import hu.bme.sch.cmsch.util.getUser
 import jakarta.servlet.http.HttpServletResponse
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean

backend/src/main/kotlin/hu/bme/sch/cmsch/component/admission/AdmissionComponent.kt

@@ -1,9 +1,9 @@
 package hu.bme.sch.cmsch.component.admission
 
-import hu.bme.sch.cmsch.component.*
-import hu.bme.sch.cmsch.setting.ComponentSettingService
+import hu.bme.sch.cmsch.component.ComponentBase
 import hu.bme.sch.cmsch.model.RoleType
 import hu.bme.sch.cmsch.service.ControlPermissions
+import hu.bme.sch.cmsch.setting.ComponentSettingService
 import hu.bme.sch.cmsch.setting.MinRoleSettingProxy
 import hu.bme.sch.cmsch.setting.SettingProxy
 import hu.bme.sch.cmsch.setting.SettingType

backend/src/main/kotlin/hu/bme/sch/cmsch/component/admission/AdmissionService.kt

@@ -18,7 +18,7 @@ import kotlin.reflect.full.memberProperties
 
 @Service
 @ConditionalOnBean(AdmissionComponent::class)
-open class AdmissionService(
+class AdmissionService(
     private val admissionEntryRepository: AdmissionEntryRepository,
     private val clock: TimeService,
     private val auditLogService: AuditLogService,
@@ -29,7 +29,7 @@ open class AdmissionService(
 ) {
 
     @Transactional(readOnly = false, isolation = Isolation.READ_COMMITTED)
-    open fun logEntryAttempt(
+    fun logEntryAttempt(
         response: AdmissionResponse,
         gate: CmschUser,
         token: String,
@@ -59,7 +59,7 @@ open class AdmissionService(
     }
 
     @Transactional(readOnly = true, isolation = Isolation.READ_COMMITTED)
-    open fun generateAdmissionExportForForm(id: Int): ByteArrayOutputStream {
+    fun generateAdmissionExportForForm(id: Int): ByteArrayOutputStream {
         val outputStream = ByteArrayOutputStream()
         val responses = responseRepository.orElseThrow().findAllByFormIdOrderByLineAsc(id)
         val admissions = admissionEntryRepository.findAllByFormIdAndAllowedTrue(id)
@@ -101,7 +101,7 @@ open class AdmissionService(
     }
 
     @Transactional(readOnly = true, isolation = Isolation.READ_COMMITTED)
-    open fun getTicketByQr(cmschId: String): TicketEntity? {
+    fun getTicketByQr(cmschId: String): TicketEntity? {
         val user = userRepository.findByCmschId(cmschId).getOrNull()
         if (user == null) {
             return ticketRepository.findTop1ByQrCodeAndUseCmschIdTrue(cmschId).firstOrNull()
@@ -118,12 +118,12 @@ open class AdmissionService(
 
 
     @Transactional(readOnly = true, isolation = Isolation.READ_COMMITTED)
-    open fun countEntries(cmschId: String): Long {
+    fun countEntries(cmschId: String): Long {
         return admissionEntryRepository.countAllByToken(cmschId)
     }
 
     @Transactional(readOnly = true, isolation = Isolation.READ_COMMITTED)
-    open fun hasTicket(cmschId: String): Boolean {
+    fun hasTicket(cmschId: String): Boolean {
         return getTicketByQr(cmschId) != null
     }
 

backend/src/main/kotlin/hu/bme/sch/cmsch/component/app/ApplicationComponent.kt

@@ -1,6 +1,6 @@
 package hu.bme.sch.cmsch.component.app
 
-import hu.bme.sch.cmsch.component.*
+import hu.bme.sch.cmsch.component.ComponentBase
 import hu.bme.sch.cmsch.model.RoleType
 import hu.bme.sch.cmsch.service.ControlPermissions
 import hu.bme.sch.cmsch.setting.ComponentSettingService

backend/src/main/kotlin/hu/bme/sch/cmsch/component/app/ApplicationComponentController.kt

@@ -4,8 +4,8 @@ import hu.bme.sch.cmsch.component.ComponentApiBase
 import hu.bme.sch.cmsch.service.AdminMenuCategory
 import hu.bme.sch.cmsch.service.AdminMenuService
 import hu.bme.sch.cmsch.service.AuditLogService
-import hu.bme.sch.cmsch.service.StorageService
 import hu.bme.sch.cmsch.service.ControlPermissions.PERMISSION_CONTROL_APP
+import hu.bme.sch.cmsch.service.StorageService
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.core.env.Environment
 import org.springframework.stereotype.Controller