✨ Display selected year sponsor (#113)

psbss · web-flow · commit 2c6770d8b141 · 2025-12-05T15:59:05.000+09:00
* Display selected year sponsor

* Fix tests

include SponsorsTests

* Show sponsors section if any plan has data.

* [Review] Modify fetch sponsors switch case
diff --git a/MyLibrary/Sources/DataClient/Client.swift b/MyLibrary/Sources/DataClient/Client.swift
@@ -8,7 +8,7 @@ public struct DataClient {
   public var fetchDay1: @Sendable () throws -> Conference
   public var fetchDay2: @Sendable () throws -> Conference
   public var fetchDay3: @Sendable () throws -> Conference
-  public var fetchSponsors: @Sendable () throws -> Sponsors
+  public var fetchSponsors: @Sendable (_ year: ConferenceYear) throws -> Sponsors
   public var fetchOrganizers: @Sendable () throws -> [Organizer]
   public var fetchSpeakers: @Sendable () throws -> [Speaker]
 }
@@ -31,8 +31,8 @@ extension DataClient: DependencyKey {
       let response = try jsonDecoder.decode(Conference.self, from: data)
       return response
     },
-    fetchSponsors: {
-      let data = loadDataFromBundle(fileName: "sponsors")
+    fetchSponsors: { year in
+      let data = loadDataFromBundle(fileName: "\(year.rawValue)-sponsors")
       let response = try jsonDecoder.decode(Sponsors.self, from: data)
       return response
     },
diff --git a/MyLibrary/Sources/DataClient/Resources/2025-sponsors.json b/MyLibrary/Sources/DataClient/Resources/2025-sponsors.json
diff --git a/MyLibrary/Sources/DataClient/Resources/2026-sponsors.json b/MyLibrary/Sources/DataClient/Resources/2026-sponsors.json
@@ -0,0 +1,10 @@
+{
+    "platinum": [],
+    "gold": [],
+    "silver": [],
+    "bronze": [],
+    "diversity": [],
+    "student": [],
+    "community": [],
+    "individual": []
+}
diff --git a/MyLibrary/Sources/SharedModels/ConferenceYear.swift b/MyLibrary/Sources/SharedModels/ConferenceYear.swift
@@ -1,8 +1,8 @@
-enum ConferenceYear: Int, CaseIterable {
+public enum ConferenceYear: Int, CaseIterable {
   case year2025 = 2025
   case year2026 = 2026
 
-  static var latest: Self {
+  public static var latest: Self {
     Self.allCases.max(by: { $0.rawValue < $1.rawValue })!
   }
 }
diff --git a/MyLibrary/Sources/SponsorFeature/Sponsors.swift b/MyLibrary/Sources/SponsorFeature/Sponsors.swift
@@ -40,7 +40,7 @@ public struct SponsorsList {
     Reduce { state, action in
       switch action {
       case .view(.onAppear):
-        state.sponsors = try! dataClient.fetchSponsors()
+        state.sponsors = try! dataClient.fetchSponsors(.year2026)
         return .none
 
       case .view(.sponsorTapped(let sponsor)):
diff --git a/MyLibrary/Tests/SponsorFeatureTests/SponsorsTests.swift b/MyLibrary/Tests/SponsorFeatureTests/SponsorsTests.swift
@@ -12,7 +12,9 @@ final class SponsorsTests: XCTestCase {
     let store = TestStore(initialState: SponsorsList.State()) {
       SponsorsList()
     } withDependencies: {
-      $0[DataClient.self].fetchSponsors = { @Sendable in .mock }
+      $0[DataClient.self].fetchSponsors = { @Sendable (_: ConferenceYear) throws -> Sponsors in
+        .mock
+      }
     }
 
     await store.send(\.view.onAppear) {
diff --git a/Website/Sources/Components/AccessComponent.swift b/Website/Sources/Components/AccessComponent.swift
@@ -1,4 +1,5 @@
 import Ignite
+import SharedModels
 
 struct AccessComponent: HTML {
   let year: ConferenceYear
diff --git a/Website/Sources/Components/MainFooter.swift b/Website/Sources/Components/MainFooter.swift
@@ -1,5 +1,6 @@
 import Foundation
 import Ignite
+import SharedModels
 
 struct MainFooter: HTML {
   let year: ConferenceYear
diff --git a/Website/Sources/Components/MainFooterWithBackground.swift b/Website/Sources/Components/MainFooterWithBackground.swift
@@ -1,4 +1,5 @@
 import Ignite
+import SharedModels
 
 struct MainFooterWithBackground: HTML {
   let year: ConferenceYear
diff --git a/Website/Sources/Components/MainNavigationBar.swift b/Website/Sources/Components/MainNavigationBar.swift
@@ -1,4 +1,5 @@
 import Ignite
+import SharedModels
 
 struct MainNavigationBar: HTML {
   let path: (ConferenceYear, SupportedLanguage) -> String
diff --git a/Website/Sources/Components/OutlineComponent.swift b/Website/Sources/Components/OutlineComponent.swift
@@ -1,4 +1,5 @@
 import Ignite
+import SharedModels
 
 struct OutlineComponent: HTML {
   let year: ConferenceYear
diff --git a/Website/Sources/ConferenceWebsite.swift b/Website/Sources/ConferenceWebsite.swift
@@ -1,6 +1,7 @@
 import Cocoa
 import Foundation
 import Ignite
+import SharedModels
 
 @main
 struct ConferenceWebsite {
diff --git a/Website/Sources/Pages/CodeOfConduct.swift b/Website/Sources/Pages/CodeOfConduct.swift
@@ -1,4 +1,5 @@
 import Ignite
+import SharedModels
 
 enum CodeOfConductSectionType: String, SectionDefinition {
   case communityParticipation = "Participation in the Community"
diff --git a/Website/Sources/Pages/FAQ.swift b/Website/Sources/Pages/FAQ.swift
@@ -1,4 +1,5 @@
 import Ignite
+import SharedModels
 
 enum FAQSectionType: String, SectionDefinition {
   case aboutTrySwift = "Q. What's try! Swift?"
diff --git a/Website/Sources/Pages/HomeSections.swift b/Website/Sources/Pages/HomeSections.swift
@@ -25,7 +25,7 @@ extension HomeSectionType {
   func isAvailable(for year: ConferenceYear) -> Bool {
     switch year {
     case .year2025: true
-    case .year2026: [.about, .outline, .tickets, .access, .meetTheHosts, .meetTheOrganizers].contains(self)
+    case .year2026: [.about, .outline, .tickets, .access, .meetTheHosts, .sponsor, .meetTheOrganizers].contains(self)
     }
   }
 
@@ -132,9 +132,11 @@ extension HomeSectionType {
         }
       }
     case .sponsor:
-      SectionHeader(type: self, language: language)
+      let sponsors = try! dataClient.fetchSponsors(year)
+      if sponsors.allPlans.values.contains(where: { !$0.isEmpty }) {
+        SectionHeader(type: self, language: language)
+      }
 
-      let sponsors = try! dataClient.fetchSponsors()
       ForEach(Plan.allCases) { plan in
         if let sponsors = sponsors.allPlans[plan], !sponsors.isEmpty {
           Text(plan.rawValue.localizedCapitalized.uppercased())
diff --git a/Website/Sources/Pages/PrivacyPolicy.swift b/Website/Sources/Pages/PrivacyPolicy.swift
@@ -1,4 +1,5 @@
 import Ignite
+import SharedModels
 
 enum PrivacyPolicySectionType: String, SectionDefinition {
   case announcementForUS = "" // Untitled

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-enum ConferenceYear: Int, CaseIterable {`
	`1`	`+public enum ConferenceYear: Int, CaseIterable {`
`2`	`2`	`case year2025 = 2025`
`3`	`3`	`case year2026 = 2026`
`4`	`4`
`5`		`- static var latest: Self {`
	`5`	`+ public static var latest: Self {`
`6`	`6`	`Self.allCases.max(by: { $0.rawValue < $1.rawValue })!`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import Ignite`
	`2`	`+import SharedModels`
`2`	`3`
`3`	`4`	`struct AccessComponent: HTML {`
`4`	`5`	`let year: ConferenceYear`