Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
webomagic-auth
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Pratik Shrivastava
webomagic-auth
Commits
4c494289
Commit
4c494289
authored
Jul 22, 2024
by
deepdey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: add get-all api and get api for address only for admin
parent
40db2db0
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
132 additions
and
1 deletion
+132
-1
app/routes/address/__init__.py
app/routes/address/__init__.py
+71
-0
app/routes/address/address_dao_service.py
app/routes/address/address_dao_service.py
+45
-1
app/routes/address/address_payload.py
app/routes/address/address_payload.py
+13
-0
app/routes/address/address_validator.py
app/routes/address/address_validator.py
+3
-0
No files found.
app/routes/address/__init__.py
View file @
4c494289
...
...
@@ -147,6 +147,77 @@ class GetAllAddresses(Resource):
return
prepare_api_response
(
EXCEPTION_CODE
,
str
(
e
))
@
ns
.
route
(
'/admin-get'
,
methods
=
[
'GET'
])
class
GetAddressForAdmin
(
Resource
):
@
ns
.
doc
(
security
=
SECURITY
)
@
ns
.
expect
(
*
get_address_payload
())
@
ns
.
response
(
*
get_address_response
())
@
sanitized
()
@
fetch_user
()
def
get
(
self
,
user_id
:
int
):
try
:
validator
=
GetAddressValidator
()
arguments
:
dict
=
validator
.
load
(
request
.
args
)
address_info
:
ORM
.
Address
|
None
=
\
get_address_by_id_for_admin
(
arguments
[
'id'
],
user_id
)
if
address_info
is
None
:
return
prepare_api_response
(
404
,
'Address not found'
)
return
prepare_api_response
(
SUCCESS_CODE
,
GET_SUCCESS_MESSAGE
,
data
=
address_info
.
to_dict
()
)
except
ValidationError
as
e
:
return
prepare_api_response
(
VALIDATION_ERROR_CODE
,
VALIDATION_ERROR_MESSAGE
,
error
=
e
.
normalized_messages
()
)
except
Exception
as
e
:
logger
.
error
(
traceback
.
format_exc
())
return
prepare_api_response
(
EXCEPTION_CODE
,
str
(
e
))
@
ns
.
route
(
'/admin-get-all'
,
methods
=
[
'GET'
])
class
GetAddressListForAdmin
(
Resource
):
@
ns
.
doc
(
security
=
SECURITY
)
@
ns
.
expect
(
*
get_addres_list_for_admin_payload
())
@
ns
.
response
(
*
get_address_response
())
@
sanitized
()
@
fetch_user
()
def
get
(
self
,
user_id
:
int
):
try
:
validator
=
GetAddressListForAdminValidator
()
arguments
:
dict
=
validator
.
load
(
request
.
args
)
addresses_list
:
List
[
ORM
.
Address
]
=
\
get_address_list_of_user_for_admin
(
arguments
[
'user_id'
],
user_id
)
return
prepare_api_response
(
SUCCESS_CODE
,
GET_SUCCESS_MESSAGE
,
data
=
[
address
.
to_dict
()
for
address
in
addresses_list
]
)
except
ValidationError
as
e
:
return
prepare_api_response
(
VALIDATION_ERROR_CODE
,
VALIDATION_ERROR_MESSAGE
,
error
=
e
.
normalized_messages
()
)
except
Exception
as
e
:
logger
.
error
(
traceback
.
format_exc
())
return
prepare_api_response
(
EXCEPTION_CODE
,
str
(
e
))
@
ns
.
route
(
'/delete'
,
methods
=
[
'DELETE'
])
class
DeleteAddress
(
Resource
):
...
...
app/routes/address/address_dao_service.py
View file @
4c494289
from
typing
import
List
from
app
import
orm
as
ORM
from
app
import
db
from
app.app_config.constant
import
RoleTypeEnum
from
app.routes.user.user_dao_service
import
get_user_by_id
def
get_address_by_id
(
address_id
:
int
,
user_id
:
int
)
->
ORM
.
Address
|
None
:
...
...
@@ -15,6 +17,49 @@ def get_addresses_by_user_id_and_name(user_id: int, name: str) -> List[ORM.Addre
return
ORM
.
Address
.
query
.
filter_by
(
user_id
=
user_id
,
name
=
name
)
.
first
()
def
get_address_by_id_for_admin
(
address_id
:
int
,
admin_id
:
int
)
->
ORM
.
Address
|
None
:
admin_user
:
ORM
.
User
|
None
=
get_user_by_id
(
admin_id
)
if
not
admin_user
:
raise
Exception
(
'User not found for mapped apiKey'
)
if
admin_user
.
role_type
.
role_name
!=
RoleTypeEnum
.
SUPER_ADMIN
.
value
:
return
(
db
.
session
.
query
(
ORM
.
Address
)
.
join
(
ORM
.
User
,
ORM
.
User
.
id
==
ORM
.
Address
.
user_id
)
.
filter
(
ORM
.
User
.
project_id
==
admin_user
.
project_id
,
ORM
.
Address
.
id
==
address_id
,
)
.
first
()
)
else
:
return
ORM
.
User
.
query
.
filter
(
ORM
.
Address
.
id
==
address_id
)
.
first
()
def
get_address_list_of_user_for_admin
(
user_id
:
int
,
admin_id
:
int
)
->
List
[
ORM
.
Address
]:
admin_user
:
ORM
.
User
|
None
=
get_user_by_id
(
admin_id
)
if
not
admin_user
:
raise
Exception
(
'User not found for mapped apiKey'
)
if
admin_user
.
role_type
.
role_name
!=
RoleTypeEnum
.
SUPER_ADMIN
.
value
:
return
(
db
.
session
.
query
(
ORM
.
Address
)
.
join
(
ORM
.
User
,
ORM
.
User
.
id
==
ORM
.
Address
.
user_id
)
.
filter
(
ORM
.
User
.
project_id
==
admin_user
.
project_id
,
ORM
.
Address
.
user_id
==
user_id
,
)
.
all
()
)
else
:
return
ORM
.
Address
.
query
.
filter_by
(
user_id
=
user_id
)
.
all
()
def
add_address
(
payload
:
dict
)
->
int
:
try
:
address_model
=
ORM
.
Address
(
...
...
@@ -78,4 +123,3 @@ def delete_address(address_id: int) -> bool:
db
.
session
.
delete
(
address
)
db
.
session
.
commit
()
return
True
app/routes/address/address_payload.py
View file @
4c494289
...
...
@@ -20,6 +20,7 @@ def add_address_payload() -> list:
)
return
[
payload
]
def
update_address_payload
()
->
list
:
payload
=
api
.
model
(
'UpdateAddress Payload'
,
...
...
@@ -39,11 +40,23 @@ def update_address_payload() -> list:
)
return
[
payload
]
def
get_address_payload
()
->
list
:
parser
=
api
.
parser
()
parser
.
add_argument
(
'id'
,
required
=
True
,
type
=
int
,
location
=
'args'
)
return
[
parser
]
def
get_admin_address_payload
()
->
list
:
return
get_address_payload
()
def
get_addres_list_for_admin_payload
()
->
list
:
parser
=
api
.
parser
()
parser
.
add_argument
(
'user_id'
,
required
=
True
,
type
=
int
,
location
=
'args'
)
return
[
parser
]
def
delete_address_payload
()
->
list
:
payload
=
api
.
model
(
'DeleteAddress Payload'
,
...
...
app/routes/address/address_validator.py
View file @
4c494289
...
...
@@ -28,5 +28,8 @@ class UpdateAddressValidator(Schema):
class
GetAddressValidator
(
Schema
):
id
=
fields
.
Integer
(
required
=
True
,
validate
=
validate
.
Range
(
min
=
1
))
class
GetAddressListForAdminValidator
(
Schema
):
user_id
=
fields
.
Integer
(
required
=
True
,
validate
=
validate
.
Range
(
min
=
1
))
class
DeleteAddressValidator
(
Schema
):
id
=
fields
.
Integer
(
required
=
True
,
validate
=
validate
.
Range
(
min
=
1
))
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