Merge pull request #232 from PROCOLLAB-github/dev

draft field in user projects list

Author: VeryBigSad

docker-compose.yml

@@ -69,4 +69,4 @@ volumes:
   prom-data:
   prom-configs:
   log:
-  redis_data:
+  redis-data:

news/mixins.py

@@ -1,33 +1,54 @@
+from django.contrib.auth import get_user_model
+
 from news.models import News
 from partner_programs.models import PartnerProgram
 from projects.models import Project
 
+User = get_user_model()
+
 
 class NewsQuerysetMixin:
     """
     Mixin for getting queryset for news
     """
 
     def get_queryset_for_project(self):
+        """Returns queryset of news for project"""
+        project_pk = self.kwargs.get("project_pk")
         try:
-            project = Project.objects.get(pk=self.kwargs.get("project_pk"))
+            project = Project.objects.get(pk=project_pk)
         except Project.DoesNotExist:
+            # TODO: raise http 404 here
             return News.objects.none()
         return News.objects.get_news(obj=project)
 
     def get_queryset_for_program(self):
+        """Returns queryset of news for partner program"""
+        partnerprogram_pk = self.kwargs.get("partnerprogram_pk")
         try:
-            program = PartnerProgram.objects.get(pk=self.kwargs.get("partnerprogram_pk"))
+            program = PartnerProgram.objects.get(pk=partnerprogram_pk)
         except PartnerProgram.DoesNotExist:
+            # TODO: raise http 404 here
             return News.objects.none()
         return News.objects.get_news(obj=program)
 
+    def get_queryset_for_user(self):
+        """Returns queryset of news for user"""
+        user_pk = self.kwargs.get("user_pk")
+        try:
+            user = User.objects.get(pk=user_pk)
+        except User.DoesNotExist:
+            # TODO: raise http 404 here
+            return News.objects.none()
+        return News.objects.get_news(obj=user)
+
     def get_queryset(self):
+        """Chooses what queryset to return - for project, program or user"""
         if self.kwargs.get("project_pk") is not None:
-            # it's a project
             return self.get_queryset_for_project()
         elif self.kwargs.get("partnerprogram_pk") is not None:
-            # it's a partner program
             return self.get_queryset_for_program()
+        elif self.kwargs.get("user_pk") is not None:
+            return self.get_queryset_for_user()
         else:
             return News.objects.none()

news/views.py

@@ -1,16 +1,20 @@
+from django.contrib.auth import get_user_model
+from django.shortcuts import get_object_or_404
 from rest_framework import generics, status
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 
 from core.serializers import SetViewedSerializer, SetLikedSerializer
 from core.services import add_view, set_like
+from news.mixins import NewsQuerysetMixin
 from news.models import News
 from news.pagination import NewsPagination
 from news.permissions import IsNewsCreatorOrReadOnly
 from news.serializers import NewsListSerializer, NewsDetailSerializer
-from news.mixins import NewsQuerysetMixin
 from projects.models import Project
 
+User = get_user_model()
+
 
 class NewsList(NewsQuerysetMixin, generics.ListCreateAPIView):
     serializer_class = NewsListSerializer
@@ -19,14 +23,20 @@ class NewsList(NewsQuerysetMixin, generics.ListCreateAPIView):
 
     def post(self, request, *args, **kwargs):
         if kwargs.get("project_pk"):
-            project = Project.objects.get(pk=kwargs["project_pk"])
+            project = get_object_or_404(Project, pk=kwargs["project_pk"])
             news = News.objects.add_news(project, **request.data)
             return Response(
                 NewsDetailSerializer(news).data, status=status.HTTP_201_CREATED
             )
+        elif kwargs.get("user_pk"):
+            user = get_object_or_404(User, pk=kwargs["user_pk"])
+            news = News.objects.add_news(user, **request.data)
+            return Response(
+                NewsDetailSerializer(news).data, status=status.HTTP_201_CREATED
+            )
         else:
-            # creating partner program news, not implemented yet
-            raise NotImplementedError()
+            # creating partner program news, not implemented yet, return 400
+            return Response(status=status.HTTP_400_BAD_REQUEST)
 
     def get(self, request, *args, **kwargs):
         news = self.paginate_queryset(self.get_queryset())

