Handle playlist games with missing IDs

Namely Favorites.
oblivioncth · Aug 12, 2023 · 0d73e74 · 0d73e74
1 parent 9650445
commit 0d73e74
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -52,7 +52,7 @@ set(LIBFP_QX_COMPONENTS
 
 include(OB/FetchQx)
 ob_fetch_qx(
-    REF "87475b929b645665f92bdb0f6551aa63887c791f"
+    REF "6608e0a92d667846333c2349344771eb3c1a1c60"
     COMPONENTS
         ${LIBFP_QX_COMPONENTS}
 )

diff --git a/lib/include/fp/fp-items.h b/lib/include/fp/fp-items.h
@@ -307,7 +307,7 @@ class FP_FP_EXPORT PlaylistGame
 
     //-Instance Variables-----------------------------------------------------------------------------------------------
 private:
-    int mId;
+    std::optional<int> mId;
     QUuid mPlaylistId;
     int mOrder;
     QUuid mGameId;
@@ -318,7 +318,7 @@ class FP_FP_EXPORT PlaylistGame
 
     //-Instance Functions------------------------------------------------------------------------------------------------------
 public:
-    int id() const;
+    std::optional<int> id() const;
     QUuid playlistId() const;
     int order() const;
     QUuid gameId() const;
@@ -336,7 +336,7 @@ class FP_FP_EXPORT PlaylistGame::Builder
 
     //-Instance Functions------------------------------------------------------------------------------------------
 public:
-    Builder& wId(int id);
+    Builder& wId(std::optional<int> id);
     Builder& wPlaylistId(QStringView rawPlaylistId);
     Builder& wOrder(int order);
     Builder& wGameId(QStringView rawGameId);

diff --git a/lib/src/fp-items.cpp b/lib/src/fp-items.cpp
@@ -254,7 +254,7 @@ PlaylistGame::PlaylistGame() {}
 //-Instance Functions------------------------------------------------------------------------------------------------
 //Public:
 
-int PlaylistGame::id() const { return mId; }
+std::optional<int> PlaylistGame::id() const { return mId; }
 QUuid PlaylistGame::playlistId() const { return mPlaylistId; }
 int PlaylistGame::order() const { return mOrder; }
 QUuid PlaylistGame::gameId() const { return mGameId; }
@@ -269,7 +269,7 @@ PlaylistGame::Builder::Builder() {}
 
 //-Instance Functions------------------------------------------------------------------------------------------
 //Public:
-PlaylistGame::Builder& PlaylistGame::Builder::wId(int id) { mPlaylistGameBlueprint.mId = id; return *this; }
+PlaylistGame::Builder& PlaylistGame::Builder::wId(std::optional<int> id) { mPlaylistGameBlueprint.mId = id; return *this; }
 PlaylistGame::Builder& PlaylistGame::Builder::wPlaylistId(QStringView rawPlaylistId) { mPlaylistGameBlueprint.mPlaylistId = QUuid(rawPlaylistId); return *this; }
 PlaylistGame::Builder& PlaylistGame::Builder::wOrder(int order) { mPlaylistGameBlueprint.mOrder = order; return *this; }
 PlaylistGame::Builder& PlaylistGame::Builder::wGameId(QStringView rawGameId) { mPlaylistGameBlueprint.mGameId = QUuid(rawGameId); return *this; }

diff --git a/lib/src/fp-playlistmanager.cpp b/lib/src/fp-playlistmanager.cpp
@@ -13,7 +13,7 @@ namespace Json
 
 struct PlaylistGame
 {
-    int id;
+    std::optional<int> id;
     QString playlistId;
     int order;
     QString gameId;