BN-4308 [REFACTOR] Simplify view state refreshing

pkozielecki · web-flow · commit ac81a63daecd · 2023-02-28T12:41:28.000+01:00
diff --git a/NetworkModuleSampleApp/NetworkModuleSampleApp.xcodeproj/project.pbxproj b/NetworkModuleSampleApp/NetworkModuleSampleApp.xcodeproj/project.pbxproj
@@ -17,7 +17,7 @@
 		2290A8E12995118F00067FFC /* StringExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2290A8E02995118F00067FFC /* StringExtensions.swift */; };
 		2290A8E6299A62AE00067FFC /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2290A8E5299A62AE00067FFC /* Logging.swift */; };
 		AD06FC26297FE93900A05C0F /* EpisodeHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD06FC25297FE93900A05C0F /* EpisodeHeaderView.swift */; };
-		AD073F02297EC3DA007B8C89 /* NetworkModuleSampleAppApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD073F01297EC3DA007B8C89 /* NetworkModuleSampleAppApp.swift */; };
+		AD073F02297EC3DA007B8C89 /* NetworkModuleSampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD073F01297EC3DA007B8C89 /* NetworkModuleSampleApp.swift */; };
 		AD073F06297EC3DC007B8C89 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AD073F05297EC3DC007B8C89 /* Assets.xcassets */; };
 		AD073F09297EC3DC007B8C89 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AD073F08297EC3DC007B8C89 /* Preview Assets.xcassets */; };
 		AD073F16297EC45A007B8C89 /* HomeScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD073F15297EC45A007B8C89 /* HomeScene.swift */; };
@@ -53,7 +53,7 @@
 		22BD5043299B97BA009B301C /* NgNetworkModuleShowcase.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = NgNetworkModuleShowcase.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		AD06FC25297FE93900A05C0F /* EpisodeHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EpisodeHeaderView.swift; sourceTree = "<group>"; };
 		AD073EFE297EC3DA007B8C89 /* NetworkModuleSampleApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NetworkModuleSampleApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		AD073F01297EC3DA007B8C89 /* NetworkModuleSampleAppApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkModuleSampleAppApp.swift; sourceTree = "<group>"; };
+		AD073F01297EC3DA007B8C89 /* NetworkModuleSampleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkModuleSampleApp.swift; sourceTree = "<group>"; };
 		AD073F05297EC3DC007B8C89 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		AD073F08297EC3DC007B8C89 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
 		AD073F15297EC45A007B8C89 /* HomeScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeScene.swift; sourceTree = "<group>"; };
@@ -165,7 +165,7 @@
 				ADC19E5E2981723700E26D25 /* PreviewMocks */,
 				ADC19E3F29812F4C00E26D25 /* App */,
 				AD073F14297EC439007B8C89 /* Scenes */,
-				AD073F01297EC3DA007B8C89 /* NetworkModuleSampleAppApp.swift */,
+				AD073F01297EC3DA007B8C89 /* NetworkModuleSampleApp.swift */,
 				AD073F05297EC3DC007B8C89 /* Assets.xcassets */,
 				AD073F07297EC3DC007B8C89 /* Preview Content */,
 			);
@@ -485,7 +485,7 @@
 				ADC19E5B29816AC100E26D25 /* EpisodeCharacterRowView.swift in Sources */,
 				2260DF2029926F7500ED9386 /* GetEpisodesListRequest.swift in Sources */,
 				ADC19E4B2981537E00E26D25 /* Routes.swift in Sources */,
-				AD073F02297EC3DA007B8C89 /* NetworkModuleSampleAppApp.swift in Sources */,
+				AD073F02297EC3DA007B8C89 /* NetworkModuleSampleApp.swift in Sources */,
 				ADC19E602981724600E26D25 /* PreviewMocks.swift in Sources */,
 				ADC19E44298130D000E26D25 /* EpisodeListViewModel.swift in Sources */,
 				ADC19E4E2981584F00E26D25 /* EpisodeModel.swift in Sources */,
