Skip to content
Merged

Dev #66

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion projects/managers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion projects/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ class Meta:
"last_name",
"role",
"key_skills",
# "member_key_skills",
"avatar",
]

Expand Down
2 changes: 1 addition & 1 deletion projects/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
14 changes: 8 additions & 6 deletions users/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down