diff --git a/backend/project/api/users/serializers.py b/backend/project/api/users/serializers.py index b669fa5..085b661 100644 --- a/backend/project/api/users/serializers.py +++ b/backend/project/api/users/serializers.py @@ -5,15 +5,15 @@ from api.users.models import User class UserSerializer(serializers.ModelSerializer): + event_id = serializers.IntegerField() + class Meta: model = User fields = "__all__" def create(self, validated_data): try: - event = Event.objects.get( - pk=self.context["view"].kwargs.get("event_id") - ) + event = Event.objects.get(pk=validated_data.pop("event_id")) except Event.DoesNotExist as e: msg = "Event does not exist" raise serializers.ValidationError(msg) from e diff --git a/backend/project/api/users/urls.py b/backend/project/api/users/urls.py index 1c4ab6f..8d3e74c 100644 --- a/backend/project/api/users/urls.py +++ b/backend/project/api/users/urls.py @@ -8,7 +8,7 @@ from api.users.views import ( app_name = "users" urlpatterns = [ - path("register//", RegisterUserView.as_view(), name="register"), + path("register/", RegisterUserView.as_view(), name="register"), path( "upload/excel//", RegisterUsersFromExcelView.as_view(), diff --git a/backend/project/api/users/views.py b/backend/project/api/users/views.py index a701a21..ac4e284 100644 --- a/backend/project/api/users/views.py +++ b/backend/project/api/users/views.py @@ -22,7 +22,6 @@ class UserViewSet(ReadOnlyModelViewSet): serializer_class = UserSerializer -#! Починить вьюшку, сделать экспорт class RegisterUsersFromExcelView(APIView): def post(self, request, event_id): try: @@ -43,14 +42,13 @@ class RegisterUsersFromExcelView(APIView): try: df = pd.read_excel(excel_file) - for index, row in df.iterrows(): - # Создаем нового пользователя + for _, row in df.iterrows(): user = User.objects.create( - first_name=row["First Name"], - last_name=row["Last Name"], - email=row["Email"], - birth_date=row["Birth Date"], - bio=row["Bio"], + first_name=row["first_name"], + last_name=row["last_name"], + email=row["email"], + birth_date=row["birth_date"], + bio=row["bio"], ) event.users.add(user)