Merge branch 'main' of https://gitea.staxriver.com/staxriver/PadelClubData

PadelClubData/Data/Gen/BaseGroupStage.swift

@@ -17,9 +17,17 @@ public class BaseGroupStage: SyncedModelObject, SyncedStorable {
     public var index: Int = 0
     public var size: Int = 0
     public var format: MatchFormat? = nil
-    public var startDate: Date? = nil
+    public var startDate: Date? = nil {
+        didSet {
+            if self.tournamentValue()?.hasStarted() == false {
+                plannedStartDate = startDate
+            }
+        }
+    }
+    
     public var name: String? = nil
     public var step: Int = 0
+    public var plannedStartDate: Date? = nil
 
     public init(
         id: String = Store.randomId(),
@@ -29,7 +37,8 @@ public class BaseGroupStage: SyncedModelObject, SyncedStorable {
         format: MatchFormat? = nil,
         startDate: Date? = nil,
         name: String? = nil,
-        step: Int = 0
+        step: Int = 0,
+        plannedStartDate: Date? = nil
     ) {
         super.init()
         self.id = id
@@ -40,6 +49,7 @@ public class BaseGroupStage: SyncedModelObject, SyncedStorable {
         self.startDate = startDate
         self.name = name
         self.step = step
+        self.plannedStartDate = plannedStartDate
     }
     required public override init() {
         super.init()
@@ -54,6 +64,7 @@ public class BaseGroupStage: SyncedModelObject, SyncedStorable {
         case _startDate = "startDate"
         case _name = "name"
         case _step = "step"
+        case _plannedStartDate = "plannedStartDate"
     }
 
     required init(from decoder: Decoder) throws {
@@ -66,6 +77,7 @@ public class BaseGroupStage: SyncedModelObject, SyncedStorable {
         self.startDate = try container.decodeIfPresent(Date.self, forKey: ._startDate) ?? nil
         self.name = try container.decodeIfPresent(String.self, forKey: ._name) ?? nil
         self.step = try container.decodeIfPresent(Int.self, forKey: ._step) ?? 0
+        self.plannedStartDate = try container.decodeIfPresent(Date.self, forKey: ._plannedStartDate) ?? nil
         try super.init(from: decoder)
     }
 
@@ -79,6 +91,7 @@ public class BaseGroupStage: SyncedModelObject, SyncedStorable {
         try container.encode(self.startDate, forKey: ._startDate)
         try container.encode(self.name, forKey: ._name)
         try container.encode(self.step, forKey: ._step)
+        try container.encode(self.plannedStartDate, forKey: ._plannedStartDate)
         try super.encode(to: encoder)
     }
 
@@ -96,6 +109,7 @@ public class BaseGroupStage: SyncedModelObject, SyncedStorable {
         self.startDate = groupstage.startDate
         self.name = groupstage.name
         self.step = groupstage.step
+        self.plannedStartDate = groupstage.plannedStartDate
     }
 
     public static func relationships() -> [Relationship] {
@@ -104,4 +118,4 @@ public class BaseGroupStage: SyncedModelObject, SyncedStorable {
         ]
     }
 
-}
+}

PadelClubData/Data/Gen/BaseMatch.swift

@@ -15,7 +15,16 @@ public class BaseMatch: SyncedModelObject, SyncedStorable {
     public var id: String = Store.randomId()
     public var round: String? = nil
     public var groupStage: String? = nil
-    public var startDate: Date? = nil
+    public var startDate: Date? = nil {
+        didSet {
+            if self.roundValue()?.tournamentObject()?.hasStarted() == false {
+                plannedStartDate = startDate
+            } else if self.groupStageValue()?.tournamentObject()?.hasStarted() == false {
+                plannedStartDate = startDate
+            }
+        }
+    }
+    
     public var endDate: Date? = nil
     public var index: Int = 0
     public var format: MatchFormat? = nil
@@ -26,6 +35,7 @@ public class BaseMatch: SyncedModelObject, SyncedStorable {
     public var disabled: Bool = false
     public var courtIndex: Int? = nil
     public var confirmed: Bool = false
+    public var plannedStartDate: Date? = nil
 
     public init(
         id: String = Store.randomId(),
@@ -41,7 +51,8 @@ public class BaseMatch: SyncedModelObject, SyncedStorable {
         name: String? = nil,
         disabled: Bool = false,
         courtIndex: Int? = nil,
-        confirmed: Bool = false
+        confirmed: Bool = false,
+        plannedStartDate: Date? = nil
     ) {
         super.init()
         self.id = id
@@ -58,6 +69,7 @@ public class BaseMatch: SyncedModelObject, SyncedStorable {
         self.disabled = disabled
         self.courtIndex = courtIndex
         self.confirmed = confirmed
+        self.plannedStartDate = plannedStartDate
     }
     required public override init() {
         super.init()
@@ -78,6 +90,7 @@ public class BaseMatch: SyncedModelObject, SyncedStorable {
         case _disabled = "disabled"
         case _courtIndex = "courtIndex"
         case _confirmed = "confirmed"
+        case _plannedStartDate = "plannedStartDate"
     }
 
     required init(from decoder: Decoder) throws {
@@ -96,6 +109,7 @@ public class BaseMatch: SyncedModelObject, SyncedStorable {
         self.disabled = try container.decodeIfPresent(Bool.self, forKey: ._disabled) ?? false
         self.courtIndex = try container.decodeIfPresent(Int.self, forKey: ._courtIndex) ?? nil
         self.confirmed = try container.decodeIfPresent(Bool.self, forKey: ._confirmed) ?? false
+        self.plannedStartDate = try container.decodeIfPresent(Date.self, forKey: ._plannedStartDate) ?? nil
         try super.init(from: decoder)
     }
 
@@ -115,6 +129,7 @@ public class BaseMatch: SyncedModelObject, SyncedStorable {
         try container.encode(self.disabled, forKey: ._disabled)
         try container.encode(self.courtIndex, forKey: ._courtIndex)
         try container.encode(self.confirmed, forKey: ._confirmed)
+        try container.encode(self.plannedStartDate, forKey: ._plannedStartDate)
         try super.encode(to: encoder)
     }
 
@@ -144,6 +159,7 @@ public class BaseMatch: SyncedModelObject, SyncedStorable {
         self.disabled = match.disabled
         self.courtIndex = match.courtIndex
         self.confirmed = match.confirmed
+        self.plannedStartDate = match.plannedStartDate
     }
 
     public static func relationships() -> [Relationship] {
@@ -153,4 +169,4 @@ public class BaseMatch: SyncedModelObject, SyncedStorable {
         ]
     }
 
-}
+}

PadelClubData/Data/Gen/BaseRound.swift

@@ -17,9 +17,17 @@ public class BaseRound: SyncedModelObject, SyncedStorable {
     public var index: Int = 0
     public var parent: String? = nil
     public var format: MatchFormat? = nil
-    public var startDate: Date? = nil
+    public var startDate: Date? = nil {
+        didSet {
+            if self.tournamentValue()?.hasStarted() == false {
+                plannedStartDate = startDate
+            }
+        }
+    }
+    
     public var groupStageLoserBracket: Bool = false
     public var loserBracketMode: LoserBracketMode = .automatic
+    public var plannedStartDate: Date? = nil
 
     public init(
         id: String = Store.randomId(),
@@ -29,7 +37,8 @@ public class BaseRound: SyncedModelObject, SyncedStorable {
         format: MatchFormat? = nil,
         startDate: Date? = nil,
         groupStageLoserBracket: Bool = false,
-        loserBracketMode: LoserBracketMode = .automatic
+        loserBracketMode: LoserBracketMode = .automatic,
+        plannedStartDate: Date? = nil
     ) {
         super.init()
         self.id = id
@@ -40,6 +49,7 @@ public class BaseRound: SyncedModelObject, SyncedStorable {
         self.startDate = startDate
         self.groupStageLoserBracket = groupStageLoserBracket
         self.loserBracketMode = loserBracketMode
+        self.plannedStartDate = plannedStartDate
     }
     required public override init() {
         super.init()
@@ -54,6 +64,7 @@ public class BaseRound: SyncedModelObject, SyncedStorable {
         case _startDate = "startDate"
         case _groupStageLoserBracket = "groupStageLoserBracket"
         case _loserBracketMode = "loserBracketMode"
+        case _plannedStartDate = "plannedStartDate"
     }
 
     required init(from decoder: Decoder) throws {
@@ -66,6 +77,7 @@ public class BaseRound: SyncedModelObject, SyncedStorable {
         self.startDate = try container.decodeIfPresent(Date.self, forKey: ._startDate) ?? nil
         self.groupStageLoserBracket = try container.decodeIfPresent(Bool.self, forKey: ._groupStageLoserBracket) ?? false
         self.loserBracketMode = try container.decodeIfPresent(LoserBracketMode.self, forKey: ._loserBracketMode) ?? .automatic
+        self.plannedStartDate = try container.decodeIfPresent(Date.self, forKey: ._plannedStartDate) ?? nil
         try super.init(from: decoder)
     }
 
@@ -79,6 +91,7 @@ public class BaseRound: SyncedModelObject, SyncedStorable {
         try container.encode(self.startDate, forKey: ._startDate)
         try container.encode(self.groupStageLoserBracket, forKey: ._groupStageLoserBracket)
         try container.encode(self.loserBracketMode, forKey: ._loserBracketMode)
+        try container.encode(self.plannedStartDate, forKey: ._plannedStartDate)
         try super.encode(to: encoder)
     }
 
@@ -96,6 +109,7 @@ public class BaseRound: SyncedModelObject, SyncedStorable {
         self.startDate = round.startDate
         self.groupStageLoserBracket = round.groupStageLoserBracket
         self.loserBracketMode = round.loserBracketMode
+        self.plannedStartDate = round.plannedStartDate
     }
 
     public static func relationships() -> [Relationship] {
@@ -104,4 +118,4 @@ public class BaseRound: SyncedModelObject, SyncedStorable {
         ]
     }
 
-}
+}

PadelClubData/Data/Gen/BaseTournament.swift

@@ -79,6 +79,8 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
     public var enableTimeToConfirm: Bool = false
     public var isCorporateTournament: Bool = false
     public var isTemplate: Bool = false
+    public var publishProg: Bool = false
+    public var showTeamsInProg: Bool = false
 
     public init(
         id: String = Store.randomId(),
@@ -147,7 +149,9 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
         stripeAccountId: String? = nil,
         enableTimeToConfirm: Bool = false,
         isCorporateTournament: Bool = false,
-        isTemplate: Bool = false
+        isTemplate: Bool = false,
+        publishProg: Bool = false,
+        showTeamsInProg: Bool = false
     ) {
         super.init()
         self.id = id
@@ -217,6 +221,8 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
         self.enableTimeToConfirm = enableTimeToConfirm
         self.isCorporateTournament = isCorporateTournament
         self.isTemplate = isTemplate
+        self.publishProg = publishProg
+        self.showTeamsInProg = showTeamsInProg
     }
     required public override init() {
         super.init()
@@ -292,6 +298,8 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
         case _enableTimeToConfirm = "enableTimeToConfirm"
         case _isCorporateTournament = "isCorporateTournament"
         case _isTemplate = "isTemplate"
+        case _publishProg = "publishProg"
+        case _showTeamsInProg = "showTeamsInProg"
     }
 
     private static func _decodePayment(container: KeyedDecodingContainer<CodingKeys>) throws -> TournamentPayment? {
@@ -430,6 +438,8 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
         self.enableTimeToConfirm = try container.decodeIfPresent(Bool.self, forKey: ._enableTimeToConfirm) ?? false
         self.isCorporateTournament = try container.decodeIfPresent(Bool.self, forKey: ._isCorporateTournament) ?? false
         self.isTemplate = try container.decodeIfPresent(Bool.self, forKey: ._isTemplate) ?? false
+        self.publishProg = try container.decodeIfPresent(Bool.self, forKey: ._publishProg) ?? false
+        self.showTeamsInProg = try container.decodeIfPresent(Bool.self, forKey: ._showTeamsInProg) ?? false
         try super.init(from: decoder)
     }
 
@@ -502,6 +512,8 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
         try container.encode(self.enableTimeToConfirm, forKey: ._enableTimeToConfirm)
         try container.encode(self.isCorporateTournament, forKey: ._isCorporateTournament)
         try container.encode(self.isTemplate, forKey: ._isTemplate)
+        try container.encode(self.publishProg, forKey: ._publishProg)
+        try container.encode(self.showTeamsInProg, forKey: ._showTeamsInProg)
         try super.encode(to: encoder)
     }
 
@@ -579,6 +591,8 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
         self.enableTimeToConfirm = tournament.enableTimeToConfirm
         self.isCorporateTournament = tournament.isCorporateTournament
         self.isTemplate = tournament.isTemplate
+        self.publishProg = tournament.publishProg
+        self.showTeamsInProg = tournament.showTeamsInProg
     }
 
     public static func relationships() -> [Relationship] {

PadelClubData/Data/Gen/GroupStage.json

@@ -45,6 +45,11 @@
           "name": "step",
           "type": "Int",
           "defaultValue": "0"
+        },
+        {
+          "name": "plannedStartDate",
+          "type": "Date",
+          "optional": true
         }
       ],
       "tokenExemptedMethods": []

PadelClubData/Data/Gen/Match.json

@@ -76,6 +76,11 @@
           "name": "confirmed",
           "type": "Bool",
           "defaultValue": "false"
+        },
+        {
+          "name": "plannedStartDate",
+          "type": "Date",
+          "optional": true
         }
       ]
     }

PadelClubData/Data/Gen/Round.json

@@ -46,6 +46,11 @@
           "name": "loserBracketMode",
           "type": "LoserBracketMode",
           "defaultValue": ".automatic"
+        },
+        {
+          "name": "plannedStartDate",
+          "type": "Date",
+          "optional": true
         }
       ]
     }

PadelClubData/Data/Gen/Tournament.json

@@ -348,6 +348,16 @@
           "name": "isTemplate",
           "type": "Bool",
           "defaultValue": "false"
+        },
+        {
+          "name": "publishProg",
+          "type": "Bool",
+          "defaultValue": "false"
+        },
+        {
+          "name": "showTeamsInProg",
+          "type": "Bool",
+          "defaultValue": "false"
         }
       ]
     }

