Fix delete message parsing

ShrapnelDSP · Dec 10, 2023 · 5de686a · 5de686a
1 parent a842751
commit 5de686a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/firmware/components/presets/src/presets_json_parser.cpp b/firmware/components/presets/src/presets_json_parser.cpp
@@ -122,16 +122,12 @@ std::optional<Update> from_json(const rapidjson::Value &json)
 template <>
 std::optional<Delete> from_json(const rapidjson::Value &json)
 {
-    auto id_json = json.FindMember("selectedPreset");
+    auto id_json = json.FindMember("id");
     if(id_json == json.MemberEnd())
-    {
         return std::nullopt;
-    }
 
     if(!id_json->value.IsUint())
-    {
         return std::nullopt;
-    }
 
     return {{.id{id_json->value.GetUint()}}};
 }

diff --git a/test/integration/integration_test.cpp b/test/integration/integration_test.cpp
@@ -66,17 +66,26 @@ class FakeStorage final : public shrapnel::persistence::Storage
                 save,
                 ((const char *key), (etl::string_view data)),
                 (override));
+    MOCK_METHOD(int,
+                save,
+                ((const char *key), (uint32_t data)),
+                (override));
     MOCK_METHOD(int,
                 load,
                 ((const char *key), (etl::istring & data)),
                 (override));
+    MOCK_METHOD(int,
+                load,
+                ((const char *key), (uint32_t & data)),
+                (override));
 };
 
 class Integration : public ::testing::Test
 {
 protected:
     Integration()
         : audio_params(std::make_unique<shrapnel::AudioParameters>()),
+          storage{std::make_shared<FakeStorage>()},
           uut{send_message_fn, in_queue, &midi_uart, audio_params, storage}
     {
     }
@@ -100,7 +109,7 @@ class Integration : public ::testing::Test
     shrapnel::Queue<AppMessage, QUEUE_LEN> in_queue;
     FakeMidiUart midi_uart;
     std::shared_ptr<shrapnel::AudioParameters> audio_params;
-    FakeStorage storage;
+    std::shared_ptr<FakeStorage> storage;
     shrapnel::MainThread<shrapnel::MAX_PARAMETERS, QUEUE_LEN> uut;
 };