From b364e20aaaef4148aa889a641e35b0c2376d0529 Mon Sep 17 00:00:00 2001 From: Laurent Date: Tue, 1 Apr 2025 19:01:55 +0200 Subject: [PATCH] Fix isCanceled and payment not being properly encoded --- PadelClub/Data/Gen/BaseTournament.swift | 6 +++--- PadelClub/Data/Gen/Tournament.json | 6 ++++-- PadelClub/Data/Gen/generator.py | 8 ++++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/PadelClub/Data/Gen/BaseTournament.swift b/PadelClub/Data/Gen/BaseTournament.swift index 2fe870f..96682aa 100644 --- a/PadelClub/Data/Gen/BaseTournament.swift +++ b/PadelClub/Data/Gen/BaseTournament.swift @@ -221,10 +221,10 @@ class BaseTournament: SyncedModelObject, SyncedStorable { case _qualifiedPerGroupStage = "qualifiedPerGroupStage" case _teamsPerGroupStage = "teamsPerGroupStage" case _entryFee = "entryFee" - case _payment = "payment" + case _payment = "globalId" case _additionalEstimationDuration = "additionalEstimationDuration" case _isDeleted = "isDeleted" - case _isCanceled = "isCanceled" + case _isCanceled = "localId" case _publishTeams = "publishTeams" case _publishSummons = "publishSummons" case _publishGroupStages = "publishGroupStages" @@ -519,4 +519,4 @@ class BaseTournament: SyncedModelObject, SyncedStorable { ] } -} \ No newline at end of file +} diff --git a/PadelClub/Data/Gen/Tournament.json b/PadelClub/Data/Gen/Tournament.json index 0b474c9..1262af0 100644 --- a/PadelClub/Data/Gen/Tournament.json +++ b/PadelClub/Data/Gen/Tournament.json @@ -137,7 +137,8 @@ "type": "TournamentPayment", "optional": true, "defaultValue": "nil", - "encryption": "tournament_payment" + "encryption": "tournament_payment", + "codingKey": "globalId" }, { "name": "additionalEstimationDuration", @@ -153,7 +154,8 @@ "name": "isCanceled", "type": "Bool", "defaultValue": "false", - "encryption": "tournament_iscanceled" + "encryption": "tournament_iscanceled", + "codingKey": "localId" }, { "name": "publishTeams", diff --git a/PadelClub/Data/Gen/generator.py b/PadelClub/Data/Gen/generator.py index a8ece00..722fd6a 100644 --- a/PadelClub/Data/Gen/generator.py +++ b/PadelClub/Data/Gen/generator.py @@ -170,9 +170,13 @@ class SwiftModelGenerator: lines = [" enum CodingKeys: String, CodingKey {"] for prop in properties: name = prop['name'] - # Add underscore prefix to case name if observable, but keep the string value without underscore + # Add underscore prefix to case name if observable case_name = f"_{name}" if is_observable else name - lines.append(f" case {case_name} = \"{name}\"") + + # Use custom codingKey if provided, otherwise use the property name + coding_key_value = prop.get("codingKey", name) + + lines.append(f" case {case_name} = \"{coding_key_value}\"") lines.append(" }") return lines