SuggestionsIntegrationTests fix

lunrong · Jan 31, 2016 · 91d996d · 91d996d
1 parent 5205533
commit 91d996d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/core/controllers/feedback_test.py b/core/controllers/feedback_test.py
@@ -535,6 +535,10 @@ def test_actions_related_to_suggestions(self):
         rejected_suggestion_thread_id = threads[1]['thread_id']
         unsuccessful_accept_thread_id = threads[2]['thread_id']
 
+        self.assertEqual(threads[0]['subject'], 'Suggestion for state A.')
+        self.assertEqual(threads[1]['subject'], 'A new value.')
+        self.assertEqual(threads[2]['subject'], 'Empty suggestion')
+
         # Accept a suggestion.
         self._accept_suggestion(accepted_suggestion_thread_id, csrf_token)
         updated_exploration = exp_services.get_exploration_by_id(self.EXP_ID)

diff --git a/core/storage/feedback/gae_models.py b/core/storage/feedback/gae_models.py
@@ -118,17 +118,8 @@ def get_threads(cls, exploration_id):
         Does not include the deleted entries.
         """
         return cls.get_all().filter(
-            cls.exploration_id == exploration_id).fetch(
-                feconf.DEFAULT_QUERY_LIMIT)
-
-    @classmethod
-    def get_threads_with_suggestions(cls, exploration_id):
-        """Returns an array of threads that have suggestions, for the given
-        exploration."""
-
-        return cls.get_all().filter(
-            cls.exploration_id == exploration_id).filter(
-                cls.has_suggestion == True).fetch(feconf.DEFAULT_QUERY_LIMIT)  # pylint: disable=singleton-comparison
+            cls.exploration_id == exploration_id).order(
+                cls.last_updated).fetch(feconf.DEFAULT_QUERY_LIMIT)
 
 
 class FeedbackMessageModel(base_models.BaseModel):
@@ -261,7 +252,7 @@ class SuggestionModel(base_models.BaseModel):
     # Name of the corresponding state.
     state_name = ndb.StringProperty(required=True, indexed=True)
     # Learner-provided description of suggestion changes.
-    description = ndb.StringProperty(required=True, indexed=True)
+    description = ndb.TextProperty(required=True, indexed=False)
     # The state's content after the suggested edits.
     # Contains keys 'type' (always 'text') and 'value' (the actual content).
     state_content = ndb.JsonProperty(required=True, indexed=False)

diff --git a/index.yaml b/index.yaml
@@ -75,6 +75,12 @@ indexes:
   - name: last_updated
     direction: desc
 
+- kind: FeedbackThreadModel
+  properties:
+  - name: deleted
+  - name: exploration_id
+  - name: last_updated
+
 - kind: JobModel
   properties:
   - name: status_code