Merge pull request #174 from PROCOLLAB-github/dev

yakser · web-flow · commit f6fa14798c5d · 2023-07-19T15:03:08.000+04:00
Dev
diff --git a/core/constants.py b/core/constants.py
@@ -1,2 +1,4 @@
 ONE_DAY_IN_SECONDS = 60 * 60 * 24
 ONE_WEEK_IN_SECONDS = ONE_DAY_IN_SECONDS * 7
+VIEWS_CACHING_TIMEOUT = 60 * 15
+LIKES_CACHING_TIMEOUT = 60 * 15
diff --git a/core/services.py b/core/services.py
@@ -1,6 +1,8 @@
 from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
+from django.core.cache import cache
 
+from core.constants import VIEWS_CACHING_TIMEOUT, LIKES_CACHING_TIMEOUT
 from core.models import Like, View, Link
 
 User = get_user_model()
@@ -34,9 +36,15 @@ def get_fans(obj):
 
 def get_likes_count(obj):
     obj_type = ContentType.objects.get_for_model(obj)
-    return User.objects.filter(
-        likes__content_type=obj_type, likes__object_id=obj.id
-    ).count()
+    # cache this
+    likes_count = cache.get(f"likes_count_{obj_type}_{obj.id}")
+    if likes_count is None:
+        likes_count = User.objects.filter(
+            likes__content_type=obj_type, likes__object_id=obj.id
+        ).count()
+        # cache for LIKES_CACHING_TIMEOUT seconds
+        cache.set(f"views_count_{obj_type}_{obj.id}", likes_count, LIKES_CACHING_TIMEOUT)
+    return likes_count
 
 
 def set_like(obj, user, is_liked):
@@ -76,9 +84,16 @@ def get_viewers(obj):
 
 def get_views_count(obj):
     obj_type = ContentType.objects.get_for_model(obj)
-    return User.objects.filter(
-        views__content_type=obj_type, views__object_id=obj.id
-    ).count()
+    # cache this
+    views_count = cache.get(f"views_count_{obj_type}_{obj.id}")
+    if views_count is None:
+        views_count = User.objects.filter(
+            views__content_type=obj_type, views__object_id=obj.id
+        ).count()
+        # cache for VIEWS_CACHING_TIMEOUT seconds
+        cache.set(f"views_count_{obj_type}_{obj.id}", views_count, VIEWS_CACHING_TIMEOUT)
+
+    return views_count
 
 
 def set_viewed(obj, user, is_viewed):
diff --git a/partner_programs/admin.py b/partner_programs/admin.py
@@ -47,6 +47,7 @@ class PartnerProgramUserProfileAdmin(admin.ModelAdmin):
     list_filter = ("partner_program",)
     raw_id_fields = (
         "user",
+        "project",
         "partner_program",
     )
     date_hierarchy = "datetime_created"
diff --git a/partner_programs/migrations/0003_partnerprogramuserprofile_project_and_more.py b/partner_programs/migrations/0003_partnerprogramuserprofile_project_and_more.py
@@ -0,0 +1,46 @@
+# Generated by Django 4.2.3 on 2023-07-18 20:25
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("projects", "0019_alter_project_options_project_hidden_score"),
+        ("partner_programs", "0002_alter_partnerprogram_options_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="partnerprogramuserprofile",
+            name="project",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="partner_program_profiles",
+                to="projects.project",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="partnerprogramuserprofile",
+            name="partner_program",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="partner_program_profiles",
+                to="partner_programs.partnerprogram",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="partnerprogramuserprofile",
+            name="user",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="partner_program_profiles",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]
diff --git a/partner_programs/models.py b/partner_programs/models.py
@@ -2,6 +2,7 @@
 from django.db import models
 
 from partner_programs.constants import get_default_data_schema
+from projects.models import Project
 
 User = get_user_model()
 
