wip

stephtelolahy · Jan 6, 2025 · b3869dc · b3869dc
1 parent 6c6ae41
commit b3869dc
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 43 deletions.
diff --git a/WildWestOnline/.swiftpm/xcode/xcshareddata/xcschemes/SettingsData.xcscheme b/WildWestOnline/.swiftpm/xcode/xcshareddata/xcschemes/SettingsData.xcscheme
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1620"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "SettingsData"
+               BuildableName = "SettingsData"
+               BlueprintName = "SettingsData"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "SettingsData"
+            BuildableName = "SettingsData"
+            BlueprintName = "SettingsData"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/WildWestOnline/Core/Game/Sources/Reducer/GameReducer.swift b/WildWestOnline/Core/Game/Sources/Reducer/GameReducer.swift
@@ -14,18 +14,6 @@ public func gameReducer(
         return .none
     }
 
-    return .group([
-        try prepareReducer(state: &state, action: action),
-        try updateReducer(state: &state, action: action),
-        try triggerEffectsReducer(state: &state, action: action),
-        try playAIMoveReducer(state: &state, action: action)
-    ])
-}
-
-private func prepareReducer(
-    state: inout GameState,
-    action: GameAction
-) throws -> Effect {
     guard !state.isOver else {
         fatalError("Unexpected game is over")
     }
@@ -44,13 +32,6 @@ private func prepareReducer(
         state.active.removeValue(forKey: action.payload.target)
     }
 
-    return .none
-}
-
-private func updateReducer(
-    state: inout GameState,
-    action: GameAction
-) throws -> Effect {
     if action.payload.selectors.isNotEmpty {
         if state.pendingChoice != nil {
             fatalError("Unexpected waiting user choice")
@@ -67,19 +48,3 @@ private func updateReducer(
 
     return .none
 }
-
-private func triggerEffectsReducer(
-    state: inout GameState,
-    action: GameAction
-) throws -> Effect {
-    // TODO: triggered effects
-    .none
-}
-
-private func playAIMoveReducer(
-    state: inout GameState,
-    action: GameAction
-) throws -> Effect {
-    // TODO: AI moves
-    .none
-}
diff --git a/WildWestOnline/Core/Game/Tests/CreateGameStore.swift b/WildWestOnline/Core/Game/Tests/CreateGameStore.swift
@@ -7,9 +7,7 @@
 import Redux
 import GameCore
 
-typealias GameStore = Store<GameState, Void>
-
-@MainActor func createGameStore(initialState: GameState) -> GameStore {
+@MainActor func createGameStore(initialState: GameState) -> Store<GameState, Void> {
     .init(
         initialState: initialState,
         reducer: gameReducer,

diff --git a/WildWestOnline/Data/Cards/Tests/Misc/CreateGameStoreWithSideEffects.swift b/WildWestOnline/Data/Cards/Tests/Misc/CreateGameStoreWithSideEffects.swift
@@ -0,0 +1,17 @@
+//
+//  CreateGameStoreWithSideEffects.swift
+//  WildWestOnline
+//
+//  Created by Hugues Stephano TELOLAHY on 06/01/2025.
+//
+
+import Redux
+import GameCore
+
+@MainActor func createGameStoreWithSideEffects(initialState: GameState) -> Store<GameState, Void> {
+    .init(
+        initialState: initialState,
+        reducer: gameReducer,
+        dependencies: ()
+    )
+}
diff --git a/WildWestOnline/Data/Settings/Sources/SettingsRepository.swift b/WildWestOnline/Data/Settings/Sources/SettingsRepository.swift
@@ -9,7 +9,7 @@
 import Serialization
 import SettingsCore
 
-public class SettingsRepository: SettingsService {
+public class SettingsRepository {
     public init() {}
 
     @UserDefaultsStored("settings.playersCount", defaultValue: 5)

diff --git a/WildWestOnline/Utilities/Redux/Tests/StoreProjectionTest.swift b/WildWestOnline/Utilities/Redux/Tests/StoreProjectionTest.swift
@@ -26,7 +26,7 @@ struct StoreProjectionTest {
         )
 
         let connector = SearchView.Connector()
-        let sut: SearchView.ViewModel = await store.projection(deriveState: connector.deriveState)
+        let sut = await store.projection(deriveState: connector.deriveState)
 
         // When
         await sut.dispatch(AppAction.fetchRecent)
@@ -42,9 +42,8 @@ private struct SearchView: View {
     struct State: Equatable {
         let items: [String]
     }
-
-    typealias ViewModel = Store<State, Void>
-    @ObservedObject var store: ViewModel
+
+    @ObservedObject var store: Store<State, Void>
     @SwiftUI.State var query: String = ""
 
     var body: some View {