Updated to match curriculum

Author: cndreisbach

src/global_growth/core.clj

@@ -2,45 +2,64 @@
   (:require [clj-http.client :as client]
             [cheshire.core :as json]))
 
-(defn TODO [msg]
-  (throw (Exception. msg)))
+;;;; MODULE 4
 
-(defn parse-json [str]
-  (json/parse-string str true))
-
-;; WORLD BANK API CALLS
 (defn get-api
   "Returns map representing API response."
   [path params]
-  (let [base-path (str "http://api.worldbank.org" path)
+  (let [url (str "http://api.worldbank.org" path)
         query-params (merge params {:format "json" :per_page 10000})
-        response (parse-json (:body (client/get base-path {:query-params query-params})))
+        response (json/parse-string
+                  (:body (client/get url {:query-params query-params})) true)
         metadata (first response)
         results (second response)]
     {:metadata metadata
      :results results}))
 
-(defn get-values
-  "Returns a relation of two keys from API response."
-  [path query-params key1 key2]
-  (let [response (get-api path query-params)]
-    (for [item (:results response)]
-      [(key1 item) (key2 item)])))
+(defn get-country-and-value
+  [response]
+  (for [item (:results response)]
+    (vector (get-in item [:country :value]) (get item :value))))
 
 (defn remove-aggregate-countries
   "Remove all countries that aren't actually countries, but are aggregates."
   [countries]
   (remove (fn [country]
             (= (get-in country [:region :value]) "Aggregates")) countries))
 
-(def indicators
-  (delay (get-values "/topics/16/indicators" {} :name :id)))
-
 ;; Get set of country ids so we can filter out aggregate values.
-(def country-ids
+(def countries
   (delay
     (let [countries (remove-aggregate-countries (:results (get-api "/countries" {})))]
-      (set (map :iso2Code countries)))))
+      (set (map :name countries)))))
+
+(defn get-indicator-values
+  "Returns indicator values for a specified year for all countries."
+  [indicator-code year]
+  (let [response (get-api (str "/countries/all/indicators/" indicator-code)
+                          {:date (str year)})
+        values (get-country-and-value response)]
+    (for [[country value] values
+          :when (and (not (nil? value))
+                     (contains? @countries country))]
+      [country (read-string value)])))
+
+;;;; MODULE 5
+
+(defn take-top-values
+  [indicator-values num-values]
+  (take num-values
+        (sort-by second > indicator-values)))
+
+(defn get-values
+  "Returns a relation of two keys from API response."
+  [path query-params key1 key2]
+  (let [response (get-api path query-params)]
+    (for [item (:results response)]
+      [(key1 item) (key2 item)])))
+
+(def indicators
+  (delay (get-values "/topics/16/indicators" {} :name :id)))
 
 (defn get-indicators []
   "Gets vector of indicators.
@@ -50,21 +69,9 @@
   /indicators:             All Indicators (about 8800)"
   @indicators)
 
-(defn get-indicator-values
-  "Returns indicator values for a specified year for all countries."
-  [indicator year list-size]
-  (let [values (get-values (str "/countries/all/indicators/" indicator)
-                           {:date (str year)}
-                           :country :value)]
-    (take list-size
-        (sort-by second >
-                 (for [[country value] values
-                       :when (and (not (nil? value))
-                                  (contains? @country-ids (:id country)))]
-                   [(:value country) (read-string value)])))))
-
 (defn -main
   [& args]
-  (let [indicator-values (get-indicator-values "EN.POP.DNST" 2010 10)]
-    (doseq [value indicator-values]
+  (let [indicator-values (get-indicator-values "EN.POP.DNST" 2010)
+        top-10-values (take-top-values indicator-values 10)]
+    (doseq [value top-10-values]
       (println (str (first value) " " (second value))))))

src/global_growth/web.clj

@@ -1,17 +1,11 @@
 (ns global-growth.web
-  (:require [global-growth.core :as global-growth]
+  (:require [global-growth.core :as api]
             [compojure.core :refer [defroutes GET]]
             [compojure.handler :refer [site]]
             [hiccup.core :as hiccup]
             [hiccup.page :as page]
             [hiccup.form :as form]))
 
-; TODO: handle paging: right now just getting a large value
-; for 'per_page' parameter.
-; Maybe that is fine for simplicity. But that could be a
-; problem if we get things with large result sets. Not
-; getting large results as of now.
-
 ;; WEB APP
 
 (defn layout
@@ -52,12 +46,14 @@
 
 (defn view-indicators
   [indicator1 indicator2 year]
-  (let [inds1 (global-growth/get-indicator-values indicator1 year)
-        inds2 (global-growth/get-indicator-values indicator2 year)
+  (let [inds1 (api/take-top-values
+               (api/get-indicator-values indicator1 year) 10)
+        inds2 (api/take-top-values
+               (api/get-indicator-values indicator2 year) 10)
         indicator-map (into {}
                             (map (fn [indicator]
                                    [(second indicator) (first indicator)])
-                                 (global-growth/get-indicators)))]
+                                 (api/get-indicators)))]
   (layout "Sorted Indicators"
           [:h1 "Sorted Indicators"]
           [:div.row
@@ -83,12 +79,12 @@
                        (form/label "indicator1" "Indicator 1:  ")
                        (form/drop-down {:class "form-control"}
                                        "indicator1"
-                                       (global-growth/get-indicators))]
+                                       (api/get-indicators))]
                       [:div.form-group.col-md-5
                        (form/label "indicator2" "Indicator 2:  ")
                        (form/drop-down {:class "form-control"}
                                        "indicator2"
-                                       (global-growth/get-indicators))]
+                                       (api/get-indicators))]
                       [:div.form-group.col-md-2
                        (form/label "year" "Year: ")
                        (form/drop-down {:class "form-control"}