From c69f4cd5d948802077d9017d489289f9942704e9 Mon Sep 17 00:00:00 2001 From: Peter Odeny Date: Sat, 14 Oct 2023 14:43:00 +0300 Subject: [PATCH 1/9] add users --- core/views/coreuser.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/core/views/coreuser.py b/core/views/coreuser.py index b8a29fa2..b7797fff 100644 --- a/core/views/coreuser.py +++ b/core/views/coreuser.py @@ -89,6 +89,17 @@ def me(self, request, *args, **kwargs): serializer = self.get_serializer(instance=user, context={'request': request}) return Response(serializer.data) + @action(methods=['POST'], detail=False) + def assignees(self, request, *args, **kwargs): + user_uuids = request.data + users = ( + self.get_queryset() + .filter(core_user_uuid__in=user_uuids) + .values('core_user_uuid', 'first_name', 'last_name', 'email') + ) + + return Response(list(users), status=status.HTTP_200_OK) + @swagger_auto_schema(methods=['post'], request_body=CoreUserInvitationSerializer, responses=COREUSER_INVITE_RESPONSE) @@ -330,4 +341,4 @@ def verify_email(self, request, *args, **kwargs): { 'success': serializer.is_valid(), }, - status=status.HTTP_200_OK) \ No newline at end of file + status=status.HTTP_200_OK) From 17b11722f8cf072108a453160e96e611ac6bb818 Mon Sep 17 00:00:00 2001 From: Peter Odeny Date: Sat, 14 Oct 2023 16:23:13 +0300 Subject: [PATCH 2/9] fix data --- core/views/coreuser.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/core/views/coreuser.py b/core/views/coreuser.py index b7797fff..371bf491 100644 --- a/core/views/coreuser.py +++ b/core/views/coreuser.py @@ -92,13 +92,23 @@ def me(self, request, *args, **kwargs): @action(methods=['POST'], detail=False) def assignees(self, request, *args, **kwargs): user_uuids = request.data - users = ( - self.get_queryset() - .filter(core_user_uuid__in=user_uuids) - .values('core_user_uuid', 'first_name', 'last_name', 'email') - ) + final_data= dict() + if user_uuids: + users = ( + self.get_queryset() + .in_bulk(user_uuids) + ) + + final_data = { + key: dict( + first_name=value.first_name, + last_name=value.last_name, + ) + for key, value in users.items() + } + - return Response(list(users), status=status.HTTP_200_OK) + return Response(final_data, status=status.HTTP_200_OK) @swagger_auto_schema(methods=['post'], request_body=CoreUserInvitationSerializer, From 89317d3b39a085ae501b96f4887f50520ecc5061 Mon Sep 17 00:00:00 2001 From: Peter Odeny Date: Sun, 15 Oct 2023 13:24:52 +0300 Subject: [PATCH 3/9] fix data --- core/views/coreuser.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/views/coreuser.py b/core/views/coreuser.py index 371bf491..1c3a56b4 100644 --- a/core/views/coreuser.py +++ b/core/views/coreuser.py @@ -96,15 +96,15 @@ def assignees(self, request, *args, **kwargs): if user_uuids: users = ( self.get_queryset() - .in_bulk(user_uuids) + .filter(core_user_uuid__in=user_uuids) ) final_data = { - key: dict( - first_name=value.first_name, - last_name=value.last_name, + item.core_user_uuid: dict( + first_name=item.first_name, + last_name=item.last_name, ) - for key, value in users.items() + for item in users.items() } From 6cf8e66227f6dc0606a1480e3f70639f05f1a0f2 Mon Sep 17 00:00:00 2001 From: Peter Odeny Date: Sun, 15 Oct 2023 16:03:15 +0300 Subject: [PATCH 4/9] fix data --- core/views/coreuser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/views/coreuser.py b/core/views/coreuser.py index 1c3a56b4..6d0d9ee4 100644 --- a/core/views/coreuser.py +++ b/core/views/coreuser.py @@ -104,7 +104,7 @@ def assignees(self, request, *args, **kwargs): first_name=item.first_name, last_name=item.last_name, ) - for item in users.items() + for item in users } From ba59656b87d07f5225d84a0f64639692b9aefef9 Mon Sep 17 00:00:00 2001 From: Peter Odeny Date: Wed, 8 Nov 2023 17:36:13 +0300 Subject: [PATCH 5/9] fix error --- templates/email/coreuser/invitation.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/email/coreuser/invitation.html b/templates/email/coreuser/invitation.html index a1b5f7e8..f295cfa2 100644 --- a/templates/email/coreuser/invitation.html +++ b/templates/email/coreuser/invitation.html @@ -20,7 +20,9 @@

- My profile + + Accept invitation + From a8228d0d340ed8965f06b14454965ed545b76ab2 Mon Sep 17 00:00:00 2001 From: Peter Odeny Date: Wed, 8 Nov 2023 17:37:26 +0300 Subject: [PATCH 6/9] fix error --- templates/email/coreuser/invitation.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/email/coreuser/invitation.html b/templates/email/coreuser/invitation.html index f295cfa2..9a5b09b9 100644 --- a/templates/email/coreuser/invitation.html +++ b/templates/email/coreuser/invitation.html @@ -21,7 +21,8 @@

- Accept invitation + Accept invitation
+ or copy link: {{ invitation_link }} From f51b9ce9e7ec1b59e06081134555fa34fe6fed4c Mon Sep 17 00:00:00 2001 From: Peter Odeny Date: Wed, 8 Nov 2023 19:51:45 +0300 Subject: [PATCH 7/9] fix error --- templates/email/coreuser/invitation.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/templates/email/coreuser/invitation.html b/templates/email/coreuser/invitation.html index 9a5b09b9..be8d5d00 100644 --- a/templates/email/coreuser/invitation.html +++ b/templates/email/coreuser/invitation.html @@ -21,10 +21,13 @@

- Accept invitation
- or copy link: {{ invitation_link }} + My Profile
+ +

Or copy the link:


+

{{ invitation_link }}

+ From eb481a807f0ed50c55a7020198e02fadf153af41 Mon Sep 17 00:00:00 2001 From: Peter Odeny Date: Wed, 8 Nov 2023 20:18:05 +0300 Subject: [PATCH 8/9] fix error --- templates/email/coreuser/invitation.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/email/coreuser/invitation.html b/templates/email/coreuser/invitation.html index be8d5d00..4168bf03 100644 --- a/templates/email/coreuser/invitation.html +++ b/templates/email/coreuser/invitation.html @@ -25,8 +25,8 @@

-

Or copy the link:


-

{{ invitation_link }}

+

Or copy the link:

+

{{ invitation_link }}
From 54976265febee472f0da9b70e2e123bbcf1fe8c2 Mon Sep 17 00:00:00 2001 From: Peter Odeny Date: Sat, 11 Nov 2023 11:51:05 +0300 Subject: [PATCH 9/9] bump version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a60e0711..a6af8214 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.8" +LABEL version="0.6.0"