From f446450e72ca521b3f922f6c80d4e8e42b8c86dd Mon Sep 17 00:00:00 2001
From: 7mochi <flyingcatdm@gmail.com>
Date: Wed, 13 Sep 2023 11:44:13 -0500
Subject: [PATCH] fix: apply suggestions

---
 app/api/domains/cho.py            |  2 +-
 app/repositories/ingame_logins.py | 34 +++++++++++++++----------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/app/api/domains/cho.py b/app/api/domains/cho.py
index aea051d30..f3ec7bf8f 100644
--- a/app/api/domains/cho.py
+++ b/app/api/domains/cho.py
@@ -699,7 +699,7 @@ async def login(
     """ login credentials verified """
 
     await logins_repo.create(
-        userid=user_info["id"],
+        user_id=user_info["id"],
         ip=str(ip),
         osu_ver=osu_version.date,
         osu_stream=osu_version.stream,
diff --git a/app/repositories/ingame_logins.py b/app/repositories/ingame_logins.py
index a186d231d..092826b4a 100644
--- a/app/repositories/ingame_logins.py
+++ b/app/repositories/ingame_logins.py
@@ -24,14 +24,19 @@
 )
 
 
-async def create(userid: int, ip: str, osu_ver: str, osu_stream: str) -> dict[str, Any]:
+async def create(
+    user_id: int,
+    ip: str,
+    osu_ver: str,
+    osu_stream: str,
+) -> dict[str, Any]:
     """Create a new login entry in the database."""
     query = f"""\
         INSERT INTO ingame_logins (userid, ip, osu_ver, osu_stream, datetime)
              VALUES (:userid, :ip, :osu_ver, :osu_stream, NOW())
     """
     params = {
-        "userid": userid,
+        "userid": user_id,
         "ip": ip,
         "osu_ver": osu_ver,
         "osu_stream": osu_stream,
@@ -53,7 +58,7 @@ async def create(userid: int, ip: str, osu_ver: str, osu_stream: str) -> dict[st
 
 async def fetch_one(
     id: Optional[int] = None,
-    userid: Optional[int] = None,
+    user_id: Optional[int] = None,
     ip: Optional[str] = None,
     osu_ver: Optional[str] = None,
     osu_stream: Optional[str] = None,
@@ -61,7 +66,7 @@ async def fetch_one(
     """Fetch a login entry from the database."""
     if (
         id is None
-        and userid is None
+        and user_id is None
         and ip is None
         and osu_ver is None
         and osu_stream is None
@@ -79,7 +84,7 @@ async def fetch_one(
     """
     params = {
         "id": id,
-        "userid": userid,
+        "userid": user_id,
         "ip": ip,
         "osu_ver": osu_ver,
         "osu_stream": osu_stream,
@@ -89,10 +94,8 @@ async def fetch_one(
 
 
 async def fetch_count(
-    userid: Optional[int] = None,
+    user_id: Optional[int] = None,
     ip: Optional[str] = None,
-    osu_ver: Optional[str] = None,
-    osu_stream: Optional[str] = None,
 ) -> int:
     """Fetch the number of logins in the database."""
     query = """\
@@ -100,15 +103,10 @@ async def fetch_count(
           FROM ingame_logins
         WHERE userid = COALESCE(:userid, userid)
           AND ip = COALESCE(:ip, ip)
-          AND osu_ver = COALESCE(:osu_ver, osu_ver)
-          AND osu_stream = COALESCE(:osu_stream, osu_stream)
-
     """
     params = {
-        "userid": userid,
+        "userid": user_id,
         "ip": ip,
-        "osu_ver": osu_ver,
-        "osu_stream": osu_stream,
     }
     rec = await app.state.services.database.fetch_one(query, params)
     assert rec is not None
@@ -116,7 +114,7 @@ async def fetch_count(
 
 
 async def fetch_many(
-    userid: Optional[int] = None,
+    user_id: Optional[int] = None,
     ip: Optional[str] = None,
     osu_ver: Optional[str] = None,
     osu_stream: Optional[str] = None,
@@ -133,7 +131,7 @@ async def fetch_many(
            AND osu_stream = COALESCE(:osu_stream, osu_stream)
     """
     params = {
-        "userid": userid,
+        "userid": user_id,
         "ip": ip,
         "osu_ver": osu_ver,
         "osu_stream": osu_stream,
@@ -153,7 +151,7 @@ async def fetch_many(
 
 async def update(
     id: int,
-    userid: Optional[int] = None,
+    user_id: Optional[int] = None,
     ip: Optional[str] = None,
     osu_ver: Optional[str] = None,
     osu_stream: Optional[str] = None,
@@ -169,7 +167,7 @@ async def update(
     """
     params = {
         "id": id,
-        "userid": userid,
+        "userid": user_id,
         "ip": ip,
         "osu_ver": osu_ver,
         "osu_stream": osu_stream,