Merge pull request howard12721#2 from howard12721/enchantment/hide-be…

…fore-first-join 初参加後に作成されたお知らせのみを表示するように
gravis8888 · Sep 2, 2023 · 3be497a · 3be497a
2 parents daf7c37 + 26683a6
commit 3be497a
Show file tree

Hide file tree

Showing 18 changed files with 218 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -13,12 +13,18 @@ Spigot 1.20
 
 ### 💬 コマンド
 
-| コマンド | 引数 | 説明 | パーミッション |
-| --- | --- | --- | --- |
-| /noticebox add |  | お知らせを作成するための本を取得します | `noticebox.add` |
-| /noticebox remove |  | お知らせを削除するためのGUIを表示します | `noticebox.remove` |
-| /noticebox open |  | お知らせ一覧のGUIを表示します | `noticebox.open` |
-| /noticebox open | `<player>` | `<player>`に対してお知らせ一覧のGUIを表示します | `noticebox.open-other` |
+| コマンド              | 引数         | 説明                             | パーミッション                |
+|-------------------|------------|--------------------------------|------------------------|
+| /noticebox add    |            | お知らせを作成するための本を取得します            | `noticebox.add`        |
+| /noticebox remove |            | お知らせを削除するためのGUIを表示します          | `noticebox.remove`     |
+| /noticebox open   |            | お知らせ一覧のGUIを表示します               | `noticebox.open`       |
+| /noticebox open   | `<player>` | `<player>`に対してお知らせ一覧のGUIを表示します | `noticebox.open-other` |
+
+### 💬 その他のパーミッション
+
+| パーミッション           | 説明                  |
+|-------------------|---------------------|
+| noticebox.viewall | すべてのお知らせが見れるようになります |
 
 ### 👦 お知らせ作成の流れ
 

diff --git a/src/main/kotlin/jp/xhw/noticebox/NoticeBoxPlugin.kt b/src/main/kotlin/jp/xhw/noticebox/NoticeBoxPlugin.kt
@@ -4,26 +4,32 @@ import dev.jorel.commandapi.CommandAPI
 import dev.jorel.commandapi.CommandAPIBukkitConfig
 import jp.xhw.noticebox.application.external.Economy
 import jp.xhw.noticebox.application.external.ItemClaimLogic
+import jp.xhw.noticebox.application.service.StoreUserFirstJoinService
 import jp.xhw.noticebox.infrastructure.dao.AnnounceOpens
 import jp.xhw.noticebox.infrastructure.dao.AnnounceRewards
 import jp.xhw.noticebox.infrastructure.dao.Announces
+import jp.xhw.noticebox.infrastructure.dao.Users
 import jp.xhw.noticebox.infrastructure.external.ItemClaimLogicImpl
 import jp.xhw.noticebox.infrastructure.external.VaultEconomy
 import jp.xhw.noticebox.infrastructure.repository.AnnounceSqliteRepository
 import jp.xhw.noticebox.infrastructure.repository.UserSqliteRepository
 import jp.xhw.noticebox.presenter.command.Command
 import jp.xhw.noticebox.presenter.listener.EventListener
 import org.bukkit.Bukkit
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
+import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.plugin.java.JavaPlugin
 import org.jetbrains.exposed.sql.Database
 import org.jetbrains.exposed.sql.SchemaUtils
 import org.jetbrains.exposed.sql.transactions.TransactionManager
 import org.jetbrains.exposed.sql.transactions.transaction
 import java.io.File
 import java.sql.Connection
+import java.time.LocalDateTime
 import java.util.logging.Level
 
