Skip to content

Commit

Permalink
remove phone number field and use consistent phone number validation
Browse files Browse the repository at this point in the history
Fixes #1243
  • Loading branch information
sainak committed Jun 13, 2023
1 parent d953637 commit e7fb7cb
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 69 deletions.
6 changes: 0 additions & 6 deletions care/facility/api/serializers/patient.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@
from care.utils.notification_handler import NotificationGenerator
from care.utils.queryset.facility import get_home_facility_queryset
from care.utils.serializer.external_id_field import ExternalIdSerializerField
from care.utils.serializer.phonenumber_ispossible_field import (
PhoneNumberIsPossibleField,
)
from config.serializers import ChoiceField


Expand Down Expand Up @@ -165,8 +162,6 @@ class Meta:
model = PatientTeleConsultation
fields = "__all__"

phone_number = PhoneNumberIsPossibleField()

facility = ExternalIdSerializerField(
queryset=Facility.objects.all(), required=False
)
Expand Down Expand Up @@ -417,7 +412,6 @@ def create(self, validated_data):

class PatientSearchSerializer(serializers.ModelSerializer):
gender = ChoiceField(choices=GENDER_CHOICES)
phone_number = PhoneNumberIsPossibleField()
patient_id = serializers.UUIDField(source="external_id", read_only=True)

# facility_id = serializers.UUIDField(read_only=True, allow_null=True)
Expand Down
7 changes: 1 addition & 6 deletions care/facility/api/serializers/shifting.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
from care.users.api.serializers.user import UserBaseMinimumSerializer
from care.utils.notification_handler import NotificationGenerator
from care.utils.serializer.external_id_field import ExternalIdSerializerField
from care.utils.serializer.phonenumber_ispossible_field import (
PhoneNumberIsPossibleField,
)
from config.serializers import ChoiceField


Expand Down Expand Up @@ -223,9 +220,7 @@ class ShiftingSerializer(serializers.ModelSerializer):
ambulance_driver_name = serializers.CharField(
required=False, allow_null=True, allow_blank=True
)
ambulance_phone_number = PhoneNumberIsPossibleField(
required=False, allow_null=True, allow_blank=True
)

ambulance_number = serializers.CharField(
required=False, allow_null=True, allow_blank=True
)
Expand Down
6 changes: 0 additions & 6 deletions care/users/api/serializers/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
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
from care.utils.serializer.phonenumber_ispossible_field import (
PhoneNumberIsPossibleField,
)
from config.serializers import ChoiceField

User = get_user_model()
Expand All @@ -28,8 +25,6 @@ class SignUpSerializer(serializers.ModelSerializer):
user_type = ChoiceField(choices=User.TYPE_CHOICES)
gender = ChoiceField(choices=GENDER_CHOICES)
password = serializers.CharField(write_only=True)
phone_number = PhoneNumberIsPossibleField()
alt_phone_number = PhoneNumberIsPossibleField(required=False, allow_blank=True)

class Meta:
model = User
Expand Down Expand Up @@ -269,7 +264,6 @@ class UserSerializer(SignUpSerializer):
local_body_object = LocalBodySerializer(source="local_body", read_only=True)
district_object = DistrictSerializer(source="district", read_only=True)
state_object = StateSerializer(source="state", read_only=True)
alt_phone_number = PhoneNumberIsPossibleField(required=False, allow_blank=True)
home_facility_object = FacilityBareMinimumSerializer(
source="home_facility", read_only=True
)
Expand Down
20 changes: 0 additions & 20 deletions care/utils/serializer/phonenumber_ispossible_field.py

This file was deleted.

29 changes: 0 additions & 29 deletions care/utils/serializer/tests/test_phonenumber_ispossible_field.py

This file was deleted.

2 changes: 0 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ dry-rest-permissions==0.1.10 # For permissions handling
django-cors-headers==3.2.1
django-watchman==1.1.0 # For Status Endpoints
django-maintenance-mode==0.14.0 # Maintenance mode
django-phonenumber-field==4.0.0
phonenumberslite==8.12.1
django-queryset-csv==1.1.0
django-rest-passwordreset==1.1.0
healthy-django>=0.1.0
Expand Down

0 comments on commit e7fb7cb

Please sign in to comment.