From 633e6c0184072b8b48518a0720f8f6d31a71427c Mon Sep 17 00:00:00 2001 From: Peter Odeny Date: Thu, 23 Mar 2023 08:55:49 +0100 Subject: [PATCH 1/3] fix unit tests --- core/serializers.py | 4 ++-- core/tests/test_coreuserview.py | 7 +++++-- core/tests/test_serializers.py | 4 +++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/core/serializers.py b/core/serializers.py index 75a82bd0..27bd8325 100644 --- a/core/serializers.py +++ b/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 diff --git a/core/tests/test_coreuserview.py b/core/tests/test_coreuserview.py index b9dda343..4202f6da 100644 --- a/core/tests/test_coreuserview.py +++ b/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 diff --git a/core/tests/test_serializers.py b/core/tests/test_serializers.py index ca7b7ae4..f23eff00 100644 --- a/core/tests/test_serializers.py +++ b/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) From 9dc5db5c7524ac542ca2b90475768757eab3b93a Mon Sep 17 00:00:00 2001 From: Peter Odeny Date: Wed, 3 May 2023 21:19:56 +0200 Subject: [PATCH 2/3] bump version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c23e3adb..a60e0711 100644 --- a/Dockerfile +++ b/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" From bca94ac3ffb043a9ec3f0a747f05743dcf6a49b0 Mon Sep 17 00:00:00 2001 From: Peter Odeny Date: Tue, 22 Aug 2023 17:17:57 +0300 Subject: [PATCH 3/3] fix invite link --- buildly/settings/production.py | 1 - core/views/coreuser.py | 11 ++--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/buildly/settings/production.py b/buildly/settings/production.py index be799f2d..5e96243e 100644 --- a/buildly/settings/production.py +++ b/buildly/settings/production.py @@ -1,4 +1,3 @@ -from .base import * from .authentication import * from .email import * diff --git a/core/views/coreuser.py b/core/views/coreuser.py index 48498fed..b8a29fa2 100644 --- a/core/views/coreuser.py +++ b/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