Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
humanities
gargantext
Commits
c7bed046
Commit
c7bed046
authored
Feb 23, 2016
by
Mathieu Rodic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FEAT] added a new resource to the API: `/api/nodes/(\d+)`
[FEAT] deletions now cascade
parent
89c93f35
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
7 deletions
+38
-7
ngrams.py
gargantext/models/ngrams.py
+2
-2
nodes.py
gargantext/models/nodes.py
+3
-2
nodes.py
gargantext/views/api/nodes.py
+31
-2
urls.py
gargantext/views/api/urls.py
+2
-1
No files found.
gargantext/models/ngrams.py
View file @
c7bed046
...
@@ -17,6 +17,6 @@ class Ngram(Base):
...
@@ -17,6 +17,6 @@ class Ngram(Base):
class
NodeNgram
(
Base
):
class
NodeNgram
(
Base
):
__tablename__
=
'nodes_ngrams'
__tablename__
=
'nodes_ngrams'
id
=
Column
(
Integer
)
id
=
Column
(
Integer
)
node_id
=
Column
(
Integer
,
ForeignKey
(
Node
.
id
),
primary_key
=
True
)
node_id
=
Column
(
Integer
,
ForeignKey
(
Node
.
id
,
ondelete
=
'CASCADE'
),
primary_key
=
True
)
ngram_id
=
Column
(
Integer
,
ForeignKey
(
Ngram
.
id
),
primary_key
=
True
)
ngram_id
=
Column
(
Integer
,
ForeignKey
(
Ngram
.
id
,
ondelete
=
'CASCADE'
),
primary_key
=
True
)
weight
=
Column
(
Float
)
weight
=
Column
(
Float
)
gargantext/models/nodes.py
View file @
c7bed046
...
@@ -25,8 +25,9 @@ class Node(Base):
...
@@ -25,8 +25,9 @@ class Node(Base):
__tablename__
=
'nodes'
__tablename__
=
'nodes'
id
=
Column
(
Integer
,
primary_key
=
True
)
id
=
Column
(
Integer
,
primary_key
=
True
)
typename
=
Column
(
NodeType
,
index
=
True
)
typename
=
Column
(
NodeType
,
index
=
True
)
user_id
=
Column
(
Integer
,
ForeignKey
(
User
.
id
))
# foreign keys
parent_id
=
Column
(
Integer
,
ForeignKey
(
'nodes.id'
))
user_id
=
Column
(
Integer
,
ForeignKey
(
User
.
id
,
ondelete
=
'CASCADE'
))
parent_id
=
Column
(
Integer
,
ForeignKey
(
'nodes.id'
,
ondelete
=
'CASCADE'
))
# main data
# main data
name
=
Column
(
String
(
255
))
name
=
Column
(
String
(
255
))
date
=
Column
(
DateTime
(),
default
=
datetime
.
now
)
date
=
Column
(
DateTime
(),
default
=
datetime
.
now
)
...
...
gargantext/views/api/nodes.py
View file @
c7bed046
from
gargantext.util.http
import
*
from
gargantext.util.http
import
*
from
gargantext.util.db
import
*
from
gargantext.util.db
import
*
from
gargantext.util.db_cache
import
*
from
gargantext.models
import
*
from
gargantext.models
import
*
from
gargantext.constants
import
*
from
gargantext.constants
import
*
from
gargantext.util.validation
import
validate
from
gargantext.util.validation
import
validate
class
Node
sList
(
APIView
):
class
Node
ListResource
(
APIView
):
_fields
=
[
'id'
,
'parent_id'
,
'name'
,
'typename'
,
'hyperdata'
]
_fields
=
[
'id'
,
'parent_id'
,
'name'
,
'typename'
,
'hyperdata'
]
_types
=
NODETYPES
_types
=
NODETYPES
...
@@ -52,7 +53,6 @@ class NodesList(APIView):
...
@@ -52,7 +53,6 @@ class NodesList(APIView):
# return the result!
# return the result!
return
parameters
,
query
,
count
return
parameters
,
query
,
count
def
get
(
self
,
request
):
def
get
(
self
,
request
):
"""Displays the list of nodes corresponding to the query.
"""Displays the list of nodes corresponding to the query.
"""
"""
...
@@ -75,3 +75,32 @@ class NodesList(APIView):
...
@@ -75,3 +75,32 @@ class NodesList(APIView):
'parameters'
:
parameters
,
'parameters'
:
parameters
,
'count'
:
count
,
'count'
:
count
,
},
200
)
},
200
)
class
NodeResource
(
APIView
):
def
_query
(
self
,
request
,
node_id
):
user
=
cache
.
User
[
request
.
user
.
username
]
node
=
session
.
query
(
Node
)
.
filter
(
Node
.
id
==
node_id
)
.
first
()
if
node
is
None
:
raise
Http404
()
if
not
user
.
owns
(
node
):
raise
HttpResponseForbidden
()
return
user
,
node
def
get
(
self
,
request
,
node_id
):
from
sqlalchemy
import
delete
user
,
node
=
self
.
_query
(
request
,
node_id
)
return
JsonHttpResponse
({
'id'
:
node
.
id
,
'parent_id'
:
node
.
parent_id
,
'name'
:
node
.
name
,
'hyperdata'
:
node
.
hyperdata
,
})
def
delete
(
self
,
request
,
node_id
):
user
,
node
=
self
.
_query
(
request
,
node_id
)
result
=
session
.
execute
(
delete
(
Node
)
.
where
(
Node
.
id
==
node_id
)
)
session
.
commit
()
return
JsonHttpResponse
({
'deleted'
:
result
.
rowcount
})
gargantext/views/api/urls.py
View file @
c7bed046
...
@@ -4,5 +4,6 @@ from . import nodes
...
@@ -4,5 +4,6 @@ from . import nodes
urlpatterns
=
[
urlpatterns
=
[
url
(
r'^nodes$'
,
nodes
.
NodesList
.
as_view
()),
url
(
r'^nodes$'
,
nodes
.
NodeListResource
.
as_view
()),
url
(
r'^nodes/(\d+)$'
,
nodes
.
NodeResource
.
as_view
()),
]
]
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment