Merge pull request #5 from RyanSept/ft-add-doctors-to-api

Missing commits in master (currently deployed in prod)

Author: DavidLemayian

README.md

@@ -12,9 +12,9 @@ Specification for the API is shown below. It is an open api and requires no auth
 
 | EndPoint                            | Allowed Methods  | Functionality                                            | Parameters |
 |-------------------------------------|------------------|----------------------------------------------------------|------------|
-| `/doctors/search.json`              | GET              | Search a doctor by the name                              | q=<name>   |
-| `/nurses/search.json`               | GET              | Search a nurse by the name                               | q=<name>   |
-| `/clinical-officers/search.json`    | GET              | Search a clinical officer by the name                    | q=<name>   |
+| `/doctors/search.json`              | GET              | Search a doctor by the name                              | q=[name]   |
+| `/nurses/search.json`               | GET              | Search a nurse by the name                               | q=[name]   |
+| `/clinical-officers/search.json`    | GET              | Search a clinical officer by the name                    | q=[name]   |
 
 
 ### Installation

healthtools_ke_api/__init__.py

@@ -34,7 +34,9 @@ def index():
         "authentication": [],
         "endpoints": {
             "/": {"methods": ["GET"]},
-            "/nurses": {"methods": ["GET"]}
+            "/nurses": {"methods": ["GET"]},
+            "/doctors": {"methods": ["GET"]},
+            "/clinical-officers": {"methods": ["GET"]}
         }
     }
     return jsonify(msg)

healthtools_ke_api/views/sms_handler.py

@@ -2,6 +2,8 @@
 
 from healthtools_ke_api.analytics import track_event
 from healthtools_ke_api.views.nurses import get_nurses_from_nc_registry
+from healthtools_ke_api.views.doctors import get_doctors_from_cloudsearch
+from healthtools_ke_api.views.clinical_officers import get_clinical_officers_from_cloudsearch
 
 import requests
 import re
@@ -68,26 +70,25 @@ def build_query_response(query):
     if find_keyword_in_query(query, DOC_KEYWORDS):
         search_terms = find_keyword_in_query(query, DOC_KEYWORDS)
         query = query[:search_terms.start()] + query[search_terms.end():]
-        r = requests.get(current_app.config.get('DOCTORS_SEARCH_URL'), params={'q': query})
-        msg = construct_docs_response(parse_cloud_search_results(r))
-        print msg
-        return [msg, r.json()]
+        print query
+        doctors = get_doctors_from_cloudsearch(query)
+        msg = construct_docs_response(doctors[:SMS_RESULT_COUNT])
+        return [msg]
     # Looking for Nurses keywords
     elif find_keyword_in_query(query, NO_KEYWORDS):
         search_terms = find_keyword_in_query(query, NO_KEYWORDS)
         query = query[:search_terms.start()] + query[search_terms.end():]
         nurses = get_nurses_from_nc_registry(query)
         msg = construct_nurse_response(nurses[:SMS_RESULT_COUNT])
-        print msg
         return [msg]
     # Looking for clinical officers Keywords
     elif find_keyword_in_query(query, CO_KEYWORDS):
         search_terms = find_keyword_in_query(query, CO_KEYWORDS)
         query = query[:search_terms.start()] + query[search_terms.end():]
-        r = requests.get(current_app.config.get('CO_SEARCH_URL'), params={'q': query})
-        msg = construct_co_response(parse_cloud_search_results(r))
-        print msg
-        return [msg, r.json()]
+        print query
+        clinical_officers = get_clinical_officers_from_cloudsearch(query)
+        msg = construct_co_response(clinical_officers[:SMS_RESULT_COUNT])
+        return [msg]
     # Looking for nhif hospitals
     elif find_keyword_in_query(query, NHIF_KEYWORDS):
         search_terms = find_keyword_in_query(query, NHIF_KEYWORDS)
@@ -125,8 +126,9 @@ def construct_co_response(co_list):
     count = 1
     msg_items = []
     for co in co_list:
+        co = co["fields"]
         status = " ".join(
-            [str(count) + ".", co['name'], "-", co['qualification']])
+            [str(count) + ".", "".join(co['name']), "-", "".join(co['qualifications'])])
         msg_items.append(status)
         count = count + 1
     if len(co_list) > 1:
@@ -193,13 +195,14 @@ def construct_docs_response(docs_list):
     msg_items = []
 
     for doc in docs_list:
+        doc = doc["fields"]
         # Ignore speciality if not there, dont display none
-        if doc['specialty'] == "None":
-            status = " ".join([str(count) + ".", doc['name'], "-",
-                               doc['registration_number'], "-", doc['qualification']])
+        if doc['speciality'] == "None":
+            status = " ".join([str(count) + ".", "".join(doc['name']), "-",
+                               "".join(doc['reg_no']), "-", "".join(doc['qualifications'])])
         else:
-            status = " ".join([str(count) + ".", doc['name'], "-", doc[
-                              'registration_number'], "-", doc['qualification'], doc['specialty']])
+            status = " ".join([str(count) + ".", "".join(doc['name']), "-", "".join(doc[
+                              'reg_no']), "-", "".join(doc['qualifications']), "".join(doc['speciality'])])
         msg_items.append(status)
         count = count + 1
     if len(docs_list) > 1: