Merge

bothub/api/v2/repository/serializers.py

@@ -162,7 +162,7 @@ def get_intents(self, obj):
                 lambda intent: {
                     'value': intent,
                     'examples__count': obj.examples(
-                        exclude_deleted=False).filter(
+                        exclude_deleted=True).filter(
                             intent=intent).count(),
                 },
                 obj.intents),

bothub/api/v2/repository/tests.py

@@ -8,11 +8,13 @@
 from bothub.common.models import RepositoryCategory
 from bothub.common.models import Repository
 from bothub.common.models import RequestRepositoryAuthorization
+from bothub.common.models import RepositoryExample
 from bothub.common import languages
 
 from ..tests.utils import create_user_and_token
 
 from .views import RepositoryViewSet
+from .serializers import RepositorySerializer
 
 
 def get_valid_mockups(categories):
@@ -362,3 +364,36 @@ def test_false_when_request(self):
         available_request_authorization = content_data.get(
             'available_request_authorization')
         self.assertFalse(available_request_authorization)
+
+
+class IntentsInRepositorySerializer(TestCase):
+    def setUp(self):
+        self.owner, self.owner_token = create_user_and_token('owner')
+
+        self.repository = Repository.objects.create(
+            owner=self.owner,
+            name='Testing',
+            slug='test',
+            language=languages.LANGUAGE_EN)
+        RepositoryExample.objects.create(
+            repository_update=self.repository.current_update(),
+            text='hi',
+            intent='greet')
+
+    def test_count_1(self):
+        repository_data = RepositorySerializer(self.repository).data
+        intent = repository_data.get('intents')[0]
+        self.assertEqual(intent.get('examples__count'), 1)
+
+    def test_example_deleted(self):
+        example = RepositoryExample.objects.create(
+            repository_update=self.repository.current_update(),
+            text='hi',
+            intent='greet')
+        repository_data = RepositorySerializer(self.repository).data
+        intent = repository_data.get('intents')[0]
+        self.assertEqual(intent.get('examples__count'), 2)
+        example.delete()
+        repository_data = RepositorySerializer(self.repository).data
+        intent = repository_data.get('intents')[0]
+        self.assertEqual(intent.get('examples__count'), 1)

bothub/common/models.py

@@ -484,7 +484,10 @@ def ready_for_train(self):
            not self.deleted.exists():
             return False
 
-        return True
+        if self.examples.count() == 0:
+            return False
+
+        return len(self.requirements_to_train) is 0
 
     @property
     def intents(self):

bothub/common/tests.py

@@ -885,6 +885,15 @@ def test_settings_change_exists_requirements(self):
             1)
         self.assertFalse(self.repository.current_update().ready_for_train)
 
+    def test_no_examples(self):
+        example = RepositoryExample.objects.create(
+            repository_update=self.repository.current_update(),
+            text='hi',
+            intent='greet')
+        self.repository.current_update().start_training(self.owner)
+        example.delete()
+        self.assertFalse(self.repository.current_update().ready_for_train)
+
 
 class RequestRepositoryAuthorizationTestCase(TestCase):
     def setUp(self):