Merge branch 'main'

online_payment
Raz 7 months ago
commit 4baf30647d
  1. 2
      PadelClub/Data/Club.swift
  2. 1
      PadelClub/Data/Gen/BaseClub.swift
  3. 1
      PadelClub/Data/Gen/BaseCourt.swift
  4. 1
      PadelClub/Data/Gen/BaseCustomUser.swift
  5. 1
      PadelClub/Data/Gen/BaseDateInterval.swift
  6. 1
      PadelClub/Data/Gen/BaseDrawLog.swift
  7. 1
      PadelClub/Data/Gen/BaseEvent.swift
  8. 1
      PadelClub/Data/Gen/BaseGroupStage.swift
  9. 1
      PadelClub/Data/Gen/BaseMatch.swift
  10. 1
      PadelClub/Data/Gen/BaseMatchScheduler.swift
  11. 1
      PadelClub/Data/Gen/BaseMonthData.swift
  12. 1
      PadelClub/Data/Gen/BasePlayerRegistration.swift
  13. 1
      PadelClub/Data/Gen/BasePurchase.swift
  14. 1
      PadelClub/Data/Gen/BaseRound.swift
  15. 3
      PadelClub/Data/Gen/BaseTeamRegistration.swift
  16. 1
      PadelClub/Data/Gen/BaseTeamScore.swift
  17. 1
      PadelClub/Data/Gen/BaseTournament.swift
  18. 1
      PadelClub/Data/Gen/Club.json
  19. 6
      PadelClub/Data/Gen/generator.py

