Merge pull request #227 from gcivil-nyu-org/develop

Final

Author: deusalexmachina

chatbot/templates/chat.html

@@ -80,7 +80,7 @@ <h1 class="mb-3 mb-md-0 hero-heading mb-0">Test our chatBot client</h1>
   $(window).load(function() {
     $messages.mCustomScrollbar();
     {% if user.is_authenticated %}
-    insertResponseMessage('Hi {{ user.username }}, I\'m your Personal Concierge. How can I help?');
+    insertResponseMessage('Hi {{ user.username }}, I’m a virtual assistant that can help you find COVID-19 compliant restaurants.');
     {% endif %}
   });
 
@@ -120,7 +120,7 @@ <h1 class="mb-3 mb-md-0 hero-heading mb-0">Test our chatBot client</h1>
         if (m != d.getMinutes()) {
           m = d.getMinutes();
         }
-    $('<div class="media col-md-9 col-xl-7 ml-auto mb-3"><div class="media-body mr-3"><div class="bg-primary rounded p-4 mb-2"><p class="text-sm mb-0 text-white">' + msg + '</p></div><p class="small ml-3">' + d.getHours() + ':' + m + '</p></div><img class="avatar avatar-border-white" src="https://d19m59y37dris4.cloudfront.net/directory/1-6/img/avatar/avatar-10.jpg" alt="user" /></div>').appendTo($('.mCSB_container')).addClass('new');
+    $('<div class="media col-md-9 col-xl-7 ml-auto mb-3"><div class="media-body mr-3"><div class="bg-primary rounded p-4 mb-2"><p class="text-sm mb-0 text-white">' + msg + '</p></div><p class="small ml-3">' + d.getHours() + ':' + m + '</p></div><img class="avatar avatar-border-white" src="https://dine-safely.s3.amazonaws.com/icon-user-1.png" alt="user" /></div>').appendTo($('.mCSB_container')).addClass('new');
     $('.message-input').val('');
     updateScrollbar();
 
@@ -136,10 +136,17 @@ <h1 class="mb-3 mb-md-0 hero-heading mb-0">Test our chatBot client</h1>
 
           for (var message of messages) {
             if (message.type === 'unstructured') {
-              insertResponseMessage(message.unstructured.text);
+
+              // Got json from aws
+              if (message.unstructured.text[0] == "{") {
+                var aws_data = JSON.parse(message.unstructured.text);
+                insertResponseMessageWithFilter(aws_data);
+              } else {
+                insertResponseMessage(message.unstructured.text);
+              }
+
             } else if (message.type === 'structured' && message.structured.type === 'product') {
               var html = '';
-
               insertResponseMessage(message.structured.text);
 
               setTimeout(function() {
@@ -174,6 +181,33 @@ <h1 class="mb-3 mb-md-0 hero-heading mb-0">Test our chatBot client</h1>
       return false;
     }
   })
+  function insertResponseMessageWithFilter(filter) {
+    console.log(filter);
+    $.ajax({
+      type: 'POST',
+      url: '../restaurant/chatbot/keywordtest',
+      data: JSON.stringify(filter),
+      contentType: 'application/json; charset=UTF-8',
+      dataType: 'json',
+      success: function(data) {
+        if (data['restaurants'].length == 0) {
+          insertResponseMessage("Sorry, we couldn't find any compliant restaurants based on your inputs.");
+        } else {
+          let recommend_restaurants_str = "Here, I found some highly-rated restaurant(s) for you!<br>";
+          for(var i = 0; i < data['restaurants'].length; i++) {
+            recommend_restaurants_str += "<a target='_blank' href=" + "https://dine-safe-ly.herokuapp.com/restaurant/profile/" + data['restaurants'][i]['id'].toString() + ">" + data['restaurants'][i]['restaurant_name'].toString() + "</a>";
+            recommend_restaurants_str += "<br>";
+          }
+          insertResponseMessage(recommend_restaurants_str);
+        }
+
+
+
+      },
+      error: function(xhr, type) {
+      }
+    });
+  }
 
   function insertResponseMessage(content) {
     $('<div class="message loading new"><figure class="avatar"><img src="https://media1.tenor.com/images/672b62d967f8d00d608d22f36c1831db/tenor.gif" width="25px" height="25px" /></figure><span></span></div>').appendTo($('.mCSB_container'));
@@ -185,7 +219,7 @@ <h1 class="mb-3 mb-md-0 hero-heading mb-0">Test our chatBot client</h1>
         if (m != d.getMinutes()) {
           m = d.getMinutes();
         }
-      $('<div class="media col-md-9 col-xl-7 mb-3"><img class="avatar avatar-border-white" src="https://d19m59y37dris4.cloudfront.net/directory/1-6/img/avatar/avatar-1.jpg" alt="user"><div class="message media-body ml-3"><div class="bg-gray-200 rounded p-4 mb-2"><p class="text-sm mb-0">' + content + '</p></div><p class="small ml-3">' + d.getHours() + ':' + m + '</p></div>').appendTo($('.mCSB_container')).addClass('new');
+      $('<div class="media col-md-9 col-xl-7 mb-3"><img class="avatar avatar-border-white" src="https://dine-safely.s3.amazonaws.com/icons8-chatbot-80.png" alt="user"><div class="message media-body ml-3"><div class="bg-gray-200 rounded p-4 mb-2"><p class="text-sm mb-0">' + content + '</p></div><p class="small ml-3">' + d.getHours() + ':' + m + '</p></div>').appendTo($('.mCSB_container')).addClass('new');
 
       updateScrollbar();
       i++;

data.json

@@ -1,7 +1,5 @@
 from django.shortcuts import render
-from restaurant.utils import (
-    get_restaurant_list,
-)
+from restaurant.utils import get_compliant_restaurant_list
 
 import logging
 
@@ -11,8 +9,11 @@
 
 
 def index(request):
-    restaurant_list = get_restaurant_list(
-        1, RESTAURANT_NUMBER, rating_filter=[3, 4, 5], compliant_filter="Compliant"
+    restaurant_list = get_compliant_restaurant_list(
+        1,
+        RESTAURANT_NUMBER,
+        rating_filter=[3, 3.5, 4, 4.5, 5],
+        compliant_filter="Compliant",
     )
     parameter_dict = {
         "restaurant_list": restaurant_list,

dinesafelysite/views.py

@@ -0,0 +1,10 @@
+diff a/getinspection.py b/getinspection.py	(rejected hunks)
+@@ -207,7 +207,7 @@
+         # save_inspections(inspection_df)
+ 
+ 
+-# sched.start()
++sched.start()
+ 
+ 
+ def populate_restaurant_with_yelp_id():

getinspection.py.rej

@@ -28,16 +28,6 @@ def save(self, commit=True):
         return questionnaire
 
 
-class SaveFavoriteForm(forms.Form):
-    restaurant_business_id = forms.CharField(label="restaurant_id")
-    user_id = forms.CharField(label="user_id", required=False)
-
-
-class DeleteFavoriteForm(forms.Form):
-    restaurant_business_id = forms.CharField(label="restaurant_id")
-    user_id = forms.CharField(label="user_id")
-
-
 class SearchFilterForm(forms.Form):
     CHOICES_NEIGHBOURHOOD = [
         ("Chelsea and Clinton", "Chelsea and Clinton"),