diff --git a/backend/secfit/tests/tests_2wd_register.py b/backend/secfit/tests/tests_2wd_register.py index b42a865acb66849c85bd148f2ca6dec74035eee4..a0bacf6a2779faaa64abaa7368ce41c6d909beaa 100644 --- a/backend/secfit/tests/tests_2wd_register.py +++ b/backend/secfit/tests/tests_2wd_register.py @@ -129,7 +129,6 @@ class UserRegistration2WayDomainTests(APITestCase): self.assertEquals((status_code == 201), validity) except AssertionError as e: failures.append({ first_field.name: first_field.value, second_field.name: second_field.value, "error": e }) - print(failures) - print(len(failures)) + self.assertEqual(len(failures), 0) \ No newline at end of file diff --git a/backend/secfit/tests/tests_edit_profile_api.py b/backend/secfit/tests/tests_edit_profile_api.py index fbc80760686214b755eb35cbe8fc8156c98cdedf..ffcebf3aaa93adde7adca015422717ca5b4b16a2 100644 --- a/backend/secfit/tests/tests_edit_profile_api.py +++ b/backend/secfit/tests/tests_edit_profile_api.py @@ -45,19 +45,19 @@ class EditProfileAPITests(APITestCase): img.save("test.jpg") with open("test.jpg", "rb") as f: data = { "profile_image": f } - response = self.client.patch(path=f"{self.path}{self.alice_data['id']}/", data=data) + response = self.client.put(path=f"{self.path}{self.alice_data['id']}/", data=data) self.assertEqual(response.status_code, 200) self.assertContains(response=response, text="test.jpg") img = Image.new(mode="RGB", size=(400, 400), color=(255, 0, 0)) img.save("test2.jpg") with open("test2.jpg", "rb") as f: data = { "profile_image": f } - response = self.client.patch(path=f"{self.path}{self.alice_data['id']}/", data=data) + response = self.client.put(path=f"{self.path}{self.alice_data['id']}/", data=data) self.assertEqual(response.status_code, 200) self.assertContains(response=response, text="test2.jpg") def test_edit_bio(self): data = { "bio": "hello", "athletes": self.alice_data['athletes'] } - response = self.client.patch(path=f"{self.path}{self.alice_data['id']}/", data=data) + response = self.client.put(path=f"{self.path}{self.alice_data['id']}/", data=data) self.assertEqual(response.status_code, 200) self.assertEqual(response.data["bio"], "hello") \ No newline at end of file diff --git a/backend/secfit/tests/tests_friend_requests_api.py b/backend/secfit/tests/tests_friend_requests_api.py index 9b0a901c046d8aaea51ea9fdecc64b531ed46114..7dfc8ec6e6bc5f887fb0e85d6f03a9d2024bbd0b 100644 --- a/backend/secfit/tests/tests_friend_requests_api.py +++ b/backend/secfit/tests/tests_friend_requests_api.py @@ -54,16 +54,16 @@ class FriendRequestAPITests(APITestCase): def test_can_add_friends(self): data = { "symmetric_friends": self.bob_data['id'] } - response = self.client.patch(path=f"{self.path}{self.alice_data['id']}/", data=data) + response = self.client.put(path=f"{self.path}{self.alice_data['id']}/", data=data) data = { "symmetric_friends": self.clair_data['id'] } - response = self.client.patch(path=f"{self.path}{self.alice_data['id']}/", data=data) + response = self.client.put(path=f"{self.path}{self.alice_data['id']}/", data=data) self.assertEqual(len(response.data["symmetric_friends"]), 2) def test_can_add_and_view_friends(self): data = { "symmetric_friends": self.bob_data['id'] } - response = self.client.patch(path=f"{self.path}{self.alice_data['id']}/", data=data) + response = self.client.put(path=f"{self.path}{self.alice_data['id']}/", data=data) data = { "symmetric_friends": self.clair_data['id'] } - response = self.client.patch(path=f"{self.path}{self.alice_data['id']}/", data=data) + response = self.client.put(path=f"{self.path}{self.alice_data['id']}/", data=data) self.assertEqual(len(response.data["symmetric_friends"]), 2) response = self.client.get(path=f"{self.path}{self.alice_data['id']}/") self.assertEqual(len(response.data["symmetric_friends"]), 2) diff --git a/backend/secfit/users/serializers.py b/backend/secfit/users/serializers.py index 8e3a7a3fbe2f8c272b710ce01975e5302187e681..54184bf4a5894aa34bc4a46ade947e0bf230e939 100644 --- a/backend/secfit/users/serializers.py +++ b/backend/secfit/users/serializers.py @@ -100,7 +100,8 @@ class UserPutSerializer(serializers.ModelSerializer): if "profile_image" in validated_data: instance.profile_image = validated_data["profile_image"] if "symmetric_friends" in validated_data: - instance.symmetric_friends.add(validated_data["symmetric_friends"][0]) + if len(validated_data["symmetric_friends"]) > 0: + instance.symmetric_friends.add(validated_data["symmetric_friends"][0]) return instance diff --git a/backend/secfit/users/views.py b/backend/secfit/users/views.py index 49ec3756865a1d7b8e51c03906b23c15b9755eda..421e03a2a1e9022a336ee847f60140bc136b65d4 100644 --- a/backend/secfit/users/views.py +++ b/backend/secfit/users/views.py @@ -83,7 +83,7 @@ class UserDetail( return self.update(request, *args, **kwargs) def patch(self, request, *args, **kwargs): - self.serializer_class = UserPutSerializer + #self.serializer_class = UserPutSerializer return self.partial_update(request, *args, **kwargs) diff --git a/frontend/www/scripts/friends.js b/frontend/www/scripts/friends.js index 934c084b4ead0cd239a93fbcc57e4a480f89f98c..0455653034319cb84aa052f31f0a886538968515 100644 --- a/frontend/www/scripts/friends.js +++ b/frontend/www/scripts/friends.js @@ -166,7 +166,7 @@ function renderSearchResult(friends) { a.href = `profile.html?id=${friend.id}`; const button = divFriendRequest.querySelector("button"); - button.addEventListener("click", () => addFriend(friend.id)); + button.addEventListener("click", () => addFriend(friend.url)); container.appendChild(cloneFriendRequest); });