Merge pull request #2135 from GiganticMinecraft/fix/getGachaList

ガチャの景品データを取得するSQLを修正
GiganticMinecraft · Jun 29, 2023 · 8ff3b7d · 8ff3b7d
2 parents e108f42 + 407c7b5
commit 8ff3b7d
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/...ama/seichiassist/subsystems/gachaprize/infrastructure/JdbcGachaPrizeListPersistence.scala b/...ama/seichiassist/subsystems/gachaprize/infrastructure/JdbcGachaPrizeListPersistence.scala
@@ -18,11 +18,7 @@ class JdbcGachaPrizeListPersistence[F[_]: Sync, ItemStack: Cloneable](
   override def list: F[Vector[GachaPrize[ItemStack]]] = {
     Sync[F].delay {
       DB.readOnly { implicit session =>
-        sql"""SELECT gachadata.id, gachadata.probability, gachadata.itemstack, gacha_events.event_name FROM gachadata
-             | LEFT OUTER JOIN gacha_events ON gachadata.event_id = gacha_events.id
-             | UNION
-             | SELECT gachadata.id, gachadata.probability, gachadata.itemstack, gacha_events.event_name FROM gachadata
-             | RIGHT OUTER JOIN gacha_events ON gachadata.event_id = gacha_events.id"""
+        sql"SELECT gachadata.id AS gacha_prize_id, probability, itemstack, event_name FROM gachadata INNER JOIN gacha_events ON gachadata.event_id = gacha_events.id"
           .stripMargin
           .map { rs =>
             val probability = rs.double("probability")
@@ -34,7 +30,7 @@ class JdbcGachaPrizeListPersistence[F[_]: Sync, ItemStack: Cloneable](
                   itemStack,
                   GachaProbability(probability),
                   probability < 0.1,
-                  GachaPrizeId(rs.int("id")),
+                  GachaPrizeId(rs.int("gacha_prize_id")),
                   rs.stringOpt("event_name").map(GachaEventName)
                 )
               }