Skip to content
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.

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

feat: active inactive user phase 2 #4624

Merged
merged 68 commits into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
ebedf11
listing user and group changes
Shivam-nagar23 Jan 25, 2024
a628719
default value chnage
Shivam-nagar23 Jan 25, 2024
d54de55
group listing optimisation
Shivam-nagar23 Jan 25, 2024
a4baf56
wire_gen
Shivam-nagar23 Jan 25, 2024
08465d3
order by in group
Shivam-nagar23 Jan 25, 2024
2854bf0
Merge branch 'main' into feat-active-inactive-user-phase-1
Shivam-nagar23 Jan 27, 2024
37ffe40
default values
Shivam-nagar23 Jan 29, 2024
a68c624
discard
Shivam-nagar23 Jan 29, 2024
e3c482d
updated on
Shivam-nagar23 Jan 29, 2024
defe28f
case insensitive
Shivam-nagar23 Jan 29, 2024
000a883
Merge branch 'main' into feat-active-inactive-user-phase-1
Shivam-nagar23 Jan 29, 2024
eac977e
script number change
Shivam-nagar23 Jan 29, 2024
8801233
specs
Shivam-nagar23 Jan 29, 2024
b50f89c
review chnages
Shivam-nagar23 Jan 30, 2024
1cce3af
sql update
Shivam-nagar23 Jan 30, 2024
1febba6
id for user
Shivam-nagar23 Jan 30, 2024
6603a0a
Merge branch 'main' into feat-active-inactive-user-phase-1
Shivam-nagar23 Jan 31, 2024
046f47a
script number chnage
Shivam-nagar23 Jan 31, 2024
a93a59d
review comments-1
Shivam-nagar23 Jan 31, 2024
00cd1d5
review comments
Shivam-nagar23 Jan 31, 2024
befeca7
review comments
Shivam-nagar23 Jan 31, 2024
5ef0552
rest handler remove methods
Shivam-nagar23 Jan 31, 2024
5920a87
validation for delete
Shivam-nagar23 Jan 31, 2024
79ea449
delete user handling
Shivam-nagar23 Jan 31, 2024
47e0656
review comments
Shivam-nagar23 Feb 1, 2024
d1ad254
review comments
Shivam-nagar23 Feb 1, 2024
9b2c4fa
bulk delete user and permission group
Shivam-nagar23 Feb 2, 2024
9e26f82
legacy code fix from loop in query to bulk query
Shivam-nagar23 Feb 2, 2024
c2c5fb5
Merge branch 'main' into feat-active-inactive-user-phase-1
Shivam-nagar23 Feb 5, 2024
4448c9e
export csv filters support
Shivam-nagar23 Feb 5, 2024
cde92a2
Revert "export csv filters support"
Shivam-nagar23 Feb 5, 2024
3861eb1
export csv filters
Shivam-nagar23 Feb 5, 2024
7f6baec
Merge branch 'main' into feat-active-inactive-user-phase-2
Shivam-nagar23 Feb 5, 2024
37968ec
Merge branch 'feat-active-inactive-user-phase-1' into feat-active-ina…
Shivam-nagar23 Feb 5, 2024
d61c150
bulk delete support with filters
Shivam-nagar23 Feb 5, 2024
5be6cb7
validation
Shivam-nagar23 Feb 5, 2024
af0e9b1
method break
Shivam-nagar23 Feb 5, 2024
f5b1ddf
refactor the method
Shivam-nagar23 Feb 5, 2024
a5ba2f8
condition
Shivam-nagar23 Feb 5, 2024
8c6c574
open api specs
Shivam-nagar23 Feb 5, 2024
3b3496f
Merge branch 'main' into feat-active-inactive-user-phase-1
Shivam-nagar23 Feb 5, 2024
c4d455c
specs
Shivam-nagar23 Feb 5, 2024
feee76e
Merge branch 'main' into feat-active-inactive-user-phase-1
Shivam-nagar23 Feb 5, 2024
a61f732
Merge branch 'main' into feat-active-inactive-user-phase-1
Shivam-nagar23 Feb 6, 2024
1ebee74
refactoring filters in bulk delete rolegroup
Shivam-nagar23 Feb 6, 2024
8ee364a
comments
Shivam-nagar23 Feb 6, 2024
cbd5400
comments
Shivam-nagar23 Feb 6, 2024
72ed56e
Merge branch 'feat-active-inactive-user-phase-1' into feat-active-ina…
Shivam-nagar23 Feb 6, 2024
2c6f3b7
main-merge
Shivam-nagar23 Feb 6, 2024
9dd58b6
Merge branch 'main' into feat-active-inactive-user-phase-1
Shivam-nagar23 Feb 7, 2024
5200661
Merge branch 'feat-active-inactive-user-phase-1' into feat-active-ina…
Shivam-nagar23 Feb 7, 2024
8ddfef6
main-merge
Shivam-nagar23 Feb 8, 2024
9e14845
group listing
Shivam-nagar23 Feb 9, 2024
0a8a53e
Merge branch 'main' into feat-active-inactive-user-phase-2
Shivam-nagar23 Feb 12, 2024
0e50351
review comments
Shivam-nagar23 Feb 12, 2024
154bf61
review comments
Shivam-nagar23 Feb 12, 2024
0e64fad
review comments
Shivam-nagar23 Feb 12, 2024
35cc304
review comments
Shivam-nagar23 Feb 12, 2024
82e63cc
user delete self-review
Shivam-nagar23 Feb 12, 2024
8977bcb
error handling
Shivam-nagar23 Feb 12, 2024
250535e
Merge branch 'main' into feat-active-inactive-user-phase-2
Shivam-nagar23 Feb 13, 2024
2ca1bec
renaming helpers
Shivam-nagar23 Feb 14, 2024
7b6feb6
commets
Shivam-nagar23 Feb 14, 2024
e19fba8
checks and renaming
Shivam-nagar23 Feb 14, 2024
f71dd4f
Merge branch 'main' into feat-active-inactive-user-phase-2
Shivam-nagar23 Feb 19, 2024
2ab83cf
main-merge
Shivam-nagar23 Feb 19, 2024
5a0b311
Merge branch 'main' into feat-active-inactive-user-phase-2
Shivam-nagar23 Feb 19, 2024
bbc53f3
Merge branch 'main' into feat-active-inactive-user-phase-2
Shivam-nagar23 Feb 20, 2024
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
legacy code fix from loop in query to bulk query
  • Loading branch information
