Merge pull request #482 from Shikkanime/dev

Dev

build.gradle.kts

@@ -1,14 +1,14 @@
 val ktorVersion = "2.3.11"
 val ktorSwaggerUiVersion = "2.10.0"
-val hibernateCoreVersion = "6.5.1.Final"
+val hibernateCoreVersion = "6.5.2.Final"
 val ehcacheVersion = "3.10.8"
 val glassfishJaxbVersion = "4.0.5"
 val hibernateSearchVersion = "7.1.1.Final"
 val tikaVersion = "3.0.0-BETA"
 val postgresqlVersion = "42.7.3"
 val reflectionsVersion = "0.10.2"
 val guiceVersion = "7.0.0"
-val liquibaseCoreVersion = "4.27.0"
+val liquibaseCoreVersion = "4.28.0"
 val quartzVersion = "2.5.0-rc1"
 val guavaVersion = "33.2.0-jre"
 val playwrightVersion = "1.44.0"
@@ -17,7 +17,8 @@ val gsonVersion = "2.11.0"
 val openCvVersion = "4.9.0-0"
 val bcprovVersion = "1.78.1"
 val javaImageScalingVersion = "0.8.6"
-val firebaseVersion = "9.2.0"
+val firebaseVersion = "9.3.0"
+val angusMailVersion = "2.0.3"
 
 val jdaVersion = "5.0.0-beta.24"
 val twitter4jVersion = "4.0.7"
