From 44a9b4570b66307d297274e1c316cb3d98991ac6 Mon Sep 17 00:00:00 2001
From: emaric <elena.maric@listlabs.net>
Date: Thu, 18 Jan 2024 16:02:54 +0100
Subject: [PATCH] uredjen serializer

---
 .../__pycache__/serializers.cpython-38.pyc    | Bin 1514 -> 1685 bytes
 plovidba_aplikacija/serializers.py            |  36 ++++++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/plovidba_aplikacija/__pycache__/serializers.cpython-38.pyc b/plovidba_aplikacija/__pycache__/serializers.cpython-38.pyc
index 0bd93e72674ca86b0ee59f8174a177dd41d1de2e..fe28572c0cf82c4e655811ef2aa761de21f96e15 100644
GIT binary patch
literal 1685
zcmaJ>&2QT_6ep<<%TDa1ThL)WtZpx^fx$qx(}rLu&<?`}#2w&uAA$ja5ov?6ENUd3
zHHLGU1N5|=2JGry2ILReKf~)z{TFuHqtql$i&X-j-Xp2^`FrnKyWK+YeEQi1|0_V~
zA17=-J_wIs=^+q?7|zig#~3@F<Yex}9`GLXbAKMhLA4*`VI0DFm^bE89AWeoVht9Z
zBNlO-HP>F;V!;UYo3B78>SMd3xe_!NORhAC!M9Qr<`u3F_n#hTd}c;sx=@AGMhxM~
z-uG~wQ6psWrBYI*PSf_|y%zK*z;F~}hGGJKU`D_XvL><Tygo;<{{l@g3s`s_#lZ{Y
zqc{ZL8urecc1KrEzGcn1`UsXj*s{jG*k?En7y*6W^6vlZ8ys;%Z6ir&o+rt$AKEBM
z3OeUWVp~Zvmu!(cem6;eUeLTgQBW>q132Wl4JU%<OkW_?f!&JyJAVB6_!(qYk4I*~
zcwrunpKv`hvK*JWJQ3`ej_0SmIJpv&Qc0KV>kV4wVn$Pu(eYM|2IZ;sozG1dvx7*4
zeXRC@NePh4rvZ$+@)(xh09oOUD*<{*&d9Q3@P@3&OMFItK*fC@8Ju~>pO9Hg9b)8O
z1Ib(CU-3_<AU`4#u83)@iTYzjHWBmSPp{&9;QW=x(5wk(e*HDgl?OZ&_BZb=Fs*DS
z+ns>*RUq&R|4DwwXW<G;4K^Ci218J$XlSEc))6lULw-W@j27LARC8*&OWN&Sp7sXa
zBdKWjSQyd$X7qG8uwE_;Ab`rhp$dRfUn{|u55F!zjbQHIqSuuQ7;1Xm6D2avDoDSf
zx!<;4DNE~T8Z-vEq)gjAXXFV_q23kbZS%X+vSw8XxwS2!MWGEXQf_@FQe(X-H_CNF
zjg^LkPD+ioVX8Pa96;`Co=<G2@(*@c0zF0J_GOTjsNQoL-go2{kT`T|X671cYR{d0
z1f&g1-vNT~E+M#s4{(RHFuY_Rq}$jh%X{zWgW9hf7;^4kF8u%mgVtyR6?C{+;f!Q}
z0fr9&TfqCk6X2_s8(w?f4{V?pC0F*Ak%{7^;u<=l8X#3v7C*Q6wC}0AV8TXMiR|3G
zdx32;Nz$BZog{Szs^IU#U-w|?2nYmUy~~f^5$aoR^c%|cigNQ<?KtB4sY<JI>TUbA
z;gq{6v6cRwyH~m48qO{401=Un9~~$s_jfD=qD?YUFjan$YNlMD+7B3@dnyO1EQ}Jz
zgQ?JiDVMqejSZ{WqAT#I+wT5{H<b+d^OTov2<sYxdq-{>T@T92_?D;DaB`m7=&+t@
PU%1h!UCedPA^^^RG+MY)

literal 1514
zcmaJ>O>fjV81_e!Nukr0kA*D<&@S4QBB7DEB7~4Y%ZctvBQDWMRvLS%%w&>adkU@6
zQ!8<TD;Ey**dM^3@s$&Qfz!UP(`jd0Z5{cE{rcm5{64S!rr*CtpnUt|L`4B1-?6h?
zz($@!HBSH}k+dW;no^2wR<apSIkdS9%3v0zAtkSf3}tjgWTfaMI^=0j_J$;hf53W@
zP<P!ZU1Vjkue5<~_)lF__6O|-H~!w9sHq(mJ9Ayt#uhoQS}y#w<M}9(Qb|$<KB;8j
zlO3{@Bby_V1|5$y{6NN3_GEk%r_l!zkQDi>xO*3U4bO;O@{07HLp8Sn7G4zxA2bam
zgZ=paga6-e@LJi-^@PaEQi!c2a<LFqHd8{lYeLLwIWMujD#Y7)R(2yg1Ya(MK~=hF
zT&Pl-6QcWI_3(4_;>qX@MAM9hb}m(AACF!tGqrUyYRY=IklWd4wx_Dyv#w}#jqyD<
zWKCI2v%HvOqa|Gi&7KR8a}UpqDG<|u>UC)33}8`^A=VdA%~ODuenlzBF*{(EwoI~3
z0?0Rs1UWwP18&)bPl7SbYI#9h`k8&A2SFPQ$w{>3;<E18I9}EjKxT_?Yd&uRqYIgY
zjyH9qF$=o*^lHeM+!`0<T4h$jjKHXJ?ACT6$s|~$0L)x}v9<5&8?b|maPich$5ewa
zqVED+hiYN~LRaY>`1XIhLf_8!e`14iLYh7{H=)te37No&0hy#<FlpFU!ZeQQTL1~~
zSkd>6?!myXU~_R%8JktPx<Jz1u(i;t(aM1G5T?4qBN;Cb-G6ii*-Hy^<hdvdP0?ol
z0%+Npro83)PtcWnUE!iFbgh^qsA5Y6gB;+;gc2JZlCNP4S#S(z)f=!?66s&y*U9G<
z2u!xCTxjNv(k_}eC|DBuqwD)Pbrazp0?t37ZbgW^%#0DDi-=e3cNoK~Y5ZdbiruFX
zjjz`1)LE=iWxaxct9_RH6wnW_i(9+?sncBH1zwWkAx`lWB4}akeA2{hEr_F-YqV}9
zv0DS3tQc#!^Y3as)hLs@D<@gCQxEdGvbxwF>=b6OqiW;h<060aO_%2Dukjf;f1&)w
aOFaCmfIM9Mw0lmT;hSa9|0={|mHi6<v~7a`

diff --git a/plovidba_aplikacija/serializers.py b/plovidba_aplikacija/serializers.py
index 3aac045..b5824bf 100644
--- a/plovidba_aplikacija/serializers.py
+++ b/plovidba_aplikacija/serializers.py
@@ -1,6 +1,8 @@
 from rest_framework import serializers
 from django.contrib.gis.geos import Point
 from .models import ObjektSigurnosti
+import json
+from rest_framework.exceptions import ValidationError
 
 class ObjektSigurnostiSerializer(serializers.ModelSerializer):
 
@@ -10,16 +12,26 @@ class ObjektSigurnostiSerializer(serializers.ModelSerializer):
     
     def create(self, validated_data):
         lokacija_data = validated_data.pop('lokacija', None)
-        lokacija = Point(lokacija_data['lon'], lokacija_data['lat'], srid=3765)
-        objekt = ObjektSigurnosti.objects.create(lokacija=lokacija, **validated_data)
-        return objekt
 
-    def to_representation(self, instance):
-        return {'lon': instance.lokacija.x, 'lat': instance.lokacija.y}
-    
-    def update(self, instance, validated_data):
-        lokacija_data = validated_data.pop('lokacija', None)
-        lokacija = Point(lokacija_data['lon'], lokacija_data['lat'], srid=3765) if lokacija_data else None
-        instance.lokacija = lokacija
-        instance.save()
-        return super().update(instance, validated_data)
+        try:
+            lokacija_data = json.loads(lokacija_data)
+        except (json.JSONDecodeError, TypeError):
+            raise ValidationError("Nevaljan format za 'lokacija'. Mora biti JSON.")
+        
+        if isinstance(lokacija_data, dict):
+            lon = lokacija_data.get('lon')
+            lat = lokacija_data.get('lat')
+
+            if lon is not None and lat is not None:
+                lokacija = Point(lon, lat, srid=3765)
+                objekt = ObjektSigurnosti.objects.create(lokacija=lokacija, **validated_data)
+                return objekt
+            
+        raise ValidationError("Invalid 'lon' or 'lat' vrijednosti za 'lokacija'.")
+         
+
+    def to_representation(self, instance): #u sklopu ovog definiran i update
+        representation = super().to_representation(instance)    #da se prikažu sva polja
+        representation['lon'] = instance.lokacija.x
+        representation['lat'] = instance.lokacija.y
+        return representation