Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
where
Commits
7a586ed5
Commit
7a586ed5
authored
Feb 20, 2020
by
Zach Perkins
Browse files
Changed these names back again
parent
c4e6d25e
Changes
1
Hide whitespace changes
Inline
Side-by-side
where/app.py
View file @
7a586ed5
...
...
@@ -15,6 +15,11 @@ def create_resource(session, model_cls, data, get_function):
return
response
def
get_resource
(
session
,
model_cls
,
id
):
resource
=
session
.
query
(
model_cls
).
get
(
id
)
return
make_response
(
jsonify
(
resource
.
as_json
()),
200
)
def
search_resource
(
session
,
model_cls
,
data
):
query
=
session
.
query
(
model_cls
).
filter_by
(
**
data
)
results
=
list
(
map
(
lambda
m
:
m
.
as_json
(),
query
.
limit
(
100
).
all
()))
...
...
@@ -118,11 +123,7 @@ def test_data(session):
@
app
.
route
(
'/category/<id>'
)
@
with_session
def
get_category
(
session
,
id
):
result
=
session
.
query
(
Category
).
filter_by
(
id
=
id
).
first
()
if
result
:
return
jsonify
(
result
.
as_json
())
else
:
abort
(
404
)
return
get_resource
(
session
,
Category
,
id
)
@
app
.
route
(
'/category/<id>/children'
)
...
...
@@ -140,8 +141,7 @@ def handle_point(session):
return
search_resource
(
session
,
Point
,
dict
(
request
.
args
))
elif
request
.
method
==
'POST'
:
data
=
request
.
get_json
()
data
[
'category'
]
=
session
.
query
(
Category
).
get
(
data
[
'category'
])
data
[
'parent_id'
]
=
data
.
pop
(
'parent'
,
None
)
data
[
'category'
]
=
session
.
query
(
Category
).
get
(
data
.
pop
(
'category_id'
))
return
create_resource
(
session
,
Point
,
data
,
'get_point'
)
...
...
@@ -149,11 +149,7 @@ def handle_point(session):
@
app
.
route
(
'/point/<id>'
,
methods
=
[
'GET'
,
'PUT'
,
'DELETE'
])
@
with_session
def
get_point
(
session
,
id
):
result
=
session
.
query
(
Point
).
get
(
id
)
if
result
:
return
jsonify
(
result
.
as_json
())
else
:
abort
(
404
)
return
get_resource
(
session
,
Point
,
id
)
@
app
.
route
(
'/point/<id>/children'
,
methods
=
[
'GET'
])
...
...
@@ -163,5 +159,6 @@ def get_point_children(session, id):
data
[
'parent_id'
]
=
id
return
search_resource
(
session
,
Point
,
data
)
if
__name__
==
'__main__'
:
app
.
run
()
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