Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ガチャのアイテム設定系不具合の修正 #2122

Merged
merged 3 commits into from
Jun 29, 2023
Merged

ガチャのアイテム設定系不具合の修正 #2122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4449ff4
fix: ガチャ景品の保存コマンドでイベント用のガチャ景品が保存できていなかった不具合を修正
rito528 Jun 28, 2023
4bd3112
fix: addコマンドで自動的に保存するように
rito528 Jun 29, 2023
8ea9c60
fix: イベント中のガチャリストにエンチャント瓶を含める
rito528 Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/scala/com/github/unchama/seichiassist/subsystems/gacha/bukkit/GachaCommand.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ class GachaCommand[
.beginConfiguration()
.execution { _ =>
val eff = for {
gachaPrizes <- gachaPrizeAPI.listOfNow
gachaPrizes <- gachaPrizeAPI.allGachaPrizeList
_ <- gachaPrizeAPI.replace(gachaPrizes)
} yield MessageEffect("ガチャデータをmysqlに保存しました。")

Expand Down
3 changes: 2 additions & 1 deletion src/main/scala/com/github/unchama/seichiassist/subsystems/gachaprize/System.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ object System {
) +: prizes
}
newGachaPrizes <- allGachaPrizesListReference.get
_ <- _gachaPersistence.addGachaPrize(newGachaPrizes.head)
_ <- _gachaPersistence
.addMineStackGachaObject(
newGachaPrizes.head.id,
Expand All @@ -114,7 +115,7 @@ object System {
} yield {
createdEvents.find(_.isHolding) match {
case Some(value) =>
prizes.filter(_.gachaEventName.contains(value.eventName))
prizes.filter(_.gachaEventName.contains(value.eventName)) :+ expBottle
case None =>
prizes.filter(_.gachaEventName.isEmpty)
}
Expand Down
5 changes: 5 additions & 0 deletions .../github/unchama/seichiassist/subsystems/gachaprize/domain/GachaPrizeListPersistence.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ trait GachaPrizeListPersistence[F[_], ItemStack] {
*/
def list: F[Vector[GachaPrize[ItemStack]]]

/**
* @return ガチャアイテムを追加する作用
*/
def addGachaPrize(gachaPrize: GachaPrize[ItemStack]): F[Unit]

/**
* @return ガチャリストを更新する作用
*/
Expand Down
14 changes: 14 additions & 0 deletions ...ama/seichiassist/subsystems/gachaprize/infrastructure/JdbcGachaPrizeListPersistence.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,20 @@ class JdbcGachaPrizeListPersistence[F[_]: Sync, ItemStack: Cloneable](
}
}

override def addGachaPrize(gachaPrize: GachaPrize[ItemStack]): F[Unit] = Sync[F].delay {
DB.localTx { implicit session =>
val eventId = gachaPrize.gachaEventName.flatMap { eventName =>
sql"SELECT id FROM gacha_events WHERE event_name = ${eventName.name}"
.map(_.int("id"))
.single()
.apply()
}

sql"INSERT INTO gachadata VALUES (${gachaPrize.id.id}, ${gachaPrize.probability.value}, ${serializeAndDeserialize
.serialize(gachaPrize.itemStack)}, $eventId)".execute().apply()
}
}

override def set(gachaPrizesList: Vector[GachaPrize[ItemStack]]): F[Unit] = {
Sync[F].delay {
DB.localTx { implicit session =>
Expand Down