nginx/nginx.conf

@@ -18,4 +18,18 @@ server {
         proxy_pass         http://grafana:3000;
         proxy_set_header   Host $host;
     }
+    
+    location @proxy_to_app {
+        proxy_pass http://web:8000;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        proxy_redirect off;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Host $server_name;
+    }
 }

users/serializers.py

@@ -5,6 +5,7 @@
 from core.services import get_views_count
 from core.utils import get_user_online_cache_key
 from projects.models import Project
+from projects.validators import validate_project
 from .models import CustomUser, Expert, Investor, Member, Mentor, UserAchievement
 
 
@@ -322,3 +323,38 @@ class PasswordSerializer(serializers.Serializer):
 
 class ResendVerifyEmailSerializer(serializers.Serializer):
     email = serializers.EmailField(required=True)
+
+
+class UserProjectListSerializer(serializers.ModelSerializer):
+    views_count = serializers.SerializerMethodField(method_name="count_views")
+    short_description = serializers.SerializerMethodField()
+
+    @classmethod
+    def count_views(cls, project):
+        return get_views_count(project)
+
+    @classmethod
+    def get_short_description(cls, project):
+        return project.get_short_description()
+
+    class Meta:
+        model = Project
+        fields = [
+            "id",
+            "name",
+            "leader",
+            "short_description",
+            "image_address",
+            "industry",
+            "views_count",
+            "draft",
+        ]
+
+        read_only_fields = ["leader", "views_count"]
+
+    def is_valid(self, *, raise_exception=False):
+        return super().is_valid(raise_exception=raise_exception)
+
+    def validate(self, data):
+        super().validate(data)
+        return validate_project(data)

users/urls.py

@@ -1,5 +1,6 @@
 from django.urls import path, re_path, include
 
+from news.views import NewsList, NewsDetail, NewsDetailSetViewed, NewsDetailSetLiked
 from users.views import (
     AchievementDetail,
     AchievementList,
@@ -35,6 +36,10 @@
     path("users/<int:pk>/", UserDetail.as_view()),
     path("users/<int:pk>/set_onboarding_stage/", SetUserOnboardingStage.as_view()),
     path("users/<int:pk>/force_verify/", ForceVerifyView.as_view()),
+    path("users/<int:user_pk>/news/", NewsList.as_view()),
+    path("users/<int:user_pk>/news/<int:pk>/", NewsDetail.as_view()),
+    path("users/<int:user_pk>/news/<int:pk>/set_viewed/", NewsDetailSetViewed.as_view()),
+    path("users/<int:user_pk>/news/<int:pk>/set_liked/", NewsDetailSetLiked.as_view()),
     path("users/current/", CurrentUser.as_view()),
     # todo: change password view
     path("users/current/programs/", CurrentUserPrograms.as_view()),

users/views.py

@@ -50,6 +50,7 @@
     UserListSerializer,
     VerifyEmailSerializer,
     ResendVerifyEmailSerializer,
+    UserProjectListSerializer,
 )
 from .filters import UserFilter
 from .pagination import UsersPagination
@@ -253,18 +254,21 @@ class AchievementDetail(RetrieveUpdateDestroyAPIView):
 class UserProjectsList(GenericAPIView):
     permission_classes = [IsAuthenticated]
     pagination_class = ProjectsPagination
-    serializer_class = ProjectListSerializer
+    serializer_class = UserProjectListSerializer
 
     def get(self, request):
-        queryset = Project.objects.get_user_projects_for_list_view().filter(
+        self.queryset = Project.objects.get_user_projects_for_list_view().filter(
             Q(leader_id=self.request.user.id) | Q(collaborator__user=self.request.user)
         )
 
-        page = self.paginate_queryset(queryset)
+        page = self.paginate_queryset(self.queryset)
         if page is not None:
             serializer = self.get_serializer(page, many=True)
             return self.get_paginated_response(serializer.data)
-        return Response(serializer.data, status=status.HTTP_200_OK)
+        return Response(
+            {"detail": "Unable to return paginated list"},
+            status=status.HTTP_400_BAD_REQUEST,
+        )
 
 
 class LogoutView(APIView):