fix bug handler.priority not saved

jlmadurga · Apr 27, 2016 · 32872f0 · 32872f0
1 parent f2b84e1
commit 32872f0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/microbot/serializers/handler.py b/microbot/serializers/handler.py
@@ -107,8 +107,7 @@ class HandlerUpdateSerializer(HandlerSerializer):
     pattern = serializers.CharField(required=False, max_length=250, validators=[validators.validate_pattern],
                                     help_text=_("""Regular expression the Handler will be triggered. 
                                                 Using https://docs.python.org/2/library/re.html#regular-expression-syntax"""))
-    priority = serializers.IntegerField(required=False, min_value=0,
-                                        help_text=_("Set priority execution. Higher value higher priority"))
+    priority = serializers.IntegerField(required=False, help_text=_("Set priority execution. Higher value higher priority"))
     response = ResponseUpdateSerializer(many=False, required=False,
                                         help_text=_("Template the handler uses to generate response"))
     request = RequestUpdateSerializer(many=False, required=False,

diff --git a/microbot/views/api/handler.py b/microbot/views/api/handler.py
@@ -32,6 +32,7 @@ def _creator(self, bot, serializer):
         return Handler.objects.create(bot=bot,
                                       name=serializer.data['name'],
                                       pattern=serializer.data['pattern'],
+                                      priority=serializer.data.get('priority', 0),
                                       response=response,
                                       enabled=serializer.data['enabled'],
                                       request=request,

diff --git a/tests/api/test_handler.py b/tests/api/test_handler.py
@@ -94,7 +94,7 @@ def test_get_handlers_not_auth(self):
         self._test_get_list_not_auth(self._handler_list_url())
 
     def test_post_handlers_ok(self):
-        data = {'name': self.handler.name, 'pattern': self.handler.pattern, 
+        data = {'name': self.handler.name, 'pattern': self.handler.pattern,
                 'response': {'text_template': self.handler.response.text_template,
                              'keyboard_template': self.handler.response.keyboard_template},
                 'enabled': False, 'request': {'url_template': self.handler.request.url_template, 'method': self.handler.request.method,
@@ -228,7 +228,7 @@ def test_get_handler_not_found(self):
 
     def test_put_handler_ok(self):
         data = {'name': self.handler.name, 'pattern': self.handler.pattern, 'response': {'text_template': self.handler.response.text_template,
-                'keyboard_template': self.handler.response.keyboard_template}, 'enabled': False, 'priority': self.handler.priority,
+                'keyboard_template': self.handler.response.keyboard_template}, 'enabled': False, 'priority': -1,
                 'request': {'url_template': self.handler.request.url_template, 'method': self.handler.request.method,
                             'url_parameters': [{'key': self.handler.request.url_parameters.all()[0].key,
                                                 'value_template': 'new_url_param_value'}],
@@ -239,6 +239,7 @@ def test_put_handler_ok(self):
         data = self._test_put_detail_ok(self._handler_detail_url(), data, HandlerDetail, self.bot.pk, self.handler.pk)
         updated = Handler.objects.get(pk=self.handler.pk)
         self.assertEqual(updated.enabled, False)
+        self.assertEqual(updated.priority, -1)
         self.assertEqual(UrlParam.objects.get(key=self.handler.request.url_parameters.all()[0].key).value_template, 'new_url_param_value')
         self.assertEqual(HeaderParam.objects.get(key=self.handler.request.header_parameters.all()[0].key).value_template, 'new_header_param_value')
         self.assertHandler(data['id'], data['created_at'], data['updated_at'], data['name'],