From b9b861d68479c8f385021883cd7361c8b7c1daa2 Mon Sep 17 00:00:00 2001
From: zurdi <zurdizurdo25@gmail.com>
Date: Thu, 27 Jun 2024 18:46:56 +0200
Subject: [PATCH 01/23] set main sibling added to the backend

---
 backend/alembic/versions/0021_fav_sibling.py  | 36 +++++++++++
 backend/endpoints/responses/rom.py            |  2 +
 backend/endpoints/rom.py                      |  1 +
 backend/models/rom.py                         |  3 +
 .../__generated__/models/DetailedRomSchema.ts |  1 +
 .../src/__generated__/models/RomSchema.ts     |  1 +
 .../src/components/Details/Info/FileInfo.vue  | 60 ++++++++++++++++++-
 frontend/src/services/api/rom.ts              |  2 +
 8 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 backend/alembic/versions/0021_fav_sibling.py

diff --git a/backend/alembic/versions/0021_fav_sibling.py b/backend/alembic/versions/0021_fav_sibling.py
new file mode 100644
index 000000000..b2ad9c6ee
--- /dev/null
+++ b/backend/alembic/versions/0021_fav_sibling.py
@@ -0,0 +1,36 @@
+"""empty message
+
+Revision ID: 0021_fav_sibling
+Revises: 0020_created_and_updated
+Create Date: 2024-06-27 18:04:55.707623
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "0021_fav_sibling"
+down_revision = "0020_created_and_updated"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("roms", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "fav_sibling", sa.Boolean(), nullable=True, server_default=sa.false()
+            )
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("roms", schema=None) as batch_op:
+        batch_op.drop_column("fav_sibling")
+
+    # ### end Alembic commands ###
diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py
index 4e5280db8..5b101d881 100644
--- a/backend/endpoints/responses/rom.py
+++ b/backend/endpoints/responses/rom.py
@@ -94,6 +94,8 @@ class RomSchema(BaseModel):
     files: list[str]
     full_path: str
 
+    fav_sibling: bool
+
     created_at: datetime
     updated_at: datetime
 
diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index b43474657..a9c31ab1f 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -278,6 +278,7 @@ async def update_rom(
     cleaned_data = {}
     cleaned_data["igdb_id"] = data.get("igdb_id", None)
     cleaned_data["moby_id"] = data.get("moby_id", None)
+    cleaned_data["fav_sibling"] = bool(data.get("fav_sibling", None))
 
     if cleaned_data["moby_id"]:
         moby_rom = meta_moby_handler.get_rom_by_id(cleaned_data["moby_id"])
diff --git a/backend/models/rom.py b/backend/models/rom.py
index 8f53b3fc4..c88178353 100644
--- a/backend/models/rom.py
+++ b/backend/models/rom.py
@@ -81,6 +81,9 @@ class Rom(BaseModel):
     states: Mapped[list["State"]] = relationship(back_populates="rom")
     screenshots: Mapped[list["Screenshot"]] = relationship(back_populates="rom")
     notes: Mapped[list["RomNote"]] = relationship(back_populates="rom")
+
+    fav_sibling: Mapped[bool | None] = mapped_column(default=False)
+
     created_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True), server_default=func.now()
     )
diff --git a/frontend/src/__generated__/models/DetailedRomSchema.ts b/frontend/src/__generated__/models/DetailedRomSchema.ts
index 10ad1628c..257537027 100644
--- a/frontend/src/__generated__/models/DetailedRomSchema.ts
+++ b/frontend/src/__generated__/models/DetailedRomSchema.ts
@@ -48,6 +48,7 @@ export type DetailedRomSchema = {
   multi: boolean;
   files: Array<string>;
   full_path: string;
+  fav_sibling: boolean;
   created_at: string;
   updated_at: string;
   merged_screenshots: Array<string>;
diff --git a/frontend/src/__generated__/models/RomSchema.ts b/frontend/src/__generated__/models/RomSchema.ts
index 80f8b6d3a..a77c4d643 100644
--- a/frontend/src/__generated__/models/RomSchema.ts
+++ b/frontend/src/__generated__/models/RomSchema.ts
@@ -43,6 +43,7 @@ export type RomSchema = {
   multi: boolean;
   files: Array<string>;
   full_path: string;
+  fav_sibling: boolean;
   created_at: string;
   updated_at: string;
   readonly sort_comparator: string;
diff --git a/frontend/src/components/Details/Info/FileInfo.vue b/frontend/src/components/Details/Info/FileInfo.vue
index 1ab1d7aca..426369b9d 100644
--- a/frontend/src/components/Details/Info/FileInfo.vue
+++ b/frontend/src/components/Details/Info/FileInfo.vue
@@ -1,12 +1,42 @@
 <script setup lang="ts">
 import VersionSwitcher from "@/components/Details/VersionSwitcher.vue";
+import romApi from "@/services/api/rom";
 import storeDownload from "@/stores/download";
 import type { Platform } from "@/stores/platforms";
 import type { DetailedRom } from "@/stores/roms";
+import type { Events } from "@/types/emitter";
 import { formatBytes } from "@/utils";
+import type { Emitter } from "mitt";
+import { inject } from "vue";
 
-defineProps<{ rom: DetailedRom; platform: Platform }>();
+const props = defineProps<{ rom: DetailedRom; platform: Platform }>();
+const emitter = inject<Emitter<Events>>("emitter");
 const downloadStore = storeDownload();
+
+async function updateMainSibling() {
+  const updatedRom = props.rom;
+  updatedRom.fav_sibling = !props.rom.fav_sibling;
+  await romApi
+    .updateRom({ rom: updatedRom })
+    .then(({ data }) => {
+      emitter?.emit("snackbarShow", {
+        msg: "Rom updated successfully!",
+        icon: "mdi-check-bold",
+        color: "green",
+      });
+    })
+    .catch((error) => {
+      console.log(error);
+      emitter?.emit("snackbarShow", {
+        msg: error.response.data.detail,
+        icon: "mdi-close-circle",
+        color: "red",
+      });
+    })
+    .finally(() => {
+      emitter?.emit("showLoadingDialog", { loading: false, scrim: false });
+    });
+}
 </script>
 <template>
   <v-row
@@ -18,7 +48,33 @@ const downloadStore = storeDownload();
       <span>Ver.</span>
     </v-col>
     <v-col>
-      <version-switcher :rom="rom" :platform="platform" />
+      <v-row class="align-center" no-gutters>
+        <version-switcher :rom="rom" :platform="platform" />
+        <v-tooltip
+          location="top"
+          class="tooltip"
+          transition="fade-transition"
+          text="Set as main sibling"
+          open-delay="300"
+        >
+          <template #activator="{ props }">
+            <v-btn
+              v-bind="props"
+              @click="updateMainSibling"
+              class="ml-4"
+              icon
+              density="comfortable"
+              :ripple="false"
+              color="secondary"
+              variant="flat"
+            >
+              <v-icon color="romm-accent-1">{{
+                rom.fav_sibling ? "mdi-star" : "mdi-star-outline"
+              }}</v-icon>
+            </v-btn>
+          </template></v-tooltip
+        >
+      </v-row>
     </v-col>
   </v-row>
   <v-row v-if="!rom.multi" class="align-center my-3" no-gutters>
diff --git a/frontend/src/services/api/rom.ts b/frontend/src/services/api/rom.ts
index 21e8d0676..133accce5 100644
--- a/frontend/src/services/api/rom.ts
+++ b/frontend/src/services/api/rom.ts
@@ -142,6 +142,8 @@ async function updateRom({
   const formData = new FormData();
   if (rom.igdb_id) formData.append("igdb_id", rom.igdb_id.toString());
   if (rom.moby_id) formData.append("moby_id", rom.moby_id.toString());
+  if (rom.fav_sibling)
+    formData.append("fav_sibling", rom.fav_sibling.toString());
   formData.append("name", rom.name || "");
   formData.append("file_name", rom.file_name);
   formData.append("summary", rom.summary || "");

From 7d9ce05c3c43874a24bea93c18fb6dc439fe0898 Mon Sep 17 00:00:00 2001
From: Zurdi <zurdizurdo25@gmail.com>
Date: Thu, 27 Jun 2024 20:22:25 +0200
Subject: [PATCH 02/23] added main sibling to the front and database

---
 backend/endpoints/rom.py                      |  6 +++-
 backend/handler/database/roms_handler.py      |  7 +++++
 .../src/components/Details/Info/FileInfo.vue  | 28 ++++++++++---------
 .../components/Details/VersionSwitcher.vue    | 10 ++-----
 frontend/src/stores/roms.ts                   | 16 ++++++++---
 5 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index a9c31ab1f..e3259777f 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -372,8 +372,12 @@ async def update_rom(
         cleaned_data.update({"path_screenshots": path_screenshots})
 
     db_rom_handler.update_rom(id, cleaned_data)
+    updated_rom = db_rom_handler.get_roms(id)
 
-    return DetailedRomSchema.from_orm_with_request(db_rom_handler.get_roms(id), request)
+    if cleaned_data["fav_sibling"]:
+        db_rom_handler.set_main_sibling(updated_rom)
+
+    return DetailedRomSchema.from_orm_with_request(updated_rom, request)
 
 
 @protected_route(router.post, "/roms/delete", ["roms.write"])
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index 5dfcffa9c..0861763b6 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -122,6 +122,13 @@ class DBRomsHandler(DBBaseHandler):
             .execution_options(synchronize_session="evaluate")
         )
 
+    @begin_session
+    def set_main_sibling(self, rom: Rom, session: Session = None) -> None:
+        siblings = [rom.id for rom in rom.get_sibling_roms()]
+        return session.execute(
+            update(Rom).where(Rom.id.in_(siblings)).values(fav_sibling=False)
+        )
+
     @begin_session
     def delete_rom(self, id: int, session: Session = None) -> Rom:
         return session.execute(
diff --git a/frontend/src/components/Details/Info/FileInfo.vue b/frontend/src/components/Details/Info/FileInfo.vue
index 426369b9d..555dc357d 100644
--- a/frontend/src/components/Details/Info/FileInfo.vue
+++ b/frontend/src/components/Details/Info/FileInfo.vue
@@ -45,7 +45,7 @@ async function updateMainSibling() {
     no-gutters
   >
     <v-col cols="3" xl="2">
-      <span>Ver.</span>
+      <span>Version</span>
     </v-col>
     <v-col>
       <v-row class="align-center" no-gutters>
@@ -54,24 +54,26 @@ async function updateMainSibling() {
           location="top"
           class="tooltip"
           transition="fade-transition"
-          text="Set as main sibling"
+          text="Set as default version"
           open-delay="300"
         >
           <template #activator="{ props }">
-            <v-btn
+            <v-chip
               v-bind="props"
+              rounded="0"
+              variant="text"
+              class="ml-3"
               @click="updateMainSibling"
-              class="ml-4"
-              icon
-              density="comfortable"
-              :ripple="false"
-              color="secondary"
-              variant="flat"
+              ><v-icon
+                :class="rom.fav_sibling ? '' : 'mr-1'"
+                :color="rom.fav_sibling ? 'romm-accent-1' : ''"
+                >{{
+                  rom.fav_sibling
+                    ? "mdi-checkbox-outline"
+                    : "mdi-checkbox-blank-outline"
+                }}</v-icon
+              >{{ rom.fav_sibling ? "" : "Set as default" }}</v-chip
             >
-              <v-icon color="romm-accent-1">{{
-                rom.fav_sibling ? "mdi-star" : "mdi-star-outline"
-              }}</v-icon>
-            </v-btn>
           </template></v-tooltip
         >
       </v-row>
diff --git a/frontend/src/components/Details/VersionSwitcher.vue b/frontend/src/components/Details/VersionSwitcher.vue
index 9df4adabe..bd14a397c 100644
--- a/frontend/src/components/Details/VersionSwitcher.vue
+++ b/frontend/src/components/Details/VersionSwitcher.vue
@@ -31,9 +31,11 @@ function updateVersion() {
   <v-select
     v-model="version"
     label="Version"
+    single-line
+    color="romm-gray"
     variant="outlined"
     density="compact"
-    class="version-select"
+    max-width="fit-content"
     hide-details
     :items="
       [rom, ...rom.sibling_roms].map((i) => ({
@@ -44,9 +46,3 @@ function updateVersion() {
     @update:model-value="updateVersion"
   />
 </template>
-
-<style scoped>
-.version-select {
-  max-width: fit-content;
-}
-</style>
diff --git a/frontend/src/stores/roms.ts b/frontend/src/stores/roms.ts
index 96809f586..8babc3f63 100644
--- a/frontend/src/stores/roms.ts
+++ b/frontend/src/stores/roms.ts
@@ -60,10 +60,18 @@ export default defineStore("roms", {
             game.igdb_id || game.moby_id || nanoid(),
         ),
       )
-        .map((games) => ({
-          ...(games.shift() as SimpleRom),
-          siblings: games,
-        }))
+        .map((games) => {
+          const favSiblingIndex = games.findIndex((game) => game.fav_sibling);
+          const primaryGame =
+            favSiblingIndex !== -1
+              ? games.splice(favSiblingIndex, 1)[0]
+              : games.shift();
+
+          return {
+            ...(primaryGame as SimpleRom),
+            siblings: games,
+          };
+        })
         .sort((a, b) => {
           return a.sort_comparator.localeCompare(b.sort_comparator);
         });

From 39877b13b7c9bfc8bfb5b3426fd3ebbdad23e1e5 Mon Sep 17 00:00:00 2001
From: zurdi <zurdizurdo25@gmail.com>
Date: Thu, 27 Jun 2024 23:20:37 +0200
Subject: [PATCH 03/23] fixed game info details

---
 .../src/components/Details/Info/FileInfo.vue  | 188 ++++++++--------
 .../src/components/Details/Info/GameInfo.vue  | 210 +++++++++---------
 .../components/Details/VersionSwitcher.vue    |   4 +-
 3 files changed, 211 insertions(+), 191 deletions(-)

diff --git a/frontend/src/components/Details/Info/FileInfo.vue b/frontend/src/components/Details/Info/FileInfo.vue
index 555dc357d..b556e5e41 100644
--- a/frontend/src/components/Details/Info/FileInfo.vue
+++ b/frontend/src/components/Details/Info/FileInfo.vue
@@ -9,10 +9,12 @@ import { formatBytes } from "@/utils";
 import type { Emitter } from "mitt";
 import { inject } from "vue";
 
+// Props
 const props = defineProps<{ rom: DetailedRom; platform: Platform }>();
 const emitter = inject<Emitter<Events>>("emitter");
 const downloadStore = storeDownload();
 
+// Functions
 async function updateMainSibling() {
   const updatedRom = props.rom;
   updatedRom.fav_sibling = !props.rom.fav_sibling;
@@ -39,97 +41,107 @@ async function updateMainSibling() {
 }
 </script>
 <template>
-  <v-row
-    v-if="rom.sibling_roms && rom.sibling_roms.length > 0"
-    class="align-center my-3"
-    no-gutters
-  >
-    <v-col cols="3" xl="2">
-      <span>Version</span>
-    </v-col>
+  <v-row class="ml-4" no-gutters>
     <v-col>
-      <v-row class="align-center" no-gutters>
-        <version-switcher :rom="rom" :platform="platform" />
-        <v-tooltip
-          location="top"
-          class="tooltip"
-          transition="fade-transition"
-          text="Set as default version"
-          open-delay="300"
-        >
-          <template #activator="{ props }">
-            <v-chip
-              v-bind="props"
-              rounded="0"
-              variant="text"
-              class="ml-3"
-              @click="updateMainSibling"
-              ><v-icon
-                :class="rom.fav_sibling ? '' : 'mr-1'"
-                :color="rom.fav_sibling ? 'romm-accent-1' : ''"
-                >{{
-                  rom.fav_sibling
-                    ? "mdi-checkbox-outline"
-                    : "mdi-checkbox-blank-outline"
-                }}</v-icon
-              >{{ rom.fav_sibling ? "" : "Set as default" }}</v-chip
+      <v-row
+        v-if="rom.sibling_roms && rom.sibling_roms.length > 0"
+        class="align-center my-3"
+        no-gutters
+      >
+        <v-col cols="3" xl="2">
+          <span>Version</span>
+        </v-col>
+        <v-col>
+          <v-row class="align-center" no-gutters>
+            <version-switcher :rom="rom" :platform="platform" />
+            <v-tooltip
+              location="top"
+              class="tooltip"
+              transition="fade-transition"
+              text="Set as default version"
+              open-delay="300"
             >
-          </template></v-tooltip
-        >
+              <template #activator="{ props }">
+                <v-btn
+                  v-bind="props"
+                  variant="flat"
+                  rounded="0"
+                  size="small"
+                  @click="updateMainSibling"
+                  ><v-icon
+                    :class="rom.fav_sibling ? '' : 'mr-1'"
+                    :color="rom.fav_sibling ? 'romm-accent-1' : ''"
+                    >{{
+                      rom.fav_sibling
+                        ? "mdi-checkbox-outline"
+                        : "mdi-checkbox-blank-outline"
+                    }}</v-icon
+                  >{{ rom.fav_sibling ? "" : "Default" }}</v-btn
+                >
+              </template></v-tooltip
+            >
+          </v-row>
+        </v-col>
+      </v-row>
+      <v-row v-if="!rom.multi" class="align-center my-3" no-gutters>
+        <v-col cols="3" xl="2">
+          <span>File</span>
+        </v-col>
+        <v-col>
+          <span class="text-body-1">{{ rom.file_name }}</span
+          ><v-chip class="ml-2" size="small" label>{{
+            formatBytes(rom.file_size_bytes)
+          }}</v-chip>
+        </v-col>
+      </v-row>
+      <v-row v-if="rom.multi" class="align-center my-3" no-gutters>
+        <v-col cols="3" xl="2">
+          <span>Files</span>
+        </v-col>
+        <v-col>
+          <v-row no-gutters class="align-center">
+            <v-col cols="9">
+              <v-select
+                v-model="downloadStore.filesToDownloadMultiFileRom"
+                :label="rom.file_name"
+                item-title="file_name"
+                :items="rom.files"
+                rounded="0"
+                density="compact"
+                variant="outlined"
+                return-object
+                multiple
+                hide-details
+                clearable
+                chips
+              />
+            </v-col>
+            <v-col>
+              <v-chip class="ml-2" size="small" label>{{
+                formatBytes(rom.file_size_bytes)
+              }}</v-chip>
+            </v-col>
+          </v-row>
+        </v-col>
+      </v-row>
+      <v-row v-if="rom.tags.length > 0" class="align-center my-3" no-gutters>
+        <v-col cols="3" xl="2">
+          <span>Tags</span>
+        </v-col>
+        <v-col>
+          <v-chip
+            v-for="tag in rom.tags"
+            :key="tag"
+            size="small"
+            class="mr-2"
+            label
+            color="romm-accent-1"
+            variant="tonal"
+          >
+            {{ tag }}
+          </v-chip>
+        </v-col>
       </v-row>
     </v-col>
   </v-row>
-  <v-row v-if="!rom.multi" class="align-center my-3" no-gutters>
-    <v-col cols="3" xl="2">
-      <span>File</span>
-    </v-col>
-    <v-col class="text-body-1">
-      <span>{{ rom.file_name }}</span>
-    </v-col>
-  </v-row>
-  <v-row v-if="rom.multi" class="align-center my-3" no-gutters>
-    <v-col cols="3" xl="2">
-      <span>Files</span>
-    </v-col>
-    <v-col>
-      <v-select
-        v-model="downloadStore.filesToDownloadMultiFileRom"
-        :label="rom.file_name"
-        item-title="file_name"
-        :items="rom.files"
-        class="my-2"
-        density="compact"
-        variant="outlined"
-        return-object
-        multiple
-        hide-details
-        clearable
-        chips
-      />
-    </v-col>
-  </v-row>
-  <v-row class="align-center my-3" no-gutters>
-    <v-col cols="3" xl="2">
-      <span>Size</span>
-    </v-col>
-    <v-col>
-      <span>{{ formatBytes(rom.file_size_bytes) }}</span>
-    </v-col>
-  </v-row>
-  <v-row v-if="rom.tags.length > 0" class="align-center my-3" no-gutters>
-    <v-col cols="3" xl="2">
-      <span>Tags</span>
-    </v-col>
-    <v-col>
-      <v-chip
-        v-for="tag in rom.tags"
-        :key="tag"
-        class="mr-2 py-1"
-        label
-        variant="outlined"
-      >
-        {{ tag }}
-      </v-chip>
-    </v-col>
-  </v-row>
 </template>
diff --git a/frontend/src/components/Details/Info/GameInfo.vue b/frontend/src/components/Details/Info/GameInfo.vue
index b66121cf9..5681b425f 100644
--- a/frontend/src/components/Details/Info/GameInfo.vue
+++ b/frontend/src/components/Details/Info/GameInfo.vue
@@ -10,108 +10,116 @@ const galleryFilter = storeGalleryFilter();
 const show = ref(false);
 </script>
 <template>
-  <template v-for="filter in galleryFilter.filters" :key="filter">
-    <template>
+  <v-row no-gutters class="ml-4">
+    <v-col>
       <v-divider class="mx-2 my-4" />
-      <v-row v-if="rom[filter].length > 0" class="align-center my-3" no-gutters>
-        <v-col cols="3" xl="2" class="text-capitalize">
-          <span>{{ filter }}</span>
-        </v-col>
-        <v-col>
-          <v-chip
-            v-for="value in rom[filter]"
-            :key="value"
-            class="my-1 mr-2"
-            label
-          >
-            {{ value }}
-          </v-chip>
-        </v-col>
-      </v-row>
-    </template>
-  </template>
-  <template v-if="rom.summary != ''">
-    <v-divider class="mx-2 my-4" />
-    <v-row no-gutters>
-      <v-col class="text-caption">
-        <p v-text="rom.summary" />
-      </v-col>
-    </v-row>
-  </template>
-  <template v-if="rom.merged_screenshots.length > 0">
-    <v-divider class="mx-2 my-4" />
-    <v-row no-gutters>
-      <v-col>
-        <v-carousel
-          hide-delimiter-background
-          delimiter-icon="mdi-square"
-          class="bg-primary"
-          show-arrows="hover"
-          hide-delimiters
-          progress="terciary"
-          :height="xs ? '300' : '400'"
+      <template v-for="filter in galleryFilter.filters" :key="filter">
+        <v-row
+          v-if="rom[filter].length > 0"
+          class="align-center my-3"
+          no-gutters
         >
-          <template #prev="{ props }">
-            <v-btn
-              icon="mdi-chevron-left"
-              class="translucent-dark"
-              @click="props.onClick"
-            />
-          </template>
-          <v-carousel-item
-            v-for="screenshot_url in rom.merged_screenshots"
-            :key="screenshot_url"
-            :src="screenshot_url"
-            class="pointer"
-            @click="show = true"
-          >
-          </v-carousel-item>
-          <template #next="{ props }">
-            <v-btn
-              icon="mdi-chevron-right"
-              class="translucent-dark"
-              @click="props.onClick"
-            />
-          </template>
-        </v-carousel>
-        <v-dialog v-model="show">
-          <v-list-item>
-            <template #append>
-              <v-btn @click="show = false" icon variant="flat" size="large"
-                ><v-icon class="text-white text-shadow" size="25">mdi-close</v-icon></v-btn
-              >
-            </template>
-          </v-list-item>
-          <v-carousel
-            hide-delimiter-background
-            delimiter-icon="mdi-square"
-            show-arrows="hover"
-            hide-delimiters
-            :height="xs ? '500' : '600'"
-          >
-            <template #prev="{ props }">
-              <v-btn
-                @click="props.onClick"
-                icon="mdi-chevron-left"
-                class="translucent-dark"
-              />
-            </template>
-            <v-carousel-item
-              v-for="screenshot_url in rom.merged_screenshots"
-              :key="screenshot_url"
-              :src="screenshot_url"
+          <v-col cols="3" xl="2" class="text-capitalize">
+            <span>{{ filter }}</span>
+          </v-col>
+          <v-col>
+            <v-chip
+              v-for="value in rom[filter]"
+              :key="value"
+              size="small"
+              variant="outlined"
+              class="my-1 mr-2"
+              label
             >
-            </v-carousel-item>
-            <template #next="{ props }">
-              <v-btn
-                icon="mdi-chevron-right"
-                class="translucent-dark"
-                @click="props.onClick"
-              />
-            </template>
-          </v-carousel>
-        </v-dialog>
-      </v-col>
-    </v-row>
-  </template>
+              {{ value }}
+            </v-chip>
+          </v-col>
+        </v-row>
+      </template>
+      <template v-if="rom.summary != ''">
+        <v-divider class="mx-2 my-4" />
+        <v-row no-gutters>
+          <v-col class="text-caption">
+            <p v-text="rom.summary" />
+          </v-col>
+        </v-row>
+      </template>
+      <template v-if="rom.merged_screenshots.length > 0">
+        <v-divider class="mx-2 my-4" />
+        <v-row no-gutters>
+          <v-col>
+            <v-carousel
+              hide-delimiter-background
+              delimiter-icon="mdi-square"
+              class="bg-primary"
+              show-arrows="hover"
+              hide-delimiters
+              progress="terciary"
+              :height="xs ? '300' : '400'"
+            >
+              <template #prev="{ props }">
+                <v-btn
+                  icon="mdi-chevron-left"
+                  class="translucent-dark"
+                  @click="props.onClick"
+                />
+              </template>
+              <v-carousel-item
+                v-for="screenshot_url in rom.merged_screenshots"
+                :key="screenshot_url"
+                :src="screenshot_url"
+                class="pointer"
+                @click="show = true"
+              >
+              </v-carousel-item>
+              <template #next="{ props }">
+                <v-btn
+                  icon="mdi-chevron-right"
+                  class="translucent-dark"
+                  @click="props.onClick"
+                />
+              </template>
+            </v-carousel>
+            <v-dialog v-model="show">
+              <v-list-item>
+                <template #append>
+                  <v-btn @click="show = false" icon variant="flat" size="large"
+                    ><v-icon class="text-white text-shadow" size="25"
+                      >mdi-close</v-icon
+                    ></v-btn
+                  >
+                </template>
+              </v-list-item>
+              <v-carousel
+                hide-delimiter-background
+                delimiter-icon="mdi-square"
+                show-arrows="hover"
+                hide-delimiters
+                :height="xs ? '500' : '600'"
+              >
+                <template #prev="{ props }">
+                  <v-btn
+                    @click="props.onClick"
+                    icon="mdi-chevron-left"
+                    class="translucent-dark"
+                  />
+                </template>
+                <v-carousel-item
+                  v-for="screenshot_url in rom.merged_screenshots"
+                  :key="screenshot_url"
+                  :src="screenshot_url"
+                >
+                </v-carousel-item>
+                <template #next="{ props }">
+                  <v-btn
+                    icon="mdi-chevron-right"
+                    class="translucent-dark"
+                    @click="props.onClick"
+                  />
+                </template>
+              </v-carousel>
+            </v-dialog>
+          </v-col>
+        </v-row> </template></v-col
+  ></v-row>
 </template>
diff --git a/frontend/src/components/Details/VersionSwitcher.vue b/frontend/src/components/Details/VersionSwitcher.vue
index bd14a397c..b25bf68e1 100644
--- a/frontend/src/components/Details/VersionSwitcher.vue
+++ b/frontend/src/components/Details/VersionSwitcher.vue
@@ -32,8 +32,8 @@ function updateVersion() {
     v-model="version"
     label="Version"
     single-line
-    color="romm-gray"
-    variant="outlined"
+    rounded="0"
+    variant="solo-filled"
     density="compact"
     max-width="fit-content"
     hide-details

From f6d476b7b6faf25b1570e2ae232b8025362cb07a Mon Sep 17 00:00:00 2001
From: zurdi <zurdizurdo25@gmail.com>
Date: Fri, 28 Jun 2024 00:40:04 +0200
Subject: [PATCH 04/23] ui tweak play view

---
 frontend/src/views/Play/Base.vue | 64 ++++++++++++++++++++------------
 1 file changed, 41 insertions(+), 23 deletions(-)

diff --git a/frontend/src/views/Play/Base.vue b/frontend/src/views/Play/Base.vue
index eadde72a1..2bcb1358d 100644
--- a/frontend/src/views/Play/Base.vue
+++ b/frontend/src/views/Play/Base.vue
@@ -116,6 +116,7 @@ onMounted(async () => {
             :disabled="gameRunning"
             v-model="coreRef"
             class="my-1"
+            rounded="0"
             hide-details
             variant="outlined"
             clearable
@@ -132,6 +133,7 @@ onMounted(async () => {
             :disabled="gameRunning"
             class="my-1"
             hide-details
+            rounded="0"
             variant="outlined"
             clearable
             label="BIOS"
@@ -149,6 +151,7 @@ onMounted(async () => {
             hide-details
             variant="outlined"
             clearable
+            rounded="0"
             label="Save"
             :items="
               rom.user_saves?.map((s) => ({
@@ -163,6 +166,7 @@ onMounted(async () => {
             :disabled="gameRunning"
             class="my-1"
             hide-details
+            rounded="0"
             variant="outlined"
             clearable
             label="State"
@@ -181,6 +185,7 @@ onMounted(async () => {
             hide-details
             variant="outlined"
             clearable
+            rounded="0"
             disabled
             label="Patch"
             :items="[
@@ -192,30 +197,43 @@ onMounted(async () => {
       </v-row>
       <v-row class="px-3 py-3 text-center" no-gutters>
         <v-col>
-          <v-chip
-            @click="onFullScreenChange"
-            :disabled="gameRunning"
-            :variant="fullScreenOnPlay ? 'flat' : 'outlined'"
-            :color="fullScreenOnPlay ? 'romm-accent-1' : ''"
-            ><v-icon class="mr-1">{{
-              fullScreenOnPlay
-                ? "mdi-checkbox-outline"
-                : "mdi-checkbox-blank-outline"
-            }}</v-icon
-            >Full screen</v-chip
-          >
           <v-divider class="my-4" />
-          <v-btn
-            color="romm-accent-1"
-            block
-            :disabled="gameRunning"
-            rounded="0"
-            variant="outlined"
-            size="large"
-            prepend-icon="mdi-play"
-            @click="onPlay()"
-            >Play
-          </v-btn>
+          <v-row class="align-center" no-gutters>
+            <v-col>
+              <v-btn
+                block
+                size="large"
+                rounded="0"
+                @click="onFullScreenChange"
+                :disabled="gameRunning"
+                :variant="fullScreenOnPlay ? 'flat' : 'outlined'"
+                :color="fullScreenOnPlay ? 'romm-accent-1' : ''"
+                ><v-icon class="mr-1">{{
+                  fullScreenOnPlay
+                    ? "mdi-checkbox-outline"
+                    : "mdi-checkbox-blank-outline"
+                }}</v-icon
+                >Full screen</v-btn
+              >
+            </v-col>
+            <v-col
+              cols="12"
+              :sm="gameRunning ? 12 : 7"
+              :xl="gameRunning ? 12 : 9"
+            >
+              <v-btn
+                color="romm-accent-1"
+                block
+                :disabled="gameRunning"
+                rounded="0"
+                variant="outlined"
+                size="large"
+                prepend-icon="mdi-play"
+                @click="onPlay()"
+                >Play
+              </v-btn>
+            </v-col>
+          </v-row>
           <v-btn
             class="mt-4"
             block

From 77b344cc966ed08bc0ee1b0d72629c4fb40af504 Mon Sep 17 00:00:00 2001
From: zurdi <zurdizurdo25@gmail.com>
Date: Fri, 28 Jun 2024 09:05:37 +0200
Subject: [PATCH 05/23] reverted size info

---
 .../src/components/Details/Info/FileInfo.vue  | 54 +++++++++----------
 .../src/components/Details/Info/GameInfo.vue  |  2 +-
 frontend/src/views/GameDetails.vue            |  6 ++-
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/frontend/src/components/Details/Info/FileInfo.vue b/frontend/src/components/Details/Info/FileInfo.vue
index b556e5e41..644e710d0 100644
--- a/frontend/src/components/Details/Info/FileInfo.vue
+++ b/frontend/src/components/Details/Info/FileInfo.vue
@@ -41,7 +41,7 @@ async function updateMainSibling() {
 }
 </script>
 <template>
-  <v-row class="ml-4" no-gutters>
+  <v-row no-gutters>
     <v-col>
       <v-row
         v-if="rom.sibling_roms && rom.sibling_roms.length > 0"
@@ -88,10 +88,7 @@ async function updateMainSibling() {
           <span>File</span>
         </v-col>
         <v-col>
-          <span class="text-body-1">{{ rom.file_name }}</span
-          ><v-chip class="ml-2" size="small" label>{{
-            formatBytes(rom.file_size_bytes)
-          }}</v-chip>
+          <span class="text-body-1">{{ rom.file_name }}</span>
         </v-col>
       </v-row>
       <v-row v-if="rom.multi" class="align-center my-3" no-gutters>
@@ -99,29 +96,30 @@ async function updateMainSibling() {
           <span>Files</span>
         </v-col>
         <v-col>
-          <v-row no-gutters class="align-center">
-            <v-col cols="9">
-              <v-select
-                v-model="downloadStore.filesToDownloadMultiFileRom"
-                :label="rom.file_name"
-                item-title="file_name"
-                :items="rom.files"
-                rounded="0"
-                density="compact"
-                variant="outlined"
-                return-object
-                multiple
-                hide-details
-                clearable
-                chips
-              />
-            </v-col>
-            <v-col>
-              <v-chip class="ml-2" size="small" label>{{
-                formatBytes(rom.file_size_bytes)
-              }}</v-chip>
-            </v-col>
-          </v-row>
+          <v-select
+            v-model="downloadStore.filesToDownloadMultiFileRom"
+            :label="rom.file_name"
+            item-title="file_name"
+            :items="rom.files"
+            rounded="0"
+            density="compact"
+            variant="outlined"
+            return-object
+            multiple
+            hide-details
+            clearable
+            chips
+          />
+        </v-col>
+      </v-row>
+      <v-row no-gutters class="align-center my-3">
+        <v-col cols="3" xl="2">
+          <span>Size</span>
+        </v-col>
+        <v-col>
+          <v-chip size="small" label>{{
+            formatBytes(rom.file_size_bytes)
+          }}</v-chip>
         </v-col>
       </v-row>
       <v-row v-if="rom.tags.length > 0" class="align-center my-3" no-gutters>
diff --git a/frontend/src/components/Details/Info/GameInfo.vue b/frontend/src/components/Details/Info/GameInfo.vue
index 5681b425f..de5bc6029 100644
--- a/frontend/src/components/Details/Info/GameInfo.vue
+++ b/frontend/src/components/Details/Info/GameInfo.vue
@@ -10,7 +10,7 @@ const galleryFilter = storeGalleryFilter();
 const show = ref(false);
 </script>
 <template>
-  <v-row no-gutters class="ml-4">
+  <v-row no-gutters>
     <v-col>
       <v-divider class="mx-2 my-4" />
       <template v-for="filter in galleryFilter.filters" :key="filter">
diff --git a/frontend/src/views/GameDetails.vue b/frontend/src/views/GameDetails.vue
index bd8ed994b..ec88d765d 100644
--- a/frontend/src/views/GameDetails.vue
+++ b/frontend/src/views/GameDetails.vue
@@ -172,8 +172,10 @@ watch(
           <v-col cols="12">
             <v-window disabled v-model="tab" class="py-2">
               <v-window-item value="details">
-                <file-info :rom="rom" :platform="platform" />
-                <game-info :rom="rom" />
+                <v-row no-gutters :class="{ 'mx-2': mdAndUp }">
+                  <file-info :rom="rom" :platform="platform" />
+                  <game-info :rom="rom" />
+                </v-row>
               </v-window-item>
               <v-window-item value="saves">
                 <saves :rom="rom" />

From 87d7eb51a57f77c403eb31d2d9694bf273957416 Mon Sep 17 00:00:00 2001
From: zurdi <zurdizurdo25@gmail.com>
Date: Fri, 28 Jun 2024 12:31:31 +0200
Subject: [PATCH 06/23] fixed supported platforms endpoint

---
 backend/endpoints/platform.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backend/endpoints/platform.py b/backend/endpoints/platform.py
index bcce3bc09..57d75bfcf 100644
--- a/backend/endpoints/platform.py
+++ b/backend/endpoints/platform.py
@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from decorators.auth import protected_route
 from endpoints.responses import MessageResponse
 from endpoints.responses.platform import PlatformSchema
@@ -74,6 +76,8 @@ def get_supported_platforms(request: Request) -> list[PlatformSchema]:
             "logo_path": "",
             "roms": [],
             "rom_count": 0,
+            "created_at": datetime.now(),
+            "updated_at": datetime.now(),
         }
 
         if platform["name"] in db_platforms_map:

From a282384bb549bc32079c6423ddd14342895425ff Mon Sep 17 00:00:00 2001
From: zurdi <zurdizurdo25@gmail.com>
Date: Fri, 28 Jun 2024 14:23:51 +0200
Subject: [PATCH 07/23] fixed platform error on gallery

---
 backend/endpoints/platform.py  | 10 +++++++++-
 frontend/src/views/Gallery.vue | 12 +++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/backend/endpoints/platform.py b/backend/endpoints/platform.py
index 57d75bfcf..af16d820b 100644
--- a/backend/endpoints/platform.py
+++ b/backend/endpoints/platform.py
@@ -100,7 +100,15 @@ def get_platform(request: Request, id: int) -> PlatformSchema:
         PlatformSchema: Platform
     """
 
