From 67eceb910352e6278b866ca9067fb4c2b1566942 Mon Sep 17 00:00:00 2001
From: Yorgo El Moubayed <yelmoubayed@embl.fr>
Date: Fri, 12 Mar 2021 16:12:58 +0100
Subject: [PATCH] Minor updates
---
README.md | 6 ++++++
.../construct_model.cpython-38.pyc | Bin 835 -> 782 bytes
.../__pycache__/user_model.cpython-38.pyc | Bin 505 -> 531 bytes
dataproc/api/models/construct_model.py | 3 +--
.../__pycache__/construct_view.cpython-38.pyc | Bin 2373 -> 2375 bytes
.../__pycache__/user_view.cpython-38.pyc | Bin 2262 -> 2277 bytes
dataproc/api/views/construct_view.py | 18 +++++++++---------
.../{connectors.py => relationships_view.py} | 4 +++-
dataproc/api/views/user_view.py | 5 +++--
9 files changed, 22 insertions(+), 14 deletions(-)
rename dataproc/api/views/{connectors.py => relationships_view.py} (99%)
diff --git a/README.md b/README.md
index a8580e2..9451538 100644
--- a/README.md
+++ b/README.md
@@ -50,3 +50,9 @@ python manage.py runserver
~~~
python manage.py shell
~~~
+
+## Links to official documentations
+
+* Django: <https://docs.djangoproject.com/en/3.1/>
+* Neomodel: <https://neomodel.readthedocs.io/en/latest/>
+* Neo4j: <https://neo4j.com/docs/>
\ No newline at end of file
diff --git a/dataproc/api/models/__pycache__/construct_model.cpython-38.pyc b/dataproc/api/models/__pycache__/construct_model.cpython-38.pyc
index fd1129b42abca1dd1fcddc931d2e6694d81671c0..017711cdc0d89b74d0388696f01015630d9989e2 100644
GIT binary patch
delta 250
zcmX@i*2l&h%FD~e00dbX-U-_#^2#zAOw^Vab7x3lN?~qcNMTN8Y-WyPOJNCS&}5yM
z6E*R?RDc6ec`8E`V+unQQz~;aLljFYE0APMWlv#DVQOZI;sCOk!7NT7iv`T$0<u`a
zEbbIGpkeH{IGywJic5-0lP7yHPGjVme4kO1`4&s*WPT=pHeR3=MZA+!m=YA(flLk{
zF6IF-nAjNEn7J51um~jMr^!C~DU-4um{SDN1{8*{_<*ci95%W6DWy57c8ow?F%yuG
GVFv(C=`k|^
delta 304
zcmXBO%}T^D5C`x~k|t?wSn()|_;D#-y;;1h;6c=bc*(_z6G7;@&~BcfUKL8fhfzHF
z6!ryt4X53N48MHvpS-IdW$&!b7>%u~%j&ncyHNJWdk4sn*J`1i26n+vpnPR0J#@ku
zOm11B`pTsR3`q#jc+!7v-=9;6XAY1#?uC~KZ{QNII_9)D$We6Mr6f5iBPEkINNQ4!
znxf5+&X+IkstJ!P>Y&j-J%l<Q!3Ws*1%+-jwHieHgBvv?HnUjrYTpo3T5V3n@C=m5
tV4Tf(b6uqIn;)JIa{TcWF`YN-1bVU7CTTF`Vu_*lXF$7FQrUrA{{y{OK4<^{
diff --git a/dataproc/api/models/__pycache__/user_model.cpython-38.pyc b/dataproc/api/models/__pycache__/user_model.cpython-38.pyc
index f98b4d63d02801c550c7abf040b4ad4996ea33fc..124c1d3eeb4eb349b4bf0215342c8e3dd41b4d14 100644
GIT binary patch
delta 98
zcmey#Jeh?%l$V!_0SGcOy*F~}Gm1yC7nc_0CFZ8CWGLbVii3$?p_2m{r6mgD3ySiy
lQj<&c^HR%oQwns8Q;W(nlT#;WF{TT^6+^V~O@7EI0RZ&b8H@k`
delta 93
zcmbQt@{^f6l$V!_0SG3jJ8k6FXB5B1UR+v~mzbNnlA(wXC=MomSx*jRl%Cwin5qF6
cgUIp&mE7X6$<0qG%}KRm1oDcRfP@Sa0PbiLdH?_b
diff --git a/dataproc/api/models/construct_model.py b/dataproc/api/models/construct_model.py
index c8e9bed..a30b076 100644
--- a/dataproc/api/models/construct_model.py
+++ b/dataproc/api/models/construct_model.py
@@ -1,5 +1,4 @@
from neomodel import StructuredNode, StringProperty, IntegerProperty,UniqueIdProperty, RelationshipTo
-from uuid import uuid4
# from api.models.ocf_model import OCF
# from api.models.storagehost_model import StorageHost
@@ -8,7 +7,7 @@ from uuid import uuid4
class Construct(StructuredNode):
- uid=UniqueIdProperty(default=uuid4)
+ uuid=UniqueIdProperty()
name=StringProperty()
# Relationships
diff --git a/dataproc/api/views/__pycache__/construct_view.cpython-38.pyc b/dataproc/api/views/__pycache__/construct_view.cpython-38.pyc
index c24e15ba959a8420bb8150cc5e607ef7ab1007e1..13b68bcecf4037397d998666a0ed08b8b0274832 100644
GIT binary patch
delta 41
wcmX>qbX<rxl$V!_0SHVoyc23R@*ZPkVkzBxh4COOquS(Y>~fnovrl3K0OE2By#N3J
delta 40
vcmX>ubX15pl$V!_0SNwCc_(CV<UPj7$h`R~<3UzN)ydP@<u-3)pU4OR<U0%0
diff --git a/dataproc/api/views/__pycache__/user_view.cpython-38.pyc b/dataproc/api/views/__pycache__/user_view.cpython-38.pyc
index b070008616c5c8ea82b23831cf7bb03f3216884c..3dae84405ea6ea50f29e2105b00837c6473b49f6 100644
GIT binary patch
delta 979
zcma))&ubGw6vy|?&i+c9q$x^M(loIx35ygD-daym+k;S$wzPs8LuP5a#w1R*O2dZU
zg?gE*hZel_Qt%=k#J@oB=3(#t4T1;py;+H^dT_&jc{6YJz4!S}z7)O|vRm0~#=z%1
zy!-gu+iVSvI=G6B&=By1$#8Hxf{=x#V8T3xA?zAM7Q>41aAs)6X2|ii1b@wjJZ2|$
z%ufM~XLFGgGyK9jX4}Sw0s0p?!WPaxr2DpUA2U0Ka5oI!8%$-Y_^bs{)o-@j)q{Q@
z`+6%e*Y0et`jGH;b8vXZ67yhRB)rpn8mP~3%XV>E>8S!+vZpZozM<~1QnA<Q$!-|5
zq8pvy#iHmfV!h}4tw4or=}HbbxQqk;Ve@gwfemt6y=Ub|I~U0}(E~Uk3iFf=VK5sZ
zZHVlGqYo^yVzvju680rVOE|(sM!i2`^pG*5md)A&k7k7G8Ays&C3!E$NwO&GzAbaK
zuuu|nH;5#sWuAng_@<nsm_C+QNeDWXqWWZ395z8bWp!?sRi3|`*C$JKNINxZm9}2@
zU71rKczv0&KG)R~FYI?a4bhC6|89gw6R#h2Ww3?5-c++z2^Q3n_3=n|qf!W{`#Bi@
zO*xiQRxl~6B-coOqt4J$*P5e<$aOj2O7Z7MdEI1W#MCb*Fr8!$dPtxrTv4y=3e?e)
zcj^D7rb1`t=uhvx|ClPVMbHkSAia&$FR915JjsPY#zfGMWcQG~+Q!NHbc2SIQI<PV
yxQ?NpO`JwUbX$#vtf-p1<xk_TER!sd)Jf>%h1=HmUQ}<~`dFSpW&+<y20sB0#<xQN
delta 919
zcma))&ubGw6vy|?&dzR<ZfHs{!Te}7G-U-n2!g*5L?|ethZ29Gq`_IWt2R2jMOqU2
z7kF__LWSg1dK3@h#ecxNhZVee_U=J^Z&qR|7TjgOyf?Em@AJMh-%6iLe#iIo7CyNT
zS61J@_1jR5FdJBrCE+ns54J8O5V4Uxw)AzVTx2_J$OmjB27C-)J#QxNfJs~Om+Yps
zVu5)RS2|LxK{hU|+c<N}lJ1HXczPF_#XXkV8*4J<>%FJpvi<_+g^N{{ryK07IE3Mk
zGx{E@=~wJ@IS(8>#)1D7d<KdjKvnfu*0{Pl4SE-mVZ<cDjM)&j+KC<Uhz$VIV8{|@
zz#@SkqU|s#q`ME;(I?!RzGE+LdsG}2_CQgj1j@3?QCJ|ELAe%q%BRFZN$rPWqBx~R
z5=N3WgHd3s5)GKW$`ny^nN%=Jz4%f8MJEnb3$wUr>F;*Ig(@{!*T8pMX60d8WHy~Z
zWKaf0f8tB$Xg1)cTAGXE{(4vTlHS3Eb8*sFAyq!9k2^JJ>C4VX)4eH#{hNCK?!S=r
z-z2Pgk_D1KCe$c3<VPr)coI079Y-hgrpUyY%9Jztjc3?_A-tsDh<RwE9}S&~*V$cJ
z)SGU7`|p#<{RdepWcVaZLc{gjGi8wW(@en>WEdx^ze#@GK=^nL#d7ny?9G;rVHo(S
t+wIE!{ccw^^(n6tRB=?*N$6-*n}q(Hx&h`cRP;M<sZeB)pT%#E!7sizqbvXb
diff --git a/dataproc/api/views/construct_view.py b/dataproc/api/views/construct_view.py
index 5c383c5..9569823 100644
--- a/dataproc/api/views/construct_view.py
+++ b/dataproc/api/views/construct_view.py
@@ -24,7 +24,7 @@ def indexConstruct(request):
response=[]
for construct in constructs :
obj= {
- "uid": construct.uid,
+ "uuid": construct.uuid,
"name": construct.name,
}
response.append(obj)
@@ -43,7 +43,7 @@ def showConstruct(request):
name=request.GET.get('name', ' ')
try:
construct=Construct.nodes.get(name=name)
- return JsonResponse({"uid": construct.uid, "name": construct.name}, safe=False)
+ return JsonResponse({"uuid": construct.uuid, "name": construct.name}, safe=False)
except :
return JsonResponse({"error":"Error occurred"}, safe=False)
@@ -60,7 +60,7 @@ def storeConstruct(request):
try:
construct=Construct(name=name)
construct.save()
- return JsonResponse({"uid": construct.uid})
+ return JsonResponse({"uuid": construct.uuid})
except :
return JsonResponse({"error":"Error occurred"}, safe=False)
@@ -74,12 +74,12 @@ def updateConstruct(request):
if request.method=='PUT':
json_data=json.loads(request.body)
name=json_data['name']
- uid=json_data['uid']
+ uuid=json_data['uuid']
try:
- construct=Construct.nodes.get(uid=uid)
+ construct=Construct.nodes.get(uuid=uuid)
construct.name=name
construct.save()
- return JsonResponse({"uid": construct.uid, "name": name}, safe=False)
+ return JsonResponse({"uuid": construct.uuid, "name": name}, safe=False)
except:
return JsonResponse({"error":"Error occurred"}, safe=False)
@@ -87,14 +87,14 @@ def updateConstruct(request):
def destroyConstruct(request):
"""
- Delete one construct by uid
+ Delete one construct by uuid
"""
if request.method=='DELETE':
json_data=json.loads(request.body)
- uid=json_data['uid']
+ uuid=json_data['uuid']
try:
- construct=Construct.nodes.get(uid=uid)
+ construct=Construct.nodes.get(uuid=uuid)
construct.delete()
return JsonResponse({"success": "Construct deleted"}, safe=False)
except:
diff --git a/dataproc/api/views/connectors.py b/dataproc/api/views/relationships_view.py
similarity index 99%
rename from dataproc/api/views/connectors.py
rename to dataproc/api/views/relationships_view.py
index 73ac2fa..9f1f348 100644
--- a/dataproc/api/views/connectors.py
+++ b/dataproc/api/views/relationships_view.py
@@ -1,8 +1,10 @@
# from django.http import JsonResponse
-# from api.models import *
# from django.views.decorators.csrf import csrf_exempt
# import json
+# from api.models import *
+
+
# @csrf_exempt
# def connectConstructUser(request):
# if request.method == 'PUT':
diff --git a/dataproc/api/views/user_view.py b/dataproc/api/views/user_view.py
index 0c0537b..a86e98c 100644
--- a/dataproc/api/views/user_view.py
+++ b/dataproc/api/views/user_view.py
@@ -20,7 +20,7 @@ def indexUser(request):
if request.method=='GET':
try:
- users=User.nodes.all()
+ users=User.nodes.all(lazy=False)
response=[]
for user in users :
obj= {
@@ -43,7 +43,8 @@ def showUser(request):
name=request.GET.get('name', ' ')
try:
user=User.nodes.get(name=name)
- return JsonResponse({"uid": user.uid, "name": user.name}, safe=False)
+ # return JsonResponse({"uid": user.uid, "name": user.name}, safe=False)
+ return JsonResponse({user}, safe=False)
except :
return JsonResponse({"error":"Error occurred"}, safe=False)
--
GitLab