Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
70f818b
create tables for user groups
TylerNoblett Nov 28, 2022
31a2454
add slug to group
TylerNoblett Nov 28, 2022
39e08a3
combine two migrations into one
TylerNoblett Nov 29, 2022
ca5354d
add user group functions and tests
TylerNoblett Nov 29, 2022
09b2e28
basic group page UI but no group data
TylerNoblett Dec 1, 2022
c435c6f
Group list page is working correctly
TylerNoblett Dec 7, 2022
6e05303
add users when creating group (FE & BE)
TylerNoblett Dec 8, 2022
f8e23f9
fix test to match new return items
TylerNoblett Dec 12, 2022
10f4929
add seed data
TylerNoblett Dec 12, 2022
c627fbe
add test to list
TylerNoblett Dec 12, 2022
1388f82
support showing groups with no users
TylerNoblett Dec 12, 2022
d700db0
clean up css on modal
TylerNoblett Dec 12, 2022
69d9677
remove outdated TODOs
TylerNoblett Dec 12, 2022
943a8c9
add length check of usergroups to test
TylerNoblett Dec 13, 2022
5ab3320
set user selector columns less far apart
TylerNoblett Dec 13, 2022
d8f703e
remove TODOs due to complexity
TylerNoblett Dec 13, 2022
55f05df
fix hide deleted groups
TylerNoblett Dec 13, 2022
9737e12
clean up if statement
TylerNoblett Dec 13, 2022
c44e705
lint fixes
TylerNoblett Dec 13, 2022
a40d5cd
add missing migration
TylerNoblett Dec 13, 2022
b9de1a0
fix pagination bug
TylerNoblett Dec 13, 2022
f90f994
get checkbox to look like others
TylerNoblett Dec 14, 2022
b40d01c
set up delete route
TylerNoblett Dec 14, 2022
bc86eeb
correct test
TylerNoblett Dec 14, 2022
0bda32f
fix testing error issues
TylerNoblett Dec 15, 2022
959e05d
add name field to user groups
TylerNoblett Dec 15, 2022
64ad3a0
modify user group is working
TylerNoblett Dec 16, 2022
a80d006
bug fix - show all deleted groups as deleted
TylerNoblett Dec 16, 2022
02d1f84
fix bug when there are no groups
TylerNoblett Dec 16, 2022
54fb599
break test into two
TylerNoblett Dec 16, 2022
5629f57
add modify test
TylerNoblett Dec 16, 2022
da4d8f1
add additoinal TODO
TylerNoblett Dec 16, 2022
596a34a
add slug cleaning to user groups
TylerNoblett Dec 16, 2022
fd1ee40
get rid of unused helper func
TylerNoblett Dec 16, 2022
97d0296
fix console error message by adding in key
TylerNoblett Dec 16, 2022
9621a5a
change names to match convention
TylerNoblett Dec 16, 2022
116c6dd
change var name for clarity
TylerNoblett Dec 16, 2022
3d931ce
make name shorter
TylerNoblett Dec 16, 2022
092cc9a
remove duplicate struct
TylerNoblett Dec 16, 2022
7affcbb
add frontend to opertion for user groups
TylerNoblett Dec 16, 2022
62c4469
mimic endpoints for groups
TylerNoblett Dec 16, 2022
9eb422f
fix endpoints
TylerNoblett Dec 19, 2022
4c02cc2
get group functionality working
TylerNoblett Dec 19, 2022
f73c27c
edit group role
TylerNoblett Dec 19, 2022
f316bac
fix bug where op wasn't showing up via group
TylerNoblett Dec 19, 2022
2c7d3bb
fix bug where user viewed op after group deletion
TylerNoblett Dec 19, 2022
4e8433c
remove unused refs & outdated TODOs
TylerNoblett Dec 19, 2022
eb3ae22
add todos
TylerNoblett Dec 19, 2022
b786ae5
remove outdate todos
TylerNoblett Dec 19, 2022
4bc358a
correct misspelling
TylerNoblett Dec 19, 2022
4d204e3
endpoints can now be accessed by op admin
TylerNoblett Dec 19, 2022
396ca87
add permission checks to non-admin routes
TylerNoblett Dec 20, 2022
137f685
change column name to match convention
TylerNoblett Dec 20, 2022
db6b365
add permission check for operation group
TylerNoblett Dec 20, 2022
2b6de84
add tests for adding and removing users
TylerNoblett Dec 20, 2022
f63cc49
add test for SetUserGroupOperationRole
TylerNoblett Dec 20, 2022
8b854e4
add additonal tests for new functions
TylerNoblett Dec 20, 2022
0f0b061
remove completed TODOS
TylerNoblett Dec 20, 2022
0d875df
fix issues with modify endpoint/test
TylerNoblett Dec 20, 2022
95552f2
make labels sing or plural
TylerNoblett Dec 20, 2022
f2feffa
allow admins of all types to view groups
TylerNoblett Dec 21, 2022
bc71321
remove duplicate line
TylerNoblett Dec 21, 2022
ade301c
fix where clause for user groups
TylerNoblett Dec 21, 2022
726885f
simplify logic
TylerNoblett Dec 21, 2022
444d822
add return values for user group funcs
TylerNoblett Dec 21, 2022
14c5f0f
add back line I accidentally removed
TylerNoblett Dec 21, 2022
0c2ab8f
remove function to enable transactions
TylerNoblett Dec 22, 2022
ab24a0e
ensure user don't create duplicate named groups
TylerNoblett Dec 22, 2022
66aea87
change add users to use transaction
TylerNoblett Dec 22, 2022
5abcd46
break up ListUserGroupsForAdmin
TylerNoblett Dec 22, 2022
472097b
remove todo that wasn't actually an issue
TylerNoblett Dec 22, 2022
ca07d68
correct typo
TylerNoblett Dec 22, 2022
d6c4fd8
fix react render error
TylerNoblett Dec 22, 2022
22700f1
patch name now showing up (look into fix later)
TylerNoblett Dec 22, 2022
a434ef4
use formfield API to update form
TylerNoblett Dec 22, 2022
909724d
make name unique
TylerNoblett Dec 22, 2022
28fb2f3
fix key error
TylerNoblett Dec 22, 2022
48a46e8
fix lowercase error
TylerNoblett Jan 3, 2023
c07e4a2
break up funciton + add tests for user groups
TylerNoblett Jan 3, 2023
2aca046
remove unneeded TODO
TylerNoblett Jan 3, 2023
8d039b6
add error and get rid of todo
TylerNoblett Jan 3, 2023
81185ba
add dto to gentypes
TylerNoblett Jan 3, 2023
f4a2746
update copywrite messages
TylerNoblett Jan 3, 2023
58d621d
lint fixes
TylerNoblett Jan 3, 2023
ba59a45
fix copywrite
TylerNoblett Jan 3, 2023
da01a4f
clarify variable name
TylerNoblett Jan 3, 2023
9e6705b
test if filtering deleted groups works
TylerNoblett Jan 4, 2023
6f29b19
fix linting errors
TylerNoblett Jan 4, 2023
e2ed9ed
respond to Joel's feedback
TylerNoblett Jan 10, 2023
ce31c95
Update backend/services/helpers_test.go
Jan 10, 2023
0c17dfa
fix formatting error
TylerNoblett Jan 10, 2023
ca7a2a6
swtiched to transaction
TylerNoblett Jan 10, 2023
54226f6
update date on checkbox file
Feb 1, 2023
b95f03c
simplify input names
TylerNoblett Feb 1, 2023
0e47fed
combine two operations into one
TylerNoblett Feb 1, 2023
7420085
use a transaction for grouped ops
TylerNoblett Feb 1, 2023
a4e2f89
update param name for clarity
TylerNoblett Feb 1, 2023
7528b33
reduce multiple queries into one
TylerNoblett Feb 1, 2023
26e939f
iterate through userSlugs once instead of twice
TylerNoblett Feb 1, 2023
3490857
simplify sql query for users
TylerNoblett Feb 2, 2023
9624629
correct test and clarify var name
TylerNoblett Feb 2, 2023
9b96df8
Update frontend/src/pages/admin_modals/index.tsx
Feb 22, 2023
734ce73
simplify updating logic
TylerNoblett Feb 22, 2023
14d61ad
Simplify AddUsersToGroup Query
Mar 1, 2023
72cf448
remove unused fmt
TylerNoblett Mar 1, 2023
90cc690
merge multiple delete statements into one
TylerNoblett Mar 1, 2023
021e24b
remove pagination for user groups
TylerNoblett Mar 2, 2023
68e9144
fix tests now that paginatino is gone
TylerNoblett Mar 2, 2023
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
10 changes: 5 additions & 5 deletions backend/services/user_groups.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,13 @@ func (i CreateUserGroupInput) validateUserGroupInput() error {
func AddUsersToGroup(tx *database.Transactable, userSlugs []string, groupID int64) error {
if len(userSlugs) > 0 {
questionMarks := "("
for i := 0; i < len(userSlugs); i++ {

interfaceSlice := make([]interface{}, len(userSlugs)+1)
for i, v := range userSlugs {
questionMarks += "?, "
interfaceSlice[i] = v
}

questionMarks = strings.TrimSuffix(questionMarks, ", ")
questionMarks += ")"

Expand All @@ -90,10 +94,6 @@ func AddUsersToGroup(tx *database.Transactable, userSlugs []string, groupID int6
FROM users, user_groups
WHERE users.slug in %s and user_groups.id = ?;`, questionMarks)

interfaceSlice := make([]interface{}, len(userSlugs)+1)
for i, v := range userSlugs {
interfaceSlice[i] = v
}
interfaceSlice[len(userSlugs)] = groupID
err := tx.Exec(sq.Expr(sqlStatement, interfaceSlice...))

Expand Down