add custom club name option in tournament for calling teams

PadelClubData/Data/Gen/BaseTournament.swift

@@ -85,6 +85,7 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
     public var clubMemberFeeDeduction: Double? = nil
     public var unregisterDeltaInHours: Int = 24
     public var currencyCode: String? = nil
+    public var customClubName: String? = nil
 
     public init(
         id: String = Store.randomId(),
@@ -158,7 +159,8 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
         showTeamsInProg: Bool = false,
         clubMemberFeeDeduction: Double? = nil,
         unregisterDeltaInHours: Int = 24,
-        currencyCode: String? = nil
+        currencyCode: String? = nil,
+        customClubName: String? = nil
     ) {
         super.init()
         self.id = id
@@ -233,6 +235,7 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
         self.clubMemberFeeDeduction = clubMemberFeeDeduction
         self.unregisterDeltaInHours = unregisterDeltaInHours
         self.currencyCode = currencyCode
+        self.customClubName = customClubName
     }
     required public override init() {
         super.init()
@@ -313,6 +316,7 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
         case _clubMemberFeeDeduction = "clubMemberFeeDeduction"
         case _unregisterDeltaInHours = "unregisterDeltaInHours"
         case _currencyCode = "currencyCode"
+        case _customClubName = "customClubName"
     }
 
     private static func _decodePayment(container: KeyedDecodingContainer<CodingKeys>) throws -> TournamentPayment? {
@@ -456,6 +460,7 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
         self.clubMemberFeeDeduction = try container.decodeIfPresent(Double.self, forKey: ._clubMemberFeeDeduction) ?? nil
         self.unregisterDeltaInHours = try container.decodeIfPresent(Int.self, forKey: ._unregisterDeltaInHours) ?? 24
         self.currencyCode = try container.decodeIfPresent(String.self, forKey: ._currencyCode) ?? nil
+        self.customClubName = try container.decodeIfPresent(String.self, forKey: ._customClubName) ?? nil
         try super.init(from: decoder)
     }
 
@@ -533,6 +538,7 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
         try container.encode(self.clubMemberFeeDeduction, forKey: ._clubMemberFeeDeduction)
         try container.encode(self.unregisterDeltaInHours, forKey: ._unregisterDeltaInHours)
         try container.encode(self.currencyCode, forKey: ._currencyCode)
+        try container.encode(self.customClubName, forKey: ._customClubName)
         try super.encode(to: encoder)
     }
 
@@ -615,6 +621,7 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
         self.clubMemberFeeDeduction = tournament.clubMemberFeeDeduction
         self.unregisterDeltaInHours = tournament.unregisterDeltaInHours
         self.currencyCode = tournament.currencyCode
+        self.customClubName = tournament.customClubName
     }
 
     public static func parentRelationships() -> [Relationship] {

PadelClubData/Data/Gen/Tournament.json

@@ -372,6 +372,11 @@
           "name": "currencyCode",
           "type": "String",
           "optional": true
+        },
+        {
+            "name": "customClubName",
+            "type": "String",
+            "optional": true
         }
       ]
     }

PadelClubData/Data/Tournament.swift

@@ -708,7 +708,7 @@ defer {
         var groupStageTeamCount: Int = groupStageSpots - wcGroupStage.count
         if groupStageTeamCount < 0 { groupStageTeamCount = 0 }
         if bracketSeeds < 0 { bracketSeeds = 0 }
-
+        let clubName = self.clubName
         if prioritizeClubMembers {
 
             var bracketTeams: [TeamRegistration] = []
@@ -2351,7 +2351,7 @@ defer {
     }
     
     public func mailSubject() -> String {
-        let subject = [tournamentTitle(hideSenior: true), formattedDate(.short), clubName].compactMap({ $0 }).joined(separator: " | ")
+        let subject = [tournamentTitle(hideSenior: true), formattedDate(.short), customClubName ?? clubName].compactMap({ $0 }).joined(separator: " | ")
         return subject
     }
     

PadelClubData/Utils/ContactManager.swift

@@ -76,7 +76,7 @@ Il est conseillé de vous présenter 10 minutes avant de jouer.\n\nMerci de me c
 
     static func callingCustomMessage(source: String? = nil, tournament: Tournament?, startDate: Date?, roundLabel: String) -> String {
         let tournamentCustomMessage = source ?? DataStore.shared.user.summonsMessageBody ?? defaultCustomMessage
-        let clubName = tournament?.clubName ?? ""
+        let clubName = tournament?.customClubName ?? tournament?.clubName ?? ""
 
         var text = tournamentCustomMessage
         let date = startDate ?? tournament?.startDate ?? Date()
@@ -107,7 +107,7 @@ Il est conseillé de vous présenter 10 minutes avant de jouer.\n\nMerci de me c
 
         let date = startDate ?? tournament?.startDate ?? Date()
 
-        let clubName = tournament?.clubName ?? ""
+        let clubName = tournament?.customClubName ?? tournament?.clubName ?? ""
         let message = DataStore.shared.user.summonsMessageBody ?? defaultCustomMessage
         let signature = DataStore.shared.user.getSummonsMessageSignature() ?? DataStore.shared.user.defaultSignature(tournament)