PadelClubData/Data/Round.swift

@@ -12,8 +12,13 @@ import SwiftUI
 @Observable
 final public class Round: BaseRound, SideStorable {
 
+    @ObservationIgnored
     private var _cachedSeedInterval: SeedInterval?
+    
+    @ObservationIgnored
     private var _cachedLoserRounds: [Round]?
+    
+    @ObservationIgnored
     private var _cachedLoserRoundsAndChildren: [Round]?
     
     public init(tournament: String, index: Int, parent: String? = nil, matchFormat: MatchFormat? = nil, startDate: Date? = nil, groupStageLoserBracket: Bool = false, loserBracketMode: LoserBracketMode = .automatic) {

PadelClubData/Data/TeamRegistration.swift

@@ -11,6 +11,8 @@ import SwiftUI
 
 @Observable
 final public class TeamRegistration: BaseTeamRegistration, SideStorable {
+    @ObservationIgnored
+    var _cachedRestingTime: (Bool, Date?)?
 
     public init(
         tournament: String, groupStage: String? = nil, registrationDate: Date? = nil,
@@ -595,8 +597,6 @@ final public class TeamRegistration: BaseTeamRegistration, SideStorable {
         }
     }
 
-    var _cachedRestingTime: (Bool, Date?)?
-
     public func restingTime() -> Date? {
         if let _cachedRestingTime { return _cachedRestingTime.1 }
         let restingTime = matches().filter({ $0.hasEnded() }).sorted(

PadelClubData/Data/Tournament.swift

@@ -125,6 +125,10 @@ final public class Tournament: BaseTournament {
     public func publishedTournamentDate() -> Date {
         return min(creationDate.tomorrowAtNine, startDate)
     }
+    
+    public func publishedProgDate() -> Date {
+        return self.startDate
+    }
 
     public func publishedTeamsDate() -> Date {
         return self.startDate
@@ -142,6 +146,10 @@ final public class Tournament: BaseTournament {
     public func isTournamentPublished() -> Bool {
         return (Date() >= publishedTournamentDate()) || publishTournament
     }
+    
+    public func isProgPublished() -> Bool {
+        return (Date() >= publishedProgDate()) || publishProg
+    }
 
     public func areTeamsPublished() -> Bool {
         return Date() >= startDate || publishTeams
@@ -1694,6 +1702,7 @@ defer {
         self.publishGroupStages = true
         self.publishRankings = true
         self.publishTournament = true
+        self.publishProg = true
 #else
         var shouldBePrivate = templateTournament?.isPrivate ?? true
         

PadelClubData/Utils/URLs.swift

@@ -58,6 +58,7 @@ public enum URLs: String, Identifiable {
 public enum PageLink: String, Identifiable, CaseIterable {
     case info = "Informations"
     case teams = "Équipes"
+    case programmation = "Programmation"
     case summons = "Convocations"
     case groupStages = "Poules"
     case matches = "Tournoi"
@@ -79,6 +80,8 @@ public enum PageLink: String, Identifiable, CaseIterable {
             return "info"
         case .teams:
             return "teams"
+        case .programmation:
+            return "prog"
         case .summons:
             return "summons"
         case .rankings: