Merge pull request #88 from buildly-release-management/master

Update Prod

Dockerfile

@@ -25,4 +25,4 @@ EXPOSE 8080
 ENTRYPOINT ["bash", "/code/scripts/docker-entrypoint.sh"]
 
 # Specify tag name to be created on github
-LABEL version="0.5.7"
+LABEL version="0.5.8"

buildly/settings/production.py

@@ -1,4 +1,3 @@
-from .base import *
 from .authentication import *
 from .email import *
 

core/serializers.py

@@ -349,13 +349,13 @@ def save(self):
 
 class OrganizationSerializer(serializers.ModelSerializer):
     id = serializers.UUIDField(source='organization_uuid', read_only=True)
-    subscription = serializers.SerializerMethodField()
+    subscriptions = serializers.SerializerMethodField()
 
     class Meta:
         model = Organization
         fields = '__all__'
 
-    def get_subscription(self, organization):
+    def get_subscriptions(self, organization):
         return SubscriptionSerializer(
             organization.organization_subscription.all(),
             many=True

core/tests/test_coreuserview.py

@@ -434,8 +434,11 @@ def test_reset_password_confirm_token_expired(self, request_factory, reset_passw
 @pytest.mark.django_db()
 class TestCoreUserRead(object):
 
-    keys = {'id', 'core_user_uuid', 'first_name', 'last_name', 'email', 'username', 'is_active', 'title',
-            'contact_info', 'privacy_disclaimer_accepted', 'organization', 'core_groups', 'user_type', 'survey_status'}
+    keys = {
+        'id', 'core_user_uuid', 'first_name', 'last_name', 'email', 'username', 'is_active', 'title',
+        'subscriptions', 'contact_info', 'privacy_disclaimer_accepted', 'organization', 'core_groups',
+        'user_type', 'survey_status'
+    }
 
     def test_coreuser_list(self, request_factory, org_member):
         factories.CoreUser.create(organization=org_member.organization, username='another_user')  # 2nd user of the org

core/tests/test_serializers.py

@@ -21,6 +21,7 @@ def test_org_serializer(request_factory, org):
             'phone',
             'industries',
             'unlimited_free_plan',
+            'subscriptions',
             ]
     assert set(data.keys()) == set(keys)
 
@@ -62,7 +63,8 @@ def test_core_user_serializer(request_factory, org_member):
             'organization',
             'core_groups',
             'user_type',
-            'survey_status'
+            'survey_status',
+            'subscriptions'
             ]
     assert set(data.keys()) == set(keys)
     assert isinstance(data['organization'], dict)

core/views/coreuser.py

@@ -9,9 +9,6 @@
 import django_filters
 import jwt
 from drf_yasg.utils import swagger_auto_schema
-from django.http import Http404
-from rest_framework.views import APIView
-from rest_framework.permissions import AllowAny
 
 from core.models import CoreUser, Organization
 from core.serializers import (CoreUserSerializer, CoreUserWritableSerializer, CoreUserInvitationSerializer,
@@ -156,9 +153,6 @@ def invite_check(self, request, *args, **kwargs):
     @transaction.atomic
     def perform_invite(self, serializer):
 
-        reg_location = urljoin(settings.FRONTEND_URL,
-                               settings.REGISTRATION_URL_PATH)
-        reg_location = reg_location + '?token={}'
         email_addresses = serializer.validated_data.get('emails')
         user = self.request.user
 
@@ -173,9 +167,8 @@ def perform_invite(self, serializer):
                 token = create_invitation_token(email_address, organization)
 
                 # build the invitation link
-                invitation_link = self.request.build_absolute_uri(
-                    reg_location.format(token)
-                )
+                invitation_link = f'{settings.FRONTEND_URL}{settings.REGISTRATION_URL_PATH}?token={token}'
+
                 links.append(invitation_link)
 
                 # create the used context for the E-mail templates