Moving initViewAction to serverCommunication module

1 files changed, 22 insertions, 22 deletions

diff --git a/src/client/elm/Update.elm b/src/client/elm/Update.elm
index c61e2f5..46c1b01 100644
--- a/src/client/elm/Update.elm
+++ b/src/client/elm/Update.elm
@@ -11,7 +11,8 @@ import ServerCommunication exposing (sendRequest)
 import Model exposing (Model)
 import Model.Translations exposing (getMessage)
 import Model.Action exposing (..)
-import Model.Action.SignInAction as SignInAction
+import Model.Action.SignInAction as SignInAction exposing (SignInAction)
+import Model.Action.LoggedInAction exposing (LoggedInAction)
 import Model.View as V
 import Model.View.SignInView exposing (..)
 import Model.View.LoggedInView exposing (..)
@@ -21,7 +22,6 @@ import Update.LoggedIn exposing (updateLoggedIn)
 import Update.SignIn exposing (updateSignIn)
 
 import SimpleHTTP exposing (post)
-import InitViewAction exposing (initViewAction)
 
 update : Action -> Model -> (Model, Effects Action)
 update action model =
@@ -31,11 +31,11 @@ update action model =
       (model, Effects.none)
 
     SignIn assertion ->
-      ( case model.view of
-          V.SignInView signInView -> { model | view = V.SignInView (updateSignIn SignInAction.Connecting signInView) }
-          _ -> model
+      ( applySignIn model (SignInAction.Connecting)
       , sendRequest (Communication.SignIn assertion)
-          |> flip Task.onError (always <| Task.succeed (UpdateSignIn (SignInAction.ErrorLogin (getMessage "ErrorSignIn" model.translations))))
+          |> flip Task.onError (\_ ->
+               Task.succeed (UpdateSignIn (SignInAction.ErrorLogin (getMessage "ErrorSignIn" model.translations)))
+             )
           |> Effects.task
       )
 
@@ -58,19 +58,19 @@ update action model =
       )
 
     UpdateSignIn signInAction ->
-      case model.view of
-        V.SignInView signInView ->
-          ( { model | view = V.SignInView (updateSignIn signInAction signInView) }
-          , Effects.none
-          )
-        _ ->
-          (model, Effects.none)
-
-    UpdateLoggedIn loggedAction ->
-      case model.view of
-        V.LoggedInView loggedInView ->
-          ( { model | view = V.LoggedInView (updateLoggedIn model loggedAction loggedInView) }
-          , Effects.none
-          )
-        _ ->
-          (model, Effects.none)
+      (applySignIn model signInAction, Effects.none)
+
+    UpdateLoggedIn loggedInAction ->
+      (applyLoggedIn model loggedInAction, Effects.none)
+
+applySignIn : Model -> SignInAction -> Model
+applySignIn model signInAction =
+  case model.view of
+    V.SignInView signInView -> { model | view = V.SignInView (updateSignIn signInAction signInView) }
+    _ -> model
+
+applyLoggedIn : Model -> LoggedInAction -> Model
+applyLoggedIn model loggedInAction =
+  case model.view of
+    V.LoggedInView loggedInView -> { model | view = V.LoggedInView (updateLoggedIn model loggedInAction loggedInView) }
+    _ -> model