-class NoticeBoxPlugin : JavaPlugin() {
+class NoticeBoxPlugin : JavaPlugin(), Listener {
 
     companion object {
         lateinit var plugin: NoticeBoxPlugin
@@ -57,8 +63,10 @@ class NoticeBoxPlugin : JavaPlugin() {
             SchemaUtils.create(Announces)
             SchemaUtils.create(AnnounceRewards)
             SchemaUtils.create(AnnounceOpens)
+            SchemaUtils.create(Users)
         }
 
+        server.pluginManager.registerEvents(this, this)
         server.pluginManager.registerEvents(EventListener(), this)
 
         Command().register()
@@ -67,4 +75,9 @@ class NoticeBoxPlugin : JavaPlugin() {
 
     override fun onDisable() {}
 
+    @EventHandler
+    fun on(event: PlayerJoinEvent) {
+        StoreUserFirstJoinService(userRepository).store(event.player.uniqueId, LocalDateTime.now())
+    }
+
 }
diff --git a/src/main/kotlin/jp/xhw/noticebox/application/exception/UserNotFoundException.kt b/src/main/kotlin/jp/xhw/noticebox/application/exception/UserNotFoundException.kt
@@ -0,0 +1,5 @@
+package jp.xhw.noticebox.application.exception
+
+import java.util.*
+
+class UserNotFoundException(val userId: UUID) : RuntimeException(userId.toString())
diff --git a/src/main/kotlin/jp/xhw/noticebox/application/service/FetchReadAnnouncesService.kt b/src/main/kotlin/jp/xhw/noticebox/application/service/FetchReadAnnouncesService.kt
@@ -1,5 +1,6 @@
 package jp.xhw.noticebox.application.service
 
+import jp.xhw.noticebox.application.exception.UserNotFoundException
 import jp.xhw.noticebox.domain.model.AnnounceId
 import jp.xhw.noticebox.domain.model.UserId
 import jp.xhw.noticebox.domain.repository.UserRepository
@@ -10,7 +11,7 @@ class FetchReadAnnouncesService(private val userRepository: UserRepository) {
 
     fun fetch(userId: UUID): List<UUID> {
         return transaction {
-            userRepository.find(UserId(userId)).openedAnnounceIds.map(AnnounceId::value)
+            userRepository.find(UserId(userId))?.openedAnnounceIds?.map(AnnounceId::value)?: throw UserNotFoundException(userId)
         }
     }
 

diff --git a/src/main/kotlin/jp/xhw/noticebox/application/service/FetchUserAnnounceSamplesService.kt b/src/main/kotlin/jp/xhw/noticebox/application/service/FetchUserAnnounceSamplesService.kt
@@ -0,0 +1,29 @@
+package jp.xhw.noticebox.application.service
+
+import jp.xhw.noticebox.application.dto.AnnounceSampleDto
+import jp.xhw.noticebox.application.exception.UserNotFoundException
+import jp.xhw.noticebox.domain.model.User
+import jp.xhw.noticebox.domain.model.UserId
+import jp.xhw.noticebox.domain.repository.AnnounceRepository
+import jp.xhw.noticebox.domain.repository.UserRepository
+import org.jetbrains.exposed.sql.transactions.transaction
+import java.util.*
+
+class FetchUserAnnounceSamplesService(
+    private val announceRepository: AnnounceRepository,
+    private val userRepository: UserRepository
+) {
+    fun fetch(userId: UUID, offset: Long, limit: Int): List<AnnounceSampleDto> {
+        return transaction {
+            val user: User = userRepository.find(UserId(userId))?: throw UserNotFoundException(userId)
+            val announceSampleList = announceRepository.findPagedAnnounceSamples(offset, limit, user.firstJoin)
+            announceSampleList.map { sample ->
+                AnnounceSampleDto(
+                    sample.announceId.value,
+                    sample.title.value,
+                    sample.createdAt
+                )
+            }
+        }
+    }
+}
diff --git a/...ion/service/GetNumberOfAnnounceService.kt → ...on/service/GetNumberOfAnnouncesService.kt b/...ion/service/GetNumberOfAnnounceService.kt → ...on/service/GetNumberOfAnnouncesService.kt
@@ -3,7 +3,7 @@ package jp.xhw.noticebox.application.service
 import jp.xhw.noticebox.domain.repository.AnnounceRepository
 import org.jetbrains.exposed.sql.transactions.transaction
 
-class GetNumberOfAnnounceService(private val announceRepository: AnnounceRepository) {
+class GetNumberOfAnnouncesService(private val announceRepository: AnnounceRepository) {
     fun get(): Long {
         return transaction {
             announceRepository.count()

diff --git a/src/main/kotlin/jp/xhw/noticebox/application/service/GetNumberOfUserAnnouncesService.kt b/src/main/kotlin/jp/xhw/noticebox/application/service/GetNumberOfUserAnnouncesService.kt
@@ -0,0 +1,17 @@
+package jp.xhw.noticebox.application.service
+
+import jp.xhw.noticebox.application.exception.UserNotFoundException
+import jp.xhw.noticebox.domain.model.UserId
+import jp.xhw.noticebox.domain.repository.AnnounceRepository
+import jp.xhw.noticebox.domain.repository.UserRepository
+import org.jetbrains.exposed.sql.transactions.transaction
+import java.util.UUID
+
+class GetNumberOfUserAnnouncesService(private val announceRepository: AnnounceRepository, private val userRepository: UserRepository) {
+    fun get(userId: UUID): Long {
+        return transaction {
+            val user = userRepository.find(UserId(userId))?: throw UserNotFoundException(userId)
+            announceRepository.count(user.firstJoin)
+        }
+    }
+}
diff --git a/src/main/kotlin/jp/xhw/noticebox/application/service/StoreUserFirstJoinService.kt b/src/main/kotlin/jp/xhw/noticebox/application/service/StoreUserFirstJoinService.kt
@@ -0,0 +1,19 @@
+package jp.xhw.noticebox.application.service
+
+import jp.xhw.noticebox.domain.model.User
+import jp.xhw.noticebox.domain.model.UserId
+import jp.xhw.noticebox.domain.repository.UserRepository
+import org.jetbrains.exposed.sql.transactions.transaction
+import java.time.LocalDateTime
+import java.util.UUID
+
+class StoreUserFirstJoinService(private val userRepository: UserRepository) {
+    fun store(userId: UUID, date: LocalDateTime) {
+        transaction {
+            val user = userRepository.find(UserId(userId))
+            if (user == null) {
+                userRepository.save(User(UserId(userId), mutableListOf(), date))
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/jp/xhw/noticebox/application/service/UserOpenAnnounceService.kt b/src/main/kotlin/jp/xhw/noticebox/application/service/UserOpenAnnounceService.kt
@@ -1,6 +1,7 @@
 package jp.xhw.noticebox.application.service
 
 import jp.xhw.noticebox.application.dto.RewardDto
+import jp.xhw.noticebox.application.exception.UserNotFoundException
 import jp.xhw.noticebox.application.external.Economy
 import jp.xhw.noticebox.application.external.ItemClaimLogic
 import jp.xhw.noticebox.domain.model.AnnounceId
@@ -18,7 +19,7 @@ class UserOpenAnnounceService(
 ) {
     fun open(userId: UUID, announceId: UUID): RewardDto? {
         return transaction {
-            val opener = userRepository.find(UserId(userId))
+            val opener = userRepository.find(UserId(userId))?: throw UserNotFoundException(userId)
             val announce = announceRepository.findById(AnnounceId(announceId)) ?: return@transaction null
 
             if (opener.isNotOpened(announce)) {

diff --git a/src/main/kotlin/jp/xhw/noticebox/domain/model/User.kt b/src/main/kotlin/jp/xhw/noticebox/domain/model/User.kt
@@ -1,9 +1,10 @@
 package jp.xhw.noticebox.domain.model
 
 import jp.xhw.noticebox.domain.exceptions.AnnounceAlreadyOpenedException
+import java.time.LocalDateTime
 import java.util.*
 
-class User(val userId: UserId, val openedAnnounceIds: MutableList<AnnounceId>) {
+class User(val userId: UserId, val openedAnnounceIds: MutableList<AnnounceId>, val firstJoin: LocalDateTime) {
 
     fun openAnnounce(announce: Announce) {
         if (openedAnnounceIds.contains(announce.announceId)) {

diff --git a/src/main/kotlin/jp/xhw/noticebox/domain/repository/AnnounceRepository.kt b/src/main/kotlin/jp/xhw/noticebox/domain/repository/AnnounceRepository.kt
@@ -4,11 +4,14 @@ import jp.xhw.noticebox.domain.model.Announce
 import jp.xhw.noticebox.domain.model.AnnounceId
 import jp.xhw.noticebox.domain.model.AnnounceReward
 import jp.xhw.noticebox.domain.model.AnnounceSample
+import java.time.LocalDateTime
 
 interface AnnounceRepository {
 
     fun findById(announceId: AnnounceId): Announce?
 
+    fun findPagedAnnounceSamples(offset: Long, limit: Int, after: LocalDateTime): List<AnnounceSample>
+
     fun findPagedAnnounceSamples(offset: Long, limit: Int): List<AnnounceSample>
 
     fun save(announce: Announce)
@@ -19,4 +22,6 @@ interface AnnounceRepository {
 
     fun count(): Long
 
+    fun count(after: LocalDateTime): Long
+
 }
diff --git a/src/main/kotlin/jp/xhw/noticebox/domain/repository/UserRepository.kt b/src/main/kotlin/jp/xhw/noticebox/domain/repository/UserRepository.kt
@@ -5,7 +5,7 @@ import jp.xhw.noticebox.domain.model.UserId
 
 interface UserRepository {
 
-    fun find(userId: UserId): User
+    fun find(userId: UserId): User?
     fun save(user: User)
 
 }
diff --git a/src/main/kotlin/jp/xhw/noticebox/infrastructure/dao/User.kt b/src/main/kotlin/jp/xhw/noticebox/infrastructure/dao/User.kt
@@ -0,0 +1,13 @@
+package jp.xhw.noticebox.infrastructure.dao
+
+import org.jetbrains.exposed.dao.UUIDEntity
+import org.jetbrains.exposed.dao.UUIDEntityClass
+import org.jetbrains.exposed.dao.id.EntityID
+import java.util.*
+
+class User (id: EntityID<UUID>) : UUIDEntity(id) {
+    companion object : UUIDEntityClass<User>(Users)
+
+    var joinedAt by Users.joinedAt
+
+}
diff --git a/src/main/kotlin/jp/xhw/noticebox/infrastructure/dao/Users.kt b/src/main/kotlin/jp/xhw/noticebox/infrastructure/dao/Users.kt
@@ -0,0 +1,12 @@
+package jp.xhw.noticebox.infrastructure.dao
+
+import org.jetbrains.exposed.dao.id.UUIDTable
+import org.jetbrains.exposed.sql.Column
+import org.jetbrains.exposed.sql.javatime.datetime
+import java.time.LocalDateTime
+
+object Users : UUIDTable() {
+
+    val joinedAt: Column<LocalDateTime> = datetime("joined_at")
+
+}
diff --git a/src/main/kotlin/jp/xhw/noticebox/infrastructure/repository/AnnounceSqliteRepository.kt b/src/main/kotlin/jp/xhw/noticebox/infrastructure/repository/AnnounceSqliteRepository.kt
@@ -7,6 +7,7 @@ import jp.xhw.noticebox.infrastructure.dao.Announces
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.statements.api.ExposedBlob
+import java.time.LocalDateTime
 import jp.xhw.noticebox.infrastructure.dao.Announce as AnnounceDao
 import jp.xhw.noticebox.infrastructure.dao.AnnounceReward as AnnounceRewardDao
 
@@ -24,6 +25,15 @@ class AnnounceSqliteRepository : AnnounceRepository {
         )
     }
 
+    override fun findPagedAnnounceSamples(offset: Long, limit: Int, after: LocalDateTime): List<AnnounceSample> {
+        val announces = Announces
+            .slice(Announces.id, Announces.title, Announces.createdAt)
+            .select { Announces.createdAt greater after }
+            .orderBy(Announces.createdAt, SortOrder.DESC)
+            .limit(limit, offset = offset)
+        return announces.map(this::convertToAnnounceSample).toList()
+    }
+
     override fun findPagedAnnounceSamples(offset: Long, limit: Int): List<AnnounceSample> {
         val announces = Announces
             .slice(Announces.id, Announces.title, Announces.createdAt)
@@ -80,6 +90,10 @@ class AnnounceSqliteRepository : AnnounceRepository {
         return AnnounceDao.count()
     }
 
+    override fun count(after: LocalDateTime): Long {
+        return Announces.select { Announces.createdAt greater after }.count()
+    }
+
     private fun convertToAnnounceSample(resultRow: ResultRow): AnnounceSample {
         val uuid = resultRow[Announces.id].value
 

diff --git a/src/main/kotlin/jp/xhw/noticebox/infrastructure/repository/UserSqliteRepository.kt b/src/main/kotlin/jp/xhw/noticebox/infrastructure/repository/UserSqliteRepository.kt
@@ -8,19 +8,27 @@ import jp.xhw.noticebox.infrastructure.dao.AnnounceOpens
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.batchInsert
 import org.jetbrains.exposed.sql.deleteWhere
-import jp.xhw.noticebox.infrastructure.dao.AnnounceOpen as UserDao
+import jp.xhw.noticebox.infrastructure.dao.AnnounceOpen as AnnounceOpensDao
+import jp.xhw.noticebox.infrastructure.dao.User as UserDao
 
 class UserSqliteRepository : UserRepository {
 
-    override fun find(userId: UserId): User {
+    override fun find(userId: UserId): User? {
+        val user = UserDao.findById(userId.value) ?: return null
         val openedAnnounces = mutableListOf<AnnounceId>()
-        UserDao
+        AnnounceOpensDao
             .find { AnnounceOpens.userId eq userId.value }
             .forEach { announceOpen -> openedAnnounces.add(AnnounceId(announceOpen.announceId)) }
-        return User(userId, openedAnnounces)
+        return User(userId, openedAnnounces, user.joinedAt)
     }
 
     override fun save(user: User) {
+        val userDao = UserDao.findById(user.userId.value)
+        if (userDao == null) {
+            UserDao.new(user.userId.value) {
+                this.joinedAt = user.firstJoin
+            }
+        }
         AnnounceOpens.deleteWhere { userId eq user.userId.value }
         val list = mutableListOf<Pair<UserId, AnnounceId>>()
         for (announceId in user.openedAnnounceIds) {