Merge pull request #310 from KiwiTechLLC/ZBKBCK-50

modified article publish and un-publish api, sonar issues, modificati…

account/utils.py

@@ -289,7 +289,13 @@ def get_user_full_name(user_obj):
     """
     return f"{user_obj.first_name} {user_obj.last_name}" if user_obj.first_name or user_obj.last_name else "User"
 
+
 def make_special_password(length=10):
+    """
+    to make secured password
+    :param length:
+    :return:
+    """
     # Define character sets
     lowercase_letters = string.ascii_lowercase
     uppercase_letters = string.ascii_uppercase
@@ -301,11 +307,11 @@ def make_special_password(length=10):
 
     # Create a password with random characters
     password = (
-        random.choice(lowercase_letters) +
+        secrets.choice(lowercase_letters) +
-        random.choice(uppercase_letters) +
+        secrets.choice(uppercase_letters) +
-        random.choice(digits) +
+        secrets.choice(digits) +
-        random.choice(special_characters) +
+        secrets.choice(special_characters) +
-        ''.join(random.choice(all_characters) for _ in range(length - 4))
+        ''.join(secrets.choice(all_characters) for _ in range(length - 4))
     )
 
     # Shuffle the characters to make it more random

guardian/views.py

@@ -185,9 +185,12 @@ class CreateTaskAPIView(viewsets.ModelViewSet):
         try:
             image = request.data['default_image']
             junior_ids = request.data['junior'].split(',')
-            # if not junior.isnumeric():
+
-            #     """junior value must be integer"""
+            invalid_junior_ids = [junior_id for junior_id in junior_ids if not junior_id.isnumeric()]
-            #     return custom_error_response(ERROR_CODE['2047'], response_status=status.HTTP_400_BAD_REQUEST)
+            if invalid_junior_ids:
+                # At least one junior value is not an integer
+                return custom_error_response(ERROR_CODE['2047'], response_status=status.HTTP_400_BAD_REQUEST)
+
             allowed_extensions = ['.jpg', '.jpeg', '.png']
             if not any(extension in str(image) for extension in allowed_extensions):
                 return custom_error_response(ERROR_CODE['2048'], response_status=status.HTTP_400_BAD_REQUEST)
@@ -203,9 +206,8 @@ class CreateTaskAPIView(viewsets.ModelViewSet):
 
             guardian = Guardian.objects.filter(user=request.user).select_related('user').last()
             junior_data = Junior.objects.filter(id__in=junior_ids).select_related('auth')
-
+            if junior_data:
                 for junior in junior_data:
-                if junior:
                     index = junior.guardian_code.index(guardian.guardian_code)
                     status_index = junior.guardian_code_status[index]
                     if status_index == str(NUMBER['three']):

web_admin/serializers/article_serializer.py

@@ -15,6 +15,7 @@ from notifications.utils import send_notification_multiple_user
 from web_admin.models import Article, ArticleCard, SurveyOption, ArticleSurvey, DefaultArticleCardImage
 from web_admin.utils import pop_id, get_image_url
 from junior.models import JuniorArticlePoints, JuniorArticle
+
 USER = get_user_model()
 
 
@@ -90,10 +91,9 @@ class ArticleSerializer(serializers.ModelSerializer):
         """
         article_cards = attrs.get('article_cards', None)
         article_survey = attrs.get('article_survey', None)
-        if article_cards is None or len(article_cards) > int(MAX_ARTICLE_CARD):
+        if not 0 < len(article_cards) <= int(MAX_ARTICLE_CARD):
             raise serializers.ValidationError({'details': ERROR_CODE['2039']})
-        if article_survey is None or len(article_survey) < int(MIN_ARTICLE_SURVEY) or int(
+        if not int(MIN_ARTICLE_SURVEY) <= len(article_survey) <= int(MAX_ARTICLE_SURVEY):
-                MAX_ARTICLE_SURVEY) < len(article_survey):
             raise serializers.ValidationError({'details': ERROR_CODE['2040']})
         return attrs
 
@@ -185,6 +185,28 @@ class ArticleSerializer(serializers.ModelSerializer):
         return instance
 
 
+class ArticleStatusChangeSerializer(serializers.ModelSerializer):
+    """
+    Article status change serializer
+    """
+    class Meta:
+        """
+        meta class
+        """
+        model = Article
+        fields = ('is_published', )
+
+    def update(self, instance, validated_data):
+        """
+        :param instance: article object
+        :param validated_data:
+        :return:
+        """
+        instance.is_published = validated_data['is_published']
+        instance.save()
+        return instance
+
+
 class DefaultArticleCardImageSerializer(serializers.ModelSerializer):
     """
     Article Card serializer
@@ -221,6 +243,7 @@ class DefaultArticleCardImageSerializer(serializers.ModelSerializer):
         card_image = DefaultArticleCardImage.objects.create(**validated_data)
         return card_image
 
+
 class ArticleListSerializer(serializers.ModelSerializer):
     """
     serializer for article API
