Commit 814643dd authored by Richard Glosner's avatar Richard Glosner Committed by Martin Juhás
Browse files

fix: fix db queries that use teams__users filtering 

No API changes

Closes #308
parent 2842ee2b

common_lib/schema/types.py

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ class ExerciseType(DjangoObjectType): 
        ):  # Instructor is assigned as an instructor of the exercise

            return self.teams.all()

        # trainee or instructor assigned to specific team

        return self.teams.filter(users__user=user)

        return self.teams.filter(users=user)



    def resolve_user_set(self, info):

        if info.context.user.group == User.AuthGroup.TRAINEE:

common_lib/schema/types_new.py

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ class ExerciseType(DjangoObjectType): 
        ):  # Instructor is assigned as an instructor of the exercise

            return self.teams.all()

        # trainee or instructor assigned to specific team

        return self.teams.filter(users__user=user)

        return self.teams.filter(users=user)



    def resolve_email_participants(self, info):

        return select_by_group(

exercise/schema/query.py

+2 −2
Original line number Diff line number Diff line
@@ -121,11 +121,11 @@ class Query(graphene.ObjectType): 
        user = info.context.user

        # User dependant data resolving

        if user.group == User.AuthGroup.TRAINEE:

            exercises = Exercise.objects.filter(teams__users__user=user)

            exercises = Exercise.objects.filter(teams__users=user)

        elif user.group == User.AuthGroup.INSTRUCTOR:

            exercises = (

                user.exercises.all()

                | Exercise.objects.filter(teams__users__user=user)

                | Exercise.objects.filter(teams__users=user)

            ).distinct()

        elif user.group == User.AuthGroup.ADMIN:

            exercises = Exercise.objects.all()