From 66510c0327758c84ada7ec454265423f79f65c0a Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Sat, 18 May 2024 17:18:15 -0400
Subject: [PATCH 1/8] Improve fetch times of platforms endpoint

---
 backend/config/__init__.py                    |  3 ++-
 backend/endpoints/platform.py                 |  4 +---
 backend/endpoints/responses/platform.py       | 14 ++----------
 backend/models/platform.py                    | 13 +++++------
 docker/init_scripts/init                      |  2 +-
 env.template                                  |  3 +++
 .../__generated__/models/PlatformSchema.ts    |  2 +-
 frontend/src/components/Details/Emulation.vue |  2 +-
 .../Dialog/Platform/ViewFirmware.vue          | 22 +++++++++----------
 9 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/backend/config/__init__.py b/backend/config/__init__.py
index a4e7296f3..064f94254 100644
--- a/backend/config/__init__.py
+++ b/backend/config/__init__.py
@@ -6,10 +6,11 @@
 
 load_dotenv()
 
-# UVICORN
+# GUNICORN
 DEV_PORT: Final = int(os.environ.get("VITE_BACKEND_DEV_PORT", "5000"))
 DEV_HOST: Final = "0.0.0.0"
 ROMM_HOST: Final = os.environ.get("ROMM_HOST", DEV_HOST)
+GUNICORN_WORKERS: Final = int(os.environ.get("GUNICORN_WORKERS", 2))
 
 # PATHS
 ROMM_BASE_PATH: Final = os.environ.get("ROMM_BASE_PATH", "/romm")
