(fix) Refactor all the decode functions

contentacms · Jul 9, 2017 · 375436c · 375436c
1 parent 9fded12
commit 375436c
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 63 deletions.
diff --git a/src/App/ModelHttp.elm b/src/App/ModelHttp.elm
@@ -2,6 +2,7 @@ module App.ModelHttp exposing (..)
 
 import App.Model exposing (..)
 import App.Difficulty exposing (..)
+import App.Utils exposing (removeErrorFromList)
 import Json.Encode
 import Json.Decode exposing (field, string, int, list, succeed, Decoder, map4, at, map, map2)
 import JsonApi.Resources
@@ -331,6 +332,17 @@ decodeRecipe flags resource =
         JsonApi.Resources.attributes (recipeDecoderWithValues id (Result.map .url file_image) tags category owner) resource
 
 
+decodeRecipes : Flags -> RemoteData.WebData (List JsonApi.Resource) -> RemoteData.WebData (List Recipe)
+decodeRecipes flags =
+    RemoteData.map
+        (\resources ->
+            List.map
+                (decodeRecipe flags)
+                resources
+                |> removeErrorFromList
+        )
+
+
 resultToWebData : Result String a -> RemoteData.WebData a
 resultToWebData result =
     case result of

diff --git a/src/App/Update.elm b/src/App/Update.elm
@@ -1,6 +1,7 @@
 module App.Update exposing (..)
 
 import App.Model exposing (..)
+import App.Utils exposing (removeErrorFromList)
 import App.PageType exposing (..)
 import App.ModelHttp exposing (..)
 import JsonApi.Resources
@@ -177,15 +178,7 @@ update msg model =
         PromotedRecipesLoaded remoteResponse ->
             ( { model
                 | pageHome =
-                    { promotedRecipes =
-                        RemoteData.map
-                            (\resources ->
-                                List.map
-                                    (decodeRecipe model.flags)
-                                    resources
-                                    |> removeErrorFromList
-                            )
-                            remoteResponse
+                    { promotedRecipes = decodeRecipes model.flags remoteResponse
                     , promotedArticles = model.pageHome.promotedArticles
                     , recipes = model.pageHome.recipes
                     }
@@ -198,15 +191,7 @@ update msg model =
                 | pageHome =
                     { promotedRecipes = model.pageHome.promotedRecipes
                     , promotedArticles = model.pageHome.promotedArticles
-                    , recipes =
-                        RemoteData.map
-                            (\resources ->
-                                List.map
-                                    (decodeRecipe model.flags)
-                                    resources
-                                    |> removeErrorFromList
-                            )
-                            remoteResponse
+                    , recipes = decodeRecipes model.flags remoteResponse
                     }
               }
             , Cmd.none
@@ -235,14 +220,7 @@ update msg model =
         RecipesPerCategoryLoaded category remoteResponse ->
             let
                 additionalRecipes =
-                    RemoteData.map
-                        (\resources ->
-                            List.map
-                                (decodeRecipe model.flags)
-                                resources
-                                |> removeErrorFromList
-                        )
-                        remoteResponse
+                    decodeRecipes model.flags remoteResponse
             in
                 case model.currentPage of
                     RecipesPerCategoryList ->
@@ -262,42 +240,21 @@ update msg model =
         RecipesPerTagLoaded tag remoteResponse ->
             let
                 recipes =
-                    RemoteData.map
-                        (\resources ->
-                            List.map
-                                (decodeRecipe model.flags)
-                                resources
-                                |> removeErrorFromList
-                        )
-                        remoteResponse
+                    decodeRecipes model.flags remoteResponse
             in
                 ( { model | pageRecipesPerTag = ( tag, recipes ) }, Cmd.none )
 
         RecipesPerDifficultyLoaded difficulty remoteResponse ->
             let
                 recipes =
-                    RemoteData.map
-                        (\resources ->
-                            List.map
-                                (decodeRecipe model.flags)
-                                resources
-                                |> removeErrorFromList
-                        )
-                        remoteResponse
+                    decodeRecipes model.flags remoteResponse
             in
                 ( { model | pageRecipesPerDifficulty = ( difficulty, recipes ) }, Cmd.none )
 
         RecipesShorterThanLoaded minutes remoteResponse ->
             let
                 recipes =
-                    RemoteData.map
-                        (\resources ->
-                            List.map
-                                (decodeRecipe model.flags)
-                                resources
-                                |> removeErrorFromList
-                        )
-                        remoteResponse
+                    decodeRecipes model.flags remoteResponse
             in
                 ( { model | pageRecipesShorterThan = ( minutes, recipes ) }, Cmd.none )
 
@@ -351,19 +308,6 @@ joinListMaybe list =
                 Just filteredList
 
 
-removeErrorFromList : List (Result a b) -> List b
-removeErrorFromList list =
-    case (List.reverse list) of
-        (Ok a) :: xs ->
-            a :: removeErrorFromList xs
-
-        (Err b) :: xs ->
-            removeErrorFromList xs
-
-        [] ->
-            []
-
-
 updateError : String -> Http.Error -> Model -> ( Model, Cmd Msg )
 updateError debugMessage error model =
     let

diff --git a/src/App/Utils.elm b/src/App/Utils.elm
@@ -0,0 +1,14 @@
+module App.Utils exposing (removeErrorFromList)
+
+removeErrorFromList : List (Result a b) -> List b
+removeErrorFromList list =
+    case (List.reverse list) of
+        (Ok a) :: xs ->
+            a :: removeErrorFromList xs
+
+        (Err b) :: xs ->
+            removeErrorFromList xs
+
+        [] ->
+            []
+