set collection

core/include/ccm/services/DigiBattle99SetCompletion.hpp

@@ -3,12 +3,15 @@
 // Pure helpers: Digi-Battle set-completion progress and per-set checklists.
 // Ownership counts only when collection card.set.id matches the pack and the
 // normalized setNo appears in that pack's catalog. Duplicates / amount do not
-// inflate the numerator.
+// inflate the numerator. An optional languageFilter restricts ownership to
+// cards of that language (packs with zero matches are omitted).
 
 #include "ccm/domain/DigiBattle99Card.hpp"
 #include "ccm/domain/DigiBattle99SetCatalog.hpp"
+#include "ccm/domain/Enums.hpp"
 
 #include <cstddef>
+#include <optional>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -33,16 +36,24 @@ struct DigiBattle99ChecklistEntry {
     bool        owned{false};
 };
 
+// Distinct languages present in the collection, in allLanguages() order.
+[[nodiscard]] std::vector<Language>
+digiBattle99LanguagesInCollection(const std::vector<DigiBattle99Card>& collection);
+
 // Packs where the collection owns ≥1 card with matching set.id, ordered by
-// setName. Packs absent from the catalog are skipped.
+// setName. Packs absent from the catalog are skipped. When languageFilter is
+// set, only cards of that language count toward ownership.
 [[nodiscard]] std::vector<DigiBattle99SetCompletionProgress>
 computeDigiBattle99SetCompletion(const std::vector<DigiBattle99Card>& collection,
-                                 const DigiBattle99SetCatalog&        catalog);
+                                 const DigiBattle99SetCatalog&        catalog,
+                                 std::optional<Language> languageFilter = std::nullopt);
 
 // Full catalog checklist for one pack; owned flags from the collection.
+// When languageFilter is set, only cards of that language count as owned.
 [[nodiscard]] std::vector<DigiBattle99ChecklistEntry>
 digiBattle99ChecklistForSet(const std::vector<DigiBattle99Card>& collection,
                             const DigiBattle99SetCatalog&        catalog,
-                            std::string_view                     setId);
+                            std::string_view                     setId,
+                            std::optional<Language> languageFilter = std::nullopt);
 
 }  // namespace ccm

core/src/services/DigiBattle99SetCompletion.cpp

@@ -3,6 +3,7 @@
 #include "ccm/games/digibattle99/DigiBattle99CardPreviewSource.hpp"
 
 #include <algorithm>
+#include <array>
 #include <unordered_map>
 #include <unordered_set>
 
@@ -12,9 +13,16 @@ namespace {
 
 using OwnedBySet = std::unordered_map<std::string, std::unordered_set<std::string>>;
 
-OwnedBySet ownedSetNosBySetId(const std::vector<DigiBattle99Card>& collection) {
+bool passesLanguageFilter(const DigiBattle99Card& card,
+                          std::optional<Language> languageFilter) {
+    return !languageFilter.has_value() || card.language == *languageFilter;
+}
+
+OwnedBySet ownedSetNosBySetId(const std::vector<DigiBattle99Card>& collection,
+                              std::optional<Language>              languageFilter) {
     OwnedBySet out;
     for (const auto& card : collection) {
+        if (!passesLanguageFilter(card, languageFilter)) continue;
         if (card.set.id.empty()) continue;
         const std::string setNo =
             DigiBattle99CardPreviewSource::normalizeCardNumber(card.setNo);
@@ -26,10 +34,31 @@ OwnedBySet ownedSetNosBySetId(const std::vector<DigiBattle99Card>& collection) {
 
 }  // namespace
 
+std::vector<Language>
+digiBattle99LanguagesInCollection(const std::vector<DigiBattle99Card>& collection) {
+    const auto& langs = allLanguages();
+    std::array<bool, 10> present{};
+    for (const auto& card : collection) {
+        for (std::size_t i = 0; i < langs.size(); ++i) {
+            if (langs[i] == card.language) {
+                present[i] = true;
+                break;
+            }
+        }
+    }
+
+    std::vector<Language> out;
+    for (std::size_t i = 0; i < langs.size(); ++i) {
+        if (present[i]) out.push_back(langs[i]);
+    }
+    return out;
+}
+
 std::vector<DigiBattle99SetCompletionProgress>
 computeDigiBattle99SetCompletion(const std::vector<DigiBattle99Card>& collection,
-                                 const DigiBattle99SetCatalog&        catalog) {
-    const OwnedBySet owned = ownedSetNosBySetId(collection);
+                                 const DigiBattle99SetCatalog&        catalog,
+                                 std::optional<Language>              languageFilter) {
+    const OwnedBySet owned = ownedSetNosBySetId(collection, languageFilter);
 
     std::vector<DigiBattle99SetCompletionProgress> out;
     out.reserve(owned.size());
@@ -64,12 +93,14 @@ computeDigiBattle99SetCompletion(const std::vector<DigiBattle99Card>& collection
 std::vector<DigiBattle99ChecklistEntry>
 digiBattle99ChecklistForSet(const std::vector<DigiBattle99Card>& collection,
                             const DigiBattle99SetCatalog&        catalog,
-                            std::string_view                     setId) {
+                            std::string_view                     setId,
+                            std::optional<Language>              languageFilter) {
     const auto* pack = catalog.findPack(setId);
     if (pack == nullptr) return {};
 
     std::unordered_set<std::string> ownedNos;
     for (const auto& card : collection) {
+        if (!passesLanguageFilter(card, languageFilter)) continue;
         if (card.set.id != setId) continue;
         const std::string setNo =
             DigiBattle99CardPreviewSource::normalizeCardNumber(card.setNo);