@@ -28,7 +29,7 @@ val h2Version = "2.2.224"
 val mockitoVersion = "5.12.0"
 
 plugins {
-    val kotlinVersion = "1.9.24"
+    val kotlinVersion = "2.0.0"
 
     kotlin("jvm") version kotlinVersion
     kotlin("kapt") version kotlinVersion
@@ -95,6 +96,7 @@ dependencies {
     implementation("org.apache.tika:tika-core:$tikaVersion")
     implementation("org.apache.tika:tika-langdetect-optimaize:$tikaVersion")
     implementation("com.google.firebase:firebase-admin:$firebaseVersion")
+    implementation("org.eclipse.angus:angus-mail:$angusMailVersion")
 
     // Social networks
     implementation("net.dv8tion:JDA:$jdaVersion")

src/main/kotlin/fr/shikkanime/Application.kt

@@ -4,7 +4,9 @@ import fr.shikkanime.jobs.*
 import fr.shikkanime.modules.configureHTTP
 import fr.shikkanime.modules.configureRouting
 import fr.shikkanime.modules.configureSecurity
-import fr.shikkanime.services.*
+import fr.shikkanime.services.AnimeService
+import fr.shikkanime.services.ImageService
+import fr.shikkanime.services.MemberService
 import fr.shikkanime.socialnetworks.DiscordSocialNetwork
 import fr.shikkanime.utils.Constant
 import fr.shikkanime.utils.JobManager
@@ -19,10 +21,9 @@ private val logger = LoggerFactory.getLogger(Constant.NAME)
 fun main() {
     logger.info("Starting ${Constant.NAME}...")
     val animeService = Constant.injector.getInstance(AnimeService::class.java)
-    val episodeMappingService = Constant.injector.getInstance(EpisodeMappingService::class.java)
     animeService.preIndex()
 
-    updateAndDeleteData(episodeMappingService, animeService)
+    updateAndDeleteData(animeService)
 
     ImageService.loadCache()
     ImageService.addAll()
@@ -60,14 +61,8 @@ fun main() {
     ).start(wait = true)
 }
 
-private fun updateAndDeleteData(episodeMappingService: EpisodeMappingService, animeService: AnimeService) {
-    val episodeVariantService = Constant.injector.getInstance(EpisodeVariantService::class.java)
-
+private fun updateAndDeleteData(animeService: AnimeService) {
     animeService.findAll().forEach {
-        val mappingVariants = episodeVariantService.findAllByAnime(it)
-        it.releaseDateTime = mappingVariants.minOf { it.releaseDateTime }
-        it.lastReleaseDateTime = mappingVariants.maxOf { it.releaseDateTime }
-
         val toSlug = StringUtils.toSlug(StringUtils.getShortName(it.name!!))
 
         if (toSlug != it.slug) {
@@ -78,15 +73,6 @@ private fun updateAndDeleteData(episodeMappingService: EpisodeMappingService, an
         it.status = StringUtils.getStatus(it)
         animeService.update(it)
     }
-
-    episodeMappingService.findAll().forEach {
-        val mappingVariants = episodeVariantService.findAllByMapping(it)
-        it.releaseDateTime = mappingVariants.minOf { it.releaseDateTime }
-        it.lastReleaseDateTime = mappingVariants.maxOf { it.releaseDateTime }
-
-        it.status = StringUtils.getStatus(it)
-        episodeMappingService.update(it)
-    }
 }
 
 fun Application.module() {

src/main/kotlin/fr/shikkanime/controllers/api/MemberActionController.kt

@@ -0,0 +1,66 @@
+package fr.shikkanime.controllers.api
+
+import com.google.inject.Inject
+import fr.shikkanime.dtos.MessageDto
+import fr.shikkanime.services.MemberActionService
+import fr.shikkanime.utils.routes.Controller
+import fr.shikkanime.utils.routes.JWTAuthenticated
+import fr.shikkanime.utils.routes.Path
+import fr.shikkanime.utils.routes.Response
+import fr.shikkanime.utils.routes.method.Post
+import fr.shikkanime.utils.routes.openapi.OpenAPI
+import fr.shikkanime.utils.routes.openapi.OpenAPIResponse
+import fr.shikkanime.utils.routes.param.BodyParam
+import fr.shikkanime.utils.routes.param.QueryParam
+import java.util.*
+
+@Controller("/api/v1/member-actions")
+class MemberActionController {
+    @Inject
+    private lateinit var memberActionService: MemberActionService
+
+    @Path("/validate")
+    @Post
+    @JWTAuthenticated
+    @OpenAPI(
+        "Validate an action",
+        [
+            OpenAPIResponse(
+                200,
+                "Action validated",
+                Response::class
+            ),
+            OpenAPIResponse(
+                400,
+                "UUID is required OR Action is required",
+                MessageDto::class
+            ),
+        ],
+        security = true
+    )
+    fun validateAction(
+        @QueryParam("uuid", required = true) uuid: UUID?,
+        @BodyParam action: String?
+    ): Response {
+        if (uuid == null) {
+            return Response.badRequest(
+                MessageDto(
+                    MessageDto.Type.ERROR,
+                    "UUID is required"
+                )
+            )
+        }
+
+        if (action.isNullOrEmpty()) {
+            return Response.badRequest(
+                MessageDto(
+                    MessageDto.Type.ERROR,
+                    "Action is required"
+                )
+            )
+        }
+
+        memberActionService.validateAction(uuid, action)
+        return Response.ok()
+    }
+}

src/main/kotlin/fr/shikkanime/controllers/api/MemberController.kt

@@ -15,6 +15,8 @@ import fr.shikkanime.utils.routes.method.Put
 import fr.shikkanime.utils.routes.openapi.OpenAPI
 import fr.shikkanime.utils.routes.openapi.OpenAPIResponse
 import fr.shikkanime.utils.routes.param.BodyParam
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
 import java.util.*
 
 @Controller("/api/v1/members")
@@ -37,16 +39,30 @@ class MemberController {
         description = "Register a private member",
         responses = [
             OpenAPIResponse(201, "Private member registered", Map::class),
-        ]
+        ],
+        deprecated = true
     )
+    @Deprecated("You should use /register instead", ReplaceWith("/register"))
     private fun registerPrivateMember(): Response {
+        return registerMember()
+    }
+
+    @Path("/register")
+    @Post
+    @OpenAPI(
+        description = "Register member",
+        responses = [
+            OpenAPIResponse(201, "Member registered", Map::class),
+        ]
+    )
+    private fun registerMember(): Response {
         var identifier: String
 
         do {
             identifier = StringUtils.generateRandomString(12)
-        } while (memberCacheService.findPrivateMember(identifier) != null)
+        } while (memberCacheService.findByIdentifier(identifier) != null)
 
-        memberService.savePrivateMember(identifier)
+        memberService.save(identifier)
         return Response.created(mapOf("identifier" to identifier))
     }
 
@@ -56,12 +72,54 @@ class MemberController {
         description = "Login a private member",
         responses = [
             OpenAPIResponse(200, "Private member logged in"),
-        ]
+        ],
+        deprecated = true
     )
+    @Deprecated("You should use /login instead", ReplaceWith("/login"))
     private fun loginPrivateMember(@BodyParam identifier: String): Response {
-        return Response.ok(memberCacheService.findPrivateMember(identifier) ?: return Response.notFound())
+        return loginMember(identifier)
+    }
+
+    @Path("/login")
+    @Post
+    @OpenAPI(
+        description = "Login member",
+        responses = [
+            OpenAPIResponse(200, "Member logged in"),
+        ]
+    )
+    private fun loginMember(@BodyParam identifier: String): Response {
+        return Response.ok(memberCacheService.findByIdentifier(identifier) ?: return runBlocking {
+            delay(1000)
+            Response.notFound()
+        })
     }
 
+    @Path("/associate-email")
+    @Post
+    @JWTAuthenticated
+    @OpenAPI(
+        description = "Associate email to member",
+        responses = [
+            OpenAPIResponse(201, "Member action created", GenericDto::class),
+            OpenAPIResponse(401, "Unauthorized"),
+        ],
+        security = true
+    )
+    private fun associateEmail(@JWTUser uuidUser: UUID, @BodyParam email: String): Response {
+        // Verify email
+        if (!StringUtils.isValidEmail(email)) {
+            return Response.badRequest("Invalid email")
+        }
+
+        if (memberService.findByEmail(email) != null) {
+            return Response.conflict("Email already associated to an account")
+        }
+
+        return Response.created(GenericDto(memberService.associateEmail(uuidUser, email)))
+    }
+
+
     @Path("/animes")
     @Put
     @JWTAuthenticated

src/main/kotlin/fr/shikkanime/converters/member/MemberToMemberDtoConverter.kt

@@ -25,6 +25,7 @@ class MemberToMemberDtoConverter : AbstractConverter<Member, MemberDto>() {
             creationDateTime = from.creationDateTime.withUTCString(),
             lastUpdateDateTime = from.lastUpdateDateTime.withUTCString(),
             isPrivate = from.isPrivate,
+            email = from.email,
             followedAnimes = memberFollowAnimeService.findAllFollowedAnimesUUID(from),
             followedEpisodes = memberFollowEpisodeService.findAllFollowedEpisodesUUID(from),
             totalDuration = memberFollowEpisodeService.getTotalDuration(from),

src/main/kotlin/fr/shikkanime/dtos/MemberDto.kt

@@ -8,6 +8,7 @@ data class MemberDto(
     val creationDateTime: String,
     val lastUpdateDateTime: String,
     val isPrivate: Boolean,
+    val email: String?,
     val followedAnimes: List<UUID>,
     val followedEpisodes: List<UUID>,
     val totalDuration: Long,

src/main/kotlin/fr/shikkanime/entities/EpisodeMapping.kt

@@ -50,4 +50,7 @@ class EpisodeMapping(
     @Column(nullable = true, name = "status")
     @Enumerated(EnumType.STRING)
     var status: Status = Status.VALID,
+    @OneToMany(mappedBy = "episode", fetch = FetchType.LAZY)
+    @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+    var memberFollowEpisodes: MutableSet<MemberFollowEpisode> = mutableSetOf(),
 ) : ShikkEntity(uuid)

src/main/kotlin/fr/shikkanime/entities/Member.kt

@@ -21,6 +21,8 @@ class Member(
     val isPrivate: Boolean = false,
     @Column(nullable = false, unique = true)
     val username: String? = null,
+    @Column(nullable = true, unique = true)
+    var email: String? = null,
     @Column(nullable = false, name = "encrypted_password")
     val encryptedPassword: ByteArray? = null,
     @ElementCollection(fetch = FetchType.EAGER)

src/main/kotlin/fr/shikkanime/entities/MemberAction.kt

@@ -0,0 +1,32 @@
+package fr.shikkanime.entities
+
+import fr.shikkanime.entities.enums.Action
+import jakarta.persistence.*
+import org.hibernate.annotations.Cache
+import org.hibernate.annotations.CacheConcurrencyStrategy
+import java.time.ZonedDateTime
+import java.util.*
+
+@Entity
+@Table(name = "member_action")
+@Cacheable
+@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+class MemberAction(
+    uuid: UUID? = null,
+    @ManyToOne(optional = false, fetch = FetchType.LAZY)
+    @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+    var member: Member? = null,
+    @Column(nullable = false, name = "creation_date_time")
+    var creationDateTime: ZonedDateTime = ZonedDateTime.now(),
+    @Column(nullable = false, name = "update_date_time")
+    var updateDateTime: ZonedDateTime = creationDateTime,
+    @Column(nullable = false)
+    var email: String? = null,
+    @Column(nullable = false)
+    @Enumerated(EnumType.STRING)
+    var action: Action? = null,
+    @Column(nullable = false)
+    var validated: Boolean = false,
+    @Column(nullable = false)
+    var code: String? = null,
+) : ShikkEntity(uuid)

src/main/kotlin/fr/shikkanime/entities/enums/Action.kt

@@ -0,0 +1,5 @@
+package fr.shikkanime.entities.enums
+
+enum class Action {
+    VALIDATE_EMAIL,
+}

src/main/kotlin/fr/shikkanime/entities/enums/ConfigPropertyKey.kt

@@ -33,4 +33,8 @@ enum class ConfigPropertyKey(val key: String) {
     LAST_FETCH_OLD_EPISODES("last_fetch_old_episodes"),
     FETCH_OLD_EPISODES_RANGE("fetch_old_episodes_range"),
     FETCH_OLD_EPISODES_LIMIT("fetch_old_episodes_limit"),
+    EMAIL_HOST("email_host"),
+    EMAIL_PORT("email_port"),
+    EMAIL_USERNAME("email_username"),
+    EMAIL_PASSWORD("email_password"),
 }

src/main/kotlin/fr/shikkanime/modules/Routing.kt

@@ -95,13 +95,14 @@ private fun setSecurityHeaders(call: ApplicationCall, configCacheService: Config
 
 private fun logCallDetails(call: ApplicationCall) {
     val startTime = call.attributes[callStartTime]
-    val duration = ZonedDateTime.now().toInstant().toEpochMilli() - startTime.toInstant().toEpochMilli()
-    val path = call.request.path()
     val httpMethod = call.request.httpMethod.value
-    val userAgent = call.request.userAgent()
     val status = call.response.status()?.value ?: 0
+    val duration = ZonedDateTime.now().toInstant().toEpochMilli() - startTime.toInstant().toEpochMilli()
+    val path = call.request.path()
+    val ipAddress = call.request.origin.remoteHost
+    val userAgent = call.request.userAgent() ?: "Unknown"
 
-    logger.info("$httpMethod ${call.request.origin.uri} [$status - $duration ms] -> $path${if (userAgent != null) " ($userAgent)" else ""}")
+    logger.info("[$ipAddress - $userAgent] ($status - $duration ms) $httpMethod ${call.request.origin.uri} -> $path")
 }
 
 private fun Routing.createRoutes() {

src/main/kotlin/fr/shikkanime/modules/SwaggerRouting.kt

@@ -29,6 +29,7 @@ fun swagger(
         hidden = hiddenRoute || openApi.hidden
         summary = openApi.description
         description = openApi.description
+        deprecated = openApi.deprecated
         swaggerRequest(method)
         swaggerResponse(openApi)
     }