@@ -107,14 +108,22 @@ class PartnerProgramUserProfile(models.Model):
     """
 
     user = models.ForeignKey(
-        User, on_delete=models.CASCADE, related_name="partner_program_profile"
+        User,
+        on_delete=models.SET_NULL,
+        related_name="partner_program_profiles",
+        null=True,
+    )
+    project = models.ForeignKey(
+        Project,
+        on_delete=models.SET_NULL,
+        related_name="partner_program_profiles",
+        null=True,
     )
     partner_program = models.ForeignKey(
         PartnerProgram,
         on_delete=models.CASCADE,
-        related_name="partner_program_user_profile",
+        related_name="partner_program_profiles",
     )
-    # TODO: add amount of projects of this Program that user created
     partner_program_data = models.JSONField()
     datetime_created = models.DateTimeField(auto_now_add=True)
     datetime_updated = models.DateTimeField(auto_now=True)
@@ -128,6 +137,4 @@ class Meta:
         )
 
     def __str__(self):
-        return (
-            f"PartnerProgramUserProfile<{self.pk}> - {self.user} {self.partner_program}"
-        )
+        return f"PartnerProgramUserProfile<{self.pk}> - {self.user} {self.project} {self.partner_program}"
diff --git a/partner_programs/serializers.py b/partner_programs/serializers.py
@@ -126,3 +126,13 @@ class PartnerProgramUserSerializer(serializers.Serializer):
 
 class PartnerProgramDataSchemaSerializer(serializers.Serializer):
     data_schema = serializers.JSONField(required=True)
+
+
+class UserProgramsSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = PartnerProgram
+        fields = [
+            "id",
+            "name",
+            "tag",
+        ]
diff --git a/partner_programs/views.py b/partner_programs/views.py
@@ -96,6 +96,9 @@ def post(self, request, *args, **kwargs):
         except PartnerProgram.DoesNotExist:
             return Response(status=status.HTTP_404_NOT_FOUND)
 
+    def get(self, request, *args, **kwargs):
+        return Response(status=status.HTTP_200_OK)
+
 
 class PartnerProgramRegister(generics.GenericAPIView):
     """
diff --git a/projects/helpers.py b/projects/helpers.py
@@ -2,6 +2,7 @@
 
 from django.contrib.auth import get_user_model
 
+from partner_programs.models import PartnerProgram, PartnerProgramUserProfile
 from projects.constants import RECOMMENDATIONS_COUNT
 from projects.models import Project, ProjectLink, Achievement
 
@@ -84,3 +85,16 @@ def update_links(links, pk):
             for link in links
         ]
     )
+
+
+def update_partner_program(
+    partner_program_id: int, user: "User", instance: "Project"
+) -> None:
+    if partner_program_id:
+        partner_program = PartnerProgram.objects.get(pk=partner_program_id)
+        partner_program_profile = PartnerProgramUserProfile.objects.get(
+            user=user,
+            partner_program=partner_program,
+        )
+        partner_program_profile.project = instance
+        partner_program_profile.save()
diff --git a/projects/views.py b/projects/views.py
@@ -9,9 +9,14 @@
 from core.permissions import IsStaffOrReadOnly
 from core.serializers import SetLikedSerializer
 from core.services import add_view, set_like
+from partner_programs.models import PartnerProgram, PartnerProgramUserProfile
 from projects.filters import ProjectFilter
 from projects.constants import VERBOSE_STEPS
