diff --git a/companies/tests.py b/companies/tests.py index 343ea7c..8473b02 100644 --- a/companies/tests.py +++ b/companies/tests.py @@ -146,7 +146,7 @@ class CompanyViewSetTest(APITestCase): 'logo': None, 'city': None, 'address': 'qwer qewr 5', - 'geo': None, + 'geo': {'longitude': 1.0, 'latitude': 1.0}, 'phone': '1234', 'mobile': '4321', 'other_phone': '41423', diff --git a/core/tests.py b/core/tests.py index 22d637e..e28c6f7 100644 --- a/core/tests.py +++ b/core/tests.py @@ -614,7 +614,7 @@ class CreateCompanyUserTest(APITestCase): 'logo': None, 'city': None, 'address': 'qwer qewr 5', - 'geo': None, + 'geo': {'longitude': 1.0, 'latitude': 1.0}, 'phone': '1234', 'mobile': '4321', 'other_phone': '41423', @@ -627,6 +627,7 @@ class CreateCompanyUserTest(APITestCase): } response = self.client.post(self.endpoint, data=data, format='json') + import ipdb; ipdb.set_trace() self.assertEquals(response.status_code, 201) self.assertEquals(len(mail.outbox), 1) diff --git a/core/views.py b/core/views.py index 63ec0b8..f69b2f0 100644 --- a/core/views.py +++ b/core/views.py @@ -122,10 +122,7 @@ def create_company_user(request): # create company company_data = request.data['company'] - # substitute coordinates for Point - geo = company_data.pop('geo') - if geo: - company_data['geo'] = Point(geo['latitude'],geo['longitude']) + company_serializer = CompanySerializer( data=company_data, ) @@ -133,7 +130,7 @@ def create_company_user(request): # save model instance data new_company = Company.objects.create(**company_serializer.validated_data) else: - return Response({"error": "Company data is not valid"}, status=406) + return Response({"error": company_serializer.errors}, status=406) # create user user_data = request.data['user'] @@ -151,7 +148,7 @@ def create_company_user(request): # send verification email utils.send_verification_email(request, new_user) else: - return Response({"error": "User data is not valid"}, status=406) + return Response({"error": user_serializer.errors}, status=406) return Response(status=status.HTTP_201_CREATED)