diff --git a/NetworkModuleSampleApp/NetworkModuleSampleApp/NetworkModuleSampleApp.swift b/NetworkModuleSampleApp/NetworkModuleSampleApp/NetworkModuleSampleApp.swift
@@ -1,12 +1,12 @@
 //
-//  NetworkModuleSampleAppApp.swift
+//  NetworkModuleSampleApp.swift
 //  Netguru iOS Network Module
 //
 
 import SwiftUI
 
 @main
-struct NetworkModuleSampleAppApp: App {
+struct NetworkModuleSampleApp: App {
     var body: some Scene {
         WindowGroup {
             HomeScene()
diff --git a/NetworkModuleSampleApp/NetworkModuleSampleApp/Scenes/Episode/ViewModel/EpisodeViewModel.swift b/NetworkModuleSampleApp/NetworkModuleSampleApp/Scenes/Episode/ViewModel/EpisodeViewModel.swift
@@ -108,7 +108,7 @@ private extension EpisodeViewModel {
             .store(in: &cancellables)
     }
 
-    func fetchCharacterDataUsingAsyncAwaitApi(urlRequest: URLRequest) async {
+    @MainActor func fetchCharacterDataUsingAsyncAwaitApi(urlRequest: URLRequest) async {
         logNetworkInfo("--- [Async/Await] Request started: \(urlRequest.requestPath)")
         do {
             let characterModel = try await networkModule.performAndDecode(
@@ -117,10 +117,10 @@ private extension EpisodeViewModel {
             )
             characters.append(characterModel)
             logNetworkInfo("--- [Async/Await] Request completed: \(urlRequest.requestPath)")
-            await updateByMainActor(viewState: .loaded(episode, characters))
+            viewState = .loaded(episode, characters)
         } catch {
             logNetworkError("--- [Async/Await] Request error: \(error.localizedDescription)")
-            await updateByMainActor(viewState: .error(episode, error))
+            viewState = .error(episode, error)
         }
     }
 
@@ -136,14 +136,6 @@ private extension EpisodeViewModel {
         tasks = []
         urlTasks = []
     }
-
-    func updateByMainActor(viewState: EpisodeViewState) async {
-        // Discussion: Alternatively, you can just annotate `viewState` with @MainActor ...
-        // ... to ensure it is updated on the Main Thread.
-        await MainActor.run { [weak self] in
-            self?.viewState = viewState
-        }
-    }
 }
 
 private extension URLRequest {
diff --git a/NetworkModuleSampleApp/NetworkModuleSampleApp/Scenes/EpisodeList/ViewModels/EpisodeListViewModel.swift b/NetworkModuleSampleApp/NetworkModuleSampleApp/Scenes/EpisodeList/ViewModels/EpisodeListViewModel.swift
@@ -80,7 +80,7 @@ private extension EpisodeListViewModel {
             .assign(to: &$viewState)
     }
 
-    func fetchEpisodesListUsingAsyncAwaitApi() async {
+    @MainActor func fetchEpisodesListUsingAsyncAwaitApi() async {
         let request = GetEpisodesListRequest()
         logNetworkInfo("--- [Async/Await] Request started: \(request.path)")
         do {
@@ -89,18 +89,10 @@ private extension EpisodeListViewModel {
                 responseType: [EpisodeModel].self
             )
             logNetworkInfo("--- Async/AwaitRequest completed: \(request.path)")
-            await updateByMainActor(viewState: .loaded(episodes))
+            viewState = .loaded(episodes)
         } catch {
             logNetworkError("--- Async/AwaitRequest error: \(error.localizedDescription)")
-            await updateByMainActor(viewState: .error(error))
-        }
-    }
-
-    func updateByMainActor(viewState: EpisodeListViewState) async {
-        // Discussion: Alternatively, you can just annotate `viewState` with @MainActor ...
-        // ... to ensure it is updated on the Main Thread.
-        await MainActor.run { [weak self] in
-            self?.viewState = viewState
+            viewState = .error(error)
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ private extension EpisodeViewModel {`
`108`	`108`	`.store(in: &cancellables)`
`109`	`109`	`}`
`110`	`110`
`111`		`- func fetchCharacterDataUsingAsyncAwaitApi(urlRequest: URLRequest) async {`
	`111`	`+ @MainActor func fetchCharacterDataUsingAsyncAwaitApi(urlRequest: URLRequest) async {`
`112`	`112`	`logNetworkInfo("--- [Async/Await] Request started: \(urlRequest.requestPath)")`
`113`	`113`	`do {`
`114`	`114`	`let characterModel = try await networkModule.performAndDecode(`
`@@ -117,10 +117,10 @@ private extension EpisodeViewModel {`
`117`	`117`	`)`
`118`	`118`	`characters.append(characterModel)`
`119`	`119`	`logNetworkInfo("--- [Async/Await] Request completed: \(urlRequest.requestPath)")`
`120`		`- await updateByMainActor(viewState: .loaded(episode, characters))`
	`120`	`+ viewState = .loaded(episode, characters)`
`121`	`121`	`} catch {`
`122`	`122`	`logNetworkError("--- [Async/Await] Request error: \(error.localizedDescription)")`
`123`		`- await updateByMainActor(viewState: .error(episode, error))`
	`123`	`+ viewState = .error(episode, error)`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`
`@@ -136,14 +136,6 @@ private extension EpisodeViewModel {`
`136`	`136`	`tasks = []`
`137`	`137`	`urlTasks = []`
`138`	`138`	`}`
`139`		`-`
`140`		`- func updateByMainActor(viewState: EpisodeViewState) async {`
`141`		- // Discussion: Alternatively, you can just annotate `viewState` with @MainActor ...
`142`		`- // ... to ensure it is updated on the Main Thread.`
`143`		`- await MainActor.run { [weak self] in`
`144`		`- self?.viewState = viewState`
`145`		`- }`
`146`		`- }`
`147`	`139`	`}`
`148`	`140`
`149`	`141`	`private extension URLRequest {`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ private extension EpisodeListViewModel {`
`80`	`80`	`.assign(to: &$viewState)`
`81`	`81`	`}`
`82`	`82`
`83`		`- func fetchEpisodesListUsingAsyncAwaitApi() async {`
	`83`	`+ @MainActor func fetchEpisodesListUsingAsyncAwaitApi() async {`
`84`	`84`	`let request = GetEpisodesListRequest()`
`85`	`85`	`logNetworkInfo("--- [Async/Await] Request started: \(request.path)")`
`86`	`86`	`do {`
`@@ -89,18 +89,10 @@ private extension EpisodeListViewModel {`
`89`	`89`	`responseType: [EpisodeModel].self`
`90`	`90`	`)`
`91`	`91`	`logNetworkInfo("--- Async/AwaitRequest completed: \(request.path)")`
`92`		`- await updateByMainActor(viewState: .loaded(episodes))`
	`92`	`+ viewState = .loaded(episodes)`
`93`	`93`	`} catch {`
`94`	`94`	`logNetworkError("--- Async/AwaitRequest error: \(error.localizedDescription)")`
`95`		`- await updateByMainActor(viewState: .error(error))`
`96`		`- }`
`97`		`- }`
`98`		`-`
`99`		`- func updateByMainActor(viewState: EpisodeListViewState) async {`
`100`		- // Discussion: Alternatively, you can just annotate `viewState` with @MainActor ...
`101`		`- // ... to ensure it is updated on the Main Thread.`
`102`		`- await MainActor.run { [weak self] in`
`103`		`- self?.viewState = viewState`
	`95`	`+ viewState = .error(error)`
`104`	`96`	`}`
`105`	`97`	`}`
`106`	`98`	`}`