Fix isCanceled and payment not being properly encoded

sync_v2
Laurent 7 months ago
parent c4c2a5a893
commit b364e20aaa
  1. 6
      PadelClub/Data/Gen/BaseTournament.swift
  2. 6
      PadelClub/Data/Gen/Tournament.json
  3. 8
      PadelClub/Data/Gen/generator.py

@ -221,10 +221,10 @@ class BaseTournament: SyncedModelObject, SyncedStorable {
case _qualifiedPerGroupStage = "qualifiedPerGroupStage" case _qualifiedPerGroupStage = "qualifiedPerGroupStage"
case _teamsPerGroupStage = "teamsPerGroupStage" case _teamsPerGroupStage = "teamsPerGroupStage"
case _entryFee = "entryFee" case _entryFee = "entryFee"
case _payment = "payment" case _payment = "globalId"
case _additionalEstimationDuration = "additionalEstimationDuration" case _additionalEstimationDuration = "additionalEstimationDuration"
case _isDeleted = "isDeleted" case _isDeleted = "isDeleted"
case _isCanceled = "isCanceled" case _isCanceled = "localId"
case _publishTeams = "publishTeams" case _publishTeams = "publishTeams"
case _publishSummons = "publishSummons" case _publishSummons = "publishSummons"
case _publishGroupStages = "publishGroupStages" case _publishGroupStages = "publishGroupStages"
@ -519,4 +519,4 @@ class BaseTournament: SyncedModelObject, SyncedStorable {
] ]
} }
} }

@ -137,7 +137,8 @@
"type": "TournamentPayment", "type": "TournamentPayment",
"optional": true, "optional": true,
"defaultValue": "nil", "defaultValue": "nil",
"encryption": "tournament_payment" "encryption": "tournament_payment",
"codingKey": "globalId"
}, },
{ {
"name": "additionalEstimationDuration", "name": "additionalEstimationDuration",
@ -153,7 +154,8 @@
"name": "isCanceled", "name": "isCanceled",
"type": "Bool", "type": "Bool",
"defaultValue": "false", "defaultValue": "false",
"encryption": "tournament_iscanceled" "encryption": "tournament_iscanceled",
"codingKey": "localId"
}, },
{ {
"name": "publishTeams", "name": "publishTeams",

@ -170,9 +170,13 @@ class SwiftModelGenerator:
lines = [" enum CodingKeys: String, CodingKey {"] lines = [" enum CodingKeys: String, CodingKey {"]
for prop in properties: for prop in properties:
name = prop['name'] 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 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(" }") lines.append(" }")
return lines return lines

Loading…
Cancel
Save