1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-24 15:49:44 +02:00

More SQL changes in line with new schema

This commit is contained in:
sauls8t 2018-09-20 12:47:47 +01:00
parent 944fd98421
commit 8ee63de6c7
14 changed files with 45 additions and 37 deletions

View file

@ -26,7 +26,7 @@ type Group struct {
type Member struct {
ID uint64 `json:"id"`
OrgID string `json:"orgId"`
RoleID string `json:"roleId"`
GroupID string `json:"groupId"`
UserID string `json:"userId"`
Firstname string `json:"firstname"` //read-only info
Lastname string `json:"lastname"` //read-only info
@ -36,7 +36,7 @@ type Member struct {
type Record struct {
ID uint64 `json:"id"`
OrgID string `json:"orgId"`
RoleID string `json:"roleId"`
GroupID string `json:"groupId"`
UserID string `json:"userId"`
Name string `json:"name"`
Purpose string `json:"purpose"`
@ -45,7 +45,7 @@ type Record struct {
// UserHasGroupMembership returns true if user belongs to specified group.
func UserHasGroupMembership(r []Record, groupID, userID string) bool {
for i := range r {
if r[i].RoleID == groupID && r[i].UserID == userID {
if r[i].GroupID == groupID && r[i].UserID == userID {
return true
}
}
@ -58,7 +58,7 @@ func FilterGroupRecords(r []Record, groupID string) (m []Record) {
m = []Record{}
for i := range r {
if r[i].RoleID == groupID {
if r[i].GroupID == groupID {
m = append(m, r[i])
}
}