From c4637eed7afcc3fc74692bbd7aebb0a18a4fe21f 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?= Date: Fri, 12 May 2023 22:10:12 +1000 Subject: [PATCH] add psych_test_result column in User model; start made PsychTestAddResultViewSet --- .DS_Store | Bin 0 -> 6148 bytes pairent_backend/.DS_Store | Bin 0 -> 6148 bytes pairent_backend/pairent_app/.DS_Store | Bin 0 -> 6148 bytes ...05_user_remove_apartament_isсhild_and_more.py | 10 ++++++++-- pairent_backend/pairent_app/models.py | 1 + pairent_backend/pairent_app/serializer.py | 9 +++++++-- pairent_backend/pairent_app/urls.py | 3 ++- pairent_backend/pairent_app/views.py | 15 +++++++++++++-- 8 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 .DS_Store create mode 100644 pairent_backend/.DS_Store create mode 100644 pairent_backend/pairent_app/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..191f859fec4fcf1683ed179ca71a3a3bf69f6748 GIT binary patch literal 6148 zcmeHKL2uJA6n^e9mNFr7U}%>~k+@EyW781gl9lejfy;u}0Z>Vr0@1R#YSQ&kRmvHD z3|D^1{>x76d$uR7>CiMGRb%p#oY{x_-+M{Hf$Ri>b%IG{qagA_4>zp)9 z3&#l_<83B;aVBHfJfIcJfMwurGr)V-p@by$sHpAVee`YpQKA;%&}qJSkLcs5{)I z+w6MllgZA@?M;7ocW=7sPhP!fp}w;>oi^RIXU|_Bc8{}@T>emOk-(X#su2k$Y$8}D5hO3!-dQ&`d#M$C3m9_kw|I1kSBwM%Qua>(e z9nt~qQ-|IGx3Gt5*=lf>uVxG8Ld1NZ?&?Bjvy)f`ECc@&1AIRCP{zPurBNLnDAW@G z=%85%>gv}Y=yL-wFj#3s3q)hh_uJxf`pe*cH mX;dL7%yq0Pd=;-lm7ve(3NSEOX+#Ue{s<@02J&xDpnnjiJgWjisUss z3|pS0uT##QnWChj5-Wtzz0&oWzhlSWI35oXss1G0BkB^7hh%N}IQ%BKpK~Qzu4Nsn z%sI|zNV`>UVb!QAa}1#phVQc9LJQ=81r3F zO#{?QDo^qy*Y`hjCDW>O*ZPr^c~;fE-j!;twePKOcpF~F`w)H7)2NQ?N!5?X@3{6_ z>pZzB$H|*)I308!9O7l%TIG_98)}zPIUk%RlQK7$@yC#LF+{AsSH}VaIJD6NV<099^8Ah;s zbA?<2cBgc1NT$mK)k8QIxo;ZcpJ`&)j~x99|GApJP<_kIziQEqs)P^_0z$wLaBnlO zBRqtF5D)^l2=MzMK(dBT8>{BkfrHrsK-*|GfiizEvL|pFI&G|?2cfJLYOTs`F_g8V zJ#gbfr;Sx>C*?LD%3WEx9f~qn$N2*@oK$F4jzT~PEE8C>)h@69FYn&}FPo$$1cbnU zML@NWqvJkq$*rv`H^*yjfc%K$;Bk%BUltV1QjD>@6mKIbrN?%pCW*8uG zWr(SoRKM=_oDJE={6 z!x=9|*)Y#Drb8Ta(43o1k?mfFO8Qok^n`J#E_^`F6ffG6WLl94B5Ro$aoMuj{Fci&`G7GzClnQ{YDd$qzAIFbPh4yVY2iKMTT%1113rk9)UUAUn* zot@*y8V;9uw9*tX1vV8p^39H%|Cjsk|C=OhnF6N3zf!=}``7&*w-nCSt/", views.ApartamentViewSet.as_view({'get': 'retrieve'})), 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("apartaments/filters/", views.ApartmentFilter.as_view({'post': 'list'})), + path("psych_test/add_result/", views.PsychTestAddResultViewSet.as_view({'post': 'update'})) ]) diff --git a/pairent_backend/pairent_app/views.py b/pairent_backend/pairent_app/views.py index 88f00e9..b13aa98 100644 --- a/pairent_backend/pairent_app/views.py +++ b/pairent_backend/pairent_app/views.py @@ -7,7 +7,8 @@ from django.http import HttpResponseBadRequest from .models import Apartament, User from .serializer import (ApartamentListSerializer, - ApartamentDetailSerializer) + ApartamentDetailSerializer, + PsychTestAddResultSerializer) import json @@ -79,4 +80,14 @@ class ApartmentFilter(viewsets.ViewSet): filtered.append(entry); - return Response(ApartamentListSerializer(filtered, many=True).data); \ No newline at end of file + return Response(ApartamentListSerializer(filtered, many=True).data); + + +# TODO: доделать +class PsychTestAddResultViewSet(viewsets.ViewSet): + def update(self, request): + 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) + \ No newline at end of file