Merge branch 'master' of https://github.com/jtjun/DutchBroomstick

jtjun · Jun 19, 2019 · 425b269 · 425b269
2 parents 67ff935 + 3c2cab1
commit 425b269
Show file tree

Hide file tree

Showing 37 changed files with 5,198 additions and 4,967 deletions.
diff --git a/backend/src/dutch_broomstick/serializers.py b/backend/src/dutch_broomstick/serializers.py
@@ -43,7 +43,10 @@ def update(self, instance, validated_data):
 
         instance.save()
 
-        Profile.objects.update_or_create(user=instance, **profile_data)
+        profile = Profile.objects.get(user=instance)
+        profile.default_account = profile_data.get('default_account', profile.default_account)
+        profile.default_nickname = profile_data.get('default_nickname', profile.default_nickname)
+        profile.save()
         return instance
 
 

diff --git a/backend/src/dutch_broomstick/tests.py b/backend/src/dutch_broomstick/tests.py
@@ -151,7 +151,7 @@ def test_create_payment(self):
 
         # Payment 생성 요청
         response = self.client.post(
-            f"/api/rooms/{room_json.get('url')}/layers/0/payments",
+            f"/api/rooms/{room_json.get('url')}/layers/0/payments/",
             {
                 'fromWho': 'test1',
                 'forWhat': "고깃집",

diff --git a/backend/src/dutch_broomstick/urls.py b/backend/src/dutch_broomstick/urls.py
@@ -26,7 +26,7 @@
          views.LayerDetailView.as_view()),
 
     # payment urls
-    path('rooms/<str:url>/layers/<int:number>/payments',
+    path('rooms/<str:url>/layers/<int:number>/payments/',
          views.PaymentCreateView.as_view()),
     path('rooms/<str:url>/layers/<int:number>/payments/<str:id>',
          views.PaymentDetailView.as_view()),