diff --git a/backend/endpoints/platform.py b/backend/endpoints/platform.py
index d0b1da142..96327afe3 100644
--- a/backend/endpoints/platform.py
+++ b/backend/endpoints/platform.py
@@ -88,9 +88,7 @@ def get_platform(request: Request, id: int) -> PlatformSchema:
         PlatformSchema: Platform
     """
 
-    return PlatformSchema.from_orm_with_request(
-        db_platform_handler.get_platforms(id), request
-    )
+    return db_platform_handler.get_platforms(id)
 
 
 @protected_route(router.put, "/platforms/{id}", ["platforms.write"])
diff --git a/backend/endpoints/responses/platform.py b/backend/endpoints/responses/platform.py
index f1810e2a0..7cea12f84 100644
--- a/backend/endpoints/responses/platform.py
+++ b/backend/endpoints/responses/platform.py
@@ -1,9 +1,8 @@
 from typing import Optional
 from pydantic import BaseModel, Field
-from fastapi import Request
 
-from models.platform import Platform
 from .firmware import FirmwareSchema
+
 class PlatformSchema(BaseModel):
     id: int
     slug: str
@@ -14,16 +13,7 @@ class PlatformSchema(BaseModel):
     name: str
     logo_path: Optional[str] = ""
     rom_count: int
-
-    firmware_files: list[FirmwareSchema] = Field(default_factory=list)
+    firmware: list[FirmwareSchema] = Field(default_factory=list)
 
     class Config:
         from_attributes = True
-
-    @classmethod
-    def from_orm_with_request(cls, db_platform: Platform, request: Request) -> "PlatformSchema":
-        platform = cls.model_validate(db_platform)
-        platform.firmware_files = [
-            FirmwareSchema.model_validate(f) for f in sorted(db_platform.firmware, key=lambda x: x.file_name)
-        ]
-        return platform
diff --git a/backend/models/platform.py b/backend/models/platform.py
index 8709b407a..210c73396 100644
--- a/backend/models/platform.py
+++ b/backend/models/platform.py
@@ -1,8 +1,9 @@
+from sqlalchemy import Column, Integer, String, select, func
+from sqlalchemy.orm import Mapped, relationship, column_property
+
 from models.base import BaseModel
 from models.rom import Rom
 from models.firmware import Firmware
-from sqlalchemy import Column, Integer, String
-from sqlalchemy.orm import Mapped, relationship
 
 
 class Platform(BaseModel):
@@ -24,11 +25,9 @@ class Platform(BaseModel):
         "Firmware", lazy="selectin", back_populates="platform"
     )
 
-    @property
-    def rom_count(self) -> int:
-        from handler.database import db_platform_handler
-
-        return db_platform_handler.get_rom_count(self.id)
+    rom_count = column_property(
+        select(func.count(Rom.id)).where(Rom.platform_id == id).scalar_subquery()
+    )
 
     def __repr__(self) -> str:
         return self.name
diff --git a/docker/init_scripts/init b/docker/init_scripts/init
index ff0a3be14..d0437a983 100755
--- a/docker/init_scripts/init
+++ b/docker/init_scripts/init
@@ -46,7 +46,7 @@ start_bin_gunicorn () {
         --bind=0.0.0.0:5000 \
         --bind=unix:/tmp/gunicorn.sock \
         --pid=/tmp/gunicorn.pid \
-        --workers 2 \
+        --workers ${GUNICORN_WORKERS:=2} \
         main:app &
 }
 
diff --git a/env.template b/env.template
index 87caeaa07..068a21e0c 100644
--- a/env.template
+++ b/env.template
@@ -1,6 +1,9 @@
 ROMM_BASE_PATH=/path/to/romm_mock
 VITE_BACKEND_DEV_PORT=5000
+
+# Gunicorn (optional)
 ROMM_HOST=localhost
+GUNICORN_WORKERS=4 # (2 × CPU cores) + 1
 
 # IGDB credentials
 IGDB_CLIENT_ID=
diff --git a/frontend/src/__generated__/models/PlatformSchema.ts b/frontend/src/__generated__/models/PlatformSchema.ts
index 97fdcc252..43183ff22 100644
--- a/frontend/src/__generated__/models/PlatformSchema.ts
+++ b/frontend/src/__generated__/models/PlatformSchema.ts
@@ -15,6 +15,6 @@ export type PlatformSchema = {
     name: string;
     logo_path?: (string | null);
     rom_count: number;
-    firmware_files?: Array<FirmwareSchema>;
+    firmware?: Array<FirmwareSchema>;
 };
 
diff --git a/frontend/src/components/Details/Emulation.vue b/frontend/src/components/Details/Emulation.vue
index 530b9eecf..915005a6f 100644
--- a/frontend/src/components/Details/Emulation.vue
+++ b/frontend/src/components/Details/Emulation.vue
@@ -44,7 +44,7 @@ function onFullScreenChange() {
         label="BIOS"
         v-model="biosRef"
         :items="
-          props.platform.firmware_files?.map((f) => ({
+          props.platform.firmware?.map((f) => ({
             title: f.file_name,
             value: f,
           })) ?? []
diff --git a/frontend/src/components/Dialog/Platform/ViewFirmware.vue b/frontend/src/components/Dialog/Platform/ViewFirmware.vue
index 3bb5139c9..e16ebe90d 100644
--- a/frontend/src/components/Dialog/Platform/ViewFirmware.vue
+++ b/frontend/src/components/Dialog/Platform/ViewFirmware.vue
@@ -45,7 +45,7 @@ function uploadFirmware() {
     .then(({ data }) => {
       const { uploaded, firmware } = data;
       if (selectedPlatform.value) {
-        selectedPlatform.value.firmware_files = firmware;
+        selectedPlatform.value.firmware = firmware;
       }
 
       emitter?.emit("snackbarShow", {
@@ -75,8 +75,8 @@ function deleteFirmware() {
     .deleteFirmware({ firmware: selectedFirmware.value, deleteFromFs: false })
     .then(() => {
       if (selectedPlatform.value) {
-        selectedPlatform.value.firmware_files =
-          selectedPlatform.value.firmware_files?.filter(
+        selectedPlatform.value.firmware =
+          selectedPlatform.value.firmware?.filter(
             (firmware) => !selectedFirmware.value.includes(firmware)
           );
       }
@@ -91,12 +91,12 @@ function deleteFirmware() {
 }
 
 function allFirmwareSelected() {
-  if (selectedPlatform.value?.firmware_files?.length == 0) {
+  if (selectedPlatform.value?.firmware?.length == 0) {
     return false;
   }
   return (
     selectedFirmware.value.length ===
-    selectedPlatform.value?.firmware_files?.length
+    selectedPlatform.value?.firmware?.length
   );
 }
 
@@ -104,7 +104,7 @@ function selectAllFirmware() {
   if (allFirmwareSelected()) {
     selectedFirmware.value = [];
   } else {
-    selectedFirmware.value = selectedPlatform.value?.firmware_files ?? [];
+    selectedFirmware.value = selectedPlatform.value?.firmware ?? [];
   }
 }
 </script>
@@ -223,14 +223,14 @@ function selectAllFirmware() {
       <v-card-text
         class="my-4 py-0"
         v-if="
-          selectedPlatform?.firmware_files != undefined &&
-          selectedPlatform?.firmware_files?.length > 0
+          selectedPlatform?.firmware != undefined &&
+          selectedPlatform?.firmware?.length > 0
         "
       >
         <v-list rounded="0" class="pa-0">
           <v-list-item
             class="px-3"
-            v-for="firmware in selectedPlatform?.firmware_files ?? []"
+            v-for="firmware in selectedPlatform?.firmware ?? []"
             :key="firmware.id"
           >
             <template v-slot:prepend>
@@ -286,8 +286,8 @@ function selectAllFirmware() {
               variant="text"
               :disabled="
                 !(
-                  selectedPlatform?.firmware_files != undefined &&
-                  selectedPlatform?.firmware_files?.length > 0
+                  selectedPlatform?.firmware != undefined &&
+                  selectedPlatform?.firmware?.length > 0
                 )
               "
             >

From c3fe8d71aec1eb8196073af3f10e3bce476a3116 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Sat, 18 May 2024 18:50:23 -0400
Subject: [PATCH 2/8] add network quiest listener

---
 frontend/src/services/api/index.ts | 22 ++++++++++++++++++++--
 frontend/src/views/Home.vue        | 13 ++++++++++---
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/frontend/src/services/api/index.ts b/frontend/src/services/api/index.ts
index be44dd001..2547e7195 100644
--- a/frontend/src/services/api/index.ts
+++ b/frontend/src/services/api/index.ts
@@ -1,18 +1,36 @@
 import axios from "axios";
 import cookie from "js-cookie";
-
 import router from "@/plugins/router";
+import { debounce } from "lodash";
 
 const api = axios.create({ baseURL: "/api", timeout: 120000 });
 
+const inflightRequests = new Set();
+
+const networkQuiesced = debounce(() => {
+  document.dispatchEvent(new CustomEvent("network-quiesced"));
+}, 300);
+
 // Set CSRF header for all requests
 api.interceptors.request.use((config) => {
+  inflightRequests.add(config.url);
+  networkQuiesced.cancel();
+
   config.headers["x-csrftoken"] = cookie.get("csrftoken");
   return config;
 });
 
 api.interceptors.response.use(
-  (response) => response,
+  (response) => {
+    inflightRequests.delete(response.config.url);
+
+    // If there are no more inflight requests, fetch home data
+    if (inflightRequests.size === 0) {
+      networkQuiesced();
+    }
+
+    return response;
+  },
   (error) => {
     if (error.response?.status === 403) {
       router.push({
diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue
index feee1043f..d452bfec3 100644
--- a/frontend/src/views/Home.vue
+++ b/frontend/src/views/Home.vue
@@ -27,7 +27,7 @@ import storeScanning from "@/stores/scanning";
 import type { Events } from "@/types/emitter";
 import type { Emitter } from "mitt";
 import { storeToRefs } from "pinia";
-import { inject, onMounted, ref } from "vue";
+import { inject, onBeforeUnmount, ref, nextTick } from "vue";
 import { useDisplay } from "vuetify";
 
 // Props
@@ -48,8 +48,9 @@ emitter?.on("refreshView", async () => {
   refreshView.value = refreshView.value + 1;
 });
 
-// Functions
-onMounted(() => {
+function fetchHomeData() {
+  document.removeEventListener("network-quiesced", fetchHomeData);
+
   platformApi
     .getPlatforms()
     .then(({ data: platforms }) => {
@@ -67,6 +68,12 @@ onMounted(() => {
     .catch((error) => {
       console.error(error);
     });
+}
+
+document.addEventListener("network-quiesced", fetchHomeData);
+
+onBeforeUnmount(() => {
+  document.removeEventListener("network-quiesced", fetchHomeData);
 });
 </script>
 

From 8a1b7dfaf45184b1326a5ed91b55c3eb266d36b6 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Sat, 18 May 2024 19:06:38 -0400
Subject: [PATCH 3/8] defer fetching non criticals

---
 frontend/src/App.vue        | 35 +++++++++++++++++++++++++++++++++--
 frontend/src/views/Home.vue | 33 +--------------------------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 0241405af..4d9d86f38 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,11 +1,15 @@
 <script setup lang="ts">
 import Notification from "@/components/Notification.vue";
 import api from "@/services/api/index";
+import userApi from "@/services/api/user";
+import platformApi from "@/services/api/platform";
 import socket from "@/services/socket";
 import storeConfig from "@/stores/config";
 import storeGalleryFilter from "@/stores/galleryFilter";
 import storeHeartbeat from "@/stores/heartbeat";
 import storeRoms, { type Rom } from "@/stores/roms";
+import storePlatforms from "@/stores/platforms";
+import storeAuth from "@/stores/auth";
 import storeScanning from "@/stores/scanning";
 import type { Events } from "@/types/emitter";
 import { normalizeString } from "@/utils";
@@ -24,6 +28,8 @@ const emitter = inject<Emitter<Events>>("emitter");
 // Props
 const heartbeat = storeHeartbeat();
 const configStore = storeConfig();
+const auth = storeAuth();
+const platformsStore = storePlatforms();
 
 socket.on(
   "scan:scanning_platform",
@@ -93,16 +99,41 @@ onBeforeUnmount(() => {
   socket.off("scan:scanning_rom");
   socket.off("scan:done");
   socket.off("scan:done_ko");
+
+  document.removeEventListener("network-quiesced", fetchHomeData);
 });
 
-onBeforeMount(() => {
+function fetchHomeData() {
+  document.removeEventListener("network-quiesced", fetchHomeData);
+
   api.get("/heartbeat").then(({ data: data }) => {
     heartbeat.set(data);
   });
+
   api.get("/config").then(({ data: data }) => {
     configStore.set(data);
   });
-});
+
+  platformApi
+    .getPlatforms()
+    .then(({ data: platforms }) => {
+      platformsStore.set(platforms);
+    })
+    .catch((error) => {
+      console.error(error);
+    });
+
+  userApi
+    .fetchCurrentUser()
+    .then(({ data: user }) => {
+      auth.setUser(user);
+    })
+    .catch((error) => {
+      console.error(error);
+    });
+}
+
+document.addEventListener("network-quiesced", fetchHomeData)
 </script>
 
 <template>
diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue
index d452bfec3..90fe6a8d5 100644
--- a/frontend/src/views/Home.vue
+++ b/frontend/src/views/Home.vue
@@ -20,14 +20,12 @@ import DeleteUserDialog from "@/components/Dialog/User/DeleteUser.vue";
 import EditUserDialog from "@/components/Dialog/User/EditUser.vue";
 import Drawer from "@/components/Drawer/Base.vue";
 import platformApi from "@/services/api/platform";
-import userApi from "@/services/api/user";
-import storeAuth from "@/stores/auth";
 import storePlatforms from "@/stores/platforms";
 import storeScanning from "@/stores/scanning";
 import type { Events } from "@/types/emitter";
 import type { Emitter } from "mitt";
 import { storeToRefs } from "pinia";
-import { inject, onBeforeUnmount, ref, nextTick } from "vue";
+import { inject, ref } from "vue";
 import { useDisplay } from "vuetify";
 
 // Props
@@ -35,7 +33,6 @@ const { mdAndDown } = useDisplay();
 const scanningStore = storeScanning();
 const { scanning } = storeToRefs(scanningStore);
 const platformsStore = storePlatforms();
-const auth = storeAuth();
 const refreshView = ref(0);
 
 // Event listeners bus
@@ -47,34 +44,6 @@ emitter?.on("refreshDrawer", async () => {
 emitter?.on("refreshView", async () => {
   refreshView.value = refreshView.value + 1;
 });
-
-function fetchHomeData() {
-  document.removeEventListener("network-quiesced", fetchHomeData);
-
-  platformApi
-    .getPlatforms()
-    .then(({ data: platforms }) => {
-      platformsStore.set(platforms);
-    })
-    .catch((error) => {
-      console.error(error);
-    });
-
-  userApi
-    .fetchCurrentUser()
-    .then(({ data: user }) => {
-      auth.setUser(user);
-    })
-    .catch((error) => {
-      console.error(error);
-    });
-}
-
-document.addEventListener("network-quiesced", fetchHomeData);
-
-onBeforeUnmount(() => {
-  document.removeEventListener("network-quiesced", fetchHomeData);
-});
 </script>
 
 <template>

From 0922e5e1e2ad345f71fdd01951882439a5e67ea0 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Sat, 18 May 2024 21:00:15 -0400
Subject: [PATCH 4/8] add comments for some changes

---
 backend/models/platform.py         |  1 +
 frontend/src/App.vue               |  1 +
 frontend/src/services/api/index.ts | 10 +++++++---
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/backend/models/platform.py b/backend/models/platform.py
index 210c73396..520fa84f5 100644
--- a/backend/models/platform.py
+++ b/backend/models/platform.py
@@ -25,6 +25,7 @@ class Platform(BaseModel):
         "Firmware", lazy="selectin", back_populates="platform"
     )
 
+    # This runs a subquery to get the count of roms for the platform
     rom_count = column_property(
         select(func.count(Rom.id)).where(Rom.platform_id == id).scalar_subquery()
     )
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 4d9d86f38..0aeb17497 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -104,6 +104,7 @@ onBeforeUnmount(() => {
 });
 
 function fetchHomeData() {
+  // Remove it so it's not called multiple times
   document.removeEventListener("network-quiesced", fetchHomeData);
 
   api.get("/heartbeat").then(({ data: data }) => {
diff --git a/frontend/src/services/api/index.ts b/frontend/src/services/api/index.ts
index 2547e7195..b682cc410 100644
--- a/frontend/src/services/api/index.ts
+++ b/frontend/src/services/api/index.ts
@@ -11,20 +11,24 @@ const networkQuiesced = debounce(() => {
   document.dispatchEvent(new CustomEvent("network-quiesced"));
 }, 300);
 
-// Set CSRF header for all requests
 api.interceptors.request.use((config) => {
+  // Add request to set of inflight requests
   inflightRequests.add(config.url);
-  networkQuiesced.cancel();
 
+  // Cancel debounced networkQuiesced since a new request just came in
+  networkQuiesced.cancel();
+  
+  // Set CSRF header for all requests
   config.headers["x-csrftoken"] = cookie.get("csrftoken");
   return config;
 });
 
 api.interceptors.response.use(
   (response) => {
+    // Remove request from set of inflight requests
     inflightRequests.delete(response.config.url);
 
-    // If there are no more inflight requests, fetch home data
+    // If there are no more inflight requests, fetch app-wide data
     if (inflightRequests.size === 0) {
       networkQuiesced();
     }

From 6735be4ce882f854e8aacfedf253a5cf1cf1afb6 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Sun, 19 May 2024 11:25:46 -0400
Subject: [PATCH 5/8] add query preloader for roms

---
 backend/handler/database/platforms_handler.py | 57 +++++++++++++------
 frontend/src/App.vue                          | 14 +++--
 2 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/backend/handler/database/platforms_handler.py b/backend/handler/database/platforms_handler.py
index d7bb7dbf5..c5dc4f2a9 100644
--- a/backend/handler/database/platforms_handler.py
+++ b/backend/handler/database/platforms_handler.py
@@ -1,33 +1,62 @@
+import functools
+from sqlalchemy import delete, func, or_, select
+from sqlalchemy.orm import Session, Query, joinedload
+
 from decorators.database import begin_session
 from models.platform import Platform
 from models.rom import Rom
-from sqlalchemy import delete, func, or_, select
-from sqlalchemy.orm import Session
 
 from .base_handler import DBBaseHandler
 
 
+def with_query(func):
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        session = kwargs.get("session")
+        if session is None:
+            raise ValueError("session is required")
+
+        kwargs["query"] = session.query(Platform).options(
+            joinedload(Platform.roms)
+        )
+        return func(*args, **kwargs)
+
+    return wrapper
+
+
 class DBPlatformsHandler(DBBaseHandler):
     @begin_session
-    def add_platform(self, platform: Platform, session: Session = None):
-        return session.merge(platform)
+    @with_query
+    def add_platform(
+        self, platform: Platform, query: Query = None, session: Session = None
+    ):
+        session.merge(platform)
+        session.flush()
+
+        return query.filter(Platform.id == platform.id).one()
 
     @begin_session
-    def get_platforms(self, id: int = None, session: Session = None):
+    @with_query
+    def get_platforms(
+        self, id: int = None, query: Query = None, session: Session = None
+    ):
         return (
-            session.get(Platform, id)
+            query.get(Platform, id)
             if id
             else (
-                session.scalars(select(Platform).order_by(Platform.name.asc()))
+                session.scalars(query.order_by(Platform.name.asc()))
                 .unique()
                 .all()
             )
         )
 
     @begin_session
-    def get_platform_by_fs_slug(self, fs_slug: str, session: Session = None):
+    @with_query
+    def get_platform_by_fs_slug(
+        self, fs_slug: str, query: Query = None, session: Session = None
+    ):
         return session.scalars(
-            select(Platform).filter_by(fs_slug=fs_slug).limit(1)
+            query.filter_by(fs_slug=fs_slug).limit(1)
         ).first()
 
     @begin_session
@@ -45,13 +74,9 @@ def delete_platform(self, id: int, session: Session = None):
         )
 
     @begin_session
-    def get_rom_count(self, platform_id: int, session: Session = None):
-        return session.scalar(
-            select(func.count()).select_from(Rom).filter_by(platform_id=platform_id)
-        )
-
-    @begin_session
-    def purge_platforms(self, fs_platforms: list[str], session: Session = None):
+    def purge_platforms(
+        self, fs_platforms: list[str], session: Session = None
+    ):
         return session.execute(
             delete(Platform)
             .where(or_(Platform.fs_slug.not_in(fs_platforms), Platform.slug.is_(None)))
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 0aeb17497..5acbfc9b0 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -15,7 +15,7 @@ import type { Events } from "@/types/emitter";
 import { normalizeString } from "@/utils";
 import type { Emitter } from "mitt";
 import { storeToRefs } from "pinia";
-import { inject, onBeforeMount, onBeforeUnmount } from "vue";
+import { inject, onMounted, onBeforeUnmount } from "vue";
 
 // Props
 const scanningStore = storeScanning();
@@ -103,6 +103,12 @@ onBeforeUnmount(() => {
   document.removeEventListener("network-quiesced", fetchHomeData);
 });
 
+onMounted(() => {
+  api.get("/config").then(({ data: data }) => {
+    configStore.set(data);
+  });
+});
+
 function fetchHomeData() {
   // Remove it so it's not called multiple times
   document.removeEventListener("network-quiesced", fetchHomeData);
@@ -111,10 +117,6 @@ function fetchHomeData() {
     heartbeat.set(data);
   });
 
-  api.get("/config").then(({ data: data }) => {
-    configStore.set(data);
-  });
-
   platformApi
     .getPlatforms()
     .then(({ data: platforms }) => {
@@ -134,7 +136,7 @@ function fetchHomeData() {
     });
 }
 
-document.addEventListener("network-quiesced", fetchHomeData)
+document.addEventListener("network-quiesced", fetchHomeData);
 </script>
 
 <template>

From fffc9547501997e5e0bc10e888be87360ef296f2 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Sun, 19 May 2024 13:06:11 -0400
Subject: [PATCH 6/8] fix tests

---
 backend/handler/database/platforms_handler.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/handler/database/platforms_handler.py b/backend/handler/database/platforms_handler.py
index c5dc4f2a9..f72da8562 100644
--- a/backend/handler/database/platforms_handler.py
+++ b/backend/handler/database/platforms_handler.py
@@ -29,17 +29,17 @@ class DBPlatformsHandler(DBBaseHandler):
     @with_query
     def add_platform(
         self, platform: Platform, query: Query = None, session: Session = None
-    ):
+    ) -> Platform | None:
         session.merge(platform)
         session.flush()
 
-        return query.filter(Platform.id == platform.id).one()
+        return query.filter(Platform.id == platform.id).first()
 
     @begin_session
     @with_query
     def get_platforms(
         self, id: int = None, query: Query = None, session: Session = None
-    ):
+    ) -> list[Platform] | Platform | None:
         return (
             query.get(Platform, id)
             if id
@@ -54,13 +54,13 @@ def get_platforms(
     @with_query
     def get_platform_by_fs_slug(
         self, fs_slug: str, query: Query = None, session: Session = None
-    ):
+    ) -> Platform | None:
         return session.scalars(
             query.filter_by(fs_slug=fs_slug).limit(1)
         ).first()
 
     @begin_session
-    def delete_platform(self, id: int, session: Session = None):
+    def delete_platform(self, id: int, session: Session = None) -> int:
         # Remove all roms from that platforms first
         session.execute(
             delete(Rom)
@@ -76,7 +76,7 @@ def delete_platform(self, id: int, session: Session = None):
     @begin_session
     def purge_platforms(
         self, fs_platforms: list[str], session: Session = None
-    ):
+    ) -> int:
         return session.execute(
             delete(Platform)
             .where(or_(Platform.fs_slug.not_in(fs_platforms), Platform.slug.is_(None)))

From 9fc8267646079916afe0784c613b5869cc5bf57e Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Sun, 19 May 2024 14:29:13 -0400
Subject: [PATCH 7/8] run ruff

---
 backend/endpoints/responses/platform.py       |  1 +
 backend/handler/database/platforms_handler.py | 24 ++++++-------------
 frontend/src/services/api/index.ts            |  2 +-
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/backend/endpoints/responses/platform.py b/backend/endpoints/responses/platform.py
index 7cea12f84..5164a343f 100644
--- a/backend/endpoints/responses/platform.py
+++ b/backend/endpoints/responses/platform.py
@@ -3,6 +3,7 @@
 
 from .firmware import FirmwareSchema
 
+
 class PlatformSchema(BaseModel):
     id: int
     slug: str
diff --git a/backend/handler/database/platforms_handler.py b/backend/handler/database/platforms_handler.py
index 190439c4b..e783987fd 100644
--- a/backend/handler/database/platforms_handler.py
+++ b/backend/handler/database/platforms_handler.py
@@ -1,5 +1,5 @@
 import functools
-from sqlalchemy import delete, func, or_, select
+from sqlalchemy import delete, or_
 from sqlalchemy.orm import Session, Query, joinedload
 
 from decorators.database import begin_session
@@ -16,9 +16,7 @@ def wrapper(*args, **kwargs):
         if session is None:
             raise ValueError("session is required")
 
-        kwargs["query"] = session.query(Platform).options(
-            joinedload(Platform.roms)
-        )
+        kwargs["query"] = session.query(Platform).options(joinedload(Platform.roms))
         return func(*args, **kwargs)
 
     return wrapper
@@ -33,7 +31,7 @@ def add_platform(
         session.merge(platform)
         session.flush()
 
-        return query.filter(Platform.id == platform.id).first()
+        return query.filter(Platform.fs_slug == platform.fs_slug).first()
 
     @begin_session
     @with_query
@@ -41,13 +39,9 @@ def get_platforms(
         self, id: int = None, query: Query = None, session: Session = None
     ) -> list[Platform] | Platform | None:
         return (
-            query.get(Platform, id)
+            query.get(id)
             if id
-            else (
-                session.scalars(query.order_by(Platform.name.asc()))
-                .unique()
-                .all()
-            )
+            else (session.scalars(query.order_by(Platform.name.asc())).unique().all())
         )
 
     @begin_session
@@ -55,9 +49,7 @@ def get_platforms(
     def get_platform_by_fs_slug(
         self, fs_slug: str, query: Query = None, session: Session = None
     ) -> Platform | None:
-        return session.scalars(
-            query.filter_by(fs_slug=fs_slug).limit(1)
-        ).first()
+        return session.scalars(query.filter_by(fs_slug=fs_slug).limit(1)).first()
 
     @begin_session
     def delete_platform(self, id: int, session: Session = None) -> int:
@@ -74,9 +66,7 @@ def delete_platform(self, id: int, session: Session = None) -> int:
         )
 
     @begin_session
-    def purge_platforms(
-        self, fs_platforms: list[str], session: Session = None
-    ) -> int:
+    def purge_platforms(self, fs_platforms: list[str], session: Session = None) -> int:
         return session.execute(
             delete(Platform)
             .where(or_(Platform.fs_slug.not_in(fs_platforms), Platform.slug.is_(None)))
diff --git a/frontend/src/services/api/index.ts b/frontend/src/services/api/index.ts
index b682cc410..8002d8e86 100644
--- a/frontend/src/services/api/index.ts
+++ b/frontend/src/services/api/index.ts
@@ -17,7 +17,7 @@ api.interceptors.request.use((config) => {
 
   // Cancel debounced networkQuiesced since a new request just came in
   networkQuiesced.cancel();
-  
+
   // Set CSRF header for all requests
   config.headers["x-csrftoken"] = cookie.get("csrftoken");
   return config;

From 99919224f7fdade1e54d6bd53247c7220872b840 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Mon, 20 May 2024 09:16:31 -0400
Subject: [PATCH 8/8] delete unused file

---
 frontend/src/services/api/filter.ts | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 frontend/src/services/api/filter.ts

diff --git a/frontend/src/services/api/filter.ts b/frontend/src/services/api/filter.ts
deleted file mode 100644
index c8783a302..000000000
--- a/frontend/src/services/api/filter.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import api from "@/services/api/index";
-
-export const stateApi = api;
-
-async function getFilters(): Promise<{ data: { genres: string[] } }> {
-  return api.get("/filters");
-}
-export default {
-  getFilters,
-};