From 75c00b0e917033fcc15caf0f99a18182d476135c Mon Sep 17 00:00:00 2001 From: emaric Date: Wed, 17 Jan 2024 08:32:22 +0100 Subject: [PATCH] testovi ne rade --- .../__pycache__/models.cpython-38.pyc | Bin 1020 -> 1020 bytes .../__pycache__/serializers.cpython-38.pyc | Bin 1816 -> 1677 bytes .../__pycache__/tests.cpython-38.pyc | Bin 2431 -> 2755 bytes .../__pycache__/urls.cpython-38.pyc | Bin 515 -> 515 bytes .../__pycache__/views.cpython-38.pyc | Bin 1899 -> 1910 bytes plovidba_aplikacija/models.py | 15 --------- plovidba_aplikacija/serializers.py | 15 --------- plovidba_aplikacija/tests.py | 26 +++++----------- plovidba_aplikacija/urls.py | 1 - plovidba_aplikacija/views.py | 29 ++---------------- .../__pycache__/env.cpython-38.pyc | Bin 2583 -> 2596 bytes .../__pycache__/settings.cpython-38.pyc | Bin 3693 -> 3671 bytes plovidba_projekt/env.py | 2 +- plovidba_projekt/settings.py | 1 - 14 files changed, 10 insertions(+), 79 deletions(-) diff --git a/plovidba_aplikacija/__pycache__/models.cpython-38.pyc b/plovidba_aplikacija/__pycache__/models.cpython-38.pyc index a3796bd656c4c9e3eb896da46f750a6839fa1370..02806990b3b35b640e2aac5a578a9d990973023e 100644 GIT binary patch delta 23 dcmeyv{)e3}l$V!_0SNdSmZt_XZ{&N&3;;=;1}p#o delta 23 dcmeyv{)e3}l$V!_0SIiE7N+{JZsdE%3;;&A1=9ck diff --git a/plovidba_aplikacija/__pycache__/serializers.cpython-38.pyc b/plovidba_aplikacija/__pycache__/serializers.cpython-38.pyc index 418e54ed04c513f5cbf0d6045015acb248972d87..d7a505164bf26ed75e4048c5698c53dce7f87fca 100644 GIT binary patch delta 197 zcmbQi*UQTn%FD~e00bZFm#4C_OyrYc^qHvb&6dI$%%I7&u`hy=k#q8M#$HC&$)!vx zlMR{OC+}jCnOw^}kDni?tC$5ya4@nk7D-IjVsVkb#gUVrotT`Nm8i*ji?z74AhoCn zq^^h!L`Y8VU~yy=o_vaB2BYNUWY%O>NuY4lB_M!&)Q)z*>*WE7@-PA+lMp)q{(dP) delta 314 zcmeC>ox#T!%FD~e00d9oE=gr!o5&}_7&lSdTf&_og)@btg&~C_l`)H>nK_Cxg)5jr zlY3)L1S6y9px&969;fiOHE+iAB61F$BQ};)(zX2_PVs>Oynry=| z1LSs=WLA*MTa#^Br5V*HN3wdcf%rgERmKNO)LgL@-d4IkW^q@%&0xtk3(Ye9aaNI zmC5zYvOFnlEeuhtDeS=vnjDk$*eckRfF=|vZ(hUJ$vD}KCDJ*4k?Xe4e@l!U(q*Gk ztnc@`ITR@Zl~nPT7NjJWq^9WRC01pY6)A(XseuS}Afd@#!~>*mu@)qjBxg)s$S%oL zq%~QWRZb_$zBn_zv?wpXxFk~#sJs~Ld?pS?rhja#B8*iQlQHwJ_w-&Pj2@XaM4i1(goynCPCmD5s^5T=DI8^~_ C$x=iB delta 119 zcmX>s`d^4Il$V!_0SNAME=@J$+Q_$DQ(`u*2y?|HLC=p9!Qn2CQuY4Q_KP+I2buNiZmzhX=dRK<>lpK00Q=g<*A7qdA~6N05Hu3J^%m! delta 22 ccmZo>X=dRK<>lpK00QlMOH$`-P={yuiF$E1RB@z`S4Gm2U6hug4DkMZrL6eav_yKDE zf^TpIb$V!-p<$&x(jA?-nvMVV{>-^FkoWocR_@z(e{aC?lUYH{Kjsx$ybhOsSA@dU zSd}-IG+@N>c1K1P>Lw&W86V=Q>r0}6pfEJ#XFPBkDkBJhCj5cNJ$346Ro-3SE~z1b zx`F~^VQv?#k%TG|1keNon(>7lLdFlai&w#UgJ0|z(sj7gr?yC>myzD`-$gzCvYmD= nL;Zhk38dPVb2Hj(WvWjUGdA%Qa`E^0C{6+RBpz8z!X)|y%(^oV delta 296 zcmY+8F;2rk5Jf%fvAuD!3q%GJCzecX5T-zp5I3NuOhZExBMKs&k8KRswLd;w_3xHSK-3$i=kB; zblt-pjTy1p8A;2b-vkX*@&#U-LKKY!t)dCP;kl_rI3)-|s`wMH3h&v(%kJs^aX~#1 zbSP*+7EYqmy)zLm76dQ=1giNqDxu()XvFKNg5E034k(j3`B0R5{5`|7B+sak#!T*S pHVr9I!+E^zm)=-;)NGO|G-5wG_R-u#Fp%&574G6N(Wy>!`~x9AF8lxh diff --git a/plovidba_aplikacija/models.py b/plovidba_aplikacija/models.py index 645d4aa..4b7a7e9 100644 --- a/plovidba_aplikacija/models.py +++ b/plovidba_aplikacija/models.py @@ -16,18 +16,3 @@ class ObjektSigurnosti(models.Model): def __str__(self): return self.naziv - -# class Log(models.Model): - -# AKCIJA_CHOICES = ( -# ('Brisanje', 'Brisanje'), -# ('Unos', 'Unos'), -# ('Uređivanje', 'Uređivanje') -# ) -# user = models.ForeignKey("user.User", null=True, related_name='user_logs', on_delete=models.SET_NULL) -# timestamp = models.DateTimeField(auto_now_add=True) -# akcija = models.CharField(max_length=255, choices=AKCIJA_CHOICES) -# opis = models.TextField() - -# def __str__(self): -# return self.opis \ No newline at end of file diff --git a/plovidba_aplikacija/serializers.py b/plovidba_aplikacija/serializers.py index 0956705..42eebef 100644 --- a/plovidba_aplikacija/serializers.py +++ b/plovidba_aplikacija/serializers.py @@ -1,18 +1,6 @@ from rest_framework import serializers from django.contrib.gis.geos import Point from .models import ObjektSigurnosti -# class ObjektSigurnostiSerializer(serializers.ModelSerializer): -# class Meta: -# model = ObjektSigurnosti -# fields = '__all__' - -# class LogSerializer(serializers.ModelSerializer): - -# user_full_name = serializers.ReadOnlyField(source='user.full_name') - -# class Meta: -# model = Log -# fields = ('id', 'user', 'user_full_name', 'timestamp', 'akcija', 'opis') class PointSerializer(serializers.Serializer): lat = serializers.FloatField() @@ -21,9 +9,6 @@ class PointSerializer(serializers.Serializer): def to_representation(self, instance): return {'lat': instance.y, 'lon': instance.x} -class ObjektSigurnostiSerializer(serializers.ModelSerializer): - lokacija = PointSerializer() - class ObjektSigurnostiSerializer(serializers.ModelSerializer): lokacija = PointSerializer() diff --git a/plovidba_aplikacija/tests.py b/plovidba_aplikacija/tests.py index 8b88534..7fb5883 100644 --- a/plovidba_aplikacija/tests.py +++ b/plovidba_aplikacija/tests.py @@ -43,27 +43,15 @@ class ObjektSigurnostiDetailTest(APITestCase): response = self.client.get(self.url) self.assertEqual(response.status_code, status.HTTP_200_OK) - # def test_update_objekt_sigurnosti(self): - # data = { - # 'lokacija': {'lat': 15.17517, 'lon': 44.01113}, - # 'naziv' : 'updated-naziv', + def test_update_objekt_sigurnosti(self): + data = { + 'lokacija': {'lat':18.457, 'lon':45.124}, + 'naziv' : 'updated-naziv', - # } - # response = self.client.patch(self.url, data, format='json') - # self.assertEqual(response.status_code, status.HTTP_200_OK) - # # Reload the object from the database - # updated_objekt = ObjektSigurnosti.objects.get(pk=self.objekt.pk) - - # # Check if the values are updated correctly - # self.assertEqual(updated_objekt.lokacija.x, 13.79758) - # self.assertEqual(updated_objekt.lokacija.y, 44.9254) - # self.assertEqual(updated_objekt.naziv, 'updated-naziv') + } + response = self.client.patch(self.url, data, format='json') + self.assertEqual(response.status_code, status.HTTP_200_OK) -# def test_retrieve_objekt_sigurnosti(self): -# url = reverse('objektisigurnosti-detail', args=[self.objekt.id]) -# response = self.client.get(url) - -# self.assertEqual(response.status_code, status.HTTP_200_OK) diff --git a/plovidba_aplikacija/urls.py b/plovidba_aplikacija/urls.py index f5ef556..f4eeaf5 100644 --- a/plovidba_aplikacija/urls.py +++ b/plovidba_aplikacija/urls.py @@ -6,5 +6,4 @@ from plovidba_aplikacija import views urlpatterns = [ path('objekti/', ObjektSigurnostiList.as_view(), name='objektisigurnosti-list'), path('objekti//', ObjektSigurnostiDetail.as_view(), name='objektisigurnosti-detail' ), - # path('logs/', views.Log.as_view(), name='log-list') ] diff --git a/plovidba_aplikacija/views.py b/plovidba_aplikacija/views.py index 06192bd..ca40c9d 100644 --- a/plovidba_aplikacija/views.py +++ b/plovidba_aplikacija/views.py @@ -1,4 +1,3 @@ -# views.py from rest_framework.views import APIView from rest_framework.generics import ListAPIView from rest_framework.response import Response @@ -25,19 +24,9 @@ class ObjektSigurnostiList(generics.ListCreateAPIView): def get_queryset(self): user = self.request.user return user.accounts.all() - # def get_queryset(self): #queryset je data iz database, listing and creating objects - # queryset = ObjektSigurnosti.objects.all() - # location = self.request.query_params.get('lokacija') - # if location is not None: - # queryset = queryset.filter(lokacija__icontains=location) - # return queryset def perform_create(self, serializer): - #used to customize the behavior when creating an object, and in this case, - #it sets the operater field and creates a log entry for the created object. serializer.save(operater=self.request.user) - # instance = serializer.instance - # self.create_log(instance) def get_serializer_class(self): if self.request.method == "GET": @@ -45,21 +34,7 @@ def get_serializer_class(self): return self.serializer_class() -class ObjektSigurnostiDetail(generics.RetrieveUpdateDestroyAPIView): #retrieving, updating, and deleting a specific object +class ObjektSigurnostiDetail(generics.RetrieveUpdateDestroyAPIView): queryset = ObjektSigurnosti.objects.all() serializer_class = ObjektSigurnostiSerializer - - # def perform_update(self, serializer): - # instance = serializer.save() - # opis = "Korisnik je uredio objekt sigurnosti {} (ID: {})".format( - # instance.vrsta.naziv, instance.id - # ) - # Log.objects.create(user=self.request.user, akcija="Uređivanje", opis=opis) - - # def perform_destroy(self, instance): - # super().perform_destroy(instance) - # opis = "Korisnik je obrisao objekt sigurnosti {} (ID: {})".format( - # instance.vrsta.naziv, instance.id - # ) - # Log.objects.create(user=self.request.user, akcija="Brisanje", opis=opis) - + permission_classes = [] diff --git a/plovidba_projekt/__pycache__/env.cpython-38.pyc b/plovidba_projekt/__pycache__/env.cpython-38.pyc index eb8f33a00c9d8947fafd6d48a19d7ce104c9ad46..5f5553662238d71573d9db0be9a3a02591bfd86f 100644 GIT binary patch delta 49 zcmbO(vP6V8l$V!_0SFd$Elb_Kk(ZlMRHPs$zbrE)DKS2=ASW|BF*!3UQDL(J<97}K DT{sVV delta 36 qcmZ1?GF^l>l$V!_0SFu-=BBRO$ji;h!CsV}shg5owpo|)I|l%qvk931 diff --git a/plovidba_projekt/__pycache__/settings.cpython-38.pyc b/plovidba_projekt/__pycache__/settings.cpython-38.pyc index 6296b3adbd0786ea3581b63435ccef30606dc3f1..8bad5efd834e301cbcc28f49f027f915c538517a 100644 GIT binary patch delta 39 ucmaDWb6tivl$V!_0SJz^Elb_Gk#{`{qwwa-ER3A2OiZ6ygeKqQodN*pOAE>X delta 61 zcmcaE^Hzp8l$V!_0SHQrm!)3c$h)3JT(c;(xFkNUC^0v+JijPAzPLOwJw3H(^IjH4 QPF6;yFD$~75A#j|0A%wNe*gdg diff --git a/plovidba_projekt/env.py b/plovidba_projekt/env.py index e59fa8c..e45cdb9 100644 --- a/plovidba_projekt/env.py +++ b/plovidba_projekt/env.py @@ -9,7 +9,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(__file__)) PARDIR = os.pardir -APPLICATION_NAME = "rgi-dev" +APPLICATION_NAME = "plovidba_aplikacija " ENV_PATH = os.path.join('/etc/secrets/', APPLICATION_NAME) diff --git a/plovidba_projekt/settings.py b/plovidba_projekt/settings.py index f580181..72a8b70 100644 --- a/plovidba_projekt/settings.py +++ b/plovidba_projekt/settings.py @@ -50,7 +50,6 @@ INSTALLED_APPS = [ # 3rd party 'rest_framework', 'drf_yasg', - 'rest_framework_swagger', # Custom apps: 'plovidba_aplikacija',