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
5f6ba5f1
Commit
5f6ba5f1
authored
Jul 23, 2024
by
deepdey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: remove is_delete from user orm
parent
fd35a3ca
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
app/routes/user/user_dao_service.py
app/routes/user/user_dao_service.py
+6
-7
No files found.
app/routes/user/user_dao_service.py
View file @
5f6ba5f1
...
@@ -5,15 +5,15 @@ from app.app_config.constant import RoleTypeEnum
...
@@ -5,15 +5,15 @@ from app.app_config.constant import RoleTypeEnum
def
get_user_by_username
(
username
:
str
)
->
ORM
.
User
|
None
:
def
get_user_by_username
(
username
:
str
)
->
ORM
.
User
|
None
:
return
ORM
.
User
.
query
.
filter_by
(
username
=
username
,
is_deleted
=
False
)
.
first
()
return
ORM
.
User
.
query
.
filter_by
(
username
=
username
)
.
first
()
def
get_user_by_email
(
email
:
str
)
->
ORM
.
User
|
None
:
def
get_user_by_email
(
email
:
str
)
->
ORM
.
User
|
None
:
return
ORM
.
User
.
query
.
filter_by
(
email
=
email
,
is_deleted
=
False
)
.
first
()
return
ORM
.
User
.
query
.
filter_by
(
email
=
email
)
.
first
()
def
get_user_by_id
(
id
:
int
)
->
ORM
.
User
|
None
:
def
get_user_by_id
(
id
:
int
)
->
ORM
.
User
|
None
:
return
ORM
.
User
.
query
.
filter_by
(
id
=
id
,
is_deleted
=
False
)
.
first
()
return
ORM
.
User
.
query
.
filter_by
(
id
=
id
)
.
first
()
def
get_user_by_id_for_admin
(
admin_id
:
int
,
user_id
:
int
)
->
ORM
.
User
|
None
:
def
get_user_by_id_for_admin
(
admin_id
:
int
,
user_id
:
int
)
->
ORM
.
User
|
None
:
...
@@ -24,14 +24,13 @@ def get_user_by_id_for_admin(admin_id: int, user_id: int) -> ORM.User | None:
...
@@ -24,14 +24,13 @@ def get_user_by_id_for_admin(admin_id: int, user_id: int) -> ORM.User | None:
if
admin_user
.
role_type
.
role_name
!=
RoleTypeEnum
.
SUPER_ADMIN
.
value
:
if
admin_user
.
role_type
.
role_name
!=
RoleTypeEnum
.
SUPER_ADMIN
.
value
:
return
ORM
.
User
.
query
.
filter
(
return
ORM
.
User
.
query
.
filter
(
ORM
.
User
.
is_deleted
==
False
,
ORM
.
User
.
id
==
user_id
,
ORM
.
User
.
id
==
user_id
,
ORM
.
User
.
project_id
==
admin_user
.
project_id
,
ORM
.
User
.
project_id
==
admin_user
.
project_id
,
)
.
first
()
)
.
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
(
ORM
.
User
.
i
s_deleted
==
False
,
ORM
.
User
.
i
d
==
user_id
ORM
.
User
.
id
==
user_id
)
.
first
()
)
.
first
()
...
@@ -43,11 +42,11 @@ def get_user_list_for_project_admin(admin_id: int) -> List[ORM.User]:
...
@@ -43,11 +42,11 @@ def get_user_list_for_project_admin(admin_id: int) -> List[ORM.User]:
if
admin_user
.
role_type
.
role_name
!=
RoleTypeEnum
.
SUPER_ADMIN
.
value
:
if
admin_user
.
role_type
.
role_name
!=
RoleTypeEnum
.
SUPER_ADMIN
.
value
:
return
ORM
.
User
.
query
.
filter
(
return
ORM
.
User
.
query
.
filter
(
ORM
.
User
.
is_deleted
==
False
,
ORM
.
User
.
project_id
==
admin_user
.
project_id
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
.
all
()
def
map_user_role
(
admin_id
:
int
,
user_id
:
int
,
role_id
:
int
)
->
None
:
def
map_user_role
(
admin_id
:
int
,
user_id
:
int
,
role_id
:
int
)
->
None
:
...
...
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