From c528c6b182addc5cbb9cf199dd0b7460624a2018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B5=D0=BD=D0=B8=D1=81=20=D0=A1=D0=B0=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BF=D1=83=D0=BB=D0=BE=D0=B2?=
 <denissarapulov@MacBook-Air-Denis.local>
Date: Fri, 12 May 2023 23:01:55 +1000
Subject: [PATCH] completed PsychTestAddResultViewSet

---
 .DS_Store                                     | Bin 6148 -> 6148 bytes
 pairent_backend/.DS_Store                     | Bin 6148 -> 6148 bytes
 pairent_backend/pairent_app/.DS_Store         | Bin 6148 -> 6148 bytes
 .../pairent_app/migrations/0005_user.py       |  27 ++++++++++++++++++
 pairent_backend/pairent_app/serializer.py     |   2 +-
 pairent_backend/pairent_app/urls.py           |   2 +-
 pairent_backend/pairent_app/views.py          |   9 +++---
 7 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 pairent_backend/pairent_app/migrations/0005_user.py

diff --git a/.DS_Store b/.DS_Store
index 191f859fec4fcf1683ed179ca71a3a3bf69f6748..f25c7a4d0a6c76522e8887155e321fbe510ca148 100644
GIT binary patch
delta 21
ccmZoMXffDe!^&Y|V4$O5VrahEh4p|C06;wjtN;K2

delta 16
XcmZoMXffDe!#epDoBQTw)<z)!G|L6@

diff --git a/pairent_backend/.DS_Store b/pairent_backend/.DS_Store
index 854cc05347e510d9be9cae7855d31e37b5a355c9..befcbddf914b58daf6443e35969415a79310af67 100644
GIT binary patch
delta 21
ccmZoMXffEp$IM}3V4$O5VrafujQO1i06gCXd;kCd

delta 21
ccmZoMXffEp$IM}DZm6SRVq&&gjQO1i06jnjg#Z8m

diff --git a/pairent_backend/pairent_app/.DS_Store b/pairent_backend/pairent_app/.DS_Store
index 2dbaa29971cc187fe798940c7cfbccebb4fa8e61..715516299e30a6ecd9f4e1fe541db50e3da6044c 100644
GIT binary patch
delta 32
ocmZoMXfc@J&&ahgU^g=(*Jd6TR>sX~tP7bYHiT|w=lIJH0H2!)+W-In

delta 112
zcmZoMXfc@J&&abeU^g=(&t@JLR>mMMhFpeBhIED^hD3%EAS<6CkD=HzCqFqUCqIdS
qfkA+QfhiqG>-`4<Ad7(ktDcnN<ea4Z{2a#3e5^~DHnVg5<p%&*)E*uH

diff --git a/pairent_backend/pairent_app/migrations/0005_user.py b/pairent_backend/pairent_app/migrations/0005_user.py
new file mode 100644
index 0000000..c1fae4a
--- /dev/null
+++ b/pairent_backend/pairent_app/migrations/0005_user.py
@@ -0,0 +1,27 @@
+# Generated by Django 4.2.1 on 2023-05-12 12:45
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pairent_app', '0004_apartament_lastprice'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='User',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('favorites_apartaments', models.CharField(max_length=100, verbose_name='Избранные квартиры')),
+                ('apartaments_for_comparison', models.CharField(max_length=100, verbose_name='Квартиры для сравнения')),
+                ('psych_test_result', models.IntegerField(null=True, validators=[django.core.validators.MaxValueValidator(100)], verbose_name='Результат психологического теста')),
+            ],
+            options={
+                'verbose_name': 'Пользователь',
+                'verbose_name_plural': 'Пользователи',
+            },
+        ),
+    ]
diff --git a/pairent_backend/pairent_app/serializer.py b/pairent_backend/pairent_app/serializer.py
index 5cf35b4..3a10520 100644
--- a/pairent_backend/pairent_app/serializer.py
+++ b/pairent_backend/pairent_app/serializer.py
@@ -21,4 +21,4 @@ class ApartamentDetailSerializer(serializers.ModelSerializer):
 class PsychTestAddResultSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
-        fields = "psych_test_result"
\ No newline at end of file
+        fields = ("psych_test_result",)
\ No newline at end of file
diff --git a/pairent_backend/pairent_app/urls.py b/pairent_backend/pairent_app/urls.py
index d67a7b3..50bc96f 100644
--- a/pairent_backend/pairent_app/urls.py
+++ b/pairent_backend/pairent_app/urls.py
@@ -9,5 +9,5 @@ urlpatterns = format_suffix_patterns([
     path("apartaments/comparison/", views.ApartamentGetManyViewSet.as_view({'get': 'retrieve'})), # пример: apartaments/comparison/?user_id=1 user_id - id пользователя
     path("apartaments/favorite/", views.ApartamentGetManyViewSet.as_view({'get': 'list'})), # пример: apartaments/favorite/?user_id=1 user_id - id пользователя
     path("apartaments/filters/", views.ApartmentFilter.as_view({'post': 'list'})),
-    path("psych_test/add_result/<int:pk>", views.PsychTestAddResultViewSet.as_view({'post': 'update'}))
+    path("psych_test/add_result/<int:pk>", views.PsychTestAddResultViewSet.as_view({'patch': 'update'})) # пример: psych_test/add_result/1/?result=50 result - результат псих теста пользователя
 ])
diff --git a/pairent_backend/pairent_app/views.py b/pairent_backend/pairent_app/views.py
index b13aa98..789dee2 100644
--- a/pairent_backend/pairent_app/views.py
+++ b/pairent_backend/pairent_app/views.py
@@ -83,11 +83,12 @@ class ApartmentFilter(viewsets.ViewSet):
         return Response(ApartamentListSerializer(filtered, many=True).data);
 
 
-# TODO: доделать
 class PsychTestAddResultViewSet(viewsets.ViewSet):
-    def update(self, request):
+    def get_object(self, pk):
+        return User.objects.filter(pk=pk)
+    def update(self, request, pk):
+        user = self.get_object(pk)
         result = request.query_params.get("result", None)
-        user = User.User.objects.filter(pk=self.kwargs['pk'])
         user.update(psych_test_result=result)
-        return Response(PsychTestAddResultSerializer(user).data)
+        return Response(PsychTestAddResultSerializer(User.objects.get(pk=pk)).data)
         
\ No newline at end of file