From 1dec5ace3f5b668f190b4808678693b6d86a351a Mon Sep 17 00:00:00 2001 From: abutalib-kiwi Date: Tue, 12 Sep 2023 14:42:44 +0530 Subject: [PATCH 1/2] test cases for admin user management, analytics and notification --- account/utils.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/account/utils.py b/account/utils.py index 428df15..564472b 100644 --- a/account/utils.py +++ b/account/utils.py @@ -300,24 +300,21 @@ def make_special_password(length=10): lowercase_letters = string.ascii_lowercase uppercase_letters = string.ascii_uppercase digits = string.digits - special_characters = '!@#$%^&*()_-+=<>?/[]{}|' + special_characters = '@#$%&*?' # Combine character sets - all_characters = lowercase_letters + uppercase_letters + digits + special_characters + alphabets = lowercase_letters + uppercase_letters # Create a password with random characters - password = ( - secrets.choice(lowercase_letters) + + password = [ secrets.choice(uppercase_letters) + + secrets.choice(lowercase_letters) + secrets.choice(digits) + secrets.choice(special_characters) + - ''.join(secrets.choice(all_characters) for _ in range(length - 4)) - ) + ''.join(secrets.choice(alphabets) for _ in range(length - 4)) + ] - # Shuffle the characters to make it more random - password_list = list(password) - random.shuffle(password_list) - return ''.join(password_list) + return ''.join(password) def task_status_fun(status_value): """task status""" From 085607128b92429000d23298e1f864e2bdc56600 Mon Sep 17 00:00:00 2001 From: abutalib-kiwi Date: Wed, 13 Sep 2023 13:36:25 +0530 Subject: [PATCH 2/2] modified get article card current page method --- web_admin/serializers/article_serializer.py | 3 ++- web_admin/views/article.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web_admin/serializers/article_serializer.py b/web_admin/serializers/article_serializer.py index c1bde0e..74cf793 100644 --- a/web_admin/serializers/article_serializer.py +++ b/web_admin/serializers/article_serializer.py @@ -357,8 +357,9 @@ class ArticleCardlistSerializer(serializers.ModelSerializer): """current page""" context_data = self.context.get('user') data = JuniorArticle.objects.filter(junior__auth=context_data, article=obj.article).last() + total_count = self.context.get('card_count') if data: - return data.current_card_page + return data.current_que_page if data.current_que_page < total_count else data.current_que_page - 1 return NUMBER['zero'] class Meta(object): diff --git a/web_admin/views/article.py b/web_admin/views/article.py index e2cee07..1aa46a9 100644 --- a/web_admin/views/article.py +++ b/web_admin/views/article.py @@ -279,7 +279,8 @@ class ArticleCardListViewSet(viewsets.ModelViewSet): try: queryset = self.get_queryset() # article card list - serializer = ArticleCardlistSerializer(queryset, context={"user": self.request.user}, many=True) + serializer = ArticleCardlistSerializer(queryset, context={"user": self.request.user, + "card_count": queryset.count()}, many=True) return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) except Exception as e: return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)