@ -12,8 +12,6 @@ import LeStorage
@Observable
final class Club: BaseClub {
static var copyServerResponse: Bool { return true }
func clubTitle(_ displayStyle: DisplayStyle = .wide) -> String {
switch displayStyle {
case .wide, .title:

@ -10,6 +10,7 @@ class BaseClub: SyncedModelObject, SyncedStorable {
static func resourceName() -> String { return "clubs" }
static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
static var copyServerResponse: Bool = true
var id: String = Store.randomId()
var creator: String? = nil

@ -10,6 +10,7 @@ class BaseCourt: SyncedModelObject, SyncedStorable {
static func resourceName() -> String { return "courts" }
static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
static var copyServerResponse: Bool = false
var id: String = Store.randomId()
var index: Int = 0

@ -10,6 +10,7 @@ class BaseCustomUser: SyncedModelObject, SyncedStorable {
static func resourceName() -> String { return "users" }
static func tokenExemptedMethods() -> [HTTPMethod] { return [.post] }
static var copyServerResponse: Bool = false
var id: String = Store.randomId()
var username: String = ""

@ -10,6 +10,7 @@ class BaseDateInterval: SyncedModelObject, SyncedStorable {
static func resourceName() -> String { return "date-intervals" }
static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
static var copyServerResponse: Bool = false
var id: String = Store.randomId()
var event: String = ""

@ -10,6 +10,7 @@ class BaseDrawLog: SyncedModelObject, SyncedStorable {
static func resourceName() -> String { return "draw-logs" }
static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
static var copyServerResponse: Bool = false
var id: String = Store.randomId()
var tournament: String = ""

@ -10,6 +10,7 @@ class BaseEvent: SyncedModelObject, SyncedStorable {
static func resourceName() -> String { return "events" }
static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
static var copyServerResponse: Bool = false
var id: String = Store.randomId()
var creator: String? = nil

@ -10,6 +10,7 @@ class BaseGroupStage: SyncedModelObject, SyncedStorable {
static func resourceName() -> String { return "group-stages" }
static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
static var copyServerResponse: Bool = false
var id: String = Store.randomId()
var tournament: String = ""

@ -10,6 +10,7 @@ class BaseMatch: SyncedModelObject, SyncedStorable {
static func resourceName() -> String { return "matches" }
static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
static var copyServerResponse: Bool = false
var id: String = Store.randomId()
var round: String? = nil

@ -10,6 +10,7 @@ class BaseMatchScheduler: BaseModelObject, Storable {
static func resourceName() -> String { return "match-scheduler" }
static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
static var copyServerResponse: Bool = false
var id: String = Store.randomId()
var tournament: String = ""

@ -10,6 +10,7 @@ class BaseMonthData: BaseModelObject, Storable {
static func resourceName() -> String { return "month-data" }
static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
static var copyServerResponse: Bool = false
var id: String = Store.randomId()
var monthKey: String = ""

@ -10,6 +10,7 @@ class BasePlayerRegistration: SyncedModelObject, SyncedStorable {
static func resourceName() -> String { return "player-registrations" }
static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
static var copyServerResponse: Bool = false
var id: String = Store.randomId()
var teamRegistration: String? = nil

@ -8,6 +8,7 @@ class BasePurchase: SyncedModelObject, SyncedStorable {
static func resourceName() -> String { return "purchases" }
static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
static var copyServerResponse: Bool = false
var id: UInt64 = 0
var user: String = ""

@ -10,6 +10,7 @@ class BaseRound: SyncedModelObject, SyncedStorable {
static func resourceName() -> String { return "rounds" }
static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
static var copyServerResponse: Bool = false
var id: String = Store.randomId()
var tournament: String = ""

@ -10,6 +10,7 @@ class BaseTeamRegistration: SyncedModelObject, SyncedStorable {
static func resourceName() -> String { return "team-registrations" }
static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
static var copyServerResponse: Bool = false
var id: String = Store.randomId()
var tournament: String = ""
@ -195,4 +196,4 @@ class BaseTeamRegistration: SyncedModelObject, SyncedStorable {
]
}
}
}

@ -10,6 +10,7 @@ class BaseTeamScore: SyncedModelObject, SyncedStorable {
static func resourceName() -> String { return "team-scores" }
static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
static var copyServerResponse: Bool = false
var id: String = Store.randomId()
var match: String = ""

@ -10,6 +10,7 @@ class BaseTournament: SyncedModelObject, SyncedStorable {
static func resourceName() -> String { return "tournaments" }
static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
static var copyServerResponse: Bool = false
var id: String = Store.randomId()
var event: String? = nil

@ -4,6 +4,7 @@
"name": "Club",
"synchronizable": true,
"observable": true,
"copy_server_response": "true",
"properties": [
{
"name": "id",

@ -24,6 +24,7 @@ class SwiftModelGenerator:
resource = self.make_resource_name(model_name)
resource_name = model_data.get("resource_name", resource)
token_exempted = model_data.get("tokenExemptedMethods", [])
copy_server_response = model_data.get("copy_server_response", "false")
lines = ["// Generated by SwiftModelGenerator", "// Do not modify this file manually", ""]
@ -43,7 +44,7 @@ class SwiftModelGenerator:
lines.append("")
# Add SyncedStorable protocol requirements
lines.extend(self._generate_protocol_requirements(resource_name, token_exempted))
lines.extend(self._generate_protocol_requirements(resource_name, token_exempted, copy_server_response))
lines.append("")
# Properties
@ -371,7 +372,7 @@ class SwiftModelGenerator:
lines.append(" }")
return lines
def _generate_protocol_requirements(self, resource_name: str, token_exempted: List[str]) -> List[str]:
def _generate_protocol_requirements(self, resource_name: str, token_exempted: List[str], copy_server_response: str) -> List[str]:
"""Generate the static functions required by SyncedStorable protocol."""
# Convert HTTP methods to proper format
formatted_methods = [f".{method.lower()}" for method in token_exempted]
@ -380,6 +381,7 @@ class SwiftModelGenerator:
return [
f" static func resourceName() -> String {{ return \"{resource_name}\" }}",
f" static func tokenExemptedMethods() -> [HTTPMethod] {{ return [{methods_str}] }}",
f" static var copyServerResponse: Bool = {copy_server_response}",
]
def _generate_relationships(self, model_name, properties: List[Dict[str, Any]]) -> List[str]:

Loading…
Cancel
Save