Make some changes for auth view

dashboard/views.py

@@ -68,7 +68,7 @@ class UnRepliedReviewList(View):
         now = timezone.now()
         form = ReplyForm()
         date = now - timezone.timedelta(days=30)
-        reviews = Review.objects.filter(reply=None, update_time__gte=date).order_by('-update_time')
+        reviews = Review.objects.filter(reply=None, update_time__gte=date).exclude(comment=None).order_by('update_time')
         return render(request, 'dashboard.html', {'reviews': reviews, 'form': form})
 
 

gauth/auth_utils.py

@@ -59,8 +59,8 @@ def refresh_access_token():
     }
 
     response = post(token_uri, data=params).json()
-    access_token = response['access_token']
-    expires_in = response['expires_in']
+    access_token = response.get('access_token')
+    expires_in = response.get('expires_in')
     return access_token, expires_in
 
 

gauth/views.py

@@ -21,7 +21,7 @@ flow = google_auth_oauthlib.flow.Flow.from_client_secrets_file(
 def get_token(request):
     get_access_token(request)
     cred = request.session['credentials']
-    return HttpResponse(cred['access_token'])
+    return HttpResponse(cred.get('access_token'))
 
 
 @login_required
@@ -29,7 +29,7 @@ def google_auth(request):
     user = User.objects.filter(username='admin@ercare').first()
     if not user:
         return HttpResponse('<h1>You have to have a user account with username "admin@ercare". Please create a superuser using manage.py createsuperuser</h2>')
-    return redirect(reverse('authorize'))
+    return redirect('authorize')
 
 
 def authorize(request):
@@ -54,8 +54,9 @@ def oauth2callback(request):
     user_model.refresh_token = credentials.refresh_token
     user_model.gmb_account_id = account_id
     user_model.save()
+    print(credentials.refresh_token)
     request.session['credentials'] = credentials_to_dict(credentials)
-    return redirect(reverse('token'))
+    return redirect('token')
 
 
 def credentials_to_dict(credentials):

nlu_job/views.py

@@ -18,7 +18,7 @@ def predict_report(request, review_id):
     now = timezone.now()
     form = ReplyForm()
     date = now - timezone.timedelta(days=30)
-    reviews = Review.objects.filter(reply=None, update_time__gte=date).order_by('-update_time')
+    reviews = Review.objects.filter(reply=None, update_time__gte=date).exclude(comment=None).order_by('update_time')
     replies = {}
     for intent in intents.keys():
         r = CustomReply.objects.filter(reply_category=intent)