use map for data

Author: sapk

models/user_test.go

@@ -15,6 +15,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 )
+
 func TestUserIsPublicMember(t *testing.T) {
 	assert.NoError(t, PrepareTestDatabase())
 

models/userlist.go

@@ -17,21 +17,21 @@ func (users UserList) getUserIDs() []int64 {
 }
 
 // IsUserOrgOwner returns true if user is in the owner team of given organization.
-func (users UserList) IsUserOrgOwner(orgID int64) []bool {
-	results := make([]bool, len(users))
+func (users UserList) IsUserOrgOwner(orgID int64) map[int64]bool {
+	results := make(map[int64]bool, len(users))
 	//TODO use directly xorm
-	for i, u := range users {
-		results[i] = u.IsUserOrgOwner(orgID)
+	for _, u := range users {
+		results[u.ID] = u.IsUserOrgOwner(orgID)
 	}
 	return results
 }
 
-// IsTwoFaEnrolled return state of 2FA enrollement
-func (users UserList) IsTwoFaEnrolled() []bool {
-	results := make([]bool, len(users))
+// GetTwoFaStatus return state of 2FA enrollement
+func (users UserList) GetTwoFaStatus() map[int64]bool {
+	results := make(map[int64]bool, len(users))
 	//TODO use directly xorm
-	for i, u := range users {
-		results[i] = u.IsTwoFaEnrolled()
+	for _, u := range users {
+		results[u.ID] = u.IsTwoFaEnrolled()
 	}
 	return results
 }

models/userlist_test.go

@@ -39,20 +39,20 @@ func TestUserListIsUserOrgOwner(t *testing.T) {
 	assert.NoError(t, PrepareTestDatabase())
 	tt := []struct {
 		orgid    int64
-		expected []bool
+		expected map[int64]bool
 	}{
-		{3, []bool{true, false}},
-		{6, []bool{true}},
-		{7, []bool{true}},
-		{25, []bool{true}},
+		{3, map[int64]bool{2: true, 4: false}},
+		{6, map[int64]bool{5: true}},
+		{7, map[int64]bool{5: true}},
+		{25, map[int64]bool{24: true}},
 	}
 	for _, v := range tt {
 		t.Run(fmt.Sprintf("IsUserOrgOwnerOfOrdIg%d", v.orgid), func(t *testing.T) {
 			testUserListIsUserOrgOwner(t, v.orgid, v.expected)
 		})
 	}
 }
-func testUserListIsUserOrgOwner(t *testing.T, orgID int64, expected []bool) {
+func testUserListIsUserOrgOwner(t *testing.T, orgID int64, expected map[int64]bool) {
 	org, err := GetUserByID(orgID)
 	assert.NoError(t, err)
 	assert.NoError(t, org.GetMembers())
@@ -63,23 +63,23 @@ func TestUserListIsTwoFaEnrolled(t *testing.T) {
 	assert.NoError(t, PrepareTestDatabase())
 	tt := []struct {
 		orgid    int64
-		expected []bool
+		expected map[int64]bool
 	}{
-		{3, []bool{false, false}},
-		{6, []bool{false}},
-		{7, []bool{false}},
-		{25, []bool{true}},
+		{3, map[int64]bool{2: false, 4: false}},
+		{6, map[int64]bool{5: false}},
+		{7, map[int64]bool{5: false}},
+		{25, map[int64]bool{24: true}},
 	}
 	for _, v := range tt {
 		t.Run(fmt.Sprintf("IsTwoFaEnrolledOfOrdIg%d", v.orgid), func(t *testing.T) {
 			testUserListIsTwoFaEnrolled(t, v.orgid, v.expected)
 		})
 	}
 }
-func testUserListIsTwoFaEnrolled(t *testing.T, orgID int64, expected []bool) {
+func testUserListIsTwoFaEnrolled(t *testing.T, orgID int64, expected map[int64]bool) {
 	org, err := GetUserByID(orgID)
 	assert.NoError(t, err)
 	assert.NoError(t, org.GetMembers())
-	assert.Equal(t, expected, org.Members.IsTwoFaEnrolled())
+	assert.Equal(t, expected, org.Members.GetTwoFaStatus())
 
 }

routers/org/members.go

@@ -32,7 +32,7 @@ func Members(ctx *context.Context) {
 	ctx.Data["Members"] = org.Members
 	ctx.Data["MembersIsPublicMember"] = org.MembersIsPublic
 	ctx.Data["MembersIsUserOrgOwner"] = org.Members.IsUserOrgOwner(org.ID)
-	ctx.Data["MembersIsTwoFaEnrolled"] = org.Members.IsTwoFaEnrolled()
+	ctx.Data["MembersTwoFaStatus"] = org.Members.GetTwoFaStatus()
 
 	ctx.HTML(200, tplMembers)
 }

templates/org/member/members.tmpl

@@ -5,7 +5,7 @@
 		{{template "base/alert" .}}
 
 		<div class="list">
-			{{ range $id, $member := .Members}}
+			{{ range .Members}}
 				<div class="item ui grid">
 					<div class="ui one wide column">
 						<img class="ui avatar" src="{{.SizedRelAvatarLink 48}}">
@@ -34,15 +34,15 @@
 							{{$.i18n.Tr "org.members.member_role"}}
 						</div>
 						<div class="meta">
-							<strong>{{if index $.MembersIsUserOrgOwner $id}}<span class="octicon octicon-shield"></span> {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}}</strong>
+							<strong>{{if index $.MembersIsUserOrgOwner .ID}}<span class="octicon octicon-shield"></span> {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}}</strong>
 						</div>
 					</div>
 					<div class="ui one wide column center">
 						<div class="meta">
 							2FA
 						</div>
 						<div class="meta">
-							<strong><span class="octicon {{if index $.MembersIsTwoFaEnrolled $id}}octicon-check text green{{else}}octicon-x{{end}}"></span></strong>
+							<strong><span class="octicon {{if index $.MembersTwoFaStatus .ID}}octicon-check text green{{else}}octicon-x{{end}}"></span></strong>
 						</div>
 					</div>
 					<div class="ui four wide column">