Delete FeedbackAnalyticsAggregator

oppia · nithusha21 · Jul 7, 2021 · Jun 22, 2021 · Jun 22, 2021 · Jun 22, 2021
commit 4fae0e0e21457f846ef01fdc0b98ead3dd33da64
diff --git a/core/controllers/feedback_test.py b/core/controllers/feedback_test.py
@@ -21,12 +21,10 @@
 
 from core.domain import exp_domain
 from core.domain import exp_services
-from core.domain import feedback_jobs_continuous
 from core.domain import feedback_services
 from core.domain import rights_manager
 from core.domain import state_domain
 from core.domain import suggestion_services
-from core.domain import taskqueue_services
 from core.domain import topic_fetchers
 from core.domain import user_services
 from core.platform import models
@@ -47,17 +45,6 @@
     'entity_id', 'text', 'updated_status', 'updated_subject']
 
 
-class MockFeedbackAnalyticsAggregator(
-        feedback_jobs_continuous.FeedbackAnalyticsAggregator):
-    """A modified FeedbackAnalyticsAggregator that does not start a new batch
-    job when the previous one has finished.
-    """
-
-    @classmethod
-    def _kickoff_batch_job_after_previous_one_ends(cls):
-        pass
-
-
 class FeedbackThreadPermissionsTests(test_utils.GenericTestBase):
 
     EXP_ID = '0'
@@ -744,25 +731,10 @@ def test_get_num_threads_after_creating_feedback_analytics(self):
         feedback_services.create_thread(
             'exploration', self.exp_id, self.owner_id, 'subject', 'text')
 
-        feedback_analytics_aggregator_swap = self.swap(
-            feedback_jobs_continuous, 'FeedbackAnalyticsAggregator',
-            MockFeedbackAnalyticsAggregator)
-
-        with feedback_analytics_aggregator_swap:
-            (
-                feedback_jobs_continuous.FeedbackAnalyticsAggregator
-                .start_computation()
-            )
-            self.assertEqual(
-                self.count_jobs_in_mapreduce_taskqueue(
-                    taskqueue_services.QUEUE_NAME_CONTINUOUS_JOBS), 1)
-            self.process_and_flush_pending_mapreduce_tasks()
-            self.process_and_flush_pending_tasks()
-
-            response = self.get_json(
-                '%s/%s' % (feconf.FEEDBACK_STATS_URL_PREFIX, self.exp_id))
+        response = self.get_json(
+            '%s/%s' % (feconf.FEEDBACK_STATS_URL_PREFIX, self.exp_id))
 
-            self.assertEqual(response['num_total_threads'], 2)
-            self.assertEqual(response['num_open_threads'], 2)
+        self.assertEqual(response['num_total_threads'], 1)
+        self.assertEqual(response['num_open_threads'], 1)
 
-            self.logout()
+        self.logout()
@@ -24,6 +24,7 @@
 
 from core.domain import exp_domain
 from core.domain import exp_fetchers
+from core.domain import feedback_services
 from core.domain import stats_domain
 from core.domain import stats_services
 from core.domain import taskqueue_services
@@ -267,7 +268,7 @@ class FeedbackThreadCreatedEventHandler(BaseEventHandler):
 
     @classmethod
     def _handle_event(cls, exp_id):
-        pass
+        feedback_services.handle_new_thread_created(exp_id)
 
 
 class FeedbackThreadStatusChangedEventHandler(BaseEventHandler):
@@ -277,7 +278,8 @@ class FeedbackThreadStatusChangedEventHandler(BaseEventHandler):
 
     @classmethod
     def _handle_event(cls, exp_id, old_status, new_status):
-        pass
+        feedback_services.handle_thread_status_changed(
+            exp_id, old_status, new_status)
 
 
 class Registry(python_utils.OBJECT):

diff --git a/core/domain/feedback_jobs_continuous.py b/core/domain/feedback_jobs_continuous.py