leverage concepts and provide a templateized Enumerate function

lib/resources/resource.cpp

@@ -1,6 +1,7 @@
 #include "resource.hpp"
 
 #include <atomic>
+#include <functional>
 #include <optional>
 
 using pixelarium::imaging::PixelariumImage;

lib/resources/resource.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <concepts>
 #include <functional>
 #include <memory>
 #include <optional>
@@ -17,17 +18,16 @@ struct IResource
 template <typename R>
 concept ResT = requires(R& r) { static_cast<IResource&>(r); };
 
-// template <ResT R>
+template <typename ResT>
-template <typename R>
 class IResourcePool
 {
    public:
     virtual ~IResourcePool() = default;
-    virtual std::optional<const R*> GetResource(size_t id) const = 0;
+    virtual std::optional<const ResT*> GetResource(size_t id) const = 0;
-    virtual size_t SetResource(std::unique_ptr<R> res) = 0;
+    virtual size_t SetResource(std::unique_ptr<ResT> res) = 0;
-    virtual bool ModifyResource(size_t id, std::unique_ptr<R> res) = 0;
+    virtual bool ModifyResource(size_t id, std::unique_ptr<ResT> res) = 0;
     virtual bool DeleteResource(size_t id) = 0;
-    virtual void EnumerateResources(const std::function<void(size_t, const R&)>& func) = 0;
+    virtual void EnumerateResources(const std::function<void(size_t, const ResT&)>& func) = 0;
     virtual size_t GetTotalSize() const = 0;
 };
 
@@ -53,7 +53,18 @@ class ImageResourcePool : public IResourcePool<imaging::PixelariumImage>
 
     void EnumerateResources(const std::function<void(size_t, const imaging::PixelariumImage&)>& func) override;
 
-    size_t GetTotalSize() const override { return resources_.size();}
+    template <typename Callable>
+    requires std::invocable<Callable, size_t, const imaging::PixelariumImage&>
+    void Enumerate(Callable&& func) const
+    {
+        for (const auto& e : this->resources_)
+        {
+            func(e.first, *e.second);
+        }
+    }
+
+    size_t GetTotalSize() const override { return resources_.size(); }
+
    private:
     std::unordered_map<size_t, std::unique_ptr<imaging::PixelariumImage>> resources_;
 };

tests/lib/resources/test_resource.cpp

@@ -90,3 +90,17 @@ TEST(ImageResourcePoolTest, EnumerateResources)
     EXPECT_NE(std::find(found_ids.begin(), found_ids.end(), id1), found_ids.end());
     EXPECT_NE(std::find(found_ids.begin(), found_ids.end(), id2), found_ids.end());
 }
+
+TEST(ImageResourcePoolTest, TemplatedEnumerate)
+{
+    ImageResourcePool pool;
+    auto id1 = pool.SetResource(std::make_unique<DummyImage>());
+    auto id2 = pool.SetResource(std::make_unique<DummyImage>());
+    std::vector<size_t> found_ids{};
+
+    pool.Enumerate([&found_ids](size_t id, const pixelarium::imaging::PixelariumImage& img) { found_ids.push_back(id); });
+
+    EXPECT_EQ(found_ids.size(), 2);
+    EXPECT_NE(std::find(found_ids.begin(), found_ids.end(), id1), found_ids.end());
+    EXPECT_NE(std::find(found_ids.begin(), found_ids.end(), id2), found_ids.end());
+}