@@ -234,13 +257,14 @@ class ArticleListSerializer(serializers.ModelSerializer):
         meta class
         """
         model = Article
-        fields = ('id', 'title', 'description','image', 'total_points', 'is_completed')
+        fields = ('id', 'title', 'description', 'image', 'total_points', 'is_completed')
 
     def get_image(self, obj):
         """article image"""
         if obj.article_cards.first():
             return obj.article_cards.first().image_url
         return None
+
     def get_total_points(self, obj):
         """total points of article"""
         return obj.article_survey.all().count() * NUMBER['five']
@@ -253,6 +277,7 @@ class ArticleListSerializer(serializers.ModelSerializer):
             return junior_article.is_completed
         return False
 
+
 class ArticleQuestionSerializer(serializers.ModelSerializer):
     """
     article survey serializer
@@ -263,7 +288,6 @@ class ArticleQuestionSerializer(serializers.ModelSerializer):
     correct_answer = serializers.SerializerMethodField('get_correct_answer')
     attempted_answer = serializers.SerializerMethodField('get_attempted_answer')
 
-
     def get_is_attempt(self, obj):
         """attempt question or not"""
         context_data = self.context.get('user')
@@ -295,6 +319,7 @@ class ArticleQuestionSerializer(serializers.ModelSerializer):
         model = ArticleSurvey
         fields = ('id', 'question', 'options', 'points', 'is_attempt', 'correct_answer', 'attempted_answer')
 
+
 class StartAssessmentSerializer(serializers.ModelSerializer):
     """
     serializer for article API
@@ -310,6 +335,7 @@ class StartAssessmentSerializer(serializers.ModelSerializer):
         if data:
             return data.current_que_page if data.current_que_page < total_count else data.current_que_page - 1
         return NUMBER['zero']
+
     class Meta(object):
         """
         meta class
@@ -318,7 +344,6 @@ class StartAssessmentSerializer(serializers.ModelSerializer):
         fields = ('article_survey', 'current_page')
 
 
-
 class ArticleCardlistSerializer(serializers.ModelSerializer):
     """
     Article Card serializer

web_admin/views/article.py

@@ -17,7 +17,7 @@ from web_admin.models import Article, ArticleCard, ArticleSurvey, DefaultArticle
 from web_admin.permission import AdminPermission
 from web_admin.serializers.article_serializer import (ArticleSerializer, ArticleCardSerializer,
                                                       DefaultArticleCardImageSerializer, ArticleListSerializer,
-                                                      ArticleCardlistSerializer)
+                                                      ArticleCardlistSerializer, ArticleStatusChangeSerializer)
 
 USER = get_user_model()
 
@@ -32,7 +32,6 @@ class ArticleViewSet(GenericViewSet, mixins.CreateModelMixin, mixins.UpdateModel
     queryset = Article
     filter_backends = (SearchFilter,)
     search_fields = ['title']
-    http_method_names = ['get', 'post', 'put', 'delete']
 
     def get_queryset(self):
         article = self.queryset.objects.filter(is_deleted=False).prefetch_related(
@@ -130,21 +129,22 @@ class ArticleViewSet(GenericViewSet, mixins.CreateModelMixin, mixins.UpdateModel
             return custom_response(SUCCESS_CODE["3029"])
         return custom_error_response(ERROR_CODE["2041"], status.HTTP_400_BAD_REQUEST)
 
-    @action(methods=['get'], url_name='status-change', url_path='status-change',
+    @action(methods=['patch'], url_name='status-change', url_path='status-change',
-            detail=True)
+            detail=True, serializer_class=ArticleStatusChangeSerializer)
     def article_status_change(self, request, *args, **kwargs):
         """
         article un-publish or publish api method
-        :param request: article id
+        :param request: article id and
+                        {
+                          "is_published": true/false
+                        }
         :return: success message
         """
-        try:
         article = Article.objects.filter(id=kwargs['pk']).first()
-            article.is_published = False if article.is_published else True
+        serializer = self.serializer_class(article, data=request.data)
-            article.save(update_fields=['is_published'])
+        serializer.is_valid(raise_exception=True)
+        serializer.save()
         return custom_response(SUCCESS_CODE["3038"])
-        except AttributeError:
-            return custom_error_response(ERROR_CODE["2041"], response_status=status.HTTP_400_BAD_REQUEST)
 
     @action(methods=['get'], url_name='remove-card', url_path='remove-card',
             detail=True)