Swap part7 and part8

part8/ElmHub.elm

@@ -1,23 +1,26 @@
 module ElmHub exposing (..)
 
+import Auth
 import Html exposing (..)
 import Html.Attributes exposing (class, target, href, property, defaultValue)
 import Html.Events exposing (..)
-import Auth
+import Http
 import Task exposing (Task)
 import Json.Decode exposing (Decoder)
 import Json.Decode.Pipeline exposing (..)
-import Json.Encode
 
 
-getQueryUrl : String -> String
-getQueryUrl query =
-    -- See https://developer.github.com/v3/search/#example for how to customize!
-    "https://api.github.com/search/repositories?access_token="
-        ++ Auth.token
-        ++ "&q="
-        ++ query
-        ++ "+language:elm&sort=stars&order=desc"
+searchFeed : String -> Cmd Msg
+searchFeed query =
+    let
+        url =
+            "https://api.github.com/search/repositories?access_token="
+                ++ Auth.token
+                ++ "&q="
+                ++ query
+                ++ "+language:elm&sort=stars&order=desc"
+    in
+        Task.perform HandleSearchError HandleSearchResponse (Http.get responseDecoder url)
 
 
 responseDecoder : Decoder (List SearchResult)
@@ -98,26 +101,34 @@ type Msg
     = Search
     | SetQuery String
     | DeleteById ResultId
-    | SetResults (List SearchResult)
-    | SetErrorMessage (Maybe String)
-    | DoNothing
+    | HandleSearchResponse (List SearchResult)
+    | HandleSearchError Http.Error
 
 
-update : (String -> Cmd Msg) -> Msg -> Model -> ( Model, Cmd Msg )
-update searchFeed msg model =
+update : Msg -> Model -> ( Model, Cmd Msg )
+update msg model =
     case msg of
         Search ->
-            ( model, searchFeed (getQueryUrl model.query) )
+            ( model, searchFeed model.query )
+
+        HandleSearchResponse results ->
+            ( { model | results = results }, Cmd.none )
+
+        HandleSearchError error ->
+            let
+                errorMessage =
+                    case error of
+                        Http.UnexpectedPayload message ->
+                            Just message
+
+                        _ ->
+                            Nothing
+            in
+                ( { model | errorMessage = errorMessage }, Cmd.none )
 
         SetQuery query ->
             ( { model | query = query }, Cmd.none )
 
-        SetResults results ->
-            ( { model | results = results }, Cmd.none )
-
-        SetErrorMessage errorMessage ->
-            ( { model | errorMessage = errorMessage }, Cmd.none )
-
         DeleteById idToHide ->
             let
                 newResults =
@@ -128,15 +139,3 @@ update searchFeed msg model =
                     { model | results = newResults }
             in
                 ( newModel, Cmd.none )
-
-        DoNothing ->
-            ( model, Cmd.none )
-
-
-decodeGithubResponse : Json.Encode.Value -> Msg
-decodeGithubResponse value =
-    -- TODO use Json.Decode.DecodeValue to decode the response into an Action.
-    --
-    -- Hint: look at ElmHub.elm, specifically the definition of Action and
-    -- the deefinition of responseDecoder
-    SetErrorMessage (Just "TODO decode the response!")