From 74ea2be2e3002659da5bb0d2f1dc97cf388c6ae7 Mon Sep 17 00:00:00 2001
From: Pedro Romero <pedrojesusromeroortega@gmail.com>
Date: Sun, 25 Mar 2018 21:41:29 +0200
Subject: [PATCH] Make sure that houses are loaded before characters

---
 01 Non blocking/README.md      |   2 +-
 01 Non blocking/src/js/main.js | 104 ++++++++++++++++++---------------
 2 files changed, 57 insertions(+), 49 deletions(-)

diff --git a/01 Non blocking/README.md b/01 Non blocking/README.md
index 70ded49..c13122f 100644
--- a/01 Non blocking/README.md	
+++ b/01 Non blocking/README.md	
@@ -6,7 +6,7 @@ $ npm install
 ```
 * After installation, we can run the application using:
 ```bash
-$ npm install
+$ npm start
 ```
 * To get results on the open browser app:
     * house: `House Lannister of Casterly Rock`
diff --git a/01 Non blocking/src/js/main.js b/01 Non blocking/src/js/main.js
index 357fbfa..b4fb0e9 100644
--- a/01 Non blocking/src/js/main.js	
+++ b/01 Non blocking/src/js/main.js	
@@ -1,56 +1,64 @@
 document.onreadystatechange = () => {
-    const load = () => {
-        const search_button = document.getElementById('search_button');
-        const service = new apiIceAndFire.Service();
-        const printer = new printService.Printer();
-        const apiMapper = mapper.apiMapper();
-
-        search_button.addEventListener('click', (event) => {
-            event.stopPropagation();
-            const houseInput = document.getElementById('input-house');
-            const characterInput = document.getElementById('input-character');
-            
-            if (houseInput.value && characterInput.value) {
-                console.log('1');
-                const housesRequestConfig = {
-                    err: handleError,
-                    callback: handleHousesRequestSucces(apiMapper, printer)
-                };
-                service.getHousesByName(houseInput.value, housesRequestConfig);
-                console.log('2');
-                const charactersRequestConfig = {
-                    err: handleError,
-                    callback: handleCharactersRequestSuccess(apiMapper, printer)
-                };
-                service.getCharactersByName(characterInput.value, charactersRequestConfig);
-                console.log('3');
-            } else {
-                alert('Introduce a values')
-            }
-        });
-    };
+  const load = () => {
+    const search_button = document.getElementById("search_button");
+    const service = new apiIceAndFire.Service();
+    const printer = new printService.Printer();
+    const apiMapper = mapper.apiMapper();
 
-    function handleError() {
-        console.log(JSON.parse(this.responseText));
-    };
+    search_button.addEventListener("click", event => {
+      event.stopPropagation();
+      const houseInput = document.getElementById("input-house");
+      const characterInput = document.getElementById("input-character");
 
-    function handleHousesRequestSucces(apiMapper, printer) {
-        return function () {
-            const data = JSON.parse(this.responseText);
-            const houses = apiMapper.housesMap(data);
-            printer.printHouses(houses, 'houses');
+      if (houseInput.value && characterInput.value) {
+        console.log("1: we have house and character inputs value.");
+        const housesRequestConfig = {
+          err: handleError,
+          callback: handleHousesRequestSucces(service, apiMapper, printer, characterInput.value)
         };
+        service.getHousesByName(houseInput.value, housesRequestConfig);
+        console.log("2: called getHousesByName");
+      } else {
+        alert("Introduce a values");
+      }
+    });
+  };
+
+  function handleError() {
+    console.log(JSON.parse(this.responseText));
+  }
+
+  function handleHousesRequestSucces(service, apiMapper, printer, characterInputValue) {
+    return function() {
+      mapAndPrintHouses(apiMapper, printer, this.responseText);
+      callCharacters(service, apiMapper, printer, characterInputValue);
     };
+  }
 
-    function handleCharactersRequestSuccess(apiMapper, printer) {
-        return function () {
-            const data = JSON.parse(this.responseText);
-            const characters = apiMapper.caracthersMap(data);
-            printer.printCharacters(characters, 'characters');
-        };
-    }
+  function handleCharactersRequestSuccess(apiMapper, printer) {
+    return function() {
+      const data = JSON.parse(this.responseText);
+      const characters = apiMapper.caracthersMap(data);
+      printer.printCharacters(characters, "characters");
+    };
+  }
+
+  function mapAndPrintHouses(apiMapper, printer, serializeHouses) {
+    const data = JSON.parse(serializeHouses);
+    const houses = apiMapper.housesMap(data);
+    printer.printHouses(houses, "houses");
+  }
+
+  function callCharacters(service, apiMapper, printer, characterInputValue){
+    const charactersRequestConfig = {
+        err: handleError,
+        callback: handleCharactersRequestSuccess(apiMapper, printer)
+    };
+    service.getCharactersByName(characterInputValue,charactersRequestConfig);
+    console.log("3: called getCharactersByName");
+  }
 
-    if (document.readyState === 'complete') {
-        load();
-    }
+  if (document.readyState === "complete") {
+    load();
+  }
 };