[Findit] A huge refactoring and some bug fixing.

appengine/findit/handlers/list_analyses.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 import datetime
 
 from google.appengine.ext import ndb
 
 from base_handler import BaseHandler
 from base_handler import Permission
 from model.wf_analysis import WfAnalysis
-from model import wf_analysis_result_status
+from model import result_status
 
 
 _DEFAULT_DISPLAY_COUNT = 500
 
 
 class ListAnalyses(BaseHandler):
   PERMISSION_LEVEL = Permission.ANYONE
 
   def HandleGet(self):
     """Shows a list of Findit analysis results in HTML page.
 
     By default the page will display all the results under status FOUND_CORRECT,
     FOUND_INCORRECT and NOT_FOUND_INCORRECT.
 
     Available parameters:
       count: Parameter for number of analysis result to be displayed.
       result_status: Parameter to specify the result_status of the results.
       triage: Parameter for internal use. The page will display analysis results
         under status FOUND_INCORRECT, NOT_FOUND_INCORRECT, FOUND_UNTRIAGED and
         NOT_FOUND_UNTRIAGED.
       days: Parameter to decide only display results within a fixed amount of
         days. This parameter will turn off triage parameter and display all the
         results regardless of result_status.
     """
     status_code = int(self.request.get('result_status', '-1'))
     if status_code >= 0:
       analysis_query = WfAnalysis.query(WfAnalysis.result_status == status_code)
     elif self.request.get('triage') == '1':
       analysis_query = WfAnalysis.query(ndb.AND(
-          WfAnalysis.result_status > wf_analysis_result_status.FOUND_CORRECT,
+          WfAnalysis.result_status > result_status.FOUND_CORRECT,
           WfAnalysis.result_status <
-          wf_analysis_result_status.NOT_FOUND_CORRECT))
+          result_status.NOT_FOUND_CORRECT))
     else:
       analysis_query = WfAnalysis.query(ndb.AND(
-          WfAnalysis.result_status >= wf_analysis_result_status.FOUND_CORRECT,
-          WfAnalysis.result_status < wf_analysis_result_status.FOUND_UNTRIAGED))
+          WfAnalysis.result_status >= result_status.FOUND_CORRECT,
+          WfAnalysis.result_status < result_status.FOUND_UNTRIAGED))
 
     if self.request.get('count'):
       count = int(self.request.get('count'))
     else:
       count = _DEFAULT_DISPLAY_COUNT
 
     if self.request.get('days'):  # pragma: no cover
       start_date = datetime.datetime.utcnow() - datetime.timedelta(
           int(self.request.get('days')))
       start_date = start_date.replace(
@@ skipping 36 matching lines @@
         'analyses': analyses,
         'triage': self.request.get('triage', '-1'),
         'days': self.request.get('days', '-1'),
         'count': self.request.get('count', '-1'),
         'result_status': self.request.get('result_status', '-1')
     }
     return {'template': 'list_analyses.html', 'data': data}
 
   def HandlePost(self):  # pragma: no cover
     return self.HandleGet()