Merge 3a2ce37 into 015bed8

.gitignore

@@ -116,3 +116,6 @@ staticfiles/
 
 # OS
 .DS_Store
+
+#Pycharm
+.idea/

Pipfile

@@ -14,12 +14,14 @@ requests = "==2.20.1"
 coreapi = "==2.3.3"
 whitenoise = "==4.1.2"
 pytz = "==2018.7"
+drf-yasg = "*"
 
 [dev-packages]
 "flake8" = "*"
 coverage = "*"
 ipython = "*"
 autopep8 = "*"
+packaging = "*"
 
 [requires]
 python_version = "3.6"

bothub/api/v1/routers.py

@@ -1,7 +1,7 @@
 from rest_framework import routers
 
 from .views import NewRepositoryViewSet
-from .views import MyRepositoriesViewSet
+from .views import SearchRepositoriesViewSet
 from .views import RepositoryViewSet
 from .views import NewRepositoryExampleViewSet
 from .views import RepositoryExampleViewSet
@@ -31,7 +31,7 @@
 class Router(routers.SimpleRouter):
     routes = [
         # Dynamically generated list routes.
-        # Generated using @list_route decorator
+        # Generated using @action decorator
         # on methods of the viewset.
         routers.DynamicRoute(
             url=r'^{prefix}/{url_path}{trailing_slash}$',
@@ -40,7 +40,7 @@ class Router(routers.SimpleRouter):
             initkwargs={},
         ),
         # Dynamically generated detail routes.
-        # Generated using @detail_route decorator on methods of the viewset.
+        # Generated using @action decorator on methods of the viewset.
         routers.DynamicRoute(
             url=r'^{prefix}/{lookup}/{url_path}{trailing_slash}$',
             name='{basename}-{url_name}',
@@ -99,7 +99,7 @@ def get_lookup_regex(self, viewset, lookup_prefix=''):
 
 router = Router()
 router.register('repository/new', NewRepositoryViewSet)
-router.register('my-repositories', MyRepositoriesViewSet)
+router.register('search-repositories', SearchRepositoriesViewSet)
 router.register('repository', RepositoryViewSet)
 router.register('example/new', NewRepositoryExampleViewSet)
 router.register('example', RepositoryExampleViewSet)

bothub/api/v1/serializers/__init__.py

@@ -5,7 +5,6 @@
     AnalyzeTextSerializer,
     EvaluateSerializer,
     EditRepositorySerializer,
-    VoteSerializer,
     RepositoryAuthorizationRoleSerializer,
 )
 

bothub/api/v1/serializers/category.py

@@ -11,3 +11,4 @@ class Meta:
             'name',
             'icon',
         ]
+        ref_name = None

bothub/api/v1/serializers/example.py

@@ -16,6 +16,7 @@
 from ..validators import CanContributeInRepositoryExampleValidator
 from ..validators import CanContributeInRepositoryValidator
 from ..validators import ExampleWithIntentOrEntityValidator
+from ..validators import IntentAndSentenceNotExistsValidator
 from ..validators import EntityNotEqualLabelValidator
 from .translate import RepositoryTranslatedExampleSerializer
 
@@ -33,6 +34,7 @@ class Meta:
             'created_at',
             'value',
         ]
+        ref_name = None
 
     repository_example = serializers.PrimaryKeyRelatedField(
         queryset=RepositoryExample.objects,
@@ -62,6 +64,7 @@ class Meta:
             'entity',
             'label',
         ]
+        ref_name = None
 
     repository_example = serializers.PrimaryKeyRelatedField(
         queryset=RepositoryExample.objects,
@@ -107,6 +110,7 @@ class Meta:
             'repository_update',
             'deleted_in',
         ]
+        ref_name = None
 
     entities = RepositoryExampleEntitySerializer(
         many=True,
@@ -132,6 +136,7 @@ class Meta:
             'intent',
             'entities',
         ]
+        ref_name = None
 
     id = serializers.PrimaryKeyRelatedField(
         read_only=True,
@@ -158,10 +163,12 @@ class Meta:
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.validators.append(ExampleWithIntentOrEntityValidator())
+        self.validators.append(IntentAndSentenceNotExistsValidator())
 
     def create(self, validated_data):
         entities_data = validated_data.pop('entities')
         repository = validated_data.pop('repository')
+
         try:
             language = validated_data.pop('language')
         except KeyError:
@@ -186,6 +193,7 @@ class Meta:
             'value',
             'label',
         ]
+        ref_name = None
 
     label = serializers.SerializerMethodField()
 
@@ -203,6 +211,7 @@ class Meta:
             'value',
             'entities',
         ]
+        ref_name = None
 
     repository = serializers.StringRelatedField(read_only=True)
     entities = serializers.SlugRelatedField(