Merge branch 'master' into activities-redesign

.gitignore

@@ -1 +1 @@
-pre-commit-venv
+pre-commit-venv

zubhub_backend/Makefile

@@ -98,7 +98,7 @@ default-theme:
 	docker-compose -f docker-compose.yml exec web bash -c "python zubhub/manage.py create_default_theme"
 .PHONY: default-theme
 
-init: .env start migrate admin-user add-theme ## Initialize docker-compose containers
+init: .env start migrate admin-user default-theme ## Initialize docker-compose containers
 .PHONY: init
 
 search-index:

zubhub_backend/zubhub/creators/adapter.py

@@ -38,6 +38,7 @@ def save_user(self, request, user, form, commit=False):
         creator.bio = data.get('bio')
         creator.location = location
         creator.is_active = is_active
+        creator.tags.set(data.get('creator_tags'))
         creator.save()
 
         Setting(creator=creator, subscribe=data.get("subscribe")).save()

zubhub_backend/zubhub/creators/serializers.py

@@ -8,8 +8,7 @@
 from django.utils.translation import gettext_lazy as _
 import csv
 from .admin import badges
-from .models import CreatorGroup, Creator, CreatorGroupMembership
-from .models import Location, PhoneNumber
+from .models import CreatorGroup, Creator, CreatorGroupMembership, Location, PhoneNumber, CreatorTag
 from allauth.account.models import EmailAddress
 from rest_auth.registration.serializers import RegisterSerializer
 from rest_auth.serializers import PasswordResetSerializer
@@ -199,6 +198,8 @@ class CustomRegisterSerializer(RegisterSerializer):
                                             queryset=Location.objects.all())
     bio = serializers.CharField(allow_blank=True, default="", max_length=255)
     subscribe = serializers.BooleanField(default=False)
+    creator_tags = serializers.SlugRelatedField(slug_field='name',
+                                                queryset=CreatorTag.objects.all())
 
     def validate_username(self, username):
         # Check if the value is a valid email
@@ -247,13 +248,22 @@ def validate_location(self, location):
             raise serializers.ValidationError(_("Location is required"))
         return location
 
+    def validate_creator_tags(self, creator_tags):
+        if (len(creator_tags) < 1):
+            raise serializers.ValidationError(_("Creator tags are required"))
+        for tag in creator_tags:
+            if not CreatorTag.objects.filter(name=tag).exists():
+                raise serializers.ValidationError(_("Invalid creator tag: {}".format(tag)))
+        return creator_tags
+
     def get_cleaned_data(self):
         data_dict = super().get_cleaned_data()
         data_dict['phone'] = self.validated_data.get('phone', '')
         data_dict['dateOfBirth'] = self.validated_data.get('dateOfBirth', '')
         data_dict['location'] = self.validated_data.get('location', '')
         data_dict['bio'] = self.validated_data.get('bio', '')
         data_dict['subscribe'] = self.validated_data.get('subscribe', '')
+        data_dict['creator_tags'] = self.validated_data.get('creator_tags', [])
 
         return data_dict
 

zubhub_backend/zubhub/creators/views.py

@@ -1,5 +1,3 @@
-import csv
-from io import StringIO
 from django.forms import ValidationError
 from django.utils.translation import ugettext_lazy as _
 from notifications.models import Notification
@@ -188,6 +186,7 @@ class RegisterCreatorAPIView(RegisterView):
             "location": "string",\n
             "bio": "",\n
             "subscribe": false\n
+            "creator_tags": "string",\n
         }\n
     """