added cors Allow specific origins setting, unpublish article api, pagination in notification list

Sprint6 bugs

base/pagination.py

@@ -0,0 +1,46 @@
+"""
+web_admin pagination file
+"""
+# third party imports
+from collections import OrderedDict
+from rest_framework.pagination import PageNumberPagination
+
+from account.utils import custom_response
+from base.constants import NUMBER
+
+
+class CustomPageNumberPagination(PageNumberPagination):
+    """
+    custom paginator class
+    """
+    # Set the desired page size
+    page_size = NUMBER['ten']
+    page_size_query_param = 'page_size'
+    # Set a maximum page size if needed
+    max_page_size = NUMBER['hundred']
+
+    def get_paginated_response(self, data):
+        """
+        :param data: queryset to be paginated
+        :return: return a OrderedDict
+        """
+        return custom_response(None, OrderedDict([
+            ('count', self.page.paginator.count),
+            ('data', data),
+            ('current_page', self.page.number),
+            ('total_pages', self.page.paginator.num_pages),
+
+
+        ]))
+
+    def get_paginated_dict_response(self, data):
+        """
+        :param data: queryset to be paginated
+        :return: return a simple dict obj
+        """
+        return {
+            'count': self.page.paginator.count,
+            'data': data,
+            'current_page': self.page.number,
+            'total_pages': self.page.paginator.num_pages,
+        }

notifications/views.py

@@ -11,6 +11,7 @@ from rest_framework import viewsets, status, views
 # local imports
 from account.utils import custom_response, custom_error_response
 from base.messages import SUCCESS_CODE, ERROR_CODE
+from base.pagination import CustomPageNumberPagination
 from base.tasks import notify_task_expiry, notify_top_junior
 from notifications.constants import TEST_NOTIFICATION
 from notifications.serializers import RegisterDevice, NotificationListSerializer, ReadNotificationSerializer
@@ -33,10 +34,10 @@ class NotificationViewSet(viewsets.GenericViewSet):
         """
         queryset = Notification.objects.filter(notification_to_id=request.auth.payload['user_id']
                                                ).select_related('notification_to').order_by('-id')
-        paginator = self.pagination_class()
+        paginator = CustomPageNumberPagination()
         paginated_queryset = paginator.paginate_queryset(queryset, request)
         serializer = self.serializer_class(paginated_queryset, many=True)
-        return custom_response(None, serializer.data, count=queryset.count())
+        return paginator.get_paginated_response(serializer.data)
 
     @action(methods=['post'], detail=False, url_path='device', url_name='device', serializer_class=RegisterDevice)
     def fcm_registration(self, request):

web_admin/pagination.py

@@ -1,18 +0,0 @@
-"""
-web_admin pagination file
-"""
-# third party imports
-from rest_framework.pagination import PageNumberPagination
-
-from base.constants import NUMBER
-
-
-class CustomPageNumberPagination(PageNumberPagination):
-    """
-    custom paginator class
-    """
-    # Set the desired page size
-    page_size = NUMBER['ten']
-    page_size_query_param = 'page_size'
-    # Set a maximum page size if needed
-    max_page_size = NUMBER['hundred']

web_admin/serializers/article_serializer.py

@@ -81,7 +81,7 @@ class ArticleSerializer(serializers.ModelSerializer):
         meta class
         """
         model = Article
-        fields = ('id', 'title', 'description', 'article_cards', 'article_survey')
+        fields = ('id', 'title', 'description', 'is_published', 'article_cards', 'article_survey')
 
     def validate(self, attrs):
         """

web_admin/views/analytics.py

@@ -23,11 +23,11 @@ from django.http import HttpResponse
 
 # local imports
 from account.utils import custom_response, get_user_full_name
-from base.constants import PENDING, IN_PROGRESS, REJECTED, REQUESTED, COMPLETED, EXPIRED, DATE_FORMAT, TASK_STATUS
+from base.constants import PENDING, IN_PROGRESS, REJECTED, REQUESTED, COMPLETED, EXPIRED, TASK_STATUS
 from guardian.models import JuniorTask
 from guardian.utils import upload_excel_file_to_alibaba
 from junior.models import JuniorPoints
-from web_admin.pagination import CustomPageNumberPagination
+from base.pagination import CustomPageNumberPagination
 from web_admin.permission import AdminPermission
 from web_admin.serializers.analytics_serializer import LeaderboardSerializer, UserCSVReportSerializer
 from web_admin.utils import get_dates

web_admin/views/article.py

@@ -130,6 +130,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',
+            detail=True)
+    def article_status_change(self, request, *args, **kwargs):
+        """
+        article un-publish or publish api method
+        :param request: article id
+        :return: success message
+        """
+        try:
+            article = Article.objects.filter(id=kwargs['pk']).first()
+            article.is_published = False if article.is_published else True
+            article.save(update_fields=['is_published'])
+            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)
     def remove_article_card(self, request, *args, **kwargs):

zod_bank/settings.py

@@ -37,7 +37,17 @@ SECRET_KEY = os.getenv('SECRET_KEY')
 DEBUG = os.getenv('DEBUG')
 
 # cors allow setting
-CORS_ORIGIN_ALLOW_ALL = True
+CORS_ORIGIN_ALLOW_ALL = False
+
+# Allow specific origins
+CORS_ALLOWED_ORIGINS = [
+    "https://dev-api.zodqaapp.com",
+    "https://qa-api.zodqaapp.com",
+    "https://stage-api.zodqaapp.com",
+    # Add more trusted origins as needed
+]
+# if DEBUG:
+#     CORS_ALLOWED_ORIGINS += ["http://localhost:3000"]
 
 # allow all host
 ALLOWED_HOSTS = ['*']
@@ -53,7 +63,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    # Add Django rest frame work apps here
+    # Add Django rest framework apps here
     'django_extensions',
     'storages',
     'drf_yasg',

zod_bank/urls.py

@@ -20,12 +20,11 @@ from django.urls import path, include
 from drf_yasg import openapi
 from drf_yasg.views import get_schema_view
 from django.urls import path
-
+from django.conf import settings
 
 schema_view = get_schema_view(openapi.Info(title="Zod Bank API", default_version='v1'), public=True, )
 
 urlpatterns = [
-    path('apidoc/', schema_view.with_ui('swagger', cache_timeout=None), name='schema-swagger-ui'),
     path('admin/', admin.site.urls),
     path('', include(('account.urls', 'account'), namespace='account')),
     path('', include('guardian.urls')),
@@ -33,3 +32,6 @@ urlpatterns = [
     path('', include(('notifications.urls', 'notifications'), namespace='notifications')),
     path('', include(('web_admin.urls', 'web_admin'), namespace='web_admin')),
 ]
+
+if settings.DEBUG:
+    urlpatterns += [(path('apidoc/', schema_view.with_ui('swagger', cache_timeout=None), name='schema-swagger-ui'))]