Skip to content

Sync #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TommyLemon merged 6 commits into from
Oct 10, 2019
Merged

Sync #40

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e6f5c82
fix "'Request' object has no attribute 'user'"; add 7 test cases
zhangchunlin Oct 10, 2019
915a47e
fix "NameError: name 'n' is not defined"; add 6 test cases
zhangchunlin Oct 10, 2019
0fb0711
fix "NameError: name 'model_name' is not defined"; add 3 test cases
zhangchunlin Oct 10, 2019
8f3f0b1
fix "NameError: name 'model' is not defined"; add 1 test case
zhangchunlin Oct 10, 2019
85534ca
fix owner_condition() invoke; add 2 test cases for owner_condition()
zhangchunlin Oct 10, 2019
d960506
fix AttributeError; add 6 test cases
zhangchunlin Oct 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix "NameError: name 'n' is not defined"; add 6 test cases
  • Loading branch information
@zhangchunlin
zhangchunlin committed Oct 10, 2019
commit 915a47ea9b95543fa037c9a00651b89d3753fa77
82 changes: 82 additions & 0 deletions tests/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,88 @@ def test_apijson_get():
>>> print(d)
{'code': 400, 'msg': "no login user for role 'ADMIN'"}

>>> #query array with a role which the user doesn't really have
>>> data ='''{
... "[]":{
... "user": {
... "@role":"ADMIN",
... "@column":"id,username,nickname,email"
... }
... }
... }'''
>>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 400, 'msg': "user doesn't have role 'ADMIN'"}

>>> #query array with @count
>>> data ='''{
... "[]":{
... "@count":3,
... "user": {
... }
... }
... }'''
>>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 200, 'msg': 'success', '[]': [{'user': {'username': 'admin', 'nickname': 'Administrator', 'email': 'admin@localhost', 'is_superuser': True, 'last_login': None, 'date_join': '2018-11-01 00:00:00', 'image': '', 'active': False, 'locked': False, 'deleted': False, 'auth_type': 'default', 'timezone': '', 'id': 1}}, {'user': {'username': 'usera', 'nickname': 'User A', 'email': 'usera@localhost', 'is_superuser': False, 'last_login': None, 'date_join': '2018-02-02 00:00:00', 'image': '', 'active': False, 'locked': False, 'deleted': False, 'auth_type': 'default', 'timezone': '', 'id': 2}}, {'user': {'username': 'userb', 'nickname': 'User B', 'email': 'userb@localhost', 'is_superuser': False, 'last_login': None, 'date_join': '2018-03-03 00:00:00', 'image': '', 'active': False, 'locked': False, 'deleted': False, 'auth_type': 'default', 'timezone': '', 'id': 3}}]}

>>> #query array ,@count is bad param
>>> data ='''{
... "[]":{
... "@count":"bad",
... "user": {
... }
... }
... }'''
>>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 400, 'msg': "@count should be an int, but get 'bad'"}

>>> #query array with @count and @page
>>> data ='''{
... "[]":{
... "@count":2,
... "@page":1,
... "user": {
... }
... }
... }'''
>>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 200, 'msg': 'success', '[]': [{'user': {'username': 'userb', 'nickname': 'User B', 'email': 'userb@localhost', 'is_superuser': False, 'last_login': None, 'date_join': '2018-03-03 00:00:00', 'image': '', 'active': False, 'locked': False, 'deleted': False, 'auth_type': 'default', 'timezone': '', 'id': 3}}, {'user': {'username': 'userc', 'nickname': 'User C', 'email': 'userc@localhost', 'is_superuser': False, 'last_login': None, 'date_join': '2018-04-04 00:00:00', 'image': '', 'active': False, 'locked': False, 'deleted': False, 'auth_type': 'default', 'timezone': '', 'id': 4}}]}

>>> #query array with @count and @page, @page bad param
>>> data ='''{
... "[]":{
... "@count":2,
... "@page":"bad",
... "user": {
... }
... }
... }'''
>>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 400, 'msg': "@page should be an int, but get 'bad'"}

>>> #query array with @count and @page, @page <0
>>> data ='''{
... "[]":{
... "@count":2,
... "@page":-2,
... "user": {
... }
... }
... }'''
>>> r = handler.post('/apijson/get', data=data, pre_call=pre_call_as("usera"), middlewares=[])
>>> d = json_loads(r.data)
>>> print(d)
{'code': 400, 'msg': "page should >0, but get '-2'"}

>>> #Association query: Two tables, one to one,ref path is absolute path
>>> data ='''{
... "moment":{},
Expand Down
10 changes: 5 additions & 5 deletions uliweb_apijson/apijson/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ def _get_array_params(self):
try:
query_count = int(query_count)
except ValueError as e:
log.error("bad param in '%s': '%s'"%(n,self.query_params))
raise UliwebError("@count should be an int, now '%s'"%(query_count))
log.error("bad param in '%s': '%s'"%(query_count,self.query_params))
raise UliwebError("@count should be an int, but get '%s'"%(query_count))
self.query_count = query_count

query_page = self.query_params.get("@page")
Expand All @@ -127,10 +127,10 @@ def _get_array_params(self):
try:
query_page = int(query_page)
except ValueError as e:
log.error("bad param in '%s': '%s'"%(n,self.query_params))
raise UliwebError("@page should be an int, now '%s'"%(query_page))
log.error("bad param in '%s': '%s'"%(query_page,self.query_params))
raise UliwebError("@page should be an int, but get '%s'"%(query_page))
if query_page<0:
raise UliwebError("page should >0, now is '%s'"%(query_page))
raise UliwebError("page should >0, but get '%s'"%(query_page))
self.query_page = query_page

#https://github.com/TommyLemon/APIJSON/blob/master/Document.md#32-%E5%8A%9F%E8%83%BD%E7%AC%A6
Expand Down