Merge pull request #24 from engingulek/feature/update-with-concurrency

Feature/update with concurrency

Author: engingulek

.DS_Store

@@ -9,12 +9,12 @@ import Foundation
 import ICTMDBNetworkManagerKit
 
 
-final class HomeInteractor: PresenterToInteractorHomeProtocol {
-
+final class HomeInteractor: PresenterToInteractorHomeProtocol,@unchecked Sendable {
+  
     // MARK: - Properties
 
     /// Reference to the Presenter to send data or errors back.
-    var presenter: (any InteractorToPresenterHomeProtocol)?
+   weak var presenter: (any InteractorToPresenterHomeProtocol)?
 
     /// Network manager responsible for API requests.
     private let network: NetworkManagerProtocol
@@ -26,41 +26,20 @@ final class HomeInteractor: PresenterToInteractorHomeProtocol {
         self.network = network
     }
 
-    // MARK: - Popular TV Shows
-    
-    /// Requests popular TV shows data
-    func loadPopularMovies() async {
-        let request = PopularMoviesRequest(
-            language: deviceLanguageCode == .turkish ? .tr : .en,
-            page: 1
-        )
-
-        do {
-            let list = try await network.execute(request)
-             presenter?.sendPopularTvShows(list.results)
-        } catch {
-             presenter?.sendError(.popular)
-        }
-    }
-
-
-    
-    // MARK: - Airing Today TV Shows
-    
-    /// Requests airing today TV shows data
-    
-    func loadAiringMovies() async  {
-        let request = AiringTodayRequest(
-            language: deviceLanguageCode == .turkish ? .tr : .en,
-            page: 1
-        )
+    func loadData() async {
+        let popularMoviesRequest = PopularMoviesRequest(language: deviceLanguageCode == .turkish ? .tr : .en, page: 1)
+        let airingTodayRequest = AiringTodayRequest(language: deviceLanguageCode == .turkish ? .tr : .en, page: 1)
+        async let popularMovies = network.execute(popularMoviesRequest)
 
+        async let airingMovies = network.execute(airingTodayRequest)
+
         do {
-            let list = try await network.execute(request)
-             presenter?.sendAiringTvShows(list.results)
+            let (popularResult, airingResult) = try await (popularMovies, airingMovies)
+            
+            await presenter?.sendPopularTvShows(popularResult.results)
+            await presenter?.sendAiringTvShows(airingResult.results)
         } catch {
-             presenter?.sendError(.airingToday)
-          
+            await presenter?.sendError()
         }
     }
 }

ICTMDBHomeModule/HomeInteractor.swift

@@ -53,36 +53,24 @@ final class HomePresenter {
 /// Handles actions triggered by the View layer.
 
 extension HomePresenter: ViewToPresenterHomeProtocol {
+  
+    
 
     func viewDidLoad() {
         view?.setBackColorAble(color: "backColor")
-        //TODO: move to Localizable
-        view?.setNavigationTitle(title: "Home Page")
+        view?.setNavigationTitle(title: LocalizableUI.homePageNavTitle.localized)
 
         Task {@MainActor in
           await loadData()
         }
-      
-       
     }
 
-    
 
     @MainActor
     func loadData() async {
-        // Sending 'self' risks causing data races
-        // Sending main actor-isolated 'self' into async let risks causing data races between nonisolated and main actor-isolated uses
-       
-        /*
-         async let popular = interactor.loadPopularMovies()
-        async let movies = interactor.loadAiringMovies()
-        await popular
-        await movies
-        */
-        
-        
-        await interactor.loadPopularMovies()
-        await interactor.loadAiringMovies()
+        view?.startLoading()
+        await interactor.loadData()
+        view?.finishLoading()
     }
 
 }
@@ -142,33 +130,28 @@ extension HomePresenter {
         }
     }
 
-
-    func titleForSection(at section: Int) -> (
-        title: String,
-        sizeType: SectionSizeType,
-        buttonType: [TitleForSectionButtonType]?
-    ) {
+    func titleForSection(at section: Int) -> GenericCollectionViewKit.HeaderViewItem {
+        var headerViewItem:HeaderViewItem
         guard let sectionType = SectionType(rawValue: section) else {
-            return (title: "", sizeType: .small, buttonType: [])
+            headerViewItem = .init(title: "", sizeType: .empty)
+            return headerViewItem
         }
 
-        var item: (title: String, sizeType: SectionSizeType, buttonType: [TitleForSectionButtonType]?)
-        
         switch sectionType {
         case .popular:
-            item = (
+            headerViewItem = .init(
                 title: LocalizableUI.popular.localized,
+                icon: .init(image: .systemImage("flame.fill"), tintColor: .custom(hex: "#FF0000")),
                 sizeType: .large,
-                buttonType: [.allList]
-            )
+                buttonTypes: [.allList])
         case .airingToday:
-            item = (
+            headerViewItem = .init(
                 title: LocalizableUI.airingToday.localized,
-                sizeType: .small,
-                buttonType: [.allList]
-            )
+                icon: .init(image: .systemImage("circle.fill"), tintColor: .custom(hex: "#008000")),
+                sizeType: .large,
+                buttonTypes: [.allList])
         }
-        return item
+        return headerViewItem
     }
 
 
@@ -210,32 +193,32 @@ extension HomePresenter {
 
 // MARK: - InteractorToPresenterHomeProtocol
 /// Receives data from the Interactor and updates the view.
-extension HomePresenter:  InteractorToPresenterHomeProtocol {
+extension HomePresenter: InteractorToPresenterHomeProtocol {
+    func sendError() {
+      
+        view?.sendError(errorState: (isHidden: true,
+                                     message: LocalizableUI.somethingWentWrong.localized))
+        view?.relaodCollectionView()
+      
+    }
+    
 
     func sendAiringTvShows(_ data: [AiringToday]) {
-        view?.startLoading()
+     
         airingTodayShows = data.map { AiringTodayPresentation(tvShow: $0) }
         view?.sendError(errorState: (isHidden: false, message: ""))
         view?.relaodCollectionView()
-        view?.finishLoading()
+      
     }
 
     func sendPopularTvShows(_ data: [PopularTvShows]) {
-        view?.startLoading()
+      
         popularTvShows = data
             .map { PopularTVShowPresentation(tvShow: $0) }
             .sorted { $0.rating > $1.rating }
         view?.sendError(errorState: (isHidden: false, message: ""))
         view?.relaodCollectionView()
-        view?.finishLoading()
-    }
-    
-    func sendError(_ type: HomePageErrorType) {
-        view?.startLoading()
-        view?.sendError(errorState: (isHidden: true,
-                                     message: LocalizableUI.somethingWentWrong.localized))
-        view?.relaodCollectionView()
-        view?.finishLoading()
+      
     }
 }
 

ICTMDBHomeModule/HomePresenter.swift

@@ -50,22 +50,20 @@ protocol PresenterToViewHomeProtocol: AnyObject, Ables {
 
 // MARK: - Presenter → Interactor
 /// Protocol defining communication from Presenter to Interactor.
-@MainActor
-protocol PresenterToInteractorHomeProtocol:AnyObject {
+
+protocol PresenterToInteractorHomeProtocol:Sendable,AnyObject {
 
     /// Reference to the Presenter layer
     var presenter: InteractorToPresenterHomeProtocol? { get set }
-    
-    /// Requests popular TV shows data
-    func loadPopularMovies() async
-    
-    /// Requests airing today TV shows data
-    func loadAiringMovies() async 
+
+   // Requests data
+    func loadData() async
 }
 
 
 // MARK: - Interactor → Presenter
 /// Protocol for sending data or errors from Interactor to Presenter.
+@MainActor
 protocol InteractorToPresenterHomeProtocol : AnyObject{
 
     /// Sends fetched popular TV shows
@@ -75,7 +73,8 @@ protocol InteractorToPresenterHomeProtocol : AnyObject{
     func sendAiringTvShows(_ data: [AiringToday])
 
     /// Sends an error state
-    func sendError(_ type: HomePageErrorType)
+    func sendError()
+    
 }
 
 // MARK: - Presenter → Router

ICTMDBHomeModule/HomeProtocols.swift

@@ -44,11 +44,8 @@ public class HomeRouter:  PresenterToRouterHomeProtocol {
 
     func toDetailPage(view: (any PresenterToViewHomeProtocol)?, id: Int?) {
         // Resolve Detail module dependency from DependencyRegister
-        // Detail modülünü DependencyRegister üzerinden alır
         let detailModule = DependencyRegister.shared.resolve(TvShowDetailProtocol.self)
-        
         // Create the Detail view controller using module
-        // Modül üzerinden Detail view controller oluşturur
         let detailViewController = detailModule.createTvShowDetailModule(id: id)
 
         view?.pushViewControllerAble(detailViewController, animated: true)

ICTMDBHomeModule/HomeRouter.swift

@@ -136,5 +136,6 @@ extension HomeViewController: @MainActor PresenterToViewHomeProtocol {
 // MARK: - Preview
 #Preview {
     let module = ICTMDBHomeModule()
-    UINavigationController(rootViewController: module.createHomeModule())
+    
+    return UINavigationController(rootViewController: module.createHomeModule())
 }