-from projects.helpers import get_recommended_users, check_related_fields_update
+from projects.helpers import (
+    get_recommended_users,
+    check_related_fields_update,
+    update_partner_program,
+)
 from projects.models import Project, Achievement, ProjectNews
 from projects.pagination import ProjectNewsPagination
 from projects.permissions import (
@@ -51,6 +56,21 @@ def create(self, request, *args, **kwargs):
         serializer.validated_data["leader"] = request.user
 
         self.perform_create(serializer)
+
+        try:
+            partner_program_id = request.data.get("partner_program_id")
+            update_partner_program(partner_program_id, request.user, serializer.instance)
+        except PartnerProgram.DoesNotExist:
+            return Response(
+                {"detail": "Partner program with this id does not exist"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        except PartnerProgramUserProfile.DoesNotExist:
+            return Response(
+                {"detail": "User is not a member of this partner program"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
         headers = self.get_success_headers(serializer.data)
         return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
 
@@ -101,6 +121,20 @@ def retrieve(self, request, *args, **kwargs):
         return Response(serializer.data)
 
     def put(self, request, pk, **kwargs):
+        # fixme: add partner_program_id to docs
+        try:
+            partner_program_id = request.data.get("partner_program_id")
+            update_partner_program(partner_program_id, request.user, self.get_object())
+        except PartnerProgram.DoesNotExist:
+            return Response(
+                {"detail": "Partner program with this id does not exist"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        except PartnerProgramUserProfile.DoesNotExist:
+            return Response(
+                {"detail": "User is not a member of this partner program"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
         check_related_fields_update(request.data, pk)
         return super(ProjectDetail, self).put(request, pk)
 
diff --git a/users/urls.py b/users/urls.py
@@ -18,6 +18,8 @@
     RegisteredEventsList,
     SetUserOnboardingStage,
     ResendVerifyEmail,
+    CurrentUserPrograms,
+    CurrentUserProgramsTags,
 )
 
 app_name = "users"
@@ -35,6 +37,8 @@
     path("users/<int:pk>/set_onboarding_stage/", SetUserOnboardingStage.as_view()),
     path("users/reset-password/", EmailResetPassword.as_view()),
     path("users/current/", CurrentUser.as_view()),
+    path("users/current/programs/", CurrentUserPrograms.as_view()),
+    path("users/current/programs/tags/", CurrentUserProgramsTags.as_view()),
     path("users/current/events/", RegisteredEventsList.as_view()),
     path("users/achievements/", AchievementList.as_view()),
     path("users/achievements/<int:pk>/", AchievementDetail.as_view()),
diff --git a/users/views.py b/users/views.py
@@ -15,6 +15,7 @@
     ListCreateAPIView,
     RetrieveUpdateDestroyAPIView,
     UpdateAPIView,
+    RetrieveAPIView,
 )
 from rest_framework.permissions import AllowAny, IsAuthenticated
 from rest_framework.request import Request
@@ -25,6 +26,11 @@
 from core.permissions import IsOwnerOrReadOnly
 from events.models import Event
 from events.serializers import EventsListSerializer
+from partner_programs.models import PartnerProgram
+from partner_programs.serializers import (
+    UserProgramsSerializer,
+    PartnerProgramListSerializer,
+)
 from projects.serializers import ProjectListSerializer
 from users.helpers import (
     reset_email,
@@ -126,6 +132,36 @@ def patch(self, request, pk):
         return super().patch(request, pk)
 
 
+class CurrentUserProgramsTags(RetrieveAPIView):
+    queryset = PartnerProgram.objects.all()
+    permission_classes = [IsAuthenticated]
+    serializer_class = UserProgramsSerializer
+
+    def get(self, request, *args, **kwargs):
+        user = User.objects.get(id=request.user.id)
+        # fixme: mb hide finished programs
+        programs = [
+            profile.partner_program for profile in user.partner_program_profiles.all()
+        ]
+        serializer = self.get_serializer(programs, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+
+class CurrentUserPrograms(RetrieveAPIView):
+    queryset = PartnerProgram.objects.all()
+    permission_classes = [IsAuthenticated]
+    serializer_class = PartnerProgramListSerializer
+
+    def get(self, request, *args, **kwargs):
+        user = User.objects.get(id=request.user.id)
+        # fixme: mb hide finished programs
+        programs = [
+            profile.partner_program for profile in user.partner_program_profiles.all()
+        ]
+        serializer = self.get_serializer(programs, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+
 class CurrentUser(GenericAPIView):
     queryset = User.objects.get_users_for_detail_view()
     permission_classes = [IsAuthenticated]

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ class PartnerProgramUserProfileAdmin(admin.ModelAdmin):`
`47`	`47`	`list_filter = ("partner_program",)`
`48`	`48`	`raw_id_fields = (`
`49`	`49`	`"user",`
	`50`	`+ "project",`
`50`	`51`	`"partner_program",`
`51`	`52`	`)`
`52`	`53`	`date_hierarchy = "datetime_created"`