-    return db_platform_handler.get_platforms(id)
+    platform = db_platform_handler.get_platforms(id)
+    if platform:
+        return platform
+    else:
+        msg = f"Platform with {id} not found"
+        log.critical(msg)
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=msg
+        )
 
 
 @protected_route(router.put, "/platforms/{id}", ["platforms.write"])
diff --git a/frontend/src/views/Gallery.vue b/frontend/src/views/Gallery.vue
index 13999e211..4977a83d8 100644
--- a/frontend/src/views/Gallery.vue
+++ b/frontend/src/views/Gallery.vue
@@ -215,12 +215,14 @@ onMounted(async () => {
   } else {
     romsStore.setCurrentPlatform(routePlatform);
   }
-  resetGallery();
-  await fetchRoms();
-  setFilters();
 
-  window.addEventListener("wheel", onScroll);
-  window.addEventListener("scroll", onScroll);
+  if (!noPlatformError.value) {
+    resetGallery();
+    await fetchRoms();
+    setFilters();
+    window.addEventListener("wheel", onScroll);
+    window.addEventListener("scroll", onScroll);
+  }
 });
 
 onBeforeRouteUpdate(async (to, from) => {

From b2587fa759492b3409359bf00f68ad029964b634 Mon Sep 17 00:00:00 2001
From: Zurdi <zurdizurdo25@gmail.com>
Date: Fri, 28 Jun 2024 17:38:43 +0200
Subject: [PATCH 08/23] fixed missing cover aspect ratio

---
 frontend/src/components/common/Game/Card/Base.vue             | 1 +
 frontend/src/components/common/Game/Dialog/SearchCoverRom.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/common/Game/Card/Base.vue b/frontend/src/components/common/Game/Card/Base.vue
index 9dad754ab..a86e8e2bc 100644
--- a/frontend/src/components/common/Game/Card/Base.vue
+++ b/frontend/src/components/common/Game/Card/Base.vue
@@ -145,6 +145,7 @@ onMounted(() => {
             <v-img
               :src="`/assets/default/cover/big_${theme.global.name.value}_missing_cover.png`"
               cover
+              :aspect-ratio="2 / 3"
             ></v-img>
           </template>
           <template #placeholder>
diff --git a/frontend/src/components/common/Game/Dialog/SearchCoverRom.vue b/frontend/src/components/common/Game/Dialog/SearchCoverRom.vue
index 31ff60ae6..4f69673ed 100644
--- a/frontend/src/components/common/Game/Dialog/SearchCoverRom.vue
+++ b/frontend/src/components/common/Game/Dialog/SearchCoverRom.vue
@@ -214,7 +214,7 @@ onBeforeUnmount(() => {
                     cover
                   >
                     <template #error>
-                      <v-img :src="resource.url" cover></v-img>
+                      <v-img :src="resource.url" cover :aspect-ratio="2 / 3"></v-img>
                     </template>
                     <template #placeholder>
                       <div

From 1454395c78c37ac22a4a66c3438f44b2d67cfaf8 Mon Sep 17 00:00:00 2001
From: Zurdi <34356590+zurdi15@users.noreply.github.com>
Date: Fri, 28 Jun 2024 22:47:33 +0200
Subject: [PATCH 09/23] Update backend/endpoints/platform.py

Co-authored-by: Georges-Antoine Assi <3247106+gantoine@users.noreply.github.com>
---
 backend/endpoints/platform.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/backend/endpoints/platform.py b/backend/endpoints/platform.py
index af16d820b..f85266211 100644
--- a/backend/endpoints/platform.py
+++ b/backend/endpoints/platform.py
@@ -103,12 +103,11 @@ def get_platform(request: Request, id: int) -> PlatformSchema:
     platform = db_platform_handler.get_platforms(id)
     if platform:
         return platform
-    else:
-        msg = f"Platform with {id} not found"
-        log.critical(msg)
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=msg
-        )
+    msg = f"Platform with {id} not found"
+    log.critical(msg)
+    raise HTTPException(
+        status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=msg
+    )
 
 
 @protected_route(router.put, "/platforms/{id}", ["platforms.write"])

From c022e9cef792c6fec2d633de21aada395268560b Mon Sep 17 00:00:00 2001
From: Zurdi <zurdizurdo25@gmail.com>
Date: Sat, 29 Jun 2024 00:13:28 +0200
Subject: [PATCH 10/23] added user_rom_props entity

---
 backend/alembic/versions/0021_fav_sibling.py  |  36 ------
 .../alembic/versions/0021_user_rom_props.py   | 110 ++++++++++++++++++
 backend/endpoints/responses/rom.py            |  18 +--
 backend/endpoints/rom.py                      |  28 ++---
 backend/handler/auth/base_handler.py          |   4 +-
 backend/handler/database/roms_handler.py      |  22 ++--
 backend/models/rom.py                         |  23 ++--
 backend/models/user.py                        |   4 +-
 8 files changed, 161 insertions(+), 84 deletions(-)
 delete mode 100644 backend/alembic/versions/0021_fav_sibling.py
 create mode 100644 backend/alembic/versions/0021_user_rom_props.py

diff --git a/backend/alembic/versions/0021_fav_sibling.py b/backend/alembic/versions/0021_fav_sibling.py
deleted file mode 100644
index b2ad9c6ee..000000000
--- a/backend/alembic/versions/0021_fav_sibling.py
+++ /dev/null
@@ -1,36 +0,0 @@
-"""empty message
-
-Revision ID: 0021_fav_sibling
-Revises: 0020_created_and_updated
-Create Date: 2024-06-27 18:04:55.707623
-
-"""
-
-import sqlalchemy as sa
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision = "0021_fav_sibling"
-down_revision = "0020_created_and_updated"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("roms", schema=None) as batch_op:
-        batch_op.add_column(
-            sa.Column(
-                "fav_sibling", sa.Boolean(), nullable=True, server_default=sa.false()
-            )
-        )
-
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("roms", schema=None) as batch_op:
-        batch_op.drop_column("fav_sibling")
-
-    # ### end Alembic commands ###
diff --git a/backend/alembic/versions/0021_user_rom_props.py b/backend/alembic/versions/0021_user_rom_props.py
new file mode 100644
index 000000000..e913fcaf2
--- /dev/null
+++ b/backend/alembic/versions/0021_user_rom_props.py
@@ -0,0 +1,110 @@
+"""empty message
+
+Revision ID: 0021_user_rom_props
+Revises: 0020_created_and_updated
+Create Date: 2024-06-29 00:11:51.800988
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import mysql
+
+# revision identifiers, used by Alembic.
+revision = "0021_user_rom_props"
+down_revision = "0020_created_and_updated"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    # TODO: adjust to rename instead of drop + create
+    op.create_table(
+        "user_rom_props",
+        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column("note_raw_markdown", sa.Text(), nullable=False),
+        sa.Column("note_is_public", sa.Boolean(), nullable=True),
+        sa.Column("rom_is_main_sibling", sa.Boolean(), nullable=True),
+        sa.Column("rom_id", sa.Integer(), nullable=False),
+        sa.Column("user_id", sa.Integer(), nullable=False),
+        sa.Column(
+            "created_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.text("now()"),
+            nullable=False,
+        ),
+        sa.Column(
+            "updated_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.text("now()"),
+            nullable=False,
+        ),
+        sa.ForeignKeyConstraint(["rom_id"], ["roms.id"], ondelete="CASCADE"),
+        sa.ForeignKeyConstraint(["user_id"], ["users.id"], ondelete="CASCADE"),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("rom_id", "user_id", name="unique_rom_user_props"),
+    )
+    with op.batch_alter_table("rom_notes", schema=None) as batch_op:
+        batch_op.drop_index("unique_rom_user_note")
+
+    op.drop_table("rom_notes")
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "rom_notes",
+        sa.Column(
+            "id", mysql.INTEGER(display_width=11), autoincrement=True, nullable=False
+        ),
+        sa.Column("raw_markdown", mysql.TEXT(), nullable=False),
+        sa.Column(
+            "is_public",
+            mysql.TINYINT(display_width=1),
+            autoincrement=False,
+            nullable=True,
+        ),
+        sa.Column(
+            "rom_id",
+            mysql.INTEGER(display_width=11),
+            autoincrement=False,
+            nullable=False,
+        ),
+        sa.Column(
+            "user_id",
+            mysql.INTEGER(display_width=11),
+            autoincrement=False,
+            nullable=False,
+        ),
+        sa.Column(
+            "created_at",
+            mysql.DATETIME(),
+            server_default=sa.text("current_timestamp()"),
+            nullable=False,
+        ),
+        sa.Column(
+            "updated_at",
+            mysql.DATETIME(),
+            server_default=sa.text("current_timestamp()"),
+            nullable=False,
+        ),
+        sa.ForeignKeyConstraint(
+            ["rom_id"], ["roms.id"], name="rom_notes_ibfk_1", ondelete="CASCADE"
+        ),
+        sa.ForeignKeyConstraint(
+            ["user_id"], ["users.id"], name="rom_notes_ibfk_2", ondelete="CASCADE"
+        ),
+        sa.PrimaryKeyConstraint("id"),
+        mariadb_collate="utf8mb4_general_ci",
+        mariadb_default_charset="utf8mb4",
+        mariadb_engine="InnoDB",
+    )
+    with op.batch_alter_table("rom_notes", schema=None) as batch_op:
+        batch_op.create_index(
+            "unique_rom_user_note", ["rom_id", "user_id"], unique=True
+        )
+
+    op.drop_table("user_rom_props")
+    # ### end Alembic commands ###
diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py
index 5b101d881..939449401 100644
--- a/backend/endpoints/responses/rom.py
+++ b/backend/endpoints/responses/rom.py
@@ -26,25 +26,27 @@ RomMobyMetadata = TypedDict(  # type: ignore[misc]
 )
 
 
-class RomNoteSchema(BaseModel):
+class RomPropsSchema(BaseModel):
     id: int
     user_id: int
     rom_id: int
+    created_at: datetime
     updated_at: datetime
-    raw_markdown: str
-    is_public: bool
+    note_raw_markdown: str
+    note_is_public: bool
+    is_main_sibling: bool
     user__username: str
 
     class Config:
         from_attributes = True
 
     @classmethod
-    def for_user(cls, db_rom: Rom, user_id: int) -> list["RomNoteSchema"]:
+    def for_user(cls, db_rom: Rom, user_id: int) -> list["RomPropsSchema"]:
         return [
             cls.model_validate(n)
-            for n in db_rom.notes
+            for n in db_rom.user_rom_props
             # This is what filters out private notes
-            if n.user_id == user_id or n.is_public
+            if n.user_id == user_id or n.note_is_public
         ]
 
 
@@ -121,7 +123,7 @@ class DetailedRomSchema(RomSchema):
     user_saves: list[SaveSchema] = Field(default_factory=list)
     user_states: list[StateSchema] = Field(default_factory=list)
     user_screenshots: list[ScreenshotSchema] = Field(default_factory=list)
-    user_notes: list[RomNoteSchema] = Field(default_factory=list)
+    user_rom_props: list[RomPropsSchema] = Field(default_factory=list)
 
     @classmethod
     def from_orm_with_request(
@@ -144,7 +146,7 @@ class DetailedRomSchema(RomSchema):
             for s in db_rom.screenshots
             if s.user_id == user_id
         ]
-        rom.user_notes = RomNoteSchema.for_user(db_rom, user_id)
+        rom.user_rom_props = RomPropsSchema.for_user(db_rom, user_id)
 
         return rom
 
diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index e3259777f..d2526a075 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -16,7 +16,7 @@ from endpoints.responses.rom import (
     AddRomsResponse,
     CustomStreamingResponse,
     DetailedRomSchema,
-    RomNoteSchema,
+    RomPropsSchema,
     RomSchema,
 )
 from exceptions.fs_exceptions import RomAlreadyExistsException
@@ -432,21 +432,23 @@ async def delete_roms(
     return {"msg": f"{len(roms_ids)} roms deleted successfully!"}
 
 
-@protected_route(router.put, "/roms/{id}/note", ["notes.write"])
-async def update_rom_note(request: Request, id: int) -> RomNoteSchema:
-    db_note = db_rom_handler.get_rom_note(id, request.user.id)
-    if not db_note:
-        db_note = db_rom_handler.add_rom_note(id, request.user.id)
+@protected_route(router.put, "/roms/{id}/props", ["rom_props.write"])
+async def update_rom_props(request: Request, id: int) -> RomPropsSchema:
+    db_rom_props = db_rom_handler.get_rom_props(id, request.user.id)
+    if not db_rom_props:
+        db_rom_props = db_rom_handler.add_rom_props(id, request.user.id)
 
     data = await request.json()
-    db_rom_handler.update_rom_note(
-        db_note.id,
+    db_rom_handler.update_rom_props(
+        db_rom_props.id,
         {
-            "last_edited_at": datetime.now(),
-            "raw_markdown": data.get("raw_markdown", db_note.raw_markdown),
-            "is_public": data.get("is_public", db_note.is_public),
+            "updated_at": datetime.now(),
+            "note_raw_markdown": data.get(
+                "note_raw_markdown", db_rom_props.note_raw_markdown
+            ),
+            "note_is_public": data.get("note_is_public", db_rom_props.note_is_public),
         },
     )
 
-    db_note = db_rom_handler.get_rom_note(id, request.user.id)
-    return db_note
+    db_rom_props = db_rom_handler.get_rom_props(id, request.user.id)
+    return db_rom_props
diff --git a/backend/handler/auth/base_handler.py b/backend/handler/auth/base_handler.py
index b78c4ce34..f14257a0c 100644
--- a/backend/handler/auth/base_handler.py
+++ b/backend/handler/auth/base_handler.py
@@ -22,8 +22,8 @@ DEFAULT_SCOPES_MAP: Final = {
     "assets.read": "View assets",
     "assets.write": "Modify assets",
     "firmware.read": "View firmware",
-    "notes.read": "View notes",
-    "notes.write": "Modify notes",
+    "rom_props.read": "View rom props",
+    "rom_props.write": "Modify rom props",
 }
 
 WRITE_SCOPES_MAP: Final = {
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index 0861763b6..29c1bcb92 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -1,7 +1,7 @@
 import functools
 
 from decorators.database import begin_session
-from models.rom import Rom, RomNote
+from models.rom import Rom, UserRomProps
 from sqlalchemy import and_, delete, func, or_, select, update
 from sqlalchemy.orm import Query, Session, selectinload
 
@@ -148,24 +148,26 @@ class DBRomsHandler(DBBaseHandler):
         )
 
     @begin_session
-    def get_rom_note(
+    def get_rom_props(
         self, rom_id: int, user_id: int, session: Session = None
-    ) -> RomNote | None:
+    ) -> UserRomProps | None:
         return session.scalar(
-            select(RomNote).filter_by(rom_id=rom_id, user_id=user_id).limit(1)
+            select(UserRomProps).filter_by(rom_id=rom_id, user_id=user_id).limit(1)
         )
 
     @begin_session
-    def add_rom_note(
+    def add_rom_props(
         self, rom_id: int, user_id: int, session: Session = None
-    ) -> RomNote:
-        return session.merge(RomNote(rom_id=rom_id, user_id=user_id))
+    ) -> UserRomProps:
+        return session.merge(UserRomProps(rom_id=rom_id, user_id=user_id))
 
     @begin_session
-    def update_rom_note(self, id: int, data: dict, session: Session = None) -> RomNote:
+    def update_rom_props(
+        self, id: int, data: dict, session: Session = None
+    ) -> UserRomProps:
         return session.execute(
-            update(RomNote)
-            .where(RomNote.id == id)
+            update(UserRomProps)
+            .where(UserRomProps.id == id)
             .values(**data)
             .execution_options(synchronize_session="evaluate")
         )
diff --git a/backend/models/rom.py b/backend/models/rom.py
index dc6a0f024..159f9979f 100644
--- a/backend/models/rom.py
+++ b/backend/models/rom.py
@@ -80,9 +80,7 @@ class Rom(BaseModel):
     saves: Mapped[list["Save"]] = relationship(back_populates="rom")
     states: Mapped[list["State"]] = relationship(back_populates="rom")
     screenshots: Mapped[list["Screenshot"]] = relationship(back_populates="rom")
-    notes: Mapped[list["RomNote"]] = relationship(back_populates="rom")
-
-    fav_sibling: Mapped[bool | None] = mapped_column(default=False)
+    user_rom_props: Mapped[list["UserRomProps"]] = relationship(back_populates="rom")
 
     @property
     def platform_slug(self) -> str:
@@ -181,24 +179,23 @@ class Rom(BaseModel):
         return self.file_name
 
 
-class RomNote(BaseModel):
-    __tablename__ = "rom_notes"
+class UserRomProps(BaseModel):
+    __tablename__ = "user_rom_props"
     __table_args__ = (
-        UniqueConstraint("rom_id", "user_id", name="unique_rom_user_note"),
+        UniqueConstraint("rom_id", "user_id", name="unique_rom_user_props"),
     )
 
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
-    updated_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=func.now()
-    )
-    raw_markdown: Mapped[str] = mapped_column(Text, default="")
-    is_public: Mapped[bool | None] = mapped_column(default=False)
+    note_raw_markdown: Mapped[str] = mapped_column(Text, default="")
+    note_is_public: Mapped[bool | None] = mapped_column(default=False)
+
+    rom_is_main_sibling: Mapped[bool | None] = mapped_column(default=False)
 
     rom_id: Mapped[int] = mapped_column(ForeignKey("roms.id", ondelete="CASCADE"))
     user_id: Mapped[int] = mapped_column(ForeignKey("users.id", ondelete="CASCADE"))
 
-    rom: Mapped["Rom"] = relationship(lazy="joined", back_populates="notes")
-    user: Mapped["User"] = relationship(lazy="joined", back_populates="notes")
+    rom: Mapped["Rom"] = relationship(lazy="joined", back_populates="user_rom_props")
+    user: Mapped["User"] = relationship(lazy="joined", back_populates="user_rom_props")
 
     @property
     def user__username(self) -> str:
diff --git a/backend/models/user.py b/backend/models/user.py
index 4132080de..f1ce4bc9e 100644
--- a/backend/models/user.py
+++ b/backend/models/user.py
@@ -9,7 +9,7 @@ from starlette.authentication import SimpleUser
 
 if TYPE_CHECKING:
     from models.assets import Save, Screenshot, State
-    from models.rom import RomNote
+    from models.rom import UserRomProps
 
 
 class Role(enum.Enum):
@@ -37,7 +37,7 @@ class User(BaseModel, SimpleUser):
     saves: Mapped[list["Save"]] = relationship(back_populates="user")
     states: Mapped[list["State"]] = relationship(back_populates="user")
     screenshots: Mapped[list["Screenshot"]] = relationship(back_populates="user")
-    notes: Mapped[list["RomNote"]] = relationship(back_populates="user")
+    user_rom_props: Mapped[list["UserRomProps"]] = relationship(back_populates="user")
 
     @property
     def oauth_scopes(self):

From 0a0bab6730e2b0e1ce73dafeb2f5e80ca6405650 Mon Sep 17 00:00:00 2001
From: zurdi <zurdizurdo25@gmail.com>
Date: Sat, 29 Jun 2024 11:26:16 +0200
Subject: [PATCH 11/23] migrated rom_notes to user_rom_props

---
 .../alembic/versions/0021_user_rom_props.py   | 83 ++++++++-----------
 backend/endpoints/platform.py                 |  4 +-
 backend/endpoints/responses/rom.py            |  3 -
 backend/endpoints/rom.py                      |  8 +-
 backend/handler/database/roms_handler.py      |  2 +-
 backend/models/rom.py                         |  2 +-
 frontend/src/__generated__/index.ts           |  2 +-
 .../__generated__/models/DetailedRomSchema.ts |  5 +-
 .../{RomNoteSchema.ts => RomPropsSchema.ts}   |  8 +-
 .../src/__generated__/models/RomSchema.ts     |  1 -
 .../src/components/Details/Info/FileInfo.vue  |  2 +-
 frontend/src/components/Details/Notes.vue     | 32 +++----
 frontend/src/services/api/rom.ts              | 22 ++---
 frontend/src/stores/roms.ts                   | 11 +--
 14 files changed, 84 insertions(+), 101 deletions(-)
 rename frontend/src/__generated__/models/{RomNoteSchema.ts => RomPropsSchema.ts} (63%)

diff --git a/backend/alembic/versions/0021_user_rom_props.py b/backend/alembic/versions/0021_user_rom_props.py
index e913fcaf2..e0b514aaf 100644
--- a/backend/alembic/versions/0021_user_rom_props.py
+++ b/backend/alembic/versions/0021_user_rom_props.py
@@ -8,7 +8,6 @@ Create Date: 2024-06-29 00:11:51.800988
 
 import sqlalchemy as sa
 from alembic import op
-from sqlalchemy.dialects import mysql
 
 # revision identifiers, used by Alembic.
 revision = "0021_user_rom_props"
@@ -19,15 +18,9 @@ depends_on = None
 
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    # TODO: adjust to rename instead of drop + create
     op.create_table(
         "user_rom_props",
         sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
-        sa.Column("note_raw_markdown", sa.Text(), nullable=False),
-        sa.Column("note_is_public", sa.Boolean(), nullable=True),
-        sa.Column("rom_is_main_sibling", sa.Boolean(), nullable=True),
-        sa.Column("rom_id", sa.Integer(), nullable=False),
-        sa.Column("user_id", sa.Integer(), nullable=False),
         sa.Column(
             "created_at",
             sa.DateTime(timezone=True),
@@ -40,13 +33,24 @@ def upgrade() -> None:
             server_default=sa.text("now()"),
             nullable=False,
         ),
+        sa.Column("note_raw_markdown", sa.Text(), nullable=False),
+        sa.Column("note_is_public", sa.Boolean(), nullable=True),
+        sa.Column("is_main_sibling", sa.Boolean(), nullable=False),
+        sa.Column("rom_id", sa.Integer(), nullable=False),
+        sa.Column("user_id", sa.Integer(), nullable=False),
         sa.ForeignKeyConstraint(["rom_id"], ["roms.id"], ondelete="CASCADE"),
         sa.ForeignKeyConstraint(["user_id"], ["users.id"], ondelete="CASCADE"),
         sa.PrimaryKeyConstraint("id"),
         sa.UniqueConstraint("rom_id", "user_id", name="unique_rom_user_props"),
     )
-    with op.batch_alter_table("rom_notes", schema=None) as batch_op:
-        batch_op.drop_index("unique_rom_user_note")
+
+    op.execute(
+        """
+        INSERT INTO user_rom_props (id, updated_at, note_raw_markdown, note_is_public, is_main_sibling, rom_id, user_id)
+        SELECT id, updated_at, raw_markdown, is_public, NULL, rom_id, user_id
+        FROM rom_notes
+    """
+    )
 
     op.drop_table("rom_notes")
     # ### end Alembic commands ###
@@ -56,55 +60,38 @@ def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
         "rom_notes",
-        sa.Column(
-            "id", mysql.INTEGER(display_width=11), autoincrement=True, nullable=False
-        ),
-        sa.Column("raw_markdown", mysql.TEXT(), nullable=False),
-        sa.Column(
-            "is_public",
-            mysql.TINYINT(display_width=1),
-            autoincrement=False,
-            nullable=True,
-        ),
-        sa.Column(
-            "rom_id",
-            mysql.INTEGER(display_width=11),
-            autoincrement=False,
-            nullable=False,
-        ),
-        sa.Column(
-            "user_id",
-            mysql.INTEGER(display_width=11),
-            autoincrement=False,
-            nullable=False,
-        ),
+        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
         sa.Column(
             "created_at",
-            mysql.DATETIME(),
-            server_default=sa.text("current_timestamp()"),
+            sa.DateTime(timezone=True),
+            server_default=sa.text("now()"),
             nullable=False,
         ),
         sa.Column(
             "updated_at",
-            mysql.DATETIME(),
-            server_default=sa.text("current_timestamp()"),
+            sa.DateTime(timezone=True),
+            server_default=sa.text("now()"),
             nullable=False,
         ),
-        sa.ForeignKeyConstraint(
-            ["rom_id"], ["roms.id"], name="rom_notes_ibfk_1", ondelete="CASCADE"
-        ),
-        sa.ForeignKeyConstraint(
-            ["user_id"], ["users.id"], name="rom_notes_ibfk_2", ondelete="CASCADE"
-        ),
+        sa.Column("raw_markdown", sa.Text(), nullable=False),
+        sa.Column("is_public", sa.Boolean(), nullable=True),
+        sa.Column("rom_id", sa.Integer(), nullable=False),
+        sa.Column("user_id", sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(["rom_id"], ["roms.id"], ondelete="CASCADE"),
+        sa.ForeignKeyConstraint(["user_id"], ["users.id"], ondelete="CASCADE"),
         sa.PrimaryKeyConstraint("id"),
-        mariadb_collate="utf8mb4_general_ci",
-        mariadb_default_charset="utf8mb4",
-        mariadb_engine="InnoDB",
+        sa.UniqueConstraint("rom_id", "user_id", name="unique_rom_user_note"),
     )
-    with op.batch_alter_table("rom_notes", schema=None) as batch_op:
-        batch_op.create_index(
-            "unique_rom_user_note", ["rom_id", "user_id"], unique=True
-        )
 
+    # Copy the data back from the new table to the old table
+    op.execute(
+        """
+        INSERT INTO rom_notes (id, updated_at, raw_markdown, is_public, rom_id, user_id)
+        SELECT id, updated_at, note_raw_markdown, note_is_public, rom_id, user_id
+        FROM user_rom_props
+    """
+    )
+
+    # Drop the new table
     op.drop_table("user_rom_props")
     # ### end Alembic commands ###
diff --git a/backend/endpoints/platform.py b/backend/endpoints/platform.py
index f85266211..01cb870b8 100644
--- a/backend/endpoints/platform.py
+++ b/backend/endpoints/platform.py
@@ -105,9 +105,7 @@ def get_platform(request: Request, id: int) -> PlatformSchema:
         return platform
     msg = f"Platform with {id} not found"
     log.critical(msg)
-    raise HTTPException(
-        status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=msg
-    )
+    raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=msg)
 
 
 @protected_route(router.put, "/platforms/{id}", ["platforms.write"])
diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py
index 939449401..06a0c1b26 100644
--- a/backend/endpoints/responses/rom.py
+++ b/backend/endpoints/responses/rom.py
@@ -95,9 +95,6 @@ class RomSchema(BaseModel):
     multi: bool
     files: list[str]
     full_path: str
-
-    fav_sibling: bool
-
     created_at: datetime
     updated_at: datetime
 
diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index d2526a075..d3477f1a7 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -278,7 +278,6 @@ async def update_rom(
     cleaned_data = {}
     cleaned_data["igdb_id"] = data.get("igdb_id", None)
     cleaned_data["moby_id"] = data.get("moby_id", None)
-    cleaned_data["fav_sibling"] = bool(data.get("fav_sibling", None))
 
     if cleaned_data["moby_id"]:
         moby_rom = meta_moby_handler.get_rom_by_id(cleaned_data["moby_id"])
@@ -374,8 +373,7 @@ async def update_rom(
     db_rom_handler.update_rom(id, cleaned_data)
     updated_rom = db_rom_handler.get_roms(id)
 
-    if cleaned_data["fav_sibling"]:
-        db_rom_handler.set_main_sibling(updated_rom)
+    # db_rom_handler.set_main_sibling(updated_rom)
 
     return DetailedRomSchema.from_orm_with_request(updated_rom, request)
 
@@ -435,14 +433,16 @@ async def delete_roms(
 @protected_route(router.put, "/roms/{id}/props", ["rom_props.write"])
 async def update_rom_props(request: Request, id: int) -> RomPropsSchema:
     db_rom_props = db_rom_handler.get_rom_props(id, request.user.id)
+    log.debug("endpoint props")
+    log.debug(db_rom_props)
     if not db_rom_props:
+        log.debug("adding props")
         db_rom_props = db_rom_handler.add_rom_props(id, request.user.id)
 
     data = await request.json()
     db_rom_handler.update_rom_props(
         db_rom_props.id,
         {
-            "updated_at": datetime.now(),
             "note_raw_markdown": data.get(
                 "note_raw_markdown", db_rom_props.note_raw_markdown
             ),
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index 29c1bcb92..c7687ec0d 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -19,7 +19,7 @@ def with_assets(func):
             selectinload(Rom.saves),
             selectinload(Rom.states),
             selectinload(Rom.screenshots),
-            selectinload(Rom.notes),
+            selectinload(Rom.user_rom_props),
         )
         return func(*args, **kwargs)
 
diff --git a/backend/models/rom.py b/backend/models/rom.py
index 159f9979f..12b09eb4a 100644
--- a/backend/models/rom.py
+++ b/backend/models/rom.py
@@ -189,7 +189,7 @@ class UserRomProps(BaseModel):
     note_raw_markdown: Mapped[str] = mapped_column(Text, default="")
     note_is_public: Mapped[bool | None] = mapped_column(default=False)
 
-    rom_is_main_sibling: Mapped[bool | None] = mapped_column(default=False)
+    is_main_sibling: Mapped[bool | None] = mapped_column(default=False)
 
     rom_id: Mapped[int] = mapped_column(ForeignKey("roms.id", ondelete="CASCADE"))
     user_id: Mapped[int] = mapped_column(ForeignKey("users.id", ondelete="CASCADE"))
diff --git a/frontend/src/__generated__/index.ts b/frontend/src/__generated__/index.ts
index b4c5aafa9..c81d227e6 100644
--- a/frontend/src/__generated__/index.ts
+++ b/frontend/src/__generated__/index.ts
@@ -27,7 +27,7 @@ export type { PlatformSchema } from "./models/PlatformSchema";
 export type { Role } from "./models/Role";
 export type { RomIGDBMetadata } from "./models/RomIGDBMetadata";
 export type { RomMobyMetadata } from "./models/RomMobyMetadata";
-export type { RomNoteSchema } from "./models/RomNoteSchema";
+export type { RomPropsSchema } from "./models/RomPropsSchema";
 export type { RomSchema } from "./models/RomSchema";
 export type { SaveSchema } from "./models/SaveSchema";
 export type { SchedulerDict } from "./models/SchedulerDict";
diff --git a/frontend/src/__generated__/models/DetailedRomSchema.ts b/frontend/src/__generated__/models/DetailedRomSchema.ts
index 257537027..fce6aac12 100644
--- a/frontend/src/__generated__/models/DetailedRomSchema.ts
+++ b/frontend/src/__generated__/models/DetailedRomSchema.ts
@@ -5,7 +5,7 @@
 
 import type { RomIGDBMetadata } from "./RomIGDBMetadata";
 import type { RomMobyMetadata } from "./RomMobyMetadata";
-import type { RomNoteSchema } from "./RomNoteSchema";
+import type { RomPropsSchema } from "./RomPropsSchema";
 import type { RomSchema } from "./RomSchema";
 import type { SaveSchema } from "./SaveSchema";
 import type { ScreenshotSchema } from "./ScreenshotSchema";
@@ -48,7 +48,6 @@ export type DetailedRomSchema = {
   multi: boolean;
   files: Array<string>;
   full_path: string;
-  fav_sibling: boolean;
   created_at: string;
   updated_at: string;
   merged_screenshots: Array<string>;
@@ -56,6 +55,6 @@ export type DetailedRomSchema = {
   user_saves?: Array<SaveSchema>;
   user_states?: Array<StateSchema>;
   user_screenshots?: Array<ScreenshotSchema>;
-  user_notes?: Array<RomNoteSchema>;
+  user_rom_props?: Array<RomPropsSchema>;
   readonly sort_comparator: string;
 };
diff --git a/frontend/src/__generated__/models/RomNoteSchema.ts b/frontend/src/__generated__/models/RomPropsSchema.ts
similarity index 63%
rename from frontend/src/__generated__/models/RomNoteSchema.ts
rename to frontend/src/__generated__/models/RomPropsSchema.ts
index 2c5b4d12e..79e12593c 100644
--- a/frontend/src/__generated__/models/RomNoteSchema.ts
+++ b/frontend/src/__generated__/models/RomPropsSchema.ts
@@ -3,12 +3,14 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type RomNoteSchema = {
+export type RomPropsSchema = {
   id: number;
   user_id: number;
   rom_id: number;
+  created_at: string;
   updated_at: string;
-  raw_markdown: string;
-  is_public: boolean;
+  note_raw_markdown: string;
+  note_is_public: boolean;
+  is_main_sibling: boolean;
   user__username: string;
 };
diff --git a/frontend/src/__generated__/models/RomSchema.ts b/frontend/src/__generated__/models/RomSchema.ts
index a77c4d643..80f8b6d3a 100644
--- a/frontend/src/__generated__/models/RomSchema.ts
+++ b/frontend/src/__generated__/models/RomSchema.ts
@@ -43,7 +43,6 @@ export type RomSchema = {
   multi: boolean;
   files: Array<string>;
   full_path: string;
-  fav_sibling: boolean;
   created_at: string;
   updated_at: string;
   readonly sort_comparator: string;
diff --git a/frontend/src/components/Details/Info/FileInfo.vue b/frontend/src/components/Details/Info/FileInfo.vue
index 644e710d0..06c1fa3e7 100644
--- a/frontend/src/components/Details/Info/FileInfo.vue
+++ b/frontend/src/components/Details/Info/FileInfo.vue
@@ -17,7 +17,7 @@ const downloadStore = storeDownload();
 // Functions
 async function updateMainSibling() {
   const updatedRom = props.rom;
-  updatedRom.fav_sibling = !props.rom.fav_sibling;
+  // updatedRom.fav_sibling = !props.rom.fav_sibling;
   await romApi
     .updateRom({ rom: updatedRom })
     .then(({ data }) => {
diff --git a/frontend/src/components/Details/Notes.vue b/frontend/src/components/Details/Notes.vue
index 70000b703..542f30030 100644
--- a/frontend/src/components/Details/Notes.vue
+++ b/frontend/src/components/Details/Notes.vue
@@ -12,33 +12,33 @@ const auth = storeAuth();
 const theme = useTheme();
 const editingNote = ref(false);
 const ownNote = ref(
-  props.rom.user_notes?.find((note) => note.user_id === auth.user?.id) ?? {
+  props.rom.user_rom_props?.find((prop) => prop.user_id === auth.user?.id) ?? {
     id: null,
     user_id: auth.user?.id,
     rom_id: props.rom.id,
     updated_at: new Date(),
-    raw_markdown: "",
-    is_public: false,
+    note_raw_markdown: "",
+    note_is_public: false,
   }
 );
 const publicNotes =
-  props.rom.user_notes?.filter((note) => note.user_id !== auth.user?.id) ?? [];
+  props.rom.user_rom_props?.filter((prop) => prop.user_id !== auth.user?.id) ?? [];
 
 function togglePublic() {
-  ownNote.value.is_public = !ownNote.value.is_public;
-  romApi.updateRomNote({
+  ownNote.value.note_is_public = !ownNote.value.note_is_public;
+  romApi.updateUserRomProps({
     romId: props.rom.id,
-    rawMarkdown: ownNote.value.raw_markdown,
-    isPublic: ownNote.value.is_public,
+    noteRawMarkdown: ownNote.value.note_raw_markdown,
+    noteIsPublic: ownNote.value.note_is_public,
   });
 }
 
 function onEditNote() {
   if (editingNote.value) {
-    romApi.updateRomNote({
+    romApi.updateUserRomProps({
       romId: props.rom.id,
-      rawMarkdown: ownNote.value.raw_markdown,
-      isPublic: ownNote.value.is_public,
+      noteRawMarkdown: ownNote.value.note_raw_markdown,
+      noteIsPublic: ownNote.value.note_is_public,
     });
   }
   editingNote.value = !editingNote.value;
@@ -55,7 +55,7 @@ function onEditNote() {
               location="top"
               class="tooltip"
               transition="fade-transition"
-              :text="ownNote.is_public ? 'Make private' : 'Make public'"
+              :text="ownNote.note_is_public ? 'Make private' : 'Make public'"
               open-delay="500"
               ><template #activator="{ props: tooltipProps }">
                 <v-btn
@@ -64,7 +64,7 @@ function onEditNote() {
                   class="bg-terciary"
                 >
                   <v-icon size="large">
-                    {{ ownNote.is_public ? "mdi-eye" : "mdi-eye-off" }}
+                    {{ ownNote.note_is_public ? "mdi-eye" : "mdi-eye-off" }}
                   </v-icon>
                 </v-btn>
               </template></v-tooltip
@@ -94,7 +94,7 @@ function onEditNote() {
     <v-card-text class="pa-2">
       <MdEditor
         v-if="editingNote"
-        v-model="ownNote.raw_markdown"
+        v-model="ownNote.note_raw_markdown"
         :theme="theme.name.value == 'dark' ? 'dark' : 'light'"
         language="en-US"
         :preview="false"
@@ -103,7 +103,7 @@ function onEditNote() {
       />
       <MdPreview
         v-else
-        :model-value="ownNote.raw_markdown"
+        :model-value="ownNote.note_raw_markdown"
         :theme="theme.name.value == 'dark' ? 'dark' : 'light'"
         preview-theme="vuepress"
         code-theme="github"
@@ -128,7 +128,7 @@ function onEditNote() {
           </v-expansion-panel-title>
           <v-expansion-panel-text class="bg-secondary">
             <MdPreview
-              :model-value="note.raw_markdown"
+              :model-value="note.note_raw_markdown"
               :theme="theme.name.value == 'dark' ? 'dark' : 'light'"
               preview-theme="vuepress"
               code-theme="github"
diff --git a/frontend/src/services/api/rom.ts b/frontend/src/services/api/rom.ts
index 133accce5..d4cda35a3 100644
--- a/frontend/src/services/api/rom.ts
+++ b/frontend/src/services/api/rom.ts
@@ -142,8 +142,8 @@ async function updateRom({
   const formData = new FormData();
   if (rom.igdb_id) formData.append("igdb_id", rom.igdb_id.toString());
   if (rom.moby_id) formData.append("moby_id", rom.moby_id.toString());
-  if (rom.fav_sibling)
-    formData.append("fav_sibling", rom.fav_sibling.toString());
+  // if (rom.fav_sibling)
+  //   formData.append("fav_sibling", rom.fav_sibling.toString());
   formData.append("name", rom.name || "");
   formData.append("file_name", rom.file_name);
   formData.append("summary", rom.summary || "");
@@ -168,18 +168,18 @@ async function deleteRoms({
   });
 }
 
-async function updateRomNote({
+async function updateUserRomProps({
   romId,
-  rawMarkdown,
-  isPublic,
+  noteRawMarkdown,
+  noteIsPublic,
 }: {
   romId: number;
-  rawMarkdown: string;
-  isPublic: boolean;
+  noteRawMarkdown: string;
+  noteIsPublic: boolean;
 }): Promise<{ data: DetailedRom }> {
-  return api.put(`/roms/${romId}/note`, {
-    raw_markdown: rawMarkdown,
-    is_public: isPublic,
+  return api.put(`/roms/${romId}/props`, {
+    note_raw_markdown: noteRawMarkdown,
+    note_is_public: noteIsPublic,
   });
 }
 
@@ -193,5 +193,5 @@ export default {
   searchCover,
   updateRom,
   deleteRoms,
-  updateRomNote,
+  updateUserRomProps,
 };
diff --git a/frontend/src/stores/roms.ts b/frontend/src/stores/roms.ts
index 8babc3f63..772486308 100644
--- a/frontend/src/stores/roms.ts
+++ b/frontend/src/stores/roms.ts
@@ -61,11 +61,12 @@ export default defineStore("roms", {
         ),
       )
         .map((games) => {
-          const favSiblingIndex = games.findIndex((game) => game.fav_sibling);
-          const primaryGame =
-            favSiblingIndex !== -1
-              ? games.splice(favSiblingIndex, 1)[0]
-              : games.shift();
+          const primaryGame = games.shift();
+          // const favSiblingIndex = games.findIndex((game) => game.fav_sibling);
+          // const primaryGame =
+          //   favSiblingIndex !== -1
+          //     ? games.splice(favSiblingIndex, 1)[0]
+          //     : games.shift();
 
           return {
             ...(primaryGame as SimpleRom),

From 43cd6a838380b0be924f582501f4bd1be4006371 Mon Sep 17 00:00:00 2001
From: Zurdi <zurdizurdo25@gmail.com>
Date: Sat, 29 Jun 2024 14:09:41 +0200
Subject: [PATCH 12/23] added main sibling per user

---
 backend/endpoints/rom.py                      | 13 +++-
 backend/handler/database/roms_handler.py      |  8 +-
 backend/models/rom.py                         |  3 -
 .../src/components/Details/Info/FileInfo.vue  | 76 +++++++++++--------
 frontend/src/components/Details/Notes.vue     | 51 +++++++++----
 frontend/src/services/api/rom.ts              |  3 +
 6 files changed, 100 insertions(+), 54 deletions(-)

diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index d3477f1a7..fc13e1ad2 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -432,11 +432,13 @@ async def delete_roms(
 
 @protected_route(router.put, "/roms/{id}/props", ["rom_props.write"])
 async def update_rom_props(request: Request, id: int) -> RomPropsSchema:
+    db_rom = db_rom_handler.get_roms(id)
+    if not db_rom:
+        error = f"Rom with id {id} could not be found"
+        log.error(error)
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=error)
     db_rom_props = db_rom_handler.get_rom_props(id, request.user.id)
-    log.debug("endpoint props")
-    log.debug(db_rom_props)
     if not db_rom_props:
-        log.debug("adding props")
         db_rom_props = db_rom_handler.add_rom_props(id, request.user.id)
 
     data = await request.json()
@@ -447,8 +449,13 @@ async def update_rom_props(request: Request, id: int) -> RomPropsSchema:
                 "note_raw_markdown", db_rom_props.note_raw_markdown
             ),
             "note_is_public": data.get("note_is_public", db_rom_props.note_is_public),
+            "is_main_sibling": data.get(
+                "is_main_sibling", db_rom_props.is_main_sibling
+            ),
         },
     )
 
     db_rom_props = db_rom_handler.get_rom_props(id, request.user.id)
+    if db_rom_props.is_main_sibling:
+        db_rom_handler.set_main_sibling(db_rom, db_rom_props.user_id)
     return db_rom_props
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index c7687ec0d..1070b942b 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -123,10 +123,14 @@ class DBRomsHandler(DBBaseHandler):
         )
 
     @begin_session
-    def set_main_sibling(self, rom: Rom, session: Session = None) -> None:
+    def set_main_sibling(self, rom: Rom, user_id: int, session: Session = None) -> None:
         siblings = [rom.id for rom in rom.get_sibling_roms()]
         return session.execute(
-            update(Rom).where(Rom.id.in_(siblings)).values(fav_sibling=False)
+            update(UserRomProps)
+            .where(
+                and_(UserRomProps.rom_id.in_(siblings), UserRomProps.user_id == user_id)
+            )
+            .values(is_main_sibling=False)
         )
 
     @begin_session
diff --git a/backend/models/rom.py b/backend/models/rom.py
index 12b09eb4a..01494ab25 100644
--- a/backend/models/rom.py
+++ b/backend/models/rom.py
@@ -1,4 +1,3 @@
-from datetime import datetime
 from functools import cached_property
 from typing import TYPE_CHECKING, Any
 
@@ -7,13 +6,11 @@ from models.base import BaseModel
 from sqlalchemy import (
     JSON,
     BigInteger,
-    DateTime,
     ForeignKey,
     String,
     Text,
     UniqueConstraint,
     and_,
-    func,
     or_,
     select,
 )
diff --git a/frontend/src/components/Details/Info/FileInfo.vue b/frontend/src/components/Details/Info/FileInfo.vue
index 06c1fa3e7..2ee7cd733 100644
--- a/frontend/src/components/Details/Info/FileInfo.vue
+++ b/frontend/src/components/Details/Info/FileInfo.vue
@@ -1,44 +1,56 @@
 <script setup lang="ts">
 import VersionSwitcher from "@/components/Details/VersionSwitcher.vue";
 import romApi from "@/services/api/rom";
+import storeAuth from "@/stores/auth";
 import storeDownload from "@/stores/download";
 import type { Platform } from "@/stores/platforms";
 import type { DetailedRom } from "@/stores/roms";
-import type { Events } from "@/types/emitter";
 import { formatBytes } from "@/utils";
-import type { Emitter } from "mitt";
-import { inject } from "vue";
+import { ref, watch } from "vue";
 
 // Props
 const props = defineProps<{ rom: DetailedRom; platform: Platform }>();
-const emitter = inject<Emitter<Events>>("emitter");
 const downloadStore = storeDownload();
+const auth = storeAuth();
+const ownProps = ref(
+  props.rom.user_rom_props?.find((prop) => prop.user_id === auth.user?.id) ?? {
+    id: null,
+    user_id: auth.user?.id,
+    rom_id: props.rom.id,
+    updated_at: new Date(),
+    note_raw_markdown: "",
+    note_is_public: false,
+    is_main_sibling: false,
+  }
+);
 
 // Functions
-async function updateMainSibling() {
-  const updatedRom = props.rom;
-  // updatedRom.fav_sibling = !props.rom.fav_sibling;
-  await romApi
-    .updateRom({ rom: updatedRom })
-    .then(({ data }) => {
-      emitter?.emit("snackbarShow", {
-        msg: "Rom updated successfully!",
-        icon: "mdi-check-bold",
-        color: "green",
-      });
-    })
-    .catch((error) => {
-      console.log(error);
-      emitter?.emit("snackbarShow", {
-        msg: error.response.data.detail,
-        icon: "mdi-close-circle",
-        color: "red",
-      });
-    })
-    .finally(() => {
-      emitter?.emit("showLoadingDialog", { loading: false, scrim: false });
-    });
+async function toggleMainSibling() {
+  ownProps.value.is_main_sibling = !ownProps.value.is_main_sibling;
+  romApi.updateUserRomProps({
+    romId: props.rom.id,
+    noteRawMarkdown: ownProps.value.note_raw_markdown,
+    noteIsPublic: ownProps.value.note_is_public,
+    isMainSibling: ownProps.value.is_main_sibling,
+  });
 }
+
+watch(
+  () => props.rom,
+  async () => {
+    ownProps.value = props.rom.user_rom_props?.find(
+      (prop) => prop.user_id === auth.user?.id
+    ) ?? {
+      id: null,
+      user_id: auth.user?.id,
+      rom_id: props.rom.id,
+      updated_at: new Date(),
+      note_raw_markdown: "",
+      note_is_public: false,
+      is_main_sibling: false,
+    };
+  }
+);
 </script>
 <template>
   <v-row no-gutters>
@@ -67,16 +79,16 @@ async function updateMainSibling() {
                   variant="flat"
                   rounded="0"
                   size="small"
-                  @click="updateMainSibling"
+                  @click="toggleMainSibling"
                   ><v-icon
-                    :class="rom.fav_sibling ? '' : 'mr-1'"
-                    :color="rom.fav_sibling ? 'romm-accent-1' : ''"
+                    :class="ownProps.is_main_sibling ? '' : 'mr-1'"
+                    :color="ownProps.is_main_sibling ? 'romm-accent-1' : ''"
                     >{{
-                      rom.fav_sibling
+                      ownProps.is_main_sibling
                         ? "mdi-checkbox-outline"
                         : "mdi-checkbox-blank-outline"
                     }}</v-icon
-                  >{{ rom.fav_sibling ? "" : "Default" }}</v-btn
+                  >{{ ownProps.is_main_sibling ? "" : "Default" }}</v-btn
                 >
               </template></v-tooltip
             >
diff --git a/frontend/src/components/Details/Notes.vue b/frontend/src/components/Details/Notes.vue
index 542f30030..2b122a2d1 100644
--- a/frontend/src/components/Details/Notes.vue
+++ b/frontend/src/components/Details/Notes.vue
@@ -4,14 +4,15 @@ import storeAuth from "@/stores/auth";
 import type { DetailedRom } from "@/stores/roms";
 import { MdEditor, MdPreview } from "md-editor-v3";
 import "md-editor-v3/lib/style.css";
-import { ref } from "vue";
+import { ref, watch } from "vue";
 import { useTheme } from "vuetify";
 
+// Props
 const props = defineProps<{ rom: DetailedRom }>();
 const auth = storeAuth();
 const theme = useTheme();
 const editingNote = ref(false);
-const ownNote = ref(
+const ownProps = ref(
   props.rom.user_rom_props?.find((prop) => prop.user_id === auth.user?.id) ?? {
     id: null,
     user_id: auth.user?.id,
@@ -19,30 +20,52 @@ const ownNote = ref(
     updated_at: new Date(),
     note_raw_markdown: "",
     note_is_public: false,
+    is_main_sibling: false,
   }
 );
 const publicNotes =
-  props.rom.user_rom_props?.filter((prop) => prop.user_id !== auth.user?.id) ?? [];
+  props.rom.user_rom_props?.filter((prop) => prop.user_id !== auth.user?.id) ??
+  [];
 
+// Functions
 function togglePublic() {
-  ownNote.value.note_is_public = !ownNote.value.note_is_public;
+  ownProps.value.note_is_public = !ownProps.value.note_is_public;
   romApi.updateUserRomProps({
     romId: props.rom.id,
-    noteRawMarkdown: ownNote.value.note_raw_markdown,
-    noteIsPublic: ownNote.value.note_is_public,
+    noteRawMarkdown: ownProps.value.note_raw_markdown,
+    noteIsPublic: ownProps.value.note_is_public,
+    isMainSibling: ownProps.value.is_main_sibling,
   });
 }
 
-function onEditNote() {
+function editNote() {
   if (editingNote.value) {
     romApi.updateUserRomProps({
       romId: props.rom.id,
-      noteRawMarkdown: ownNote.value.note_raw_markdown,
-      noteIsPublic: ownNote.value.note_is_public,
+      noteRawMarkdown: ownProps.value.note_raw_markdown,
+      noteIsPublic: ownProps.value.note_is_public,
+      isMainSibling: ownProps.value.is_main_sibling,
     });
   }
   editingNote.value = !editingNote.value;
 }
+
+watch(
+  () => props.rom,
+  async () => {
+    ownProps.value = props.rom.user_rom_props?.find(
+      (prop) => prop.user_id === auth.user?.id
+    ) ?? {
+      id: null,
+      user_id: auth.user?.id,
+      rom_id: props.rom.id,
+      updated_at: new Date(),
+      note_raw_markdown: "",
+      note_is_public: false,
+      is_main_sibling: false,
+    };
+  }
+);
 </script>
 <template>
   <v-card rounded="0">
@@ -55,7 +78,7 @@ function onEditNote() {
               location="top"
               class="tooltip"
               transition="fade-transition"
-              :text="ownNote.note_is_public ? 'Make private' : 'Make public'"
+              :text="ownProps.note_is_public ? 'Make private' : 'Make public'"
               open-delay="500"
               ><template #activator="{ props: tooltipProps }">
                 <v-btn
@@ -64,7 +87,7 @@ function onEditNote() {
                   class="bg-terciary"
                 >
                   <v-icon size="large">
-                    {{ ownNote.note_is_public ? "mdi-eye" : "mdi-eye-off" }}
+                    {{ ownProps.note_is_public ? "mdi-eye" : "mdi-eye-off" }}
                   </v-icon>
                 </v-btn>
               </template></v-tooltip
@@ -77,7 +100,7 @@ function onEditNote() {
               open-delay="500"
               ><template #activator="{ props: tooltipProps }">
                 <v-btn
-                  @click="onEditNote"
+                  @click="editNote"
                   v-bind="tooltipProps"
                   class="bg-terciary"
                 >
@@ -94,7 +117,7 @@ function onEditNote() {
     <v-card-text class="pa-2">
       <MdEditor
         v-if="editingNote"
-        v-model="ownNote.note_raw_markdown"
+        v-model="ownProps.note_raw_markdown"
         :theme="theme.name.value == 'dark' ? 'dark' : 'light'"
         language="en-US"
         :preview="false"
@@ -103,7 +126,7 @@ function onEditNote() {
       />
       <MdPreview
         v-else
-        :model-value="ownNote.note_raw_markdown"
+        :model-value="ownProps.note_raw_markdown"
         :theme="theme.name.value == 'dark' ? 'dark' : 'light'"
         preview-theme="vuepress"
         code-theme="github"
diff --git a/frontend/src/services/api/rom.ts b/frontend/src/services/api/rom.ts
index d4cda35a3..828e0979d 100644
--- a/frontend/src/services/api/rom.ts
+++ b/frontend/src/services/api/rom.ts
@@ -172,14 +172,17 @@ async function updateUserRomProps({
   romId,
   noteRawMarkdown,
   noteIsPublic,
+  isMainSibling,
 }: {
   romId: number;
   noteRawMarkdown: string;
   noteIsPublic: boolean;
+  isMainSibling: boolean;
 }): Promise<{ data: DetailedRom }> {
   return api.put(`/roms/${romId}/props`, {
     note_raw_markdown: noteRawMarkdown,
     note_is_public: noteIsPublic,
+    is_main_sibling: isMainSibling,
   });
 }
 

From d17e02987c9c012238cc44f111ba0fdf70870d18 Mon Sep 17 00:00:00 2001
From: Zurdi <34356590+zurdi15@users.noreply.github.com>
Date: Sat, 29 Jun 2024 18:19:52 +0200
Subject: [PATCH 13/23] Update backend/endpoints/responses/rom.py

Co-authored-by: Georges-Antoine Assi <3247106+gantoine@users.noreply.github.com>
---
 backend/endpoints/responses/rom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py
index 06a0c1b26..f66cecb66 100644
--- a/backend/endpoints/responses/rom.py
+++ b/backend/endpoints/responses/rom.py
@@ -26,7 +26,7 @@ RomMobyMetadata = TypedDict(  # type: ignore[misc]
 )
 
 
-class RomPropsSchema(BaseModel):
+class UserRomPropsSchema(BaseModel):
     id: int
     user_id: int
     rom_id: int

From d3381e16b041c94f873b2877b19b827bbdc814c4 Mon Sep 17 00:00:00 2001
From: Zurdi <34356590+zurdi15@users.noreply.github.com>
Date: Sat, 29 Jun 2024 18:20:01 +0200
Subject: [PATCH 14/23] Update backend/handler/auth/base_handler.py

Co-authored-by: Georges-Antoine Assi <3247106+gantoine@users.noreply.github.com>
---
 backend/handler/auth/base_handler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/handler/auth/base_handler.py b/backend/handler/auth/base_handler.py
index f14257a0c..66e3dd101 100644
--- a/backend/handler/auth/base_handler.py
+++ b/backend/handler/auth/base_handler.py
@@ -22,8 +22,8 @@ DEFAULT_SCOPES_MAP: Final = {
     "assets.read": "View assets",
     "assets.write": "Modify assets",
     "firmware.read": "View firmware",
-    "rom_props.read": "View rom props",
-    "rom_props.write": "Modify rom props",
+    "user_rom.read": "View user-rom props",
+    "user_rom.write": "Modify user-rom props",
 }
 
 WRITE_SCOPES_MAP: Final = {

From 4749bf84c6281a198a62164d891020e062fdd2b2 Mon Sep 17 00:00:00 2001
From: zurdi <zurdizurdo25@gmail.com>
Date: Sun, 30 Jun 2024 01:49:07 +0200
Subject: [PATCH 15/23] atomic update user_rom_props

---
 backend/endpoints/responses/rom.py            |  6 +-
 backend/endpoints/rom.py                      | 61 +++++++++----------
 backend/handler/auth/base_handler.py          |  4 +-
 backend/handler/database/roms_handler.py      | 53 ++++++++--------
 frontend/src/__generated__/index.ts           |  2 +-
 .../__generated__/models/DetailedRomSchema.ts |  4 +-
 ...omPropsSchema.ts => UserRomPropsSchema.ts} |  2 +-
 7 files changed, 67 insertions(+), 65 deletions(-)
 rename frontend/src/__generated__/models/{RomPropsSchema.ts => UserRomPropsSchema.ts} (90%)

diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py
index f66cecb66..7e17a7448 100644
--- a/backend/endpoints/responses/rom.py
+++ b/backend/endpoints/responses/rom.py
@@ -41,7 +41,7 @@ class UserRomPropsSchema(BaseModel):
         from_attributes = True
 
     @classmethod
-    def for_user(cls, db_rom: Rom, user_id: int) -> list["RomPropsSchema"]:
+    def for_user(cls, db_rom: Rom, user_id: int) -> list["UserRomPropsSchema"]:
         return [
             cls.model_validate(n)
             for n in db_rom.user_rom_props
@@ -120,7 +120,7 @@ class DetailedRomSchema(RomSchema):
     user_saves: list[SaveSchema] = Field(default_factory=list)
     user_states: list[StateSchema] = Field(default_factory=list)
     user_screenshots: list[ScreenshotSchema] = Field(default_factory=list)
-    user_rom_props: list[RomPropsSchema] = Field(default_factory=list)
+    user_rom_props: list[UserRomPropsSchema] = Field(default_factory=list)
 
     @classmethod
     def from_orm_with_request(
@@ -143,7 +143,7 @@ class DetailedRomSchema(RomSchema):
             for s in db_rom.screenshots
             if s.user_id == user_id
         ]
-        rom.user_rom_props = RomPropsSchema.for_user(db_rom, user_id)
+        rom.user_rom_props = UserRomPropsSchema.for_user(db_rom, user_id)
 
         return rom
 
diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index fc13e1ad2..f023df37f 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -16,8 +16,8 @@ from endpoints.responses.rom import (
     AddRomsResponse,
     CustomStreamingResponse,
     DetailedRomSchema,
-    RomPropsSchema,
     RomSchema,
+    UserRomPropsSchema,
 )
 from exceptions.fs_exceptions import RomAlreadyExistsException
 from fastapi import APIRouter, File, HTTPException, Query, Request, UploadFile, status
@@ -108,15 +108,13 @@ def get_roms(
         list[RomSchema]: List of roms stored in the database
     """
 
-    with db_rom_handler.session.begin() as session:
-        return session.scalars(
-            db_rom_handler.get_roms(
-                platform_id=platform_id,
-                search_term=search_term.lower(),
-                order_by=order_by.lower(),
-                order_dir=order_dir.lower(),
-            ).limit(limit)
-        ).all()
+    return db_rom_handler.get_roms(
+        platform_id=platform_id,
+        search_term=search_term.lower(),
+        order_by=order_by.lower(),
+        order_dir=order_dir.lower(),
+        limit=limit,
+    )
 
 
 @protected_route(
@@ -373,8 +371,6 @@ async def update_rom(
     db_rom_handler.update_rom(id, cleaned_data)
     updated_rom = db_rom_handler.get_roms(id)
 
-    # db_rom_handler.set_main_sibling(updated_rom)
-
     return DetailedRomSchema.from_orm_with_request(updated_rom, request)
 
 
@@ -431,31 +427,32 @@ async def delete_roms(
 
 
 @protected_route(router.put, "/roms/{id}/props", ["rom_props.write"])
-async def update_rom_props(request: Request, id: int) -> RomPropsSchema:
+async def update_rom_props(request: Request, id: int) -> UserRomPropsSchema:
+
+    data = await request.json()
+
     db_rom = db_rom_handler.get_roms(id)
+
     if not db_rom:
         error = f"Rom with id {id} could not be found"
         log.error(error)
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=error)
-    db_rom_props = db_rom_handler.get_rom_props(id, request.user.id)
-    if not db_rom_props:
-        db_rom_props = db_rom_handler.add_rom_props(id, request.user.id)
 
-    data = await request.json()
-    db_rom_handler.update_rom_props(
-        db_rom_props.id,
-        {
-            "note_raw_markdown": data.get(
-                "note_raw_markdown", db_rom_props.note_raw_markdown
-            ),
-            "note_is_public": data.get("note_is_public", db_rom_props.note_is_public),
-            "is_main_sibling": data.get(
-                "is_main_sibling", db_rom_props.is_main_sibling
-            ),
-        },
+    db_rom_props = db_rom_handler.get_rom_props(
+        id, request.user.id
+    ) or db_rom_handler.add_rom_props(id, request.user.id)
+
+    cleaned_data = {}
+    cleaned_data["note_raw_markdown"] = data.get(
+        "note_raw_markdown", db_rom_props.note_raw_markdown
+    )
+    cleaned_data["note_is_public"] = data.get(
+        "note_is_public", db_rom_props.note_is_public
+    )
+    cleaned_data["is_main_sibling"] = data.get(
+        "is_main_sibling", db_rom_props.is_main_sibling
     )
 
-    db_rom_props = db_rom_handler.get_rom_props(id, request.user.id)
-    if db_rom_props.is_main_sibling:
-        db_rom_handler.set_main_sibling(db_rom, db_rom_props.user_id)
-    return db_rom_props
+    return db_rom_handler.update_rom_props(
+        db_rom_props.id, cleaned_data, db_rom, request.user.id
+    )
diff --git a/backend/handler/auth/base_handler.py b/backend/handler/auth/base_handler.py
index 66e3dd101..c1325cc08 100644
--- a/backend/handler/auth/base_handler.py
+++ b/backend/handler/auth/base_handler.py
@@ -22,8 +22,8 @@ DEFAULT_SCOPES_MAP: Final = {
     "assets.read": "View assets",
     "assets.write": "Modify assets",
     "firmware.read": "View firmware",
-    "user_rom.read": "View user-rom props",
-    "user_rom.write": "Modify user-rom props",
+    "rom_props.read": "View user-rom props",
+    "rom_props.write": "Modify user-rom props",
 }
 
 WRITE_SCOPES_MAP: Final = {
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index 1070b942b..47ab29176 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -69,17 +69,20 @@ class DBRomsHandler(DBBaseHandler):
         search_term: str = "",
         order_by: str = "name",
         order_dir: str = "asc",
+        limit: int = None,
         query: Query = None,
         session: Session = None,
     ) -> list[Rom] | Rom | None:
         return (
             session.scalar(query.filter_by(id=id).limit(1))
             if id
-            else self._order(
-                self._filter(select(Rom), platform_id, search_term),
-                order_by,
-                order_dir,
-            )
+            else session.scalars(
+                self._order(
+                    self._filter(select(Rom), platform_id, search_term),
+                    order_by,
+                    order_dir,
+                ).limit(limit)
+            ).all()
         )
 
     @begin_session
@@ -122,17 +125,6 @@ class DBRomsHandler(DBBaseHandler):
             .execution_options(synchronize_session="evaluate")
         )
 
-    @begin_session
-    def set_main_sibling(self, rom: Rom, user_id: int, session: Session = None) -> None:
-        siblings = [rom.id for rom in rom.get_sibling_roms()]
-        return session.execute(
-            update(UserRomProps)
-            .where(
-                and_(UserRomProps.rom_id.in_(siblings), UserRomProps.user_id == user_id)
-            )
-            .values(is_main_sibling=False)
-        )
-
     @begin_session
     def delete_rom(self, id: int, session: Session = None) -> Rom:
         return session.execute(
@@ -151,6 +143,12 @@ class DBRomsHandler(DBBaseHandler):
             .execution_options(synchronize_session="evaluate")
         )
 
+    @begin_session
+    def add_rom_props(
+        self, rom_id: int, user_id: int, session: Session = None
+    ) -> UserRomProps:
+        return session.merge(UserRomProps(rom_id=rom_id, user_id=user_id))
+
     @begin_session
     def get_rom_props(
         self, rom_id: int, user_id: int, session: Session = None
@@ -159,19 +157,26 @@ class DBRomsHandler(DBBaseHandler):
             select(UserRomProps).filter_by(rom_id=rom_id, user_id=user_id).limit(1)
         )
 
-    @begin_session
-    def add_rom_props(
-        self, rom_id: int, user_id: int, session: Session = None
-    ) -> UserRomProps:
-        return session.merge(UserRomProps(rom_id=rom_id, user_id=user_id))
-
     @begin_session
     def update_rom_props(
-        self, id: int, data: dict, session: Session = None
+        self, id: int, data: dict, rom: Rom, user_id: int, session: Session = None
     ) -> UserRomProps:
-        return session.execute(
+        session.execute(
             update(UserRomProps)
             .where(UserRomProps.id == id)
             .values(**data)
             .execution_options(synchronize_session="evaluate")
         )
+        if data["is_main_sibling"]:
+            siblings = [rom.id for rom in rom.get_sibling_roms()]
+            session.execute(
+                update(UserRomProps)
+                .where(
+                    and_(
+                        UserRomProps.rom_id.in_(siblings),
+                        UserRomProps.user_id == user_id,
+                    )
+                )
+                .values(is_main_sibling=False)
+            )
+        return self.get_rom_props(rom.id, user_id)
diff --git a/frontend/src/__generated__/index.ts b/frontend/src/__generated__/index.ts
index c81d227e6..5af907fcd 100644
--- a/frontend/src/__generated__/index.ts
+++ b/frontend/src/__generated__/index.ts
@@ -27,7 +27,6 @@ export type { PlatformSchema } from "./models/PlatformSchema";
 export type { Role } from "./models/Role";
 export type { RomIGDBMetadata } from "./models/RomIGDBMetadata";
 export type { RomMobyMetadata } from "./models/RomMobyMetadata";
-export type { RomPropsSchema } from "./models/RomPropsSchema";
 export type { RomSchema } from "./models/RomSchema";
 export type { SaveSchema } from "./models/SaveSchema";
 export type { SchedulerDict } from "./models/SchedulerDict";
@@ -42,6 +41,7 @@ export type { TokenResponse } from "./models/TokenResponse";
 export type { UploadedSavesResponse } from "./models/UploadedSavesResponse";
 export type { UploadedScreenshotsResponse } from "./models/UploadedScreenshotsResponse";
 export type { UploadedStatesResponse } from "./models/UploadedStatesResponse";
+export type { UserRomPropsSchema } from "./models/UserRomPropsSchema";
 export type { UserSchema } from "./models/UserSchema";
 export type { ValidationError } from "./models/ValidationError";
 export type { WatcherDict } from "./models/WatcherDict";
diff --git a/frontend/src/__generated__/models/DetailedRomSchema.ts b/frontend/src/__generated__/models/DetailedRomSchema.ts
index fce6aac12..ebb45f6db 100644
--- a/frontend/src/__generated__/models/DetailedRomSchema.ts
+++ b/frontend/src/__generated__/models/DetailedRomSchema.ts
@@ -5,11 +5,11 @@
 
 import type { RomIGDBMetadata } from "./RomIGDBMetadata";
 import type { RomMobyMetadata } from "./RomMobyMetadata";
-import type { RomPropsSchema } from "./RomPropsSchema";
 import type { RomSchema } from "./RomSchema";
 import type { SaveSchema } from "./SaveSchema";
 import type { ScreenshotSchema } from "./ScreenshotSchema";
 import type { StateSchema } from "./StateSchema";
+import type { UserRomPropsSchema } from "./UserRomPropsSchema";
 
 export type DetailedRomSchema = {
   id: number;
@@ -55,6 +55,6 @@ export type DetailedRomSchema = {
   user_saves?: Array<SaveSchema>;
   user_states?: Array<StateSchema>;
   user_screenshots?: Array<ScreenshotSchema>;
-  user_rom_props?: Array<RomPropsSchema>;
+  user_rom_props?: Array<UserRomPropsSchema>;
   readonly sort_comparator: string;
 };
diff --git a/frontend/src/__generated__/models/RomPropsSchema.ts b/frontend/src/__generated__/models/UserRomPropsSchema.ts
similarity index 90%
rename from frontend/src/__generated__/models/RomPropsSchema.ts
rename to frontend/src/__generated__/models/UserRomPropsSchema.ts
index 79e12593c..2b08d82cc 100644
--- a/frontend/src/__generated__/models/RomPropsSchema.ts
+++ b/frontend/src/__generated__/models/UserRomPropsSchema.ts
@@ -3,7 +3,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type RomPropsSchema = {
+export type UserRomPropsSchema = {
   id: number;
   user_id: number;
   rom_id: number;

From aff4bb65de8218189770fc0bc13ae97015a0c8e7 Mon Sep 17 00:00:00 2001
From: zurdi <zurdizurdo25@gmail.com>
Date: Sun, 30 Jun 2024 13:26:50 +0200
Subject: [PATCH 16/23] add user_rom_props to get_roms

---
 backend/endpoints/responses/rom.py              |  6 ++----
 backend/endpoints/rom.py                        |  1 +
 backend/handler/database/roms_handler.py        | 13 +++++++------
 .../__generated__/models/DetailedRomSchema.ts   |  2 +-
 frontend/src/__generated__/models/RomSchema.ts  |  2 ++
 frontend/src/stores/roms.ts                     | 17 +++++++++++------
 6 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py
index 7e17a7448..c400d6bab 100644
--- a/backend/endpoints/responses/rom.py
+++ b/backend/endpoints/responses/rom.py
@@ -98,6 +98,8 @@ class RomSchema(BaseModel):
     created_at: datetime
     updated_at: datetime
 
+    user_rom_props: UserRomPropsSchema = Field(default_factory=list)
+
     class Config:
         from_attributes = True
 
@@ -120,7 +122,6 @@ class DetailedRomSchema(RomSchema):
     user_saves: list[SaveSchema] = Field(default_factory=list)
     user_states: list[StateSchema] = Field(default_factory=list)
     user_screenshots: list[ScreenshotSchema] = Field(default_factory=list)
-    user_rom_props: list[UserRomPropsSchema] = Field(default_factory=list)
 
     @classmethod
     def from_orm_with_request(
@@ -128,7 +129,6 @@ class DetailedRomSchema(RomSchema):
     ) -> "DetailedRomSchema":
         rom = cls.model_validate(db_rom)
         user_id = request.user.id
-
         rom.sibling_roms = [
             RomSchema.model_validate(r) for r in db_rom.get_sibling_roms()
         ]
@@ -143,8 +143,6 @@ class DetailedRomSchema(RomSchema):
             for s in db_rom.screenshots
             if s.user_id == user_id
         ]
-        rom.user_rom_props = UserRomPropsSchema.for_user(db_rom, user_id)
-
         return rom
 
 
diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index f023df37f..87fe42ac6 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -114,6 +114,7 @@ def get_roms(
         order_by=order_by.lower(),
         order_dir=order_dir.lower(),
         limit=limit,
+        user_id=request.user.id,
     )
 
 
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index 47ab29176..194a5aaf0 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -69,21 +69,22 @@ class DBRomsHandler(DBBaseHandler):
         search_term: str = "",
         order_by: str = "name",
         order_dir: str = "asc",
-        limit: int = None,
+        limit: int | None = None,
+        user_id: int | None = None,
         query: Query = None,
         session: Session = None,
     ) -> list[Rom] | Rom | None:
-        return (
-            session.scalar(query.filter_by(id=id).limit(1))
-            if id
-            else session.scalars(
+        # TODO: get user_rom_props from user_id
+        if id:
+            return session.scalar(query.filter_by(id=id).limit(1))
+        else:
+            return session.scalars(
                 self._order(
                     self._filter(select(Rom), platform_id, search_term),
                     order_by,
                     order_dir,
                 ).limit(limit)
             ).all()
-        )
 
     @begin_session
     @with_assets
diff --git a/frontend/src/__generated__/models/DetailedRomSchema.ts b/frontend/src/__generated__/models/DetailedRomSchema.ts
index ebb45f6db..4d78bad12 100644
--- a/frontend/src/__generated__/models/DetailedRomSchema.ts
+++ b/frontend/src/__generated__/models/DetailedRomSchema.ts
@@ -50,11 +50,11 @@ export type DetailedRomSchema = {
   full_path: string;
   created_at: string;
   updated_at: string;
+  user_rom_props?: Array<UserRomPropsSchema>;
   merged_screenshots: Array<string>;
   sibling_roms?: Array<RomSchema>;
   user_saves?: Array<SaveSchema>;
   user_states?: Array<StateSchema>;
   user_screenshots?: Array<ScreenshotSchema>;
-  user_rom_props?: Array<UserRomPropsSchema>;
   readonly sort_comparator: string;
 };
diff --git a/frontend/src/__generated__/models/RomSchema.ts b/frontend/src/__generated__/models/RomSchema.ts
index 80f8b6d3a..51baa7de8 100644
--- a/frontend/src/__generated__/models/RomSchema.ts
+++ b/frontend/src/__generated__/models/RomSchema.ts
@@ -5,6 +5,7 @@
 
 import type { RomIGDBMetadata } from "./RomIGDBMetadata";
 import type { RomMobyMetadata } from "./RomMobyMetadata";
+import type { UserRomPropsSchema } from "./UserRomPropsSchema";
 
 export type RomSchema = {
   id: number;
@@ -45,5 +46,6 @@ export type RomSchema = {
   full_path: string;
   created_at: string;
   updated_at: string;
+  user_rom_props?: Array<UserRomPropsSchema>;
   readonly sort_comparator: string;
 };
diff --git a/frontend/src/stores/roms.ts b/frontend/src/stores/roms.ts
index 772486308..6d3e7f472 100644
--- a/frontend/src/stores/roms.ts
+++ b/frontend/src/stores/roms.ts
@@ -5,6 +5,7 @@ import type { ExtractPiniaStoreType } from "@/types";
 import { groupBy, uniqBy } from "lodash";
 import { nanoid } from "nanoid";
 import { defineStore } from "pinia";
+import storeAuth from "@/stores/auth";
 import storeGalleryFilter from "./galleryFilter";
 
 type GalleryFilterStore = ExtractPiniaStoreType<typeof storeGalleryFilter>;
@@ -51,6 +52,8 @@ export default defineStore("roms", {
         return;
       }
 
+      const auth = storeAuth();
+
       // Group roms by external id
       this._grouped = Object.values(
         groupBy(
@@ -61,12 +64,14 @@ export default defineStore("roms", {
         ),
       )
         .map((games) => {
-          const primaryGame = games.shift();
-          // const favSiblingIndex = games.findIndex((game) => game.fav_sibling);
-          // const primaryGame =
-          //   favSiblingIndex !== -1
-          //     ? games.splice(favSiblingIndex, 1)[0]
-          //     : games.shift();
+          const favSiblingIndex = games.findIndex((game) =>
+            game.user_rom_props?.find((prop) => prop.user_id === auth.user?.id),
+          );
+          console.log(favSiblingIndex);
+          const primaryGame =
+            favSiblingIndex !== -1
+              ? games.splice(favSiblingIndex, 1)[0]
+              : games.shift();
 
           return {
             ...(primaryGame as SimpleRom),

From 15f7522da5b7065bdfc11deb4290ee37f191df46 Mon Sep 17 00:00:00 2001
From: zurdi <zurdizurdo25@gmail.com>
Date: Mon, 1 Jul 2024 13:31:25 +0200
Subject: [PATCH 17/23] rom db hanlder refactor to adapt to user_rom_props

---
 backend/endpoints/platform.py                 | 18 ++--
 backend/endpoints/responses/rom.py            | 11 +--
 backend/endpoints/rom.py                      | 82 +++++++++--------
 backend/endpoints/saves.py                    |  4 +-
 backend/endpoints/screenshots.py              |  4 +-
 backend/endpoints/search.py                   |  2 +-
 backend/endpoints/states.py                   |  4 +-
 backend/exceptions/endpoint_exceptions.py     | 28 ++++++
 backend/handler/database/roms_handler.py      | 89 ++++++++++++++++---
 backend/models/assets.py                      |  4 +-
 backend/models/rom.py                         | 40 ++-------
 .../__generated__/models/DetailedRomSchema.ts |  2 +-
 .../src/__generated__/models/RomSchema.ts     |  2 +-
 .../src/components/Details/Info/FileInfo.vue  |  6 +-
 frontend/src/components/Details/Notes.vue     | 17 ++--
 frontend/src/components/Details/Saves.vue     |  1 +
 frontend/src/components/Details/States.vue    |  1 +
 frontend/src/stores/roms.ts                   |  9 +-
 frontend/src/views/GameDetails.vue            |  1 +
 19 files changed, 194 insertions(+), 131 deletions(-)
 create mode 100644 backend/exceptions/endpoint_exceptions.py

diff --git a/backend/endpoints/platform.py b/backend/endpoints/platform.py
index b26297d3c..3d0637158 100644
--- a/backend/endpoints/platform.py
+++ b/backend/endpoints/platform.py
@@ -3,6 +3,7 @@ from datetime import datetime
 from decorators.auth import protected_route
 from endpoints.responses import MessageResponse
 from endpoints.responses.platform import PlatformSchema
+from exceptions.endpoint_exceptions import PlatformNotFoundInDatabaseException
 from exceptions.fs_exceptions import PlatformAlreadyExistsException
 from fastapi import APIRouter, HTTPException, Request, status
 from handler.database import db_platform_handler
@@ -100,12 +101,12 @@ def get_platform(request: Request, id: int) -> PlatformSchema:
         PlatformSchema: Platform
     """
 
-    platform = db_platform_handler.get_platforms(id)
-    if platform:
-        return platform
-    msg = f"Platform with {id} not found"
-    log.critical(msg)
-    raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=msg)
+    platform = db_platform_handler.get_platform(id)
+
+    if not platform:
+        raise PlatformNotFoundInDatabaseException(id)
+
+    return platform
 
 
 @protected_route(router.put, "/platforms/{id}", ["platforms.write"])
@@ -140,10 +141,9 @@ async def delete_platforms(request: Request, id: int) -> MessageResponse:
     """
 
     platform = db_platform_handler.get_platform(id)
+
     if not platform:
-        error = f"Platform id {id} not found"
-        log.error(error)
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=error)
+        raise PlatformNotFoundInDatabaseException(id)
 
     log.info(f"Deleting {platform.name} [{platform.fs_slug}] from database")
     db_platform_handler.delete_platform(id)
diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py
index 8e6409ae5..d79ba0514 100644
--- a/backend/endpoints/responses/rom.py
+++ b/backend/endpoints/responses/rom.py
@@ -42,15 +42,6 @@ class UserRomPropsSchema(BaseModel):
     class Config:
         from_attributes = True
 
-    @classmethod
-    def for_user(cls, db_rom: Rom, user_id: int) -> list[UserRomPropsSchema]:
-        return [
-            cls.model_validate(n)
-            for n in db_rom.user_rom_props
-            # This is what filters out private notes
-            if n.user_id == user_id or n.note_is_public
-        ]
-
 
 class RomSchema(BaseModel):
     id: int
@@ -100,7 +91,7 @@ class RomSchema(BaseModel):
     created_at: datetime
     updated_at: datetime
 
-    user_rom_props: UserRomPropsSchema = Field(default_factory=list)
+    user_rom_props: UserRomPropsSchema | None
 
     class Config:
         from_attributes = True
diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index cdffaa355..1058ea432 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -19,6 +19,7 @@ from endpoints.responses.rom import (
     RomSchema,
     UserRomPropsSchema,
 )
+from exceptions.endpoint_exceptions import RomNotFoundInDatabaseException
 from exceptions.fs_exceptions import RomAlreadyExistsException
 from fastapi import APIRouter, File, HTTPException, Query, Request, UploadFile, status
 from fastapi.responses import FileResponse
@@ -110,11 +111,11 @@ def get_roms(
 
     return db_rom_handler.get_roms(
         platform_id=platform_id,
+        user_id=request.user.id,
         search_term=search_term.lower(),
         order_by=order_by.lower(),
         order_dir=order_dir.lower(),
         limit=limit,
-        user_id=request.user.id,
     )
 
 
@@ -133,7 +134,13 @@ def get_rom(request: Request, id: int) -> DetailedRomSchema:
     Returns:
         DetailedRomSchema: Rom stored in the database
     """
-    return DetailedRomSchema.from_orm_with_request(db_rom_handler.get_rom(id), request)
+
+    rom = db_rom_handler.get_rom(id=id, user_id=request.user.id)
+
+    if not rom:
+        raise RomNotFoundInDatabaseException(id)
+
+    return DetailedRomSchema.from_orm_with_request(rom, request)
 
 
 @protected_route(
@@ -153,7 +160,11 @@ def head_rom_content(request: Request, id: int, file_name: str):
         FileResponse: Returns the response with headers
     """
 
-    rom = db_rom_handler.get_rom(id)
+    rom = db_rom_handler.get_rom(id=id, user_id=request.user.id)
+
+    if not rom:
+        raise RomNotFoundInDatabaseException(id)
+
     rom_path = f"{LIBRARY_BASE_PATH}/{rom.full_path}"
 
     return FileResponse(
@@ -188,7 +199,11 @@ def get_rom_content(
         CustomStreamingResponse: Streams a file for multi-part roms
     """
 
-    rom = db_rom_handler.get_rom(id)
+    rom = db_rom_handler.get_rom(id=id, user_id=request.user.id)
+
+    if not rom:
+        raise RomNotFoundInDatabaseException(id)
+
     rom_path = f"{LIBRARY_BASE_PATH}/{rom.full_path}"
     files_to_download = files or rom.files
 
@@ -272,7 +287,10 @@ async def update_rom(
 
     data = await request.form()
 
-    db_rom = db_rom_handler.get_rom(id)
+    rom = db_rom_handler.get_rom(id=id, user_id=request.user.id)
+
+    if not rom:
+        raise RomNotFoundInDatabaseException(id)
 
     cleaned_data = {}
     cleaned_data["igdb_id"] = data.get("igdb_id", None)
@@ -290,25 +308,23 @@ async def update_rom(
     else:
         cleaned_data.update({"igdb_metadata": {}})
 
-    cleaned_data["name"] = data.get("name", db_rom.name)
-    cleaned_data["summary"] = data.get("summary", db_rom.summary)
+    cleaned_data["name"] = data.get("name", rom.name)
+    cleaned_data["summary"] = data.get("summary", rom.summary)
 
-    fs_safe_file_name = (
-        data.get("file_name", db_rom.file_name).strip().replace("/", "-")
-    )
+    fs_safe_file_name = data.get("file_name", rom.file_name).strip().replace("/", "-")
     fs_safe_name = cleaned_data["name"].strip().replace("/", "-")
 
     if rename_as_source:
-        fs_safe_file_name = db_rom.file_name.replace(
-            db_rom.file_name_no_tags or db_rom.file_name_no_ext, fs_safe_name
+        fs_safe_file_name = rom.file_name.replace(
+            rom.file_name_no_tags or rom.file_name_no_ext, fs_safe_name
         )
 
     try:
-        if db_rom.file_name != fs_safe_file_name:
+        if rom.file_name != fs_safe_file_name:
             fs_rom_handler.rename_file(
-                old_name=db_rom.file_name,
+                old_name=rom.file_name,
                 new_name=fs_safe_file_name,
-                file_path=db_rom.file_path,
+                file_path=rom.file_path,
             )
     except RomAlreadyExistsException as exc:
         log.error(str(exc))
@@ -325,7 +341,7 @@ async def update_rom(
     )
 
     if remove_cover:
-        cleaned_data.update(fs_resource_handler.remove_cover(rom=db_rom))
+        cleaned_data.update(fs_resource_handler.remove_cover(rom=rom))
         cleaned_data.update({"url_cover": ""})
     else:
         if artwork is not None:
@@ -334,7 +350,7 @@ async def update_rom(
                 path_cover_l,
                 path_cover_s,
                 artwork_path,
-            ) = fs_resource_handler.build_artwork_path(db_rom, file_ext)
+            ) = fs_resource_handler.build_artwork_path(rom, file_ext)
 
             cleaned_data["path_cover_l"] = path_cover_l
             cleaned_data["path_cover_s"] = path_cover_s
@@ -349,29 +365,28 @@ async def update_rom(
             with open(file_location_l, "wb+") as artwork_l:
                 artwork_l.write(artwork_file)
         else:
-            cleaned_data["url_cover"] = data.get("url_cover", db_rom.url_cover)
+            cleaned_data["url_cover"] = data.get("url_cover", rom.url_cover)
             path_cover_s, path_cover_l = fs_resource_handler.get_rom_cover(
                 overwrite=True,
-                rom=db_rom,
+                rom=rom,
                 url_cover=cleaned_data.get("url_cover", ""),
             )
             cleaned_data.update(
                 {"path_cover_s": path_cover_s, "path_cover_l": path_cover_l}
             )
 
-    if (
-        cleaned_data["igdb_id"] != db_rom.igdb_id
-        or cleaned_data["moby_id"] != db_rom.moby_id
-    ):
+    if cleaned_data["igdb_id"] != rom.igdb_id or cleaned_data["moby_id"] != rom.moby_id:
         path_screenshots = fs_resource_handler.get_rom_screenshots(
-            rom=db_rom,
+            rom=rom,
             url_screenshots=cleaned_data.get("url_screenshots", []),
         )
         cleaned_data.update({"path_screenshots": path_screenshots})
 
     db_rom_handler.update_rom(id, cleaned_data)
 
-    return DetailedRomSchema.from_orm_with_request(db_rom_handler.get_rom(id), request)
+    return DetailedRomSchema.from_orm_with_request(
+        db_rom_handler.get_rom(id=id, user_id=request.user.id), request
+    )
 
 
 @protected_route(router.post, "/roms/delete", ["roms.write"])
@@ -396,11 +411,10 @@ async def delete_roms(
     delete_from_fs: list = data["delete_from_fs"]
 
     for id in roms_ids:
-        rom = db_rom_handler.get_rom(id)
+        rom = db_rom_handler.get_rom(id=id, user_id=request.user.id)
+
         if not rom:
-            error = f"Rom with id {id} not found"
-            log.error(error)
-            raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=error)
+            raise RomNotFoundInDatabaseException(id)
 
         log.info(f"Deleting {rom.file_name} from database")
         db_rom_handler.delete_rom(id)
@@ -431,12 +445,10 @@ async def update_rom_props(request: Request, id: int) -> UserRomPropsSchema:
 
     data = await request.json()
 
-    db_rom = db_rom_handler.get_roms(id)
+    rom = db_rom_handler.get_roms(id)
 
-    if not db_rom:
-        error = f"Rom with id {id} could not be found"
-        log.error(error)
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=error)
+    if not rom:
+        raise RomNotFoundInDatabaseException(id)
 
     db_rom_props = db_rom_handler.get_rom_props(
         id, request.user.id
@@ -454,5 +466,5 @@ async def update_rom_props(request: Request, id: int) -> UserRomPropsSchema:
     )
 
     return db_rom_handler.update_rom_props(
-        db_rom_props.id, cleaned_data, db_rom, request.user.id
+        db_rom_props.id, cleaned_data, rom, request.user.id
     )
diff --git a/backend/endpoints/saves.py b/backend/endpoints/saves.py
index 085e85d81..72ba522da 100644
--- a/backend/endpoints/saves.py
+++ b/backend/endpoints/saves.py
@@ -17,7 +17,7 @@ def add_saves(
     saves: list[UploadFile] = File(...),  # noqa: B008
     emulator: str | None = None,
 ) -> UploadedSavesResponse:
-    rom = db_rom_handler.get_rom(rom_id)
+    rom = db_rom_handler.get_rom(id=rom_id, user_id=request.user.id)
     current_user = request.user
     log.info(f"Uploading saves to {rom.name}")
 
@@ -56,7 +56,7 @@ def add_saves(
         scanned_save.emulator = emulator
         db_save_handler.add_save(scanned_save)
 
-    rom = db_rom_handler.get_rom(rom_id)
+    rom = db_rom_handler.get_rom(id=rom_id, user_id=request.user.id)
     return {
         "uploaded": len(saves),
         "saves": [s for s in rom.saves if s.user_id == current_user.id],
diff --git a/backend/endpoints/screenshots.py b/backend/endpoints/screenshots.py
index a03118227..52984b88e 100644
--- a/backend/endpoints/screenshots.py
+++ b/backend/endpoints/screenshots.py
@@ -15,7 +15,7 @@ def add_screenshots(
     rom_id: int,
     screenshots: list[UploadFile] = File(...),  # noqa: B008
 ) -> UploadedScreenshotsResponse:
-    rom = db_rom_handler.get_rom(rom_id)
+    rom = db_rom_handler.get_rom(id=rom_id, user_id=request.user.id)
     current_user = request.user
     log.info(f"Uploading screenshots to {rom.name}")
 
@@ -53,7 +53,7 @@ def add_screenshots(
         scanned_screenshot.user_id = current_user.id
         db_screenshot_handler.add_screenshot(scanned_screenshot)
 
-    rom = db_rom_handler.get_rom(rom_id)
+    rom = db_rom_handler.get_rom(id=rom_id, user_id=request.user.id)
     return {
         "uploaded": len(screenshots),
         "screenshots": [s for s in rom.screenshots if s.user_id == current_user.id],
diff --git a/backend/endpoints/search.py b/backend/endpoints/search.py
index 5cee25c3a..23dd05545 100644
--- a/backend/endpoints/search.py
+++ b/backend/endpoints/search.py
@@ -40,7 +40,7 @@ async def search_rom(
             detail="No metadata providers enabled",
         )
 
-    rom = db_rom_handler.get_rom(rom_id)
+    rom = db_rom_handler.get_rom(id=rom_id, user_id=request.user.id)
     if not rom:
         return []
 
diff --git a/backend/endpoints/states.py b/backend/endpoints/states.py
index 1f4086296..104e4f30d 100644
--- a/backend/endpoints/states.py
+++ b/backend/endpoints/states.py
@@ -17,7 +17,7 @@ def add_states(
     states: list[UploadFile] = File(...),  # noqa: B008
     emulator: str | None = None,
 ) -> UploadedStatesResponse:
-    rom = db_rom_handler.get_rom(rom_id)
+    rom = db_rom_handler.get_rom(id=rom_id, user_id=request.user.id)
     current_user = request.user
     log.info(f"Uploading states to {rom.name}")
 
@@ -56,7 +56,7 @@ def add_states(
         scanned_state.emulator = emulator
         db_state_handler.add_state(scanned_state)
 
-    rom = db_rom_handler.get_rom(rom_id)
+    rom = db_rom_handler.get_rom(id=rom_id, user_id=request.user.id)
     return {
         "uploaded": len(states),
         "states": [s for s in rom.states if s.user_id == current_user.id],
diff --git a/backend/exceptions/endpoint_exceptions.py b/backend/exceptions/endpoint_exceptions.py
new file mode 100644
index 000000000..c668b0e96
--- /dev/null
+++ b/backend/exceptions/endpoint_exceptions.py
@@ -0,0 +1,28 @@
+from fastapi import HTTPException, status
+from logger.logger import log
+
+
+class PlatformNotFoundInDatabaseException(Exception):
+    def __init__(self, id):
+        self.message = f"Platform with id '{id}' not found"
+        super().__init__(self.message)
+        log.critical(self.message)
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=self.message
+        )
+
+    def __repr__(self) -> str:
+        return self.message
+
+
+class RomNotFoundInDatabaseException(Exception):
+    def __init__(self, id):
+        self.message = f"Rom with id '{id}' not found"
+        super().__init__(self.message)
+        log.critical(self.message)
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=self.message
+        )
+
+    def __repr__(self) -> str:
+        return self.message
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index 837ff2910..40cec6b06 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -2,24 +2,46 @@ import functools
 
 from decorators.database import begin_session
 from models.rom import Rom, UserRomProps
-from sqlalchemy import Select, and_, delete, func, or_, select, update
-from sqlalchemy.orm import Query, Session, selectinload
+from sqlalchemy import and_, delete, func, or_, select, update
+from sqlalchemy.orm import Query, Session, aliased, contains_eager, selectinload
 
 from .base_handler import DBBaseHandler
 
 
+class ImplementationError(Exception): ...
+
+
 def with_assets(func):
     @functools.wraps(func)
     def wrapper(*args, **kwargs):
         session = kwargs.get("session")
         if session is None:
-            raise ValueError("session is required")
+            raise ImplementationError(
+                f"Method {func} bad implementation: kwarg 'session' is required"
+            )
 
-        kwargs["query"] = select(Rom).options(
+        user_id = kwargs.get("user_id")
+        if user_id is None:
+            raise ImplementationError(
+                f"Method {func} bad implementation: kwarg 'user_id' is required"
+            )
+
+        try:
+            rom_set = select(Rom).filter_by(id=kwargs["id"])
+        except KeyError:
+            rom_set = select(Rom)
+
+        # Subquery to filter user_rom_props by user_id
+        subquery = (
+            select(aliased(Rom.user_rom_props)).filter_by(user_id=user_id).subquery()
+        )
+
+        # Construct the query to join Rom with the filtered user_rom_props
+        kwargs["query"] = rom_set.outerjoin(subquery, Rom.user_rom_props).options(
             selectinload(Rom.saves),
             selectinload(Rom.states),
             selectinload(Rom.screenshots),
-            selectinload(Rom.user_rom_props),
+            contains_eager(Rom.user_rom_props, alias=subquery),
         )
         return func(*args, **kwargs)
 
@@ -29,7 +51,7 @@ def with_assets(func):
 class DBRomsHandler(DBBaseHandler):
     def _filter(self, data, platform_id: int | None, search_term: str):
         if platform_id:
-            data = data.filter_by(platform_id=platform_id)
+            data = data.filter(Rom.platform_id == platform_id)
 
         if search_term:
             data = data.filter(
@@ -57,28 +79,44 @@ class DBRomsHandler(DBBaseHandler):
     def add_rom(self, rom: Rom, query: Query = None, session: Session = None) -> Rom:
         rom = session.merge(rom)
         session.flush()
-
         return session.scalar(query.filter_by(id=rom.id).limit(1))
 
     @begin_session
     @with_assets
     def get_rom(
-        self, id: int, *, query: Query = None, session: Session = None
+        self,
+        *,
+        id: int | None = None,
+        user_id: int | None = None,
+        query: Query = None,
+        session: Session = None,
     ) -> Rom | None:
-        return session.scalar(query.filter_by(id=id).limit(1))
+        return session.scalar(query.limit(1))
 
+    @begin_session
+    @with_assets
     def get_roms(
         self,
         *,
         platform_id: int | None = None,
+        user_id: int | None = None,
         search_term: str = "",
         order_by: str = "name",
         order_dir: str = "asc",
-    ) -> Select[tuple[Rom]]:
-        return self._order(
-            self._filter(select(Rom), platform_id, search_term),
-            order_by,
-            order_dir,
+        limit: int = None,
+        query: Query = None,
+        session: Session = None,
+    ) -> tuple[Rom | None]:
+        return (
+            session.scalars(
+                self._order(
+                    self._filter(query, platform_id, search_term),
+                    order_by,
+                    order_dir,
+                ).limit(limit)
+            )
+            .unique()
+            .all()
         )
 
     @begin_session
@@ -112,6 +150,29 @@ class DBRomsHandler(DBBaseHandler):
             query.filter_by(file_name_no_ext=file_name_no_ext).limit(1)
         )
 
+    @begin_session
+    def get_rom_siblings(self, rom: Rom, session: Session = None):
+        return session.scalars(
+            select(Rom).where(
+                and_(
+                    Rom.platform_id == rom.platform_id,
+                    Rom.id != rom.id,
+                    or_(
+                        and_(
+                            Rom.igdb_id == rom.igdb_id,
+                            Rom.igdb_id.isnot(None),
+                            Rom.igdb_id != "",
+                        ),
+                        and_(
+                            Rom.moby_id == rom.moby_id,
+                            Rom.moby_id.isnot(None),
+                            Rom.moby_id != "",
+                        ),
+                    ),
+                )
+            )
+        ).all()
+
     @begin_session
     def update_rom(self, id: int, data: dict, session: Session = None) -> Rom:
         return session.execute(
diff --git a/backend/models/assets.py b/backend/models/assets.py
index 51dce8cc1..e7cd08f74 100644
--- a/backend/models/assets.py
+++ b/backend/models/assets.py
@@ -52,7 +52,7 @@ class Save(RomAsset):
     def screenshot(self) -> Screenshot | None:
         from handler.database import db_rom_handler
 
-        db_rom = db_rom_handler.get_rom(self.rom_id)
+        db_rom = db_rom_handler.get_rom(id=self.rom_id, user_id=self.user.id)
         if db_rom is None:
             return None
 
@@ -76,7 +76,7 @@ class State(RomAsset):
     def screenshot(self) -> Screenshot | None:
         from handler.database import db_rom_handler
 
-        db_rom = db_rom_handler.get_rom(self.rom_id)
+        db_rom = db_rom_handler.get_rom(id=self.rom_id, user_id=self.user.id)
         if db_rom is None:
             return None
 
diff --git a/backend/models/rom.py b/backend/models/rom.py
index 69ac201ac..04848aad6 100644
--- a/backend/models/rom.py
+++ b/backend/models/rom.py
@@ -1,22 +1,11 @@
 from __future__ import annotations
 
-from datetime import datetime
 from functools import cached_property
 from typing import TYPE_CHECKING, Any
 
 from config import FRONTEND_RESOURCES_PATH
 from models.base import BaseModel
-from sqlalchemy import (
-    JSON,
-    BigInteger,
-    ForeignKey,
-    String,
-    Text,
-    UniqueConstraint,
-    and_,
-    or_,
-    select,
-)
+from sqlalchemy import JSON, BigInteger, ForeignKey, String, Text, UniqueConstraint
 from sqlalchemy.dialects.mysql.json import JSON as MySQLJSON
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
@@ -76,11 +65,13 @@ class Rom(BaseModel):
     )
 
     platform: Mapped[Platform] = relationship(lazy="immediate")
+    user_rom_props: Mapped[UserRomProps] = relationship(
+        back_populates="rom", lazy="immediate"
+    )
 
     saves: Mapped[list[Save]] = relationship(back_populates="rom")
     states: Mapped[list[State]] = relationship(back_populates="rom")
     screenshots: Mapped[list[Screenshot]] = relationship(back_populates="rom")
-    user_rom_props: Mapped[list[UserRomProps]] = relationship(back_populates="rom")
 
     @property
     def platform_slug(self) -> str:
@@ -112,27 +103,7 @@ class Rom(BaseModel):
     def get_sibling_roms(self) -> list[Rom]:
         from handler.database import db_rom_handler
 
-        with db_rom_handler.session.begin() as session:
-            return session.scalars(
-                select(Rom).where(
-                    and_(
-                        Rom.platform_id == self.platform_id,
-                        Rom.id != self.id,
-                        or_(
-                            and_(
-                                Rom.igdb_id == self.igdb_id,
-                                Rom.igdb_id is not None,
-                                Rom.igdb_id != "",
-                            ),
-                            and_(
-                                Rom.moby_id == self.moby_id,
-                                Rom.moby_id is not None,
-                                Rom.moby_id != "",
-                            ),
-                        ),
-                    )
-                )
-            ).all()
+        return db_rom_handler.get_rom_siblings(self)
 
     # Metadata fields
     @property
@@ -186,6 +157,7 @@ class UserRomProps(BaseModel):
     )
 
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+
     note_raw_markdown: Mapped[str] = mapped_column(Text, default="")
     note_is_public: Mapped[bool | None] = mapped_column(default=False)
 
diff --git a/frontend/src/__generated__/models/DetailedRomSchema.ts b/frontend/src/__generated__/models/DetailedRomSchema.ts
index 4d78bad12..2323073dd 100644
--- a/frontend/src/__generated__/models/DetailedRomSchema.ts
+++ b/frontend/src/__generated__/models/DetailedRomSchema.ts
@@ -50,7 +50,7 @@ export type DetailedRomSchema = {
   full_path: string;
   created_at: string;
   updated_at: string;
-  user_rom_props?: Array<UserRomPropsSchema>;
+  user_rom_props: UserRomPropsSchema | null;
   merged_screenshots: Array<string>;
   sibling_roms?: Array<RomSchema>;
   user_saves?: Array<SaveSchema>;
diff --git a/frontend/src/__generated__/models/RomSchema.ts b/frontend/src/__generated__/models/RomSchema.ts
index 51baa7de8..1f03b0389 100644
--- a/frontend/src/__generated__/models/RomSchema.ts
+++ b/frontend/src/__generated__/models/RomSchema.ts
@@ -46,6 +46,6 @@ export type RomSchema = {
   full_path: string;
   created_at: string;
   updated_at: string;
-  user_rom_props?: Array<UserRomPropsSchema>;
+  user_rom_props: UserRomPropsSchema | null;
   readonly sort_comparator: string;
 };
diff --git a/frontend/src/components/Details/Info/FileInfo.vue b/frontend/src/components/Details/Info/FileInfo.vue
index 2ee7cd733..1b860b046 100644
--- a/frontend/src/components/Details/Info/FileInfo.vue
+++ b/frontend/src/components/Details/Info/FileInfo.vue
@@ -13,7 +13,7 @@ const props = defineProps<{ rom: DetailedRom; platform: Platform }>();
 const downloadStore = storeDownload();
 const auth = storeAuth();
 const ownProps = ref(
-  props.rom.user_rom_props?.find((prop) => prop.user_id === auth.user?.id) ?? {
+  props.rom.user_rom_props ?? {
     id: null,
     user_id: auth.user?.id,
     rom_id: props.rom.id,
@@ -38,9 +38,7 @@ async function toggleMainSibling() {
 watch(
   () => props.rom,
   async () => {
-    ownProps.value = props.rom.user_rom_props?.find(
-      (prop) => prop.user_id === auth.user?.id
-    ) ?? {
+    ownProps.value = props.rom.user_rom_props ?? {
       id: null,
       user_id: auth.user?.id,
       rom_id: props.rom.id,
diff --git a/frontend/src/components/Details/Notes.vue b/frontend/src/components/Details/Notes.vue
index 2b122a2d1..13e2a3d6d 100644
--- a/frontend/src/components/Details/Notes.vue
+++ b/frontend/src/components/Details/Notes.vue
@@ -13,7 +13,7 @@ const auth = storeAuth();
 const theme = useTheme();
 const editingNote = ref(false);
 const ownProps = ref(
-  props.rom.user_rom_props?.find((prop) => prop.user_id === auth.user?.id) ?? {
+  props.rom.user_rom_props ?? {
     id: null,
     user_id: auth.user?.id,
     rom_id: props.rom.id,
@@ -23,9 +23,10 @@ const ownProps = ref(
     is_main_sibling: false,
   }
 );
-const publicNotes =
-  props.rom.user_rom_props?.filter((prop) => prop.user_id !== auth.user?.id) ??
-  [];
+// TODO: fetch public notes
+// const publicNotes =
+//   props.rom.user_rom_props?.filter((prop) => prop.user_id !== auth.user?.id) ??
+//   [];
 
 // Functions
 function togglePublic() {
@@ -53,9 +54,7 @@ function editNote() {
 watch(
   () => props.rom,
   async () => {
-    ownProps.value = props.rom.user_rom_props?.find(
-      (prop) => prop.user_id === auth.user?.id
-    ) ?? {
+    ownProps.value = props.rom.user_rom_props ?? {
       id: null,
       user_id: auth.user?.id,
       rom_id: props.rom.id,
@@ -134,7 +133,7 @@ watch(
     </v-card-text>
   </v-card>
 
-  <v-card rounded="0" v-if="publicNotes.length > 0" class="mt-2">
+  <!-- <v-card rounded="0" v-if="publicNotes.length > 0" class="mt-2">
     <v-card-title class="bg-terciary">
       <v-list-item class="pl-2 pr-0">
         <span class="text-h6">Public notes</span>
@@ -160,7 +159,7 @@ watch(
         </v-expansion-panel>
       </v-expansion-panels>
     </v-card-text>
-  </v-card>
+  </v-card> -->
 </template>
 
 <style>
diff --git a/frontend/src/components/Details/Saves.vue b/frontend/src/components/Details/Saves.vue
index 21d291972..18db16894 100644
--- a/frontend/src/components/Details/Saves.vue
+++ b/frontend/src/components/Details/Saves.vue
@@ -9,6 +9,7 @@ import { inject, onMounted, ref, watch } from "vue";
 import { useDisplay } from "vuetify";
 
 // Props
+// TODO: make states reactive on version change
 const { xs, smAndUp, mdAndUp } = useDisplay();
 const props = defineProps<{ rom: DetailedRom }>();
 const romRef = ref<DetailedRom>(props.rom);
diff --git a/frontend/src/components/Details/States.vue b/frontend/src/components/Details/States.vue
index 6cac79412..64abf1d1c 100644
--- a/frontend/src/components/Details/States.vue
+++ b/frontend/src/components/Details/States.vue
@@ -9,6 +9,7 @@ import { inject, onMounted, ref, watch } from "vue";
 import { useDisplay } from "vuetify";
 
 // Props
+// TODO: make states reactive on version change
 const { xs, smAndUp, mdAndUp } = useDisplay();
 const props = defineProps<{ rom: DetailedRom }>();
 const romRef = ref<DetailedRom>(props.rom);
diff --git a/frontend/src/stores/roms.ts b/frontend/src/stores/roms.ts
index 6d3e7f472..a75014972 100644
--- a/frontend/src/stores/roms.ts
+++ b/frontend/src/stores/roms.ts
@@ -64,13 +64,12 @@ export default defineStore("roms", {
         ),
       )
         .map((games) => {
-          const favSiblingIndex = games.findIndex((game) =>
-            game.user_rom_props?.find((prop) => prop.user_id === auth.user?.id),
+          const mainSiblingIndex = games.findIndex(
+            (game) => game.user_rom_props?.is_main_sibling,
           );
-          console.log(favSiblingIndex);
           const primaryGame =
-            favSiblingIndex !== -1
-              ? games.splice(favSiblingIndex, 1)[0]
+            mainSiblingIndex !== -1
+              ? games.splice(mainSiblingIndex, 1)[0]
               : games.shift();
 
           return {
diff --git a/frontend/src/views/GameDetails.vue b/frontend/src/views/GameDetails.vue
index ec88d765d..f7095f2b7 100644
--- a/frontend/src/views/GameDetails.vue
+++ b/frontend/src/views/GameDetails.vue
@@ -45,6 +45,7 @@ async function fetchDetails() {
     .getRom({ romId: parseInt(route.params.rom as string) })
     .then((response) => {
       rom.value = response.data;
+      console.log(rom.value)
     })
     .catch((error) => {
       console.log(error);

From a937b0ddcfa1d744728f10ec029f8334793a7e1b Mon Sep 17 00:00:00 2001
From: Zurdi <zurdizurdo25@gmail.com>
Date: Mon, 1 Jul 2024 17:42:23 +0200
Subject: [PATCH 18/23] added publicNotes schema

---
 backend/endpoints/responses/rom.py             | 13 +++++++++++++
 backend/handler/database/roms_handler.py       | 12 +++++++++++-
 backend/models/rom.py                          |  7 ++++++-
 frontend/src/__generated__/index.ts            |  1 +
 .../__generated__/models/DetailedRomSchema.ts  |  2 ++
 .../__generated__/models/PublicNoteSchema.ts   |  9 +++++++++
 frontend/src/components/Details/Notes.vue      | 14 +++++++-------
 frontend/src/components/Details/Saves.vue      | 18 ++++++------------
 frontend/src/components/Details/States.vue     | 18 ++++++------------
 frontend/src/views/GameDetails.vue             |  1 -
 10 files changed, 61 insertions(+), 34 deletions(-)
 create mode 100644 frontend/src/__generated__/models/PublicNoteSchema.ts

diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py
index d79ba0514..7108ec3bb 100644
--- a/backend/endpoints/responses/rom.py
+++ b/backend/endpoints/responses/rom.py
@@ -115,6 +115,7 @@ class DetailedRomSchema(RomSchema):
     user_saves: list[SaveSchema] = Field(default_factory=list)
     user_states: list[StateSchema] = Field(default_factory=list)
     user_screenshots: list[ScreenshotSchema] = Field(default_factory=list)
+    public_notes: list[PublicNoteSchema] = Field(default_factory=list)
 
     @classmethod
     def from_orm_with_request(cls, db_rom: Rom, request: Request) -> DetailedRomSchema:
@@ -134,9 +135,21 @@ class DetailedRomSchema(RomSchema):
             for s in db_rom.screenshots
             if s.user_id == user_id
         ]
+        rom.public_notes = [
+            {
+                "user__username": p.user__username,
+                "note_raw_markdown": p.note_raw_markdown,
+            }
+            for p in db_rom.get_public_notes(user_id)
+        ]
         return rom
 
 
+class PublicNoteSchema(TypedDict):
+    user__username: str
+    note_raw_markdown: str
+
+
 class AddRomsResponse(TypedDict):
     uploaded_roms: list[str]
     skipped_roms: list[str]
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index 40cec6b06..b1e3b4db8 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -151,7 +151,7 @@ class DBRomsHandler(DBBaseHandler):
         )
 
     @begin_session
-    def get_rom_siblings(self, rom: Rom, session: Session = None):
+    def get_sibling_roms(self, rom: Rom, session: Session = None) -> tuple[Rom | None]:
         return session.scalars(
             select(Rom).where(
                 and_(
@@ -214,6 +214,16 @@ class DBRomsHandler(DBBaseHandler):
             select(UserRomProps).filter_by(rom_id=rom_id, user_id=user_id).limit(1)
         )
 
+    @begin_session
+    def get_public_notes(
+        self, rom: Rom, user_id: int, session: Session = None
+    ) -> tuple[UserRomProps | None]:
+        return session.scalars(
+            select(UserRomProps).where(
+                and_(UserRomProps.rom_id == rom.id, UserRomProps.user_id != user_id)
+            )
+        ).all()
+
     @begin_session
     def update_rom_props(
         self, id: int, data: dict, rom: Rom, user_id: int, session: Session = None
diff --git a/backend/models/rom.py b/backend/models/rom.py
index 04848aad6..e6e8bd9d2 100644
--- a/backend/models/rom.py
+++ b/backend/models/rom.py
@@ -103,7 +103,12 @@ class Rom(BaseModel):
     def get_sibling_roms(self) -> list[Rom]:
         from handler.database import db_rom_handler
 
-        return db_rom_handler.get_rom_siblings(self)
+        return db_rom_handler.get_sibling_roms(self)
+
+    def get_public_notes(self, user_id: int) -> list[dict]:
+        from handler.database import db_rom_handler
+
+        return db_rom_handler.get_public_notes(self, user_id)
 
     # Metadata fields
     @property
diff --git a/frontend/src/__generated__/index.ts b/frontend/src/__generated__/index.ts
index 5af907fcd..054306055 100644
--- a/frontend/src/__generated__/index.ts
+++ b/frontend/src/__generated__/index.ts
@@ -24,6 +24,7 @@ export type { MessageResponse } from "./models/MessageResponse";
 export type { MetadataSourcesDict } from "./models/MetadataSourcesDict";
 export type { MobyMetadataPlatform } from "./models/MobyMetadataPlatform";
 export type { PlatformSchema } from "./models/PlatformSchema";
+export type { PublicNoteSchema } from "./models/PublicNoteSchema";
 export type { Role } from "./models/Role";
 export type { RomIGDBMetadata } from "./models/RomIGDBMetadata";
 export type { RomMobyMetadata } from "./models/RomMobyMetadata";
diff --git a/frontend/src/__generated__/models/DetailedRomSchema.ts b/frontend/src/__generated__/models/DetailedRomSchema.ts
index 2323073dd..79e62230b 100644
--- a/frontend/src/__generated__/models/DetailedRomSchema.ts
+++ b/frontend/src/__generated__/models/DetailedRomSchema.ts
@@ -3,6 +3,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
+import type { PublicNoteSchema } from "./PublicNoteSchema";
 import type { RomIGDBMetadata } from "./RomIGDBMetadata";
 import type { RomMobyMetadata } from "./RomMobyMetadata";
 import type { RomSchema } from "./RomSchema";
@@ -56,5 +57,6 @@ export type DetailedRomSchema = {
   user_saves?: Array<SaveSchema>;
   user_states?: Array<StateSchema>;
   user_screenshots?: Array<ScreenshotSchema>;
+  public_notes?: Array<PublicNoteSchema>;
   readonly sort_comparator: string;
 };
diff --git a/frontend/src/__generated__/models/PublicNoteSchema.ts b/frontend/src/__generated__/models/PublicNoteSchema.ts
new file mode 100644
index 000000000..8662c3647
--- /dev/null
+++ b/frontend/src/__generated__/models/PublicNoteSchema.ts
@@ -0,0 +1,9 @@
+/* generated using openapi-typescript-codegen -- do no edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type PublicNoteSchema = {
+  user__username: string;
+  note_raw_markdown: string;
+};
diff --git a/frontend/src/components/Details/Notes.vue b/frontend/src/components/Details/Notes.vue
index 13e2a3d6d..63cccb3be 100644
--- a/frontend/src/components/Details/Notes.vue
+++ b/frontend/src/components/Details/Notes.vue
@@ -23,10 +23,6 @@ const ownProps = ref(
     is_main_sibling: false,
   }
 );
-// TODO: fetch public notes
-// const publicNotes =
-//   props.rom.user_rom_props?.filter((prop) => prop.user_id !== auth.user?.id) ??
-//   [];
 
 // Functions
 function togglePublic() {
@@ -133,7 +129,11 @@ watch(
     </v-card-text>
   </v-card>
 
-  <!-- <v-card rounded="0" v-if="publicNotes.length > 0" class="mt-2">
+  <v-card
+    rounded="0"
+    v-if="rom.public_notes && rom.public_notes.length > 0"
+    class="mt-2"
+  >
     <v-card-title class="bg-terciary">
       <v-list-item class="pl-2 pr-0">
         <span class="text-h6">Public notes</span>
@@ -144,7 +144,7 @@ watch(
 
     <v-card-text class="pa-0">
       <v-expansion-panels multiple flat rounded="0" variant="accordion">
-        <v-expansion-panel v-for="note in publicNotes" :key="note.id">
+        <v-expansion-panel v-for="note in rom.public_notes">
           <v-expansion-panel-title class="bg-terciary">
             <span class="text-body-1">{{ note.user__username }}</span>
           </v-expansion-panel-title>
@@ -159,7 +159,7 @@ watch(
         </v-expansion-panel>
       </v-expansion-panels>
     </v-card-text>
-  </v-card> -->
+  </v-card>
 </template>
 
 <style>
diff --git a/frontend/src/components/Details/Saves.vue b/frontend/src/components/Details/Saves.vue
index 18db16894..2b850f7b1 100644
--- a/frontend/src/components/Details/Saves.vue
+++ b/frontend/src/components/Details/Saves.vue
@@ -9,17 +9,11 @@ import { inject, onMounted, ref, watch } from "vue";
 import { useDisplay } from "vuetify";
 
 // Props
-// TODO: make states reactive on version change
 const { xs, smAndUp, mdAndUp } = useDisplay();
 const props = defineProps<{ rom: DetailedRom }>();
-const romRef = ref<DetailedRom>(props.rom);
 const selectedSaves = ref<SaveSchema[]>([]);
 const emitter = inject<Emitter<Events>>("emitter");
-emitter?.on("romUpdated", (romUpdated) => {
-  if (romUpdated?.id === romRef.value.id) {
-    romRef.value.user_saves = romUpdated.user_saves;
-  }
-});
+// emitter?.on("romUpdated", (romUpdated) => {});
 const HEADERS = [
   {
     title: "Name",
@@ -47,9 +41,9 @@ async function downloasSaves() {
 }
 
 function updateDataTablePages() {
-  if (romRef.value.user_saves) {
+  if (props.rom.user_saves) {
     pageCount.value = Math.ceil(
-      romRef.value.user_saves.length / itemsPerPage.value
+      props.rom.user_saves.length / itemsPerPage.value
     );
   }
 }
@@ -65,7 +59,7 @@ onMounted(() => {
 
 <template>
   <v-data-table
-    :items="romRef.user_saves"
+    :items="rom.user_saves"
     :width="mdAndUp ? '60vw' : '95vw'"
     :items-per-page="itemsPerPage"
     :items-per-page-options="PER_PAGE_OPTIONS"
@@ -81,7 +75,7 @@ onMounted(() => {
         <v-btn
           class="bg-secondary"
           size="small"
-          @click="emitter?.emit('addSavesDialog', romRef)"
+          @click="emitter?.emit('addSavesDialog', rom)"
         >
           <v-icon>mdi-upload</v-icon>
         </v-btn>
@@ -153,7 +147,7 @@ onMounted(() => {
       </td>
     </template>
     <template #no-data
-      ><span>No saves found for {{ romRef?.name }}</span></template
+      ><span>No saves found for {{ rom.name }}</span></template
     >
     <template #item.actions="{ item }">
       <v-btn-group divided density="compact">
diff --git a/frontend/src/components/Details/States.vue b/frontend/src/components/Details/States.vue
index 64abf1d1c..26b522652 100644
--- a/frontend/src/components/Details/States.vue
+++ b/frontend/src/components/Details/States.vue
@@ -9,17 +9,11 @@ import { inject, onMounted, ref, watch } from "vue";
 import { useDisplay } from "vuetify";
 
 // Props
-// TODO: make states reactive on version change
 const { xs, smAndUp, mdAndUp } = useDisplay();
 const props = defineProps<{ rom: DetailedRom }>();
-const romRef = ref<DetailedRom>(props.rom);
 const selectedStates = ref<StateSchema[]>([]);
 const emitter = inject<Emitter<Events>>("emitter");
-emitter?.on("romUpdated", (romUpdated) => {
-  if (romUpdated?.id === romRef.value.id) {
-    romRef.value.user_states = romUpdated.user_states;
-  }
-});
+// emitter?.on("romUpdated", (romUpdated) => {});
 const HEADERS = [
   {
     title: "Name",
@@ -47,9 +41,9 @@ async function downloasStates() {
 }
 
 function updateDataTablePages() {
-  if (romRef.value.user_states) {
+  if (props.rom.user_states) {
     pageCount.value = Math.ceil(
-      romRef.value.user_states.length / itemsPerPage.value
+      props.rom.user_states.length / itemsPerPage.value
     );
   }
 }
@@ -65,7 +59,7 @@ onMounted(() => {
 
 <template>
   <v-data-table
-    :items="romRef.user_states"
+    :items="rom.user_states"
     :width="mdAndUp ? '60vw' : '95vw'"
     :items-per-page="itemsPerPage"
     :items-per-page-options="PER_PAGE_OPTIONS"
@@ -81,7 +75,7 @@ onMounted(() => {
         <v-btn
           class="bg-secondary"
           size="small"
-          @click="emitter?.emit('addStatesDialog', romRef)"
+          @click="emitter?.emit('addStatesDialog', rom)"
         >
           <v-icon>mdi-upload</v-icon>
         </v-btn>
@@ -153,7 +147,7 @@ onMounted(() => {
       </td>
     </template>
     <template #no-data
-      ><span>No states found for {{ romRef?.name }}</span></template
+      ><span>No states found for {{ rom.name }}</span></template
     >
     <template #item.actions="{ item }">
       <v-btn-group divided density="compact">
diff --git a/frontend/src/views/GameDetails.vue b/frontend/src/views/GameDetails.vue
index f7095f2b7..ec88d765d 100644
--- a/frontend/src/views/GameDetails.vue
+++ b/frontend/src/views/GameDetails.vue
@@ -45,7 +45,6 @@ async function fetchDetails() {
     .getRom({ romId: parseInt(route.params.rom as string) })
     .then((response) => {
       rom.value = response.data;
-      console.log(rom.value)
     })
     .catch((error) => {
       console.log(error);

From a417af9d41d59bb0b169d0e72ad8d04309d0c675 Mon Sep 17 00:00:00 2001
From: Zurdi <zurdizurdo25@gmail.com>
Date: Mon, 1 Jul 2024 18:17:43 +0200
Subject: [PATCH 19/23] fixed update user_rom_props

---
 backend/endpoints/rom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index 1058ea432..a90babade 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -445,7 +445,7 @@ async def update_rom_props(request: Request, id: int) -> UserRomPropsSchema:
 
     data = await request.json()
 
-    rom = db_rom_handler.get_roms(id)
+    rom = db_rom_handler.get_rom(id=id, user_id=request.user.id)
 
     if not rom:
         raise RomNotFoundInDatabaseException(id)

From 7530fdd57686e28586b717cba568f896c7f24888 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Mon, 1 Jul 2024 14:28:31 -0400
Subject: [PATCH 20/23] mega refactor of pr

---
 ...021_user_rom_props.py => 0021_rom_user.py} |  14 +-
 backend/endpoints/feeds.py                    |  92 ++++++-------
 backend/endpoints/platform.py                 |   2 +-
 backend/endpoints/responses/rom.py            |  57 ++++++--
 backend/endpoints/rom.py                      |  43 +++---
 backend/endpoints/saves.py                    |   4 +-
 backend/endpoints/screenshots.py              |   4 +-
 backend/endpoints/search.py                   |   2 +-
 backend/endpoints/sockets/scan.py             |   2 +-
 backend/endpoints/states.py                   |   4 +-
 backend/handler/auth/base_handler.py          |   4 +-
 backend/handler/database/roms_handler.py      | 125 +++++++++---------
 backend/handler/database/users_handler.py     |   4 +-
 backend/handler/tests/test_db_handler.py      |  30 ++---
 backend/models/assets.py                      |   4 +-
 backend/models/rom.py                         |  17 +--
 backend/models/user.py                        |   4 +-
 frontend/src/__generated__/index.ts           |   4 +-
 .../__generated__/models/DetailedRomSchema.ts |   8 +-
 .../src/__generated__/models/RomSchema.ts     |   4 +-
 ...UserRomPropsSchema.ts => RomUserSchema.ts} |   2 +-
 ...PublicNoteSchema.ts => UserNotesSchema.ts} |   4 +-
 .../src/components/Details/Info/FileInfo.vue  |   4 +-
 frontend/src/components/Details/Notes.vue     |  10 +-
 frontend/src/stores/roms.ts                   |   5 +-
 25 files changed, 227 insertions(+), 226 deletions(-)
 rename backend/alembic/versions/{0021_user_rom_props.py => 0021_rom_user.py} (89%)
 rename frontend/src/__generated__/models/{UserRomPropsSchema.ts => RomUserSchema.ts} (90%)
 rename frontend/src/__generated__/models/{PublicNoteSchema.ts => UserNotesSchema.ts} (73%)

diff --git a/backend/alembic/versions/0021_user_rom_props.py b/backend/alembic/versions/0021_rom_user.py
similarity index 89%
rename from backend/alembic/versions/0021_user_rom_props.py
rename to backend/alembic/versions/0021_rom_user.py
index e0b514aaf..6b3994623 100644
--- a/backend/alembic/versions/0021_user_rom_props.py
+++ b/backend/alembic/versions/0021_rom_user.py
@@ -1,6 +1,6 @@
 """empty message
 
-Revision ID: 0021_user_rom_props
+Revision ID: 0021_rom_user
 Revises: 0020_created_and_updated
 Create Date: 2024-06-29 00:11:51.800988
 
@@ -10,7 +10,7 @@ import sqlalchemy as sa
 from alembic import op
 
 # revision identifiers, used by Alembic.
-revision = "0021_user_rom_props"
+revision = "0021_rom_user"
 down_revision = "0020_created_and_updated"
 branch_labels = None
 depends_on = None
@@ -19,7 +19,7 @@ depends_on = None
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
-        "user_rom_props",
+        "rom_user",
         sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
         sa.Column(
             "created_at",
@@ -46,8 +46,8 @@ def upgrade() -> None:
 
     op.execute(
         """
-        INSERT INTO user_rom_props (id, updated_at, note_raw_markdown, note_is_public, is_main_sibling, rom_id, user_id)
-        SELECT id, updated_at, raw_markdown, is_public, NULL, rom_id, user_id
+        INSERT INTO rom_user (id, updated_at, note_raw_markdown, note_is_public, is_main_sibling, rom_id, user_id)
+        SELECT id, updated_at, raw_markdown, is_public, FALSE, rom_id, user_id
         FROM rom_notes
     """
     )
@@ -88,10 +88,10 @@ def downgrade() -> None:
         """
         INSERT INTO rom_notes (id, updated_at, raw_markdown, is_public, rom_id, user_id)
         SELECT id, updated_at, note_raw_markdown, note_is_public, rom_id, user_id
-        FROM user_rom_props
+        FROM rom_user
     """
     )
 
     # Drop the new table
-    op.drop_table("user_rom_props")
+    op.drop_table("rom_user")
     # ### end Alembic commands ###
diff --git a/backend/endpoints/feeds.py b/backend/endpoints/feeds.py
index b6e410488..be5d7dc48 100644
--- a/backend/endpoints/feeds.py
+++ b/backend/endpoints/feeds.py
@@ -30,40 +30,37 @@ def platforms_webrcade_feed(request: Request) -> WebrcadeFeedSchema:
 
     platforms = db_platform_handler.get_platforms()
 
-    with db_platform_handler.session.begin() as session:
-        return {
-            "title": "RomM Feed",
-            "longTitle": "Custom RomM Feed",
-            "description": "Custom feed from your RomM library",
-            "thumbnail": "https://raw.githubusercontent.com/rommapp/romm/f2dd425d87ad8e21bf47f8258ae5dcf90f56fbc2/frontend/assets/isotipo.svg",
-            "background": "https://raw.githubusercontent.com/rommapp/romm/release/.github/screenshots/gallery.png",
-            "categories": [
-                {
-                    "title": p.name,
-                    "longTitle": f"{p.name} Games",
-                    "background": f"{ROMM_HOST}/assets/webrcade/feed/{p.slug.lower()}-background.png",
-                    "thumbnail": f"{ROMM_HOST}/assets/webrcade/feed/{p.slug.lower()}-thumb.png",
-                    "description": "",
-                    "items": [
-                        {
-                            "title": rom.name,
-                            "description": rom.summary,
-                            "type": WEBRCADE_SLUG_TO_TYPE_MAP.get(p.slug, p.slug),
-                            "thumbnail": f"{ROMM_HOST}/assets/romm/resources/{rom.path_cover_s}",
-                            "background": f"{ROMM_HOST}/assets/romm/resources/{rom.path_cover_l}",
-                            "props": {
-                                "rom": f"{ROMM_HOST}/api/roms/{rom.id}/content/{rom.file_name}"
-                            },
-                        }
-                        for rom in session.scalars(
-                            db_rom_handler.get_roms(platform_id=p.id)
-                        ).all()
-                    ],
-                }
-                for p in platforms
-                if p.slug in WEBRCADE_SUPPORTED_PLATFORM_SLUGS
-            ],
-        }
+    return {
+        "title": "RomM Feed",
+        "longTitle": "Custom RomM Feed",
+        "description": "Custom feed from your RomM library",
+        "thumbnail": "https://raw.githubusercontent.com/rommapp/romm/f2dd425d87ad8e21bf47f8258ae5dcf90f56fbc2/frontend/assets/isotipo.svg",
+        "background": "https://raw.githubusercontent.com/rommapp/romm/release/.github/screenshots/gallery.png",
+        "categories": [
+            {
+                "title": p.name,
+                "longTitle": f"{p.name} Games",
+                "background": f"{ROMM_HOST}/assets/webrcade/feed/{p.slug.lower()}-background.png",
+                "thumbnail": f"{ROMM_HOST}/assets/webrcade/feed/{p.slug.lower()}-thumb.png",
+                "description": "",
+                "items": [
+                    {
+                        "title": rom.name,
+                        "description": rom.summary,
+                        "type": WEBRCADE_SLUG_TO_TYPE_MAP.get(p.slug, p.slug),
+                        "thumbnail": f"{ROMM_HOST}/assets/romm/resources/{rom.path_cover_s}",
+                        "background": f"{ROMM_HOST}/assets/romm/resources/{rom.path_cover_l}",
+                        "props": {
+                            "rom": f"{ROMM_HOST}/api/roms/{rom.id}/content/{rom.file_name}"
+                        },
+                    }
+                    for rom in db_rom_handler.get_roms(platform_id=p.id)
+                ],
+            }
+            for p in platforms
+            if p.slug in WEBRCADE_SUPPORTED_PLATFORM_SLUGS
+        ],
+    }
 
 
 @protected_route(router.get, "/tinfoil/feed", ["roms.read"])
@@ -79,19 +76,16 @@ def tinfoil_index_feed(request: Request, slug: str = "switch") -> TinfoilFeedSch
         TinfoilFeedSchema: Tinfoil feed object schema
     """
     switch = db_platform_handler.get_platform_by_fs_slug(slug)
-    with db_rom_handler.session.begin() as session:
-        files: list[Rom] = session.scalars(
-            db_rom_handler.get_roms(platform_id=switch.id)
-        ).all()
+    files: list[Rom] = db_rom_handler.get_roms(platform_id=switch.id)
 
-        return {
-            "files": [
-                {
-                    "url": f"{ROMM_HOST}/api/roms/{file.id}/content/{file.file_name}",
-                    "size": file.file_size_bytes,
-                }
-                for file in files
-            ],
-            "directories": [],
-            "success": "RomM Switch Library",
-        }
+    return {
+        "files": [
+            {
+                "url": f"{ROMM_HOST}/api/roms/{file.id}/content/{file.file_name}",
+                "size": file.file_size_bytes,
+            }
+            for file in files
+        ],
+        "directories": [],
+        "success": "RomM Switch Library",
+    }
diff --git a/backend/endpoints/platform.py b/backend/endpoints/platform.py
index 3d0637158..85b018451 100644
--- a/backend/endpoints/platform.py
+++ b/backend/endpoints/platform.py
@@ -5,7 +5,7 @@ from endpoints.responses import MessageResponse
 from endpoints.responses.platform import PlatformSchema
 from exceptions.endpoint_exceptions import PlatformNotFoundInDatabaseException
 from exceptions.fs_exceptions import PlatformAlreadyExistsException
-from fastapi import APIRouter, HTTPException, Request, status
+from fastapi import APIRouter, Request
 from handler.database import db_platform_handler
 from handler.filesystem import fs_platform_handler
 from handler.metadata.igdb_handler import IGDB_PLATFORM_LIST
diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py
index 7108ec3bb..128657ca7 100644
--- a/backend/endpoints/responses/rom.py
+++ b/backend/endpoints/responses/rom.py
@@ -28,7 +28,7 @@ RomMobyMetadata = TypedDict(  # type: ignore[misc]
 )
 
 
-class UserRomPropsSchema(BaseModel):
+class RomUserSchema(BaseModel):
     id: int
     user_id: int
     rom_id: int
@@ -42,6 +42,26 @@ class UserRomPropsSchema(BaseModel):
     class Config:
         from_attributes = True
 
+    @classmethod
+    def for_user(cls, db_rom: Rom, user_id: int) -> RomUserSchema | None:
+        for n in db_rom.rom_users:
+            if n.user_id == user_id:
+                return cls.model_validate(n)
+
+        return None
+
+    @classmethod
+    def notes_for_user(cls, db_rom: Rom, user_id: int) -> list[UserNotesSchema]:
+        return [
+            {
+                "username": n.user__username,
+                "note_raw_markdown": n.note_raw_markdown,
+            }
+            for n in db_rom.rom_users
+            # This is what filters out private notes
+            if n.user_id == user_id or n.note_is_public
+        ]
+
 
 class RomSchema(BaseModel):
     id: int
@@ -91,11 +111,26 @@ class RomSchema(BaseModel):
     created_at: datetime
     updated_at: datetime
 
-    user_rom_props: UserRomPropsSchema | None
+    rom_user: RomUserSchema | None = Field(default=None)
 
     class Config:
         from_attributes = True
 
+    @classmethod
+    def from_orm_with_request(cls, db_rom: Rom, request: Request) -> RomSchema:
+        rom = cls.model_validate(db_rom)
+        user_id = request.user.id
+
+        rom.rom_user = RomUserSchema.for_user(db_rom, user_id)
+
+        return rom
+
+    @classmethod
+    def from_orm_with_request_list(
+        cls, db_roms: list[Rom], request: Request
+    ) -> list[RomSchema]:
+        return [cls.from_orm_with_request(rom, request) for rom in db_roms]
+
     @computed_field  # type: ignore
     @property
     def sort_comparator(self) -> str:
@@ -111,16 +146,20 @@ class RomSchema(BaseModel):
 
 class DetailedRomSchema(RomSchema):
     merged_screenshots: list[str]
+    rom_user: RomUserSchema | None = Field(default=None)
     sibling_roms: list[RomSchema] = Field(default_factory=list)
     user_saves: list[SaveSchema] = Field(default_factory=list)
     user_states: list[StateSchema] = Field(default_factory=list)
     user_screenshots: list[ScreenshotSchema] = Field(default_factory=list)
-    public_notes: list[PublicNoteSchema] = Field(default_factory=list)
+    user_notes: list[UserNotesSchema] = Field(default_factory=list)
 
     @classmethod
     def from_orm_with_request(cls, db_rom: Rom, request: Request) -> DetailedRomSchema:
         rom = cls.model_validate(db_rom)
         user_id = request.user.id
+
+        rom.rom_user = RomUserSchema.for_user(db_rom, user_id)
+        rom.user_notes = RomUserSchema.notes_for_user(db_rom, user_id)
         rom.sibling_roms = [
             RomSchema.model_validate(r) for r in db_rom.get_sibling_roms()
         ]
@@ -135,18 +174,12 @@ class DetailedRomSchema(RomSchema):
             for s in db_rom.screenshots
             if s.user_id == user_id
         ]
-        rom.public_notes = [
-            {
-                "user__username": p.user__username,
-                "note_raw_markdown": p.note_raw_markdown,
-            }
-            for p in db_rom.get_public_notes(user_id)
-        ]
+
         return rom
 
 
-class PublicNoteSchema(TypedDict):
-    user__username: str
+class UserNotesSchema(TypedDict):
+    username: str
     note_raw_markdown: str
 
 
diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index a90babade..907afad42 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -17,7 +17,7 @@ from endpoints.responses.rom import (
     CustomStreamingResponse,
     DetailedRomSchema,
     RomSchema,
-    UserRomPropsSchema,
+    RomUserSchema,
 )
 from exceptions.endpoint_exceptions import RomNotFoundInDatabaseException
 from exceptions.fs_exceptions import RomAlreadyExistsException
@@ -108,16 +108,16 @@ def get_roms(
     Returns:
         list[RomSchema]: List of roms stored in the database
     """
-
-    return db_rom_handler.get_roms(
+    db_roms = db_rom_handler.get_roms(
         platform_id=platform_id,
-        user_id=request.user.id,
         search_term=search_term.lower(),
         order_by=order_by.lower(),
         order_dir=order_dir.lower(),
         limit=limit,
     )
 
+    return RomSchema.from_orm_with_request_list(db_roms, request)
+
 
 @protected_route(
     router.get,
@@ -135,7 +135,7 @@ def get_rom(request: Request, id: int) -> DetailedRomSchema:
         DetailedRomSchema: Rom stored in the database
     """
 
-    rom = db_rom_handler.get_rom(id=id, user_id=request.user.id)
+    rom = db_rom_handler.get_rom(id)
 
     if not rom:
         raise RomNotFoundInDatabaseException(id)
@@ -160,7 +160,7 @@ def head_rom_content(request: Request, id: int, file_name: str):
         FileResponse: Returns the response with headers
     """
 
-    rom = db_rom_handler.get_rom(id=id, user_id=request.user.id)
+    rom = db_rom_handler.get_rom(id)
 
     if not rom:
         raise RomNotFoundInDatabaseException(id)
@@ -199,7 +199,7 @@ def get_rom_content(
         CustomStreamingResponse: Streams a file for multi-part roms
     """
 
-    rom = db_rom_handler.get_rom(id=id, user_id=request.user.id)
+    rom = db_rom_handler.get_rom(id)
 
     if not rom:
         raise RomNotFoundInDatabaseException(id)
@@ -287,7 +287,7 @@ async def update_rom(
 
     data = await request.form()
 
-    rom = db_rom_handler.get_rom(id=id, user_id=request.user.id)
+    rom = db_rom_handler.get_rom(id)
 
     if not rom:
         raise RomNotFoundInDatabaseException(id)
@@ -384,9 +384,7 @@ async def update_rom(
 
     db_rom_handler.update_rom(id, cleaned_data)
 
-    return DetailedRomSchema.from_orm_with_request(
-        db_rom_handler.get_rom(id=id, user_id=request.user.id), request
-    )
+    return DetailedRomSchema.from_orm_with_request(db_rom_handler.get_rom(id), request)
 
 
 @protected_route(router.post, "/roms/delete", ["roms.write"])
@@ -411,7 +409,7 @@ async def delete_roms(
     delete_from_fs: list = data["delete_from_fs"]
 
     for id in roms_ids:
-        rom = db_rom_handler.get_rom(id=id, user_id=request.user.id)
+        rom = db_rom_handler.get_rom(id)
 
         if not rom:
             raise RomNotFoundInDatabaseException(id)
@@ -440,31 +438,28 @@ async def delete_roms(
     return {"msg": f"{len(roms_ids)} roms deleted successfully!"}
 
 
-@protected_route(router.put, "/roms/{id}/props", ["rom_props.write"])
-async def update_rom_props(request: Request, id: int) -> UserRomPropsSchema:
-
+@protected_route(router.put, "/roms/{id}/props", ["roms.user.write"])
+async def update_rom_user(request: Request, id: int) -> RomUserSchema:
     data = await request.json()
 
-    rom = db_rom_handler.get_rom(id=id, user_id=request.user.id)
+    rom = db_rom_handler.get_rom(id)
 
     if not rom:
         raise RomNotFoundInDatabaseException(id)
 
-    db_rom_props = db_rom_handler.get_rom_props(
+    db_rom_user = db_rom_handler.get_rom_user(
         id, request.user.id
-    ) or db_rom_handler.add_rom_props(id, request.user.id)
+    ) or db_rom_handler.add_rom_user(id, request.user.id)
 
     cleaned_data = {}
     cleaned_data["note_raw_markdown"] = data.get(
-        "note_raw_markdown", db_rom_props.note_raw_markdown
+        "note_raw_markdown", db_rom_user.note_raw_markdown
     )
     cleaned_data["note_is_public"] = data.get(
-        "note_is_public", db_rom_props.note_is_public
+        "note_is_public", db_rom_user.note_is_public
     )
     cleaned_data["is_main_sibling"] = data.get(
-        "is_main_sibling", db_rom_props.is_main_sibling
+        "is_main_sibling", db_rom_user.is_main_sibling
     )
 
-    return db_rom_handler.update_rom_props(
-        db_rom_props.id, cleaned_data, rom, request.user.id
-    )
+    return db_rom_handler.update_rom_user(db_rom_user.id, cleaned_data)
diff --git a/backend/endpoints/saves.py b/backend/endpoints/saves.py
index 72ba522da..085e85d81 100644
--- a/backend/endpoints/saves.py
+++ b/backend/endpoints/saves.py
@@ -17,7 +17,7 @@ def add_saves(
     saves: list[UploadFile] = File(...),  # noqa: B008
     emulator: str | None = None,
 ) -> UploadedSavesResponse:
-    rom = db_rom_handler.get_rom(id=rom_id, user_id=request.user.id)
+    rom = db_rom_handler.get_rom(rom_id)
     current_user = request.user
     log.info(f"Uploading saves to {rom.name}")
 
@@ -56,7 +56,7 @@ def add_saves(
         scanned_save.emulator = emulator
         db_save_handler.add_save(scanned_save)
 
-    rom = db_rom_handler.get_rom(id=rom_id, user_id=request.user.id)
+    rom = db_rom_handler.get_rom(rom_id)
     return {
         "uploaded": len(saves),
         "saves": [s for s in rom.saves if s.user_id == current_user.id],
diff --git a/backend/endpoints/screenshots.py b/backend/endpoints/screenshots.py
index 52984b88e..a03118227 100644
--- a/backend/endpoints/screenshots.py
+++ b/backend/endpoints/screenshots.py
@@ -15,7 +15,7 @@ def add_screenshots(
     rom_id: int,
     screenshots: list[UploadFile] = File(...),  # noqa: B008
 ) -> UploadedScreenshotsResponse:
-    rom = db_rom_handler.get_rom(id=rom_id, user_id=request.user.id)
+    rom = db_rom_handler.get_rom(rom_id)
     current_user = request.user
     log.info(f"Uploading screenshots to {rom.name}")
 
@@ -53,7 +53,7 @@ def add_screenshots(
         scanned_screenshot.user_id = current_user.id
         db_screenshot_handler.add_screenshot(scanned_screenshot)
 
-    rom = db_rom_handler.get_rom(id=rom_id, user_id=request.user.id)
+    rom = db_rom_handler.get_rom(rom_id)
     return {
         "uploaded": len(screenshots),
         "screenshots": [s for s in rom.screenshots if s.user_id == current_user.id],
diff --git a/backend/endpoints/search.py b/backend/endpoints/search.py
index 23dd05545..5cee25c3a 100644
--- a/backend/endpoints/search.py
+++ b/backend/endpoints/search.py
@@ -40,7 +40,7 @@ async def search_rom(
             detail="No metadata providers enabled",
         )
 
-    rom = db_rom_handler.get_rom(id=rom_id, user_id=request.user.id)
+    rom = db_rom_handler.get_rom(rom_id)
     if not rom:
         return []
 
diff --git a/backend/endpoints/sockets/scan.py b/backend/endpoints/sockets/scan.py
index 5eb98477b..b485c63d4 100644
--- a/backend/endpoints/sockets/scan.py
+++ b/backend/endpoints/sockets/scan.py
@@ -29,7 +29,7 @@ from rq import Worker
 from rq.job import Job
 from sqlalchemy.inspection import inspect
 
-EXCLUDED_FROM_DUMP: Final = {"created_at", "updated_at"}
+EXCLUDED_FROM_DUMP: Final = {"created_at", "updated_at", "rom_user"}
 
 
 class ScanStats:
diff --git a/backend/endpoints/states.py b/backend/endpoints/states.py
index 104e4f30d..1f4086296 100644
--- a/backend/endpoints/states.py
+++ b/backend/endpoints/states.py
@@ -17,7 +17,7 @@ def add_states(
     states: list[UploadFile] = File(...),  # noqa: B008
     emulator: str | None = None,
 ) -> UploadedStatesResponse:
-    rom = db_rom_handler.get_rom(id=rom_id, user_id=request.user.id)
+    rom = db_rom_handler.get_rom(rom_id)
     current_user = request.user
     log.info(f"Uploading states to {rom.name}")
 
@@ -56,7 +56,7 @@ def add_states(
         scanned_state.emulator = emulator
         db_state_handler.add_state(scanned_state)
 
-    rom = db_rom_handler.get_rom(id=rom_id, user_id=request.user.id)
+    rom = db_rom_handler.get_rom(rom_id)
     return {
         "uploaded": len(states),
         "states": [s for s in rom.states if s.user_id == current_user.id],
diff --git a/backend/handler/auth/base_handler.py b/backend/handler/auth/base_handler.py
index c1325cc08..3127d0cf0 100644
--- a/backend/handler/auth/base_handler.py
+++ b/backend/handler/auth/base_handler.py
@@ -22,8 +22,8 @@ DEFAULT_SCOPES_MAP: Final = {
     "assets.read": "View assets",
     "assets.write": "Modify assets",
     "firmware.read": "View firmware",
-    "rom_props.read": "View user-rom props",
-    "rom_props.write": "Modify user-rom props",
+    "roms.user.read": "View user-rom properties",
+    "roms.user.write": "Modify user-rom properties",
 }
 
 WRITE_SCOPES_MAP: Final = {
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index b1e3b4db8..6c881efaa 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -1,9 +1,9 @@
 import functools
 
 from decorators.database import begin_session
-from models.rom import Rom, UserRomProps
+from models.rom import Rom, RomUser
 from sqlalchemy import and_, delete, func, or_, select, update
-from sqlalchemy.orm import Query, Session, aliased, contains_eager, selectinload
+from sqlalchemy.orm import Query, Session, selectinload
 
 from .base_handler import DBBaseHandler
 
@@ -11,43 +11,41 @@ from .base_handler import DBBaseHandler
 class ImplementationError(Exception): ...
 
 
-def with_assets(func):
+def with_details(func):
     @functools.wraps(func)
     def wrapper(*args, **kwargs):
         session = kwargs.get("session")
         if session is None:
-            raise ImplementationError(
-                f"Method {func} bad implementation: kwarg 'session' is required"
+            raise TypeError(
+                f"{func} is missing required kwarg 'session' with type 'Session'"
             )
 
-        user_id = kwargs.get("user_id")
-        if user_id is None:
-            raise ImplementationError(
-                f"Method {func} bad implementation: kwarg 'user_id' is required"
-            )
-
-        try:
-            rom_set = select(Rom).filter_by(id=kwargs["id"])
-        except KeyError:
-            rom_set = select(Rom)
-
-        # Subquery to filter user_rom_props by user_id
-        subquery = (
-            select(aliased(Rom.user_rom_props)).filter_by(user_id=user_id).subquery()
-        )
-
-        # Construct the query to join Rom with the filtered user_rom_props
-        kwargs["query"] = rom_set.outerjoin(subquery, Rom.user_rom_props).options(
+        kwargs["query"] = select(Rom).options(
             selectinload(Rom.saves),
             selectinload(Rom.states),
             selectinload(Rom.screenshots),
-            contains_eager(Rom.user_rom_props, alias=subquery),
+            selectinload(Rom.rom_users),
         )
         return func(*args, **kwargs)
 
     return wrapper
 
 
+def with_simple(func):
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        session = kwargs.get("session")
+        if session is None:
+            raise TypeError(
+                f"{func} is missing required kwarg 'session' with type 'Session'"
+            )
+
+        kwargs["query"] = select(Rom).options(selectinload(Rom.rom_users))
+        return func(*args, **kwargs)
+
+    return wrapper
+
+
 class DBRomsHandler(DBBaseHandler):
     def _filter(self, data, platform_id: int | None, search_term: str):
         if platform_id:
@@ -75,38 +73,33 @@ class DBRomsHandler(DBBaseHandler):
             return data.order_by(_column.asc())
 
     @begin_session
-    @with_assets
+    @with_details
     def add_rom(self, rom: Rom, query: Query = None, session: Session = None) -> Rom:
         rom = session.merge(rom)
         session.flush()
+
         return session.scalar(query.filter_by(id=rom.id).limit(1))
 
     @begin_session
-    @with_assets
+    @with_details
     def get_rom(
-        self,
-        *,
-        id: int | None = None,
-        user_id: int | None = None,
-        query: Query = None,
-        session: Session = None,
+        self, id: int, *, query: Query = None, session: Session = None
     ) -> Rom | None:
-        return session.scalar(query.limit(1))
+        return session.scalar(query.filter_by(id=id).limit(1))
 
     @begin_session
-    @with_assets
+    @with_simple
     def get_roms(
         self,
         *,
         platform_id: int | None = None,
-        user_id: int | None = None,
         search_term: str = "",
         order_by: str = "name",
         order_dir: str = "asc",
-        limit: int = None,
+        limit: int | None = None,
         query: Query = None,
         session: Session = None,
-    ) -> tuple[Rom | None]:
+    ) -> list[Rom]:
         return (
             session.scalars(
                 self._order(
@@ -120,7 +113,7 @@ class DBRomsHandler(DBBaseHandler):
         )
 
     @begin_session
-    @with_assets
+    @with_details
     def get_rom_by_filename(
         self,
         platform_id: int,
@@ -133,7 +126,7 @@ class DBRomsHandler(DBBaseHandler):
         )
 
     @begin_session
-    @with_assets
+    @with_details
     def get_rom_by_filename_no_tags(
         self, file_name_no_tags: str, query: Query = None, session: Session = None
     ) -> Rom | None:
@@ -142,7 +135,7 @@ class DBRomsHandler(DBBaseHandler):
         )
 
     @begin_session
-    @with_assets
+    @with_details
     def get_rom_by_filename_no_ext(
         self, file_name_no_ext: str, query: Query = None, session: Session = None
     ) -> Rom | None:
@@ -151,9 +144,12 @@ class DBRomsHandler(DBBaseHandler):
         )
 
     @begin_session
-    def get_sibling_roms(self, rom: Rom, session: Session = None) -> tuple[Rom | None]:
+    @with_simple
+    def get_sibling_roms(
+        self, rom: Rom, query: Query = None, session: Session = None
+    ) -> list[Rom]:
         return session.scalars(
-            select(Rom).where(
+            query.where(
                 and_(
                     Rom.platform_id == rom.platform_id,
                     Rom.id != rom.id,
@@ -201,49 +197,46 @@ class DBRomsHandler(DBBaseHandler):
         )
 
     @begin_session
-    def add_rom_props(
+    def add_rom_user(
         self, rom_id: int, user_id: int, session: Session = None
-    ) -> UserRomProps:
-        return session.merge(UserRomProps(rom_id=rom_id, user_id=user_id))
+    ) -> RomUser:
+        return session.merge(RomUser(rom_id=rom_id, user_id=user_id))
 
     @begin_session
-    def get_rom_props(
+    def get_rom_user(
         self, rom_id: int, user_id: int, session: Session = None
-    ) -> UserRomProps | None:
+    ) -> RomUser | None:
         return session.scalar(
-            select(UserRomProps).filter_by(rom_id=rom_id, user_id=user_id).limit(1)
+            select(RomUser).filter_by(rom_id=rom_id, user_id=user_id).limit(1)
         )
 
     @begin_session
-    def get_public_notes(
-        self, rom: Rom, user_id: int, session: Session = None
-    ) -> tuple[UserRomProps | None]:
-        return session.scalars(
-            select(UserRomProps).where(
-                and_(UserRomProps.rom_id == rom.id, UserRomProps.user_id != user_id)
-            )
-        ).all()
+    def get_rom_user_by_id(self, id: int, session: Session = None) -> RomUser | None:
+        return session.scalar(select(RomUser).filter_by(id=id).limit(1))
 
     @begin_session
-    def update_rom_props(
-        self, id: int, data: dict, rom: Rom, user_id: int, session: Session = None
-    ) -> UserRomProps:
+    def update_rom_user(self, id: int, data: dict, session: Session = None) -> RomUser:
         session.execute(
-            update(UserRomProps)
-            .where(UserRomProps.id == id)
+            update(RomUser)
+            .where(RomUser.id == id)
             .values(**data)
             .execution_options(synchronize_session="evaluate")
         )
+
+        rom_user = self.get_rom_user_by_id(id)
+
         if data["is_main_sibling"]:
-            siblings = [rom.id for rom in rom.get_sibling_roms()]
             session.execute(
-                update(UserRomProps)
+                update(RomUser)
                 .where(
                     and_(
-                        UserRomProps.rom_id.in_(siblings),
-                        UserRomProps.user_id == user_id,
+                        RomUser.rom_id.in_(
+                            [rom.id for rom in rom_user.rom.get_sibling_roms()]
+                        ),
+                        RomUser.user_id == rom_user.user_id,
                     )
                 )
                 .values(is_main_sibling=False)
             )
-        return self.get_rom_props(rom.id, user_id)
+
+        return self.get_rom_user_by_id(id)
diff --git a/backend/handler/database/users_handler.py b/backend/handler/database/users_handler.py
index 76dcd98d7..f0a6eafa4 100644
--- a/backend/handler/database/users_handler.py
+++ b/backend/handler/database/users_handler.py
@@ -29,7 +29,7 @@ class DBUsersHandler(DBBaseHandler):
         )
 
     @begin_session
-    def get_users(self, session: Session = None):
+    def get_users(self, session: Session = None) -> list[User]:
         return session.scalars(select(User)).all()
 
     @begin_session
@@ -41,5 +41,5 @@ class DBUsersHandler(DBBaseHandler):
         )
 
     @begin_session
-    def get_admin_users(self, session: Session = None):
+    def get_admin_users(self, session: Session = None) -> list[User]:
         return session.scalars(select(User).filter_by(role=Role.ADMIN)).all()
diff --git a/backend/handler/tests/test_db_handler.py b/backend/handler/tests/test_db_handler.py
index 26521b54f..6e0f589d0 100644
--- a/backend/handler/tests/test_db_handler.py
+++ b/backend/handler/tests/test_db_handler.py
@@ -46,9 +46,8 @@ def test_roms(rom: Rom, platform: Platform):
         )
     )
 
-    with db_rom_handler.session.begin() as session:
-        roms = session.scalars(db_rom_handler.get_roms(platform_id=platform.id)).all()
-        assert len(roms) == 2
+    roms = db_rom_handler.get_roms(platform_id=platform.id)
+    assert len(roms) == 2
 
     rom = db_rom_handler.get_rom(roms[0].id)
     assert rom is not None
@@ -61,26 +60,23 @@ def test_roms(rom: Rom, platform: Platform):
 
     db_rom_handler.delete_rom(rom.id)
 
-    with db_rom_handler.session.begin() as session:
-        roms = session.scalars(db_rom_handler.get_roms(platform_id=platform.id)).all()
-        assert len(roms) == 1
+    roms = db_rom_handler.get_roms(platform_id=platform.id)
+    assert len(roms) == 1
 
     db_rom_handler.purge_roms(rom_2.platform_id, [rom_2.id])
 
-    with db_rom_handler.session.begin() as session:
-        roms = session.scalars(db_rom_handler.get_roms(platform_id=platform.id)).all()
-        assert len(roms) == 0
+    roms = db_rom_handler.get_roms(platform_id=platform.id)
+    assert len(roms) == 0
 
 
 def test_utils(rom: Rom, platform: Platform):
-    with db_rom_handler.session.begin() as session:
-        roms = session.scalars(db_rom_handler.get_roms(platform_id=platform.id)).all()
-        assert (
-            db_rom_handler.get_rom_by_filename(
-                platform_id=platform.id, file_name=rom.file_name
-            ).id
-            == roms[0].id
-        )
+    roms = db_rom_handler.get_roms(platform_id=platform.id)
+    assert (
+        db_rom_handler.get_rom_by_filename(
+            platform_id=platform.id, file_name=rom.file_name
+        ).id
+        == roms[0].id
+    )
 
 
 def test_users(admin_user):
diff --git a/backend/models/assets.py b/backend/models/assets.py
index e7cd08f74..51dce8cc1 100644
--- a/backend/models/assets.py
+++ b/backend/models/assets.py
@@ -52,7 +52,7 @@ class Save(RomAsset):
     def screenshot(self) -> Screenshot | None:
         from handler.database import db_rom_handler
 
-        db_rom = db_rom_handler.get_rom(id=self.rom_id, user_id=self.user.id)
+        db_rom = db_rom_handler.get_rom(self.rom_id)
         if db_rom is None:
             return None
 
@@ -76,7 +76,7 @@ class State(RomAsset):
     def screenshot(self) -> Screenshot | None:
         from handler.database import db_rom_handler
 
-        db_rom = db_rom_handler.get_rom(id=self.rom_id, user_id=self.user.id)
+        db_rom = db_rom_handler.get_rom(self.rom_id)
         if db_rom is None:
             return None
 
diff --git a/backend/models/rom.py b/backend/models/rom.py
index e6e8bd9d2..5500af70a 100644
--- a/backend/models/rom.py
+++ b/backend/models/rom.py
@@ -65,13 +65,11 @@ class Rom(BaseModel):
     )
 
     platform: Mapped[Platform] = relationship(lazy="immediate")
-    user_rom_props: Mapped[UserRomProps] = relationship(
-        back_populates="rom", lazy="immediate"
-    )
 
     saves: Mapped[list[Save]] = relationship(back_populates="rom")
     states: Mapped[list[State]] = relationship(back_populates="rom")
     screenshots: Mapped[list[Screenshot]] = relationship(back_populates="rom")
+    rom_users: Mapped[list[RomUser]] = relationship(back_populates="rom")
 
     @property
     def platform_slug(self) -> str:
@@ -105,11 +103,6 @@ class Rom(BaseModel):
 
         return db_rom_handler.get_sibling_roms(self)
 
-    def get_public_notes(self, user_id: int) -> list[dict]:
-        from handler.database import db_rom_handler
-
-        return db_rom_handler.get_public_notes(self, user_id)
-
     # Metadata fields
     @property
     def alternative_names(self) -> list[str]:
@@ -155,8 +148,8 @@ class Rom(BaseModel):
         return self.file_name
 
 
-class UserRomProps(BaseModel):
-    __tablename__ = "user_rom_props"
+class RomUser(BaseModel):
+    __tablename__ = "rom_user"
     __table_args__ = (
         UniqueConstraint("rom_id", "user_id", name="unique_rom_user_props"),
     )
@@ -171,8 +164,8 @@ class UserRomProps(BaseModel):
     rom_id: Mapped[int] = mapped_column(ForeignKey("roms.id", ondelete="CASCADE"))
     user_id: Mapped[int] = mapped_column(ForeignKey("users.id", ondelete="CASCADE"))
 
-    rom: Mapped[Rom] = relationship(lazy="joined", back_populates="user_rom_props")
-    user: Mapped[User] = relationship(lazy="joined", back_populates="user_rom_props")
+    rom: Mapped[Rom] = relationship(lazy="joined", back_populates="rom_users")
+    user: Mapped[User] = relationship(lazy="joined", back_populates="rom_users")
 
     @property
     def user__username(self) -> str:
diff --git a/backend/models/user.py b/backend/models/user.py
index d84897e62..c86c2d80d 100644
--- a/backend/models/user.py
+++ b/backend/models/user.py
@@ -11,7 +11,7 @@ from starlette.authentication import SimpleUser
 
 if TYPE_CHECKING:
     from models.assets import Save, Screenshot, State
-    from models.rom import UserRomProps
+    from models.rom import RomUser
 
 
 class Role(enum.Enum):
@@ -39,7 +39,7 @@ class User(BaseModel, SimpleUser):
     saves: Mapped[list[Save]] = relationship(back_populates="user")
     states: Mapped[list[State]] = relationship(back_populates="user")
     screenshots: Mapped[list[Screenshot]] = relationship(back_populates="user")
-    user_rom_props: Mapped[list[UserRomProps]] = relationship(back_populates="user")
+    rom_users: Mapped[list[RomUser]] = relationship(back_populates="user")
 
     @property
     def oauth_scopes(self):
diff --git a/frontend/src/__generated__/index.ts b/frontend/src/__generated__/index.ts
index 054306055..37f066c7f 100644
--- a/frontend/src/__generated__/index.ts
+++ b/frontend/src/__generated__/index.ts
@@ -24,11 +24,11 @@ export type { MessageResponse } from "./models/MessageResponse";
 export type { MetadataSourcesDict } from "./models/MetadataSourcesDict";
 export type { MobyMetadataPlatform } from "./models/MobyMetadataPlatform";
 export type { PlatformSchema } from "./models/PlatformSchema";
-export type { PublicNoteSchema } from "./models/PublicNoteSchema";
 export type { Role } from "./models/Role";
 export type { RomIGDBMetadata } from "./models/RomIGDBMetadata";
 export type { RomMobyMetadata } from "./models/RomMobyMetadata";
 export type { RomSchema } from "./models/RomSchema";
+export type { RomUserSchema } from "./models/RomUserSchema";
 export type { SaveSchema } from "./models/SaveSchema";
 export type { SchedulerDict } from "./models/SchedulerDict";
 export type { ScreenshotSchema } from "./models/ScreenshotSchema";
@@ -42,7 +42,7 @@ export type { TokenResponse } from "./models/TokenResponse";
 export type { UploadedSavesResponse } from "./models/UploadedSavesResponse";
 export type { UploadedScreenshotsResponse } from "./models/UploadedScreenshotsResponse";
 export type { UploadedStatesResponse } from "./models/UploadedStatesResponse";
-export type { UserRomPropsSchema } from "./models/UserRomPropsSchema";
+export type { UserNotesSchema } from "./models/UserNotesSchema";
 export type { UserSchema } from "./models/UserSchema";
 export type { ValidationError } from "./models/ValidationError";
 export type { WatcherDict } from "./models/WatcherDict";
diff --git a/frontend/src/__generated__/models/DetailedRomSchema.ts b/frontend/src/__generated__/models/DetailedRomSchema.ts
index 79e62230b..4df6c7079 100644
--- a/frontend/src/__generated__/models/DetailedRomSchema.ts
+++ b/frontend/src/__generated__/models/DetailedRomSchema.ts
@@ -3,14 +3,14 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { PublicNoteSchema } from "./PublicNoteSchema";
 import type { RomIGDBMetadata } from "./RomIGDBMetadata";
 import type { RomMobyMetadata } from "./RomMobyMetadata";
 import type { RomSchema } from "./RomSchema";
+import type { RomUserSchema } from "./RomUserSchema";
 import type { SaveSchema } from "./SaveSchema";
 import type { ScreenshotSchema } from "./ScreenshotSchema";
 import type { StateSchema } from "./StateSchema";
-import type { UserRomPropsSchema } from "./UserRomPropsSchema";
+import type { UserNotesSchema } from "./UserNotesSchema";
 
 export type DetailedRomSchema = {
   id: number;
@@ -51,12 +51,12 @@ export type DetailedRomSchema = {
   full_path: string;
   created_at: string;
   updated_at: string;
-  user_rom_props: UserRomPropsSchema | null;
+  rom_user?: RomUserSchema | null;
   merged_screenshots: Array<string>;
   sibling_roms?: Array<RomSchema>;
   user_saves?: Array<SaveSchema>;
   user_states?: Array<StateSchema>;
   user_screenshots?: Array<ScreenshotSchema>;
-  public_notes?: Array<PublicNoteSchema>;
+  user_notes?: Array<UserNotesSchema>;
   readonly sort_comparator: string;
 };
diff --git a/frontend/src/__generated__/models/RomSchema.ts b/frontend/src/__generated__/models/RomSchema.ts
index 1f03b0389..9c6687f71 100644
--- a/frontend/src/__generated__/models/RomSchema.ts
+++ b/frontend/src/__generated__/models/RomSchema.ts
@@ -5,7 +5,7 @@
 
 import type { RomIGDBMetadata } from "./RomIGDBMetadata";
 import type { RomMobyMetadata } from "./RomMobyMetadata";
-import type { UserRomPropsSchema } from "./UserRomPropsSchema";
+import type { RomUserSchema } from "./RomUserSchema";
 
 export type RomSchema = {
   id: number;
@@ -46,6 +46,6 @@ export type RomSchema = {
   full_path: string;
   created_at: string;
   updated_at: string;
-  user_rom_props: UserRomPropsSchema | null;
+  rom_user?: RomUserSchema | null;
   readonly sort_comparator: string;
 };
diff --git a/frontend/src/__generated__/models/UserRomPropsSchema.ts b/frontend/src/__generated__/models/RomUserSchema.ts
similarity index 90%
rename from frontend/src/__generated__/models/UserRomPropsSchema.ts
rename to frontend/src/__generated__/models/RomUserSchema.ts
index 2b08d82cc..03948b7ad 100644
--- a/frontend/src/__generated__/models/UserRomPropsSchema.ts
+++ b/frontend/src/__generated__/models/RomUserSchema.ts
@@ -3,7 +3,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type UserRomPropsSchema = {
+export type RomUserSchema = {
   id: number;
   user_id: number;
   rom_id: number;
diff --git a/frontend/src/__generated__/models/PublicNoteSchema.ts b/frontend/src/__generated__/models/UserNotesSchema.ts
similarity index 73%
rename from frontend/src/__generated__/models/PublicNoteSchema.ts
rename to frontend/src/__generated__/models/UserNotesSchema.ts
index 8662c3647..942a9e38e 100644
--- a/frontend/src/__generated__/models/PublicNoteSchema.ts
+++ b/frontend/src/__generated__/models/UserNotesSchema.ts
@@ -3,7 +3,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type PublicNoteSchema = {
-  user__username: string;
+export type UserNotesSchema = {
+  username: string;
   note_raw_markdown: string;
 };
diff --git a/frontend/src/components/Details/Info/FileInfo.vue b/frontend/src/components/Details/Info/FileInfo.vue
index 1b860b046..05cca08ac 100644
--- a/frontend/src/components/Details/Info/FileInfo.vue
+++ b/frontend/src/components/Details/Info/FileInfo.vue
@@ -13,7 +13,7 @@ const props = defineProps<{ rom: DetailedRom; platform: Platform }>();
 const downloadStore = storeDownload();
 const auth = storeAuth();
 const ownProps = ref(
-  props.rom.user_rom_props ?? {
+  props.rom.rom_user ?? {
     id: null,
     user_id: auth.user?.id,
     rom_id: props.rom.id,
@@ -38,7 +38,7 @@ async function toggleMainSibling() {
 watch(
   () => props.rom,
   async () => {
-    ownProps.value = props.rom.user_rom_props ?? {
+    ownProps.value = props.rom.rom_user ?? {
       id: null,
       user_id: auth.user?.id,
       rom_id: props.rom.id,
diff --git a/frontend/src/components/Details/Notes.vue b/frontend/src/components/Details/Notes.vue
index 63cccb3be..4ba23bf07 100644
--- a/frontend/src/components/Details/Notes.vue
+++ b/frontend/src/components/Details/Notes.vue
@@ -13,7 +13,7 @@ const auth = storeAuth();
 const theme = useTheme();
 const editingNote = ref(false);
 const ownProps = ref(
-  props.rom.user_rom_props ?? {
+  props.rom.rom_user ?? {
     id: null,
     user_id: auth.user?.id,
     rom_id: props.rom.id,
@@ -50,7 +50,7 @@ function editNote() {
 watch(
   () => props.rom,
   async () => {
-    ownProps.value = props.rom.user_rom_props ?? {
+    ownProps.value = props.rom.rom_user ?? {
       id: null,
       user_id: auth.user?.id,
       rom_id: props.rom.id,
@@ -131,7 +131,7 @@ watch(
 
   <v-card
     rounded="0"
-    v-if="rom.public_notes && rom.public_notes.length > 0"
+    v-if="rom.user_notes && rom.user_notes.length > 0"
     class="mt-2"
   >
     <v-card-title class="bg-terciary">
@@ -144,9 +144,9 @@ watch(
 
     <v-card-text class="pa-0">
       <v-expansion-panels multiple flat rounded="0" variant="accordion">
-        <v-expansion-panel v-for="note in rom.public_notes">
+        <v-expansion-panel v-for="note in rom.user_notes">
           <v-expansion-panel-title class="bg-terciary">
-            <span class="text-body-1">{{ note.user__username }}</span>
+            <span class="text-body-1">{{ note.username }}</span>
           </v-expansion-panel-title>
           <v-expansion-panel-text class="bg-secondary">
             <MdPreview
diff --git a/frontend/src/stores/roms.ts b/frontend/src/stores/roms.ts
index a75014972..2f13ea14b 100644
--- a/frontend/src/stores/roms.ts
+++ b/frontend/src/stores/roms.ts
@@ -5,7 +5,6 @@ import type { ExtractPiniaStoreType } from "@/types";
 import { groupBy, uniqBy } from "lodash";
 import { nanoid } from "nanoid";
 import { defineStore } from "pinia";
-import storeAuth from "@/stores/auth";
 import storeGalleryFilter from "./galleryFilter";
 
 type GalleryFilterStore = ExtractPiniaStoreType<typeof storeGalleryFilter>;
@@ -52,8 +51,6 @@ export default defineStore("roms", {
         return;
       }
 
-      const auth = storeAuth();
-
       // Group roms by external id
       this._grouped = Object.values(
         groupBy(
@@ -65,7 +62,7 @@ export default defineStore("roms", {
       )
         .map((games) => {
           const mainSiblingIndex = games.findIndex(
-            (game) => game.user_rom_props?.is_main_sibling,
+            (game) => game.rom_user?.is_main_sibling,
           );
           const primaryGame =
             mainSiblingIndex !== -1

From 16764407a34b4c06dde8946b8c35072899707490 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Mon, 1 Jul 2024 16:17:48 -0400
Subject: [PATCH 21/23] fix showing duplicate own nates

---
 backend/endpoints/responses/rom.py            |  2 ++
 .../__generated__/models/UserNotesSchema.ts   |  1 +
 frontend/src/components/Details/Notes.vue     | 32 ++++++++++---------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py
index 128657ca7..b0122473a 100644
--- a/backend/endpoints/responses/rom.py
+++ b/backend/endpoints/responses/rom.py
@@ -54,6 +54,7 @@ class RomUserSchema(BaseModel):
     def notes_for_user(cls, db_rom: Rom, user_id: int) -> list[UserNotesSchema]:
         return [
             {
+                "user_id": n.user_id,
                 "username": n.user__username,
                 "note_raw_markdown": n.note_raw_markdown,
             }
@@ -179,6 +180,7 @@ class DetailedRomSchema(RomSchema):
 
 
 class UserNotesSchema(TypedDict):
+    user_id: int
     username: str
     note_raw_markdown: str
 
diff --git a/frontend/src/__generated__/models/UserNotesSchema.ts b/frontend/src/__generated__/models/UserNotesSchema.ts
index 942a9e38e..b9a84681a 100644
--- a/frontend/src/__generated__/models/UserNotesSchema.ts
+++ b/frontend/src/__generated__/models/UserNotesSchema.ts
@@ -4,6 +4,7 @@
 /* eslint-disable */
 
 export type UserNotesSchema = {
+  user_id: number;
   username: string;
   note_raw_markdown: string;
 };
diff --git a/frontend/src/components/Details/Notes.vue b/frontend/src/components/Details/Notes.vue
index 4ba23bf07..2969d2559 100644
--- a/frontend/src/components/Details/Notes.vue
+++ b/frontend/src/components/Details/Notes.vue
@@ -12,7 +12,7 @@ const props = defineProps<{ rom: DetailedRom }>();
 const auth = storeAuth();
 const theme = useTheme();
 const editingNote = ref(false);
-const ownProps = ref(
+const romUser = ref(
   props.rom.rom_user ?? {
     id: null,
     user_id: auth.user?.id,
@@ -23,15 +23,17 @@ const ownProps = ref(
     is_main_sibling: false,
   }
 );
+const publicNotes =
+  props.rom.user_notes?.filter((note) => note.user_id !== auth.user?.id) ?? [];
 
 // Functions
 function togglePublic() {
-  ownProps.value.note_is_public = !ownProps.value.note_is_public;
+  romUser.value.note_is_public = !romUser.value.note_is_public;
   romApi.updateUserRomProps({
     romId: props.rom.id,
-    noteRawMarkdown: ownProps.value.note_raw_markdown,
-    noteIsPublic: ownProps.value.note_is_public,
-    isMainSibling: ownProps.value.is_main_sibling,
+    noteRawMarkdown: romUser.value.note_raw_markdown,
+    noteIsPublic: romUser.value.note_is_public,
+    isMainSibling: romUser.value.is_main_sibling,
   });
 }
 
@@ -39,9 +41,9 @@ function editNote() {
   if (editingNote.value) {
     romApi.updateUserRomProps({
       romId: props.rom.id,
-      noteRawMarkdown: ownProps.value.note_raw_markdown,
-      noteIsPublic: ownProps.value.note_is_public,
-      isMainSibling: ownProps.value.is_main_sibling,
+      noteRawMarkdown: romUser.value.note_raw_markdown,
+      noteIsPublic: romUser.value.note_is_public,
+      isMainSibling: romUser.value.is_main_sibling,
     });
   }
   editingNote.value = !editingNote.value;
@@ -50,7 +52,7 @@ function editNote() {
 watch(
   () => props.rom,
   async () => {
-    ownProps.value = props.rom.rom_user ?? {
+    romUser.value = props.rom.rom_user ?? {
       id: null,
       user_id: auth.user?.id,
       rom_id: props.rom.id,
@@ -73,7 +75,7 @@ watch(
               location="top"
               class="tooltip"
               transition="fade-transition"
-              :text="ownProps.note_is_public ? 'Make private' : 'Make public'"
+              :text="romUser.note_is_public ? 'Make private' : 'Make public'"
               open-delay="500"
               ><template #activator="{ props: tooltipProps }">
                 <v-btn
@@ -82,7 +84,7 @@ watch(
                   class="bg-terciary"
                 >
                   <v-icon size="large">
-                    {{ ownProps.note_is_public ? "mdi-eye" : "mdi-eye-off" }}
+                    {{ romUser.note_is_public ? "mdi-eye" : "mdi-eye-off" }}
                   </v-icon>
                 </v-btn>
               </template></v-tooltip
@@ -112,7 +114,7 @@ watch(
     <v-card-text class="pa-2">
       <MdEditor
         v-if="editingNote"
-        v-model="ownProps.note_raw_markdown"
+        v-model="romUser.note_raw_markdown"
         :theme="theme.name.value == 'dark' ? 'dark' : 'light'"
         language="en-US"
         :preview="false"
@@ -121,7 +123,7 @@ watch(
       />
       <MdPreview
         v-else
-        :model-value="ownProps.note_raw_markdown"
+        :model-value="romUser.note_raw_markdown"
         :theme="theme.name.value == 'dark' ? 'dark' : 'light'"
         preview-theme="vuepress"
         code-theme="github"
@@ -131,7 +133,7 @@ watch(
 
   <v-card
     rounded="0"
-    v-if="rom.user_notes && rom.user_notes.length > 0"
+    v-if="publicNotes && publicNotes.length > 0"
     class="mt-2"
   >
     <v-card-title class="bg-terciary">
@@ -144,7 +146,7 @@ watch(
 
     <v-card-text class="pa-0">
       <v-expansion-panels multiple flat rounded="0" variant="accordion">
-        <v-expansion-panel v-for="note in rom.user_notes">
+        <v-expansion-panel v-for="note in publicNotes">
           <v-expansion-panel-title class="bg-terciary">
             <span class="text-body-1">{{ note.username }}</span>
           </v-expansion-panel-title>

From 4a413db4c560a5fcba331936bfa368b0e2b81f08 Mon Sep 17 00:00:00 2001
From: Zurdi <zurdizurdo25@gmail.com>
Date: Tue, 2 Jul 2024 17:49:48 +0200
Subject: [PATCH 22/23] fixes from PR review

---
 backend/exceptions/endpoint_exceptions.py | 8 ++------
 backend/handler/database/roms_handler.py  | 3 ---
 frontend/src/components/Details/Saves.vue | 1 -
 frontend/src/services/api/rom.ts          | 2 --
 frontend/src/stores/roms.ts               | 8 ++++++++
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/backend/exceptions/endpoint_exceptions.py b/backend/exceptions/endpoint_exceptions.py
index c668b0e96..0de3d09ba 100644
--- a/backend/exceptions/endpoint_exceptions.py
+++ b/backend/exceptions/endpoint_exceptions.py
@@ -7,9 +7,7 @@ class PlatformNotFoundInDatabaseException(Exception):
         self.message = f"Platform with id '{id}' not found"
         super().__init__(self.message)
         log.critical(self.message)
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=self.message
-        )
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=self.message)
 
     def __repr__(self) -> str:
         return self.message
@@ -20,9 +18,7 @@ class RomNotFoundInDatabaseException(Exception):
         self.message = f"Rom with id '{id}' not found"
         super().__init__(self.message)
         log.critical(self.message)
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=self.message
-        )
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=self.message)
 
     def __repr__(self) -> str:
         return self.message
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index 6c881efaa..998fa714d 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -8,9 +8,6 @@ from sqlalchemy.orm import Query, Session, selectinload
 from .base_handler import DBBaseHandler
 
 
-class ImplementationError(Exception): ...
-
-
 def with_details(func):
     @functools.wraps(func)
     def wrapper(*args, **kwargs):
diff --git a/frontend/src/components/Details/Saves.vue b/frontend/src/components/Details/Saves.vue
index 2b850f7b1..585d326b7 100644
--- a/frontend/src/components/Details/Saves.vue
+++ b/frontend/src/components/Details/Saves.vue
@@ -13,7 +13,6 @@ const { xs, smAndUp, mdAndUp } = useDisplay();
 const props = defineProps<{ rom: DetailedRom }>();
 const selectedSaves = ref<SaveSchema[]>([]);
 const emitter = inject<Emitter<Events>>("emitter");
-// emitter?.on("romUpdated", (romUpdated) => {});
 const HEADERS = [
   {
     title: "Name",
diff --git a/frontend/src/services/api/rom.ts b/frontend/src/services/api/rom.ts
index 828e0979d..1bc6aedbd 100644
--- a/frontend/src/services/api/rom.ts
+++ b/frontend/src/services/api/rom.ts
@@ -142,8 +142,6 @@ async function updateRom({
   const formData = new FormData();
   if (rom.igdb_id) formData.append("igdb_id", rom.igdb_id.toString());
   if (rom.moby_id) formData.append("moby_id", rom.moby_id.toString());
-  // if (rom.fav_sibling)
-  //   formData.append("fav_sibling", rom.fav_sibling.toString());
   formData.append("name", rom.name || "");
   formData.append("file_name", rom.file_name);
   formData.append("summary", rom.summary || "");
diff --git a/frontend/src/stores/roms.ts b/frontend/src/stores/roms.ts
index 2f13ea14b..4906f62b5 100644
--- a/frontend/src/stores/roms.ts
+++ b/frontend/src/stores/roms.ts
@@ -61,9 +61,17 @@ export default defineStore("roms", {
         ),
       )
         .map((games) => {
+          // Find the index of the game where the 'rom_user' property has 'is_main_sibling' set to true.
+          // If such a game is found, 'mainSiblingIndex' will be its index, otherwise it will be -1.
           const mainSiblingIndex = games.findIndex(
             (game) => game.rom_user?.is_main_sibling,
           );
+
+          // Determine the primary game:
+          // - If 'mainSiblingIndex' is not -1 (i.e., a main sibling game was found),
+          //   remove that game from the 'games' array and set it as 'primaryGame'.
+          // - If no main sibling game was found ('mainSiblingIndex' is -1),
+          //   remove the first game from the 'games' array and set it as 'primaryGame'.
           const primaryGame =
             mainSiblingIndex !== -1
               ? games.splice(mainSiblingIndex, 1)[0]

From 8ef52b87e41fa678e9a4c5f22d8509a86abef96e Mon Sep 17 00:00:00 2001
From: Zurdi <34356590+zurdi15@users.noreply.github.com>
Date: Tue, 2 Jul 2024 17:50:14 +0200
Subject: [PATCH 23/23] Update
 frontend/src/components/Details/Info/FileInfo.vue

Co-authored-by: Georges-Antoine Assi <3247106+gantoine@users.noreply.github.com>
---
 frontend/src/components/Details/Info/FileInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Details/Info/FileInfo.vue b/frontend/src/components/Details/Info/FileInfo.vue
index 05cca08ac..ac34f3c49 100644
--- a/frontend/src/components/Details/Info/FileInfo.vue
+++ b/frontend/src/components/Details/Info/FileInfo.vue
@@ -12,7 +12,7 @@ import { ref, watch } from "vue";
 const props = defineProps<{ rom: DetailedRom; platform: Platform }>();
 const downloadStore = storeDownload();
 const auth = storeAuth();
-const ownProps = ref(
+const romUser = ref(
   props.rom.rom_user ?? {
     id: null,
     user_id: auth.user?.id,