Fixed bug on subscriptions when not specified any field in "data" parameter to bean return on notification message.

Author: Ernesto Perez Amigo

README.md

@@ -445,6 +445,9 @@ subscription{
 
 ## Change Log:
 
+#### v0.1.0-alpha3:
+    1.  Fixed bug on subscriptions when not specified any field in "data" parameter to bean return on notification message.
+
 #### v0.1.0-alpha2:
     1.  Fixed bug when subscribing to a given action (create, update pr delete).
     2.  Added intuitive and simple web tool to test notifications of graphene-django-extras subscription.

README.rst

@@ -478,12 +478,17 @@ For unsubscribe you must send a graphql subscription request like this:
     }
 
 
-NOTE: Each time than the Graphql server restart, you must to reestablish the websocket's connection and resend the subscription graphql request with a new websocket connection id.
+*NOTE*: Each time than the Graphql server restart, you must to reestablish the websocket's connection and resend the subscription graphql request with a new websocket connection id.
 
 
 Change Log:
 -----------
 
+**************
+v0.1.0-alpha3:
+**************
+1.  Fixed bug on subscriptions when not specified any field in "data" parameter to bean return on notification message.
+
 **************
 v0.1.0-alpha2:
 **************

graphene_django_extras/__init__.py

@@ -8,7 +8,7 @@
 from .types import DjangoObjectType, DjangoInputObjectType, DjangoListObjectType
 from .subscriptions import *
 
-VERSION = (0, 1, 0, 'alpha', '2')
+VERSION = (0, 1, 0, 'alpha', '3')
 
 __version__ = get_version(VERSION)
 

graphene_django_extras/subscriptions/mixins.py

@@ -39,6 +39,8 @@ def serialize(self, instance, action):
 
     def serialize_data(self, instance):
         data = self.get_serializer(instance).data
-        if hasattr(self.get_serializer_class().Meta, 'only_fields'):
-            data = {k: v for k, v in data.items() if k in self.get_serializer_class().Meta.only_fields}
+        only_fields = hasattr(self.get_serializer_class().Meta, 'only_fields')
+        if only_fields:
+            if self.get_serializer_class().Meta.only_fields != ['all_fields']:
+                data = {k: v for k, v in data.items() if k in self.get_serializer_class().Meta.only_fields}
         return data

graphene_django_extras/subscriptions/subscription.py

@@ -75,19 +75,20 @@ def __init_subclass_with_meta__(cls, mutation_class=None, stream=None, queryset=
         _meta.serializer_class = copy.deepcopy(mutation_class._meta.serializer_class)
         _meta.mutation_class = mutation_class
 
-        model_fields = Enum('{}Fields'.format(mutation_class._meta.model.__name__),
-                            [(to_snake_case(field.strip('_')).upper(), to_snake_case(field))
-                            for field in _meta.serializer_class.Meta.fields])
+        serializer_fields = [(to_snake_case(field.strip('_')).upper(), to_snake_case(field))
+                             for field in _meta.serializer_class.Meta.fields]
+        model_fields_enum = Enum('{}Fields'.format(mutation_class._meta.model.__name__),
+                                 serializer_fields + [('ALL_FIELDS', 'all_fields')],
+                                 description=_('Desired {} fields in subscription\'s  notification. You can specify '
+                                               '"all_fields" value.').format(mutation_class._meta.model.__name__))
 
         arguments = {
             'channel_id': Argument(String, required=True, description=_('Channel connection identification')),
             'action': Argument(ActionSubscriptionEnum, required=True,
                                description=_('Action to subscribe or to unsubscribe: (create, update or delete)')),
             'operation': Argument(OperationSubscriptionEnum, required=True, description=_('Operation to do')),
             'id': Argument(ID, description=_('ID value that the object to watch must have')),
-            'data': List(model_fields, required=False,
-                         description=_('Desired {} fields in subscription\'s  notification')
-                         .format(mutation_class._meta.model.__name__))
+            'data': List(model_fields_enum, required=False)
         }
 
         _meta.arguments = arguments
@@ -113,7 +114,7 @@ def subscription_resolver(cls, root, info, **kwargs):
         # Manage the subscribe or unsubscribe operations
         action = kwargs.get('action')
         operation = kwargs.get('operation')
-        data = kwargs.get('data', [])
+        data = kwargs.get('data', None)
         obj_id = kwargs.get('id', None)
 
         response = {
@@ -142,7 +143,8 @@ def subscription_resolver(cls, root, info, **kwargs):
                 elif operation == 'unsubscribe':
                     Group(group_name).discard(channel)
 
-            setattr(cls._meta.serializer_class.Meta, 'only_fields', data)
+            if data is not None:
+                setattr(cls._meta.serializer_class.Meta, 'only_fields', data)
 
             response.update(dict(ok=True, error=None))
             channel.send({'text': json.dumps(response)})