diff --git a/projects/managers.py b/projects/managers.py index 3de5599c..b74136a0 100644 --- a/projects/managers.py +++ b/projects/managers.py @@ -64,7 +64,7 @@ def get_projects_for_detail_view(self): ) def get_projects_for_count_view(self): - return self.get_queryset().filter(draft=False).only("id", "leader_id") + return self.get_queryset().only("id", "leader_id") def check_if_owns_any_projects(self, user) -> bool: # I don't think this should work but the function has no usages, so I'll let it be diff --git a/projects/serializers.py b/projects/serializers.py index 6a49fe0c..191b63a9 100644 --- a/projects/serializers.py +++ b/projects/serializers.py @@ -44,7 +44,6 @@ class Meta: "last_name", "role", "key_skills", - # "member_key_skills", "avatar", ] diff --git a/projects/views.py b/projects/views.py index ae0fb971..bc858405 100644 --- a/projects/views.py +++ b/projects/views.py @@ -108,7 +108,7 @@ class ProjectCountView(generics.GenericAPIView): def get(self, request): return Response( { - "all": self.get_queryset().count(), + "all": self.get_queryset().filter(draft=False).count(), "my": self.get_queryset().filter(leader_id=request.user.id).count(), }, status=status.HTTP_200_OK, diff --git a/users/views.py b/users/views.py index 18e667e0..8ddce830 100644 --- a/users/views.py +++ b/users/views.py @@ -111,18 +111,20 @@ def put(self, request, pk): # bootleg version of updating achievements via user if request.data.get("achievements") is not None: achievements = request.data.get("achievements") - for i in achievements: - achievement_id = i.get("id") + for achievement in achievements: + achievement_id = achievement.get("id") if achievement_id is None: UserAchievement.objects.create( - title=i["title"], - status=i["status"], + title=achievement["title"], + status=achievement["status"], user_id=pk, ) continue instance = UserAchievement.objects.get(id=achievement_id) - i["user"] = pk - serializer = AchievementDetailSerializer(instance, data=i, partial=False) + achievement["user"] = pk + serializer = AchievementDetailSerializer( + instance, data=achievement, partial=False + ) serializer.is_valid(raise_exception=True) serializer.save() return super().put(request, pk)