Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds skills to UserAssignedSerializer #1188

Merged
merged 2 commits into from
Feb 12, 2023
Merged

Adds skills to UserAssignedSerializer #1188

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aadeb32
Adds `skills` to `UserAssignedSerializer`
rithviknishad Feb 12, 2023
a567cf8
fix `source` of `skill` field
rithviknishad Feb 12, 2023
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
9 changes: 6 additions & 3 deletions care/users/api/serializers/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
LocalBodySerializer,
StateSerializer,
)
from care.users.api.serializers.skill import SkillSerializer
from care.users.models import GENDER_CHOICES
from care.utils.queryset.facility import get_home_facility_queryset
from care.utils.serializer.external_id_field import ExternalIdSerializerField
Expand Down Expand Up @@ -137,7 +138,7 @@ def validate_ward(self, value):
and value != self.context["created_by"].ward
and not self.context["created_by"].is_superuser
and not self.context["created_by"].user_type
>= User.TYPE_VALUE_MAP["LocalBodyAdmin"]
>= User.TYPE_VALUE_MAP["LocalBodyAdmin"]
):
raise serializers.ValidationError("Cannot create for a different Ward")
return value
Expand All @@ -148,7 +149,7 @@ def validate_local_body(self, value):
and value != self.context["created_by"].local_body
and not self.context["created_by"].is_superuser
and not self.context["created_by"].user_type
>= User.TYPE_VALUE_MAP["DistrictAdmin"]
>= User.TYPE_VALUE_MAP["DistrictAdmin"]
):
raise serializers.ValidationError(
"Cannot create for a different local body"
Expand All @@ -161,7 +162,7 @@ def validate_district(self, value):
and value != self.context["created_by"].district
and not self.context["created_by"].is_superuser
and not self.context["created_by"].user_type
>= User.TYPE_VALUE_MAP["StateAdmin"]
>= User.TYPE_VALUE_MAP["StateAdmin"]
):
raise serializers.ValidationError("Cannot create for a different district")
return value
Expand Down Expand Up @@ -357,6 +358,7 @@ class UserAssignedSerializer(serializers.ModelSerializer):
home_facility_object = FacilityBareMinimumSerializer(
source="home_facility", read_only=True
)
skills = SkillSerializer(many=True, read_only=True)

class Meta:
model = User
Expand All @@ -373,6 +375,7 @@ class Meta:
"doctor_qualification",
"doctor_experience_commenced_on",
"doctor_medical_council_registration",
"skills",
)


Expand Down