From 474c3d6f79fbbefe36a931e13511b47a373d1fcb Mon Sep 17 00:00:00 2001
From: 987123879113 <63495610+987123879113@users.noreply.github.com>
Date: Sun, 9 Jun 2024 01:32:32 +0900
Subject: [PATCH] Only return cleared songs for skill points

---
 services/gf10/db/score.sql.go         | 4 ++++
 services/gf10/sql/queries/score.sql   | 4 ++++
 services/gf11/db/score.sql.go         | 4 ++++
 services/gf11/sql/queries/score.sql   | 4 ++++
 services/gf8puv/db/score.sql.go       | 4 ++++
 services/gf8puv/sql/queries/score.sql | 4 ++++
 services/gf9/db/score.sql.go          | 2 ++
 services/gf9/sql/queries/score.sql    | 2 ++
 8 files changed, 28 insertions(+)

diff --git a/services/gf10/db/score.sql.go b/services/gf10/db/score.sql.go
index a42f436..343c876 100644
--- a/services/gf10/db/score.sql.go
+++ b/services/gf10/db/score.sql.go
@@ -15,6 +15,8 @@ FROM gf10dm9_scores
 WHERE cardid = ?
 AND game_type = ?
 AND netid != -1
+AND skill > 0
+AND clear > 0
 GROUP BY cardid, netid
 `
 
@@ -331,6 +333,8 @@ FROM gf10dm9_scores
 WHERE cardid = ?
 AND game_type = ?
 AND netid != -1
+AND skill > 0
+AND clear > 0
 GROUP BY cardid, netid, seq_mode
 `
 
diff --git a/services/gf10/sql/queries/score.sql b/services/gf10/sql/queries/score.sql
index 0ff5f1d..ebac9cc 100644
--- a/services/gf10/sql/queries/score.sql
+++ b/services/gf10/sql/queries/score.sql
@@ -72,6 +72,8 @@ FROM gf10dm9_scores
 WHERE cardid = ?
 AND game_type = ?
 AND netid != -1
+AND skill > 0
+AND clear > 0
 GROUP BY cardid, netid, seq_mode;
 
 -- name: GetAllMaxSkillPointsByCardId :many
@@ -80,6 +82,8 @@ FROM gf10dm9_scores
 WHERE cardid = ?
 AND game_type = ?
 AND netid != -1
+AND skill > 0
+AND clear > 0
 GROUP BY cardid, netid;
 
 -- name: GetFavorites :many
diff --git a/services/gf11/db/score.sql.go b/services/gf11/db/score.sql.go
index 63d6d7e..f2ae13e 100644
--- a/services/gf11/db/score.sql.go
+++ b/services/gf11/db/score.sql.go
@@ -15,6 +15,8 @@ FROM gf11dm10_scores
 WHERE gdid = ?
 AND game_type = ?
 AND netid != -1
+AND skill > 0
+AND clear > 0
 GROUP BY gdid, netid
 `
 
@@ -331,6 +333,8 @@ FROM gf11dm10_scores
 WHERE gdid = ?
 AND game_type = ?
 AND netid != -1
+AND skill > 0
+AND clear > 0
 GROUP BY gdid, netid, seq_mode
 `
 
diff --git a/services/gf11/sql/queries/score.sql b/services/gf11/sql/queries/score.sql
index aeeb3bd..c80347e 100644
--- a/services/gf11/sql/queries/score.sql
+++ b/services/gf11/sql/queries/score.sql
@@ -72,6 +72,8 @@ FROM gf11dm10_scores
 WHERE gdid = ?
 AND game_type = ?
 AND netid != -1
+AND skill > 0
+AND clear > 0
 GROUP BY gdid, netid, seq_mode;
 
 -- name: GetAllMaxSkillPointsByGdid :many
@@ -80,6 +82,8 @@ FROM gf11dm10_scores
 WHERE gdid = ?
 AND game_type = ?
 AND netid != -1
+AND skill > 0
+AND clear > 0
 GROUP BY gdid, netid;
 
 -- name: GetFavorites :many
diff --git a/services/gf8puv/db/score.sql.go b/services/gf8puv/db/score.sql.go
index a9666c8..162f959 100644
--- a/services/gf8puv/db/score.sql.go
+++ b/services/gf8puv/db/score.sql.go
@@ -84,6 +84,8 @@ FROM (
     FROM gf8dm7puv_scores
     WHERE cardid = ?
     AND game_type = ?
+    AND skill > 0
+    AND clear > 0
     ORDER BY score DESC
     LIMIT 30
 ) AS t
@@ -106,6 +108,8 @@ SELECT musicid
 FROM gf8dm7puv_scores
 WHERE cardid = ?
 AND game_type = ?
+AND skill > 0
+AND clear > 0
 ORDER BY score DESC
 LIMIT ?
 `
diff --git a/services/gf8puv/sql/queries/score.sql b/services/gf8puv/sql/queries/score.sql
index c287e63..648ab79 100644
--- a/services/gf8puv/sql/queries/score.sql
+++ b/services/gf8puv/sql/queries/score.sql
@@ -34,6 +34,8 @@ SELECT musicid
 FROM gf8dm7puv_scores
 WHERE cardid = ?
 AND game_type = ?
+AND skill > 0
+AND clear > 0
 ORDER BY score DESC
 LIMIT ?;
 
@@ -44,6 +46,8 @@ FROM (
     FROM gf8dm7puv_scores
     WHERE cardid = ?
     AND game_type = ?
+    AND skill > 0
+    AND clear > 0
     ORDER BY score DESC
     LIMIT 30
 ) AS t;
diff --git a/services/gf9/db/score.sql.go b/services/gf9/db/score.sql.go
index f806979..8ea2347 100644
--- a/services/gf9/db/score.sql.go
+++ b/services/gf9/db/score.sql.go
@@ -53,6 +53,8 @@ FROM gf9dm8_scores
 WHERE cardid = ?
 AND game_type = ?
 AND music_num != -1
+AND skill > 0
+AND clear > 0
 GROUP BY cardid, music_num
 `
 
diff --git a/services/gf9/sql/queries/score.sql b/services/gf9/sql/queries/score.sql
index 022d88f..abd8888 100644
--- a/services/gf9/sql/queries/score.sql
+++ b/services/gf9/sql/queries/score.sql
@@ -82,4 +82,6 @@ FROM gf9dm8_scores
 WHERE cardid = ?
 AND game_type = ?
 AND music_num != -1
+AND skill > 0
+AND clear > 0
 GROUP BY cardid, music_num;