Shivam-nagar23 committed Feb 2, 2024
commit 9e26f825d245590f190aeab7c0e38c5c55ff4c2e
8 changes: 6 additions & 2 deletions pkg/auth/user/RoleGroupService.go
Original file line number Diff line number Diff line change
Expand Up @@ -733,8 +733,12 @@ func (impl RoleGroupServiceImpl) DeleteRoleGroup(bean *bean.RoleGroup) (bool, er
if err != nil {
impl.logger.Errorw("error in getting all roles for groups", "err", err)
}
for _, roleGroupRoleMapping := range allRoleGroupRoleMappings {
err = impl.roleGroupRepository.DeleteRoleGroupRoleMappingByRoleId(roleGroupRoleMapping.RoleId, tx)
roleGroupRoleMappingIds := make([]int, 0, len(allRoleGroupRoleMappings))
for _, roleMapping := range allRoleGroupRoleMappings {
roleGroupRoleMappingIds = append(roleGroupRoleMappingIds, roleMapping.Id)
}
kartik-579 marked this conversation as resolved.
Show resolved Hide resolved
if len(roleGroupRoleMappingIds) > 0 {
err = impl.roleGroupRepository.DeleteRoleGroupRoleMappingByIds(roleGroupRoleMappingIds, tx)
if err != nil {
impl.logger.Errorw("error in deleting role group role mapping by role id", "err", err)
return false, err
Expand Down
10 changes: 7 additions & 3 deletions pkg/auth/user/UserService.go
Original file line number Diff line number Diff line change
Expand Up @@ -1261,10 +1261,14 @@ func (impl *UserServiceImpl) DeleteUser(bean *bean.UserInfo) (bool, error) {
impl.logger.Errorw("error while fetching user from db", "error", err)
return false, err
}
for _, item := range urm {
_, err = impl.userAuthRepository.DeleteUserRoleMapping(item, tx)
userRolesMappingIds := make([]int, 0, len(urm))
for _, urmModel := range urm {
userRolesMappingIds = append(userRolesMappingIds, urmModel.Id)
}
if len(userRolesMappingIds) > 0 {
err = impl.userAuthRepository.DeleteUserRoleMappingByIds(userRolesMappingIds, tx)
if err != nil {
impl.logger.Errorw("error while fetching user from db", "error", err)
impl.logger.Errorw("error in DeleteUser", "userRolesMappingIds", userRolesMappingIds, "err", err)
return false, err
}
}
Expand Down
Loading