From 0985fb4e8ff2a19295ac007b596494860893f8e1 Mon Sep 17 00:00:00 2001
From: zkldi <20380519+zkldi@users.noreply.github.com>
Date: Sun, 30 Jan 2022 23:05:27 +0000
Subject: [PATCH] Support `naiveSkill` for GITADORA. Fixes #624

---
 server/CHANGELOG.md                                    |  1 +
 server/package.json                                    |  2 +-
 server/pnpm-lock.yaml                                  |  8 ++++----
 .../framework/user-game-stats/rating.test.ts           |  4 ++--
 .../score-import/framework/user-game-stats/rating.ts   | 10 ++++++++--
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/server/CHANGELOG.md b/server/CHANGELOG.md
index 63ff96599..62f6ae00a 100644
--- a/server/CHANGELOG.md
+++ b/server/CHANGELOG.md
@@ -39,6 +39,7 @@ not generally be shown to end users.
 - [ENH] Ratings are nullable now. (#611)
 - [ENH] Pre-HV Leggendaria songIDs are now properly resolved. (#487)
 - [ENH] IIDX Imports are now significantly faster.
+- [ENH] GITADORA now supports `naiveSkill` -- Although GITADORA support isn't actually on yet. (#624)
 
 *****
 
diff --git a/server/package.json b/server/package.json
index 8f65f3ed3..35467a1c9 100644
--- a/server/package.json
+++ b/server/package.json
@@ -82,7 +82,7 @@
 		"rimraf": "3.0.2",
 		"safe-json-stringify": "1.2.0",
 		"seq-logging": "1.1.1",
-		"tachi-common": "0.5.9",
+		"tachi-common": "0.5.10",
 		"ts-node": "10.0.0",
 		"tsconfig-paths": "3.10.1",
 		"typescript": "4.3.4",
diff --git a/server/pnpm-lock.yaml b/server/pnpm-lock.yaml
index 24ac13780..5f649d4e6 100644
--- a/server/pnpm-lock.yaml
+++ b/server/pnpm-lock.yaml
@@ -63,7 +63,7 @@ specifiers:
   safe-json-stringify: 1.2.0
   seq-logging: 1.1.1
   supertest: 6.1.3
-  tachi-common: 0.5.9
+  tachi-common: 0.5.10
   tap: 15.0.9
   ts-node: 10.0.0
   tsconfig-paths: 3.10.1
@@ -107,7 +107,7 @@ dependencies:
   rimraf: 3.0.2
   safe-json-stringify: 1.2.0
   seq-logging: 1.1.1
-  tachi-common: 0.5.9
+  tachi-common: 0.5.10
   ts-node: 10.0.0_83f53b0a0c5616d3fa00ed4e30b9ce1b
   tsconfig-paths: 3.10.1
   typescript: 4.3.4
@@ -5393,8 +5393,8 @@ packages:
       strip-ansi: 6.0.0
     dev: true
 
-  /tachi-common/0.5.9:
-    resolution: {integrity: sha512-KFRpRyW1A9Koi8slPEbWtWCqWQMw7rDb0j7ZIb7NMnoaO+AL8kt/Yb4E8ff5HoQYwewWLgtJ1KC4x2opIjqXgg==}
+  /tachi-common/0.5.10:
+    resolution: {integrity: sha512-czqNJcN4tj/vZBjvaePj3Y34REdiQ7zulo0IaHWjLKVoRv8I5XFRJJJXikhbNQhk85XK0uEn/kkm0OlAVG1E6g==}
     dependencies:
       monk: 7.3.4
     transitivePeerDependencies:
diff --git a/server/src/lib/score-import/framework/user-game-stats/rating.test.ts b/server/src/lib/score-import/framework/user-game-stats/rating.test.ts
index 70b7a63ac..a675c6964 100644
--- a/server/src/lib/score-import/framework/user-game-stats/rating.test.ts
+++ b/server/src/lib/score-import/framework/user-game-stats/rating.test.ts
@@ -63,11 +63,11 @@ t.test("#CalculateRatings", (t) => {
 	t.test("Should return skill for Gitadora", async (t) => {
 		const res = await CalculateRatings("gitadora", "Dora", 1, logger);
 
-		t.strictSame(res, { skill: null }, "Should return skill keys.");
+		t.strictSame(res, { skill: null, naiveSkill: null }, "Should return skill keys.");
 
 		const resDP = await CalculateRatings("gitadora", "Gita", 1, logger);
 
-		t.strictSame(resDP, { skill: null }, "Should return skill keys.");
+		t.strictSame(resDP, { skill: null, naiveSkill: null }, "Should return skill keys.");
 
 		t.end();
 	});
diff --git a/server/src/lib/score-import/framework/user-game-stats/rating.ts b/server/src/lib/score-import/framework/user-game-stats/rating.ts
index 48fe7aad3..9ffaecb58 100644
--- a/server/src/lib/score-import/framework/user-game-stats/rating.ts
+++ b/server/src/lib/score-import/framework/user-game-stats/rating.ts
@@ -121,8 +121,14 @@ const RatingFunctions: RatingFunctions = {
 		}),
 	},
 	gitadora: {
-		Gita: async (g, p, u, l) => ({ skill: await CalculateGitadoraSkill(g, p, u, l) }),
-		Dora: async (g, p, u, l) => ({ skill: await CalculateGitadoraSkill(g, p, u, l) }),
+		Gita: async (g, p, u, l) => ({
+			skill: await CalculateGitadoraSkill(g, p, u, l),
+			naiveSkill: await LazySumN("skill", 50)(g, p, u),
+		}),
+		Dora: async (g, p, u, l) => ({
+			skill: await CalculateGitadoraSkill(g, p, u, l),
+			naiveSkill: await LazySumN("skill", 50)(g, p, u),
+		}),
 	},
 	bms: {
 		"7K": async (g, p, u) => ({