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
497217c1
Commit
497217c1
authored
Jul 16, 2024
by
deepdey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: update logic getuser api
parent
045c73c4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
36 deletions
+12
-36
app/orm/role_type_orm.py
app/orm/role_type_orm.py
+3
-1
app/routes/user/user_dao_service.py
app/routes/user/user_dao_service.py
+9
-35
No files found.
app/orm/role_type_orm.py
View file @
497217c1
...
@@ -19,3 +19,5 @@ class RoleType(db.Model, CustomSerializerMixin):
...
@@ -19,3 +19,5 @@ class RoleType(db.Model, CustomSerializerMixin):
created_at
=
db
.
Column
(
db
.
DATETIME
,
default
=
datetime
.
now
)
created_at
=
db
.
Column
(
db
.
DATETIME
,
default
=
datetime
.
now
)
updated_at
=
db
.
Column
(
db
.
DATETIME
,
onupdate
=
datetime
.
now
)
updated_at
=
db
.
Column
(
db
.
DATETIME
,
onupdate
=
datetime
.
now
)
is_deleted
=
db
.
Column
(
db
.
Boolean
,
default
=
False
)
is_deleted
=
db
.
Column
(
db
.
Boolean
,
default
=
False
)
serialize_rules
=
(
'-created_at'
,
'-updated_at'
)
\ No newline at end of file
app/routes/user/user_dao_service.py
View file @
497217c1
...
@@ -32,24 +32,11 @@ def get_user_by_id_for_admin(admin_id: int, user_id: int) -> ORM.User | None:
...
@@ -32,24 +32,11 @@ def get_user_by_id_for_admin(admin_id: int, user_id: int) -> ORM.User | None:
raise
Exception
(
'You do not have permission to view user details'
)
raise
Exception
(
'You do not have permission to view user details'
)
else
:
else
:
# return all user data for project admin for his specific project
# return all user data for project admin for his specific project
subquery
=
(
return
ORM
.
User
.
query
.
filter
(
ORM
.
db
.
session
.
query
(
ORM
.
Role
.
project_id
)
.
join
(
ORM
.
UserRoleMap
)
.
filter
(
ORM
.
UserRoleMap
.
user_id
==
admin_id
)
.
subquery
()
)
return
(
ORM
.
db
.
session
.
query
(
ORM
.
User
)
.
join
(
ORM
.
UserRoleMap
)
.
join
(
ORM
.
Role
)
.
filter
(
ORM
.
Role
.
project_id
==
subquery
,
ORM
.
User
.
id
==
user_id
,
ORM
.
User
.
is_deleted
==
False
,
ORM
.
User
.
is_deleted
==
False
,
)
ORM
.
User
.
id
==
user_id
,
.
first
()
ORM
.
User
.
project_id
==
admin_user
.
project_id
)
)
.
first
()
else
:
else
:
# return all user data for super admin
# return all user data for super admin
return
ORM
.
User
.
query
.
filter
(
return
ORM
.
User
.
query
.
filter
(
...
@@ -74,23 +61,10 @@ def get_user_list_for_project_admin(admin_id: int) -> List[ORM.User]:
...
@@ -74,23 +61,10 @@ def get_user_list_for_project_admin(admin_id: int) -> List[ORM.User]:
raise
Exception
(
'You do not have permission to view user list'
)
raise
Exception
(
'You do not have permission to view user list'
)
else
:
else
:
# return all user data for project admin for his specific project
# return all user data for project admin for his specific project
subquery
=
(
return
ORM
.
User
.
query
.
filter
(
ORM
.
db
.
session
.
query
(
ORM
.
Role
.
project_id
)
.
join
(
ORM
.
UserRoleMap
)
.
filter
(
ORM
.
UserRoleMap
.
user_id
==
admin_id
)
.
subquery
()
)
return
(
ORM
.
db
.
session
.
query
(
ORM
.
User
)
.
join
(
ORM
.
UserRoleMap
)
.
join
(
ORM
.
Role
)
.
filter
(
ORM
.
Role
.
project_id
==
subquery
,
ORM
.
User
.
is_deleted
==
False
,
ORM
.
User
.
is_deleted
==
False
,
)
ORM
.
User
.
project_id
==
admin_user
.
project_id
.
all
()
)
.
all
()
)
else
:
else
:
# return all user data for super admin
# return all user data for super admin
return
ORM
.
User
.
query
.
filter
(
ORM
.
User
.
is_deleted
==
False
)
.
all
()
return
ORM
.
User
.
query
.
filter
(
ORM
.
User
.
is_deleted
==
False
)
.
all
()
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