Correctly reverse score for fabricated playermatches

Author: madduck

pyproject.toml

@@ -13,7 +13,7 @@ write_to = "_version.py"
 
 [project]
 name = "tptools"
-version = "0.6.0.1"
+version = "0.6.1"
 authors = [{ name = "martin f. krafft", email = "[email protected]" }]
 description = "A set of tools to export data from with TournamentSoftware"
 readme = "README.md"

tests/test_tpmatchmaker.py

@@ -270,6 +270,56 @@ def test_resolve_unmatched_fabricate(
     assert len(matchmaker.unmatched) == 0
 
 
+def test_resolve_unmatched_fabricate_scores_reversed(
+    matchmaker: TPMatchMaker,
+    TPPlayerMatchFactory: TPPlayerMatchFactoryType,
+    tpentry1: TPEntry,
+) -> None:
+    common = {
+        "matchnr": 1,
+        "van1": 3001,
+        "van2": 3002,
+    }
+    srcpm1 = TPPlayerMatchFactory(**common | {"planning": 2001, "wn": 1001, "vn": None})
+    srcpm2 = TPPlayerMatchFactory(
+        **common
+        | {
+            "planning": 2002,
+            "wn": 1003,
+            "vn": 1004,
+        }
+    )
+    pm = TPPlayerMatchFactory(
+        matchnr=2,
+        planning=1001,
+        van1=2001,
+        van2=2002,
+        winner=1,
+        team1set1=11,
+        team2set1=5,
+        team1set2=11,
+        team2set2=6,
+        team1set3=7,
+        team2set3=11,
+        team1set4=11,
+        team2set4=8,
+        entry=tpentry1,
+    )
+
+    matchmaker.add_playermatch(srcpm1)
+    matchmaker.add_playermatch(srcpm2)
+    matchmaker.add_playermatch(pm)
+
+    matchmaker.resolve_unmatched()
+
+    m = [m for m in matchmaker.matches if m.id == "1-2"][0]
+
+    assert m.pm1.get_scores() == m.pm2.get_scores(reversed=True)
+
+    assert len(matchmaker.matches) == 2
+    assert len(matchmaker.unmatched) == 0
+
+
 def test_resolve_unmatched_fabricate_1st_round(
     matchmaker: TPMatchMaker,
     pmplayer1: TPPlayerMatch,

tptools/tpmatch.py

@@ -82,9 +82,9 @@ def _check_score_consistency(self) -> Self:
             and len(sc2) == 0
         ):
             return self
-        # assert (sc1 := self.pm1.get_scores(reversed=self.pm1.winner == 2)) == sc2, (
-        #     f"PlayerMatches have different scorelines: {sc1} vs. {sc2}"
-        # )
+        assert (sc1 := self.pm1.get_scores(reversed=self.pm1.winner == 2)) == sc2, (
+            f"PlayerMatches have different scorelines: {sc1} vs. {sc2}"
+        )
         return self
 
     @model_validator(mode="after")
@@ -384,6 +384,12 @@ def resolve_unmatched(self) -> None:
                 ):  # pragma: nocover — there is a missed branch here, but I cannot be
                     # bothered.
                     mmlogger.info(f"Fabricating a PlayerMatch to match single {pm!r}")
+
+                    scores = pm.get_scores(reversed=True)
+                    sup: dict[str, int] = {}
+                    for g, sc in enumerate(scores, 1):
+                        sup |= {f"team{t + 1}set{g}": sc[t] for t in range(2)}
+
                     self.add_playermatch(
                         pm.model_copy(
                             update={
@@ -395,6 +401,7 @@ def resolve_unmatched(self) -> None:
                                 else None,
                                 "entry": None,
                             }
+                            | sup
                         )
                     )