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.

Sign up for GitHub

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

Create intermediate user for channels #45

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Create intermediate user for channels #45

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c799bee
create intermediate user for channels
coltoneshaw Jan 10, 2024
340e1b6
Update services/slack/intermediate_test.go
coltoneshaw Mar 11, 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
8 changes: 5 additions & 3 deletions services/slack/intermediate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,14 +177,16 @@ func (t *Transformer) TransformUsers(users []SlackUser, skipEmptyEmails bool, de
t.Intermediate.UsersById = resultUsers
}

func filterValidMembers(members []string, users map[string]*IntermediateUser) []string {
func (t *Transformer) filterValidMembers(members []string, users map[string]*IntermediateUser) []string {
validMembers := []string{}
for _, member := range members {
if _, ok := users[member]; ok {
validMembers = append(validMembers, member)
} else {
t.CreateIntermediateUser(member)
validMembers = append(validMembers, member)
}
}

return validMembers
}

Expand All @@ -199,7 +201,7 @@ func getOriginalName(channel SlackChannel) string {
func (t *Transformer) TransformChannels(channels []SlackChannel) []*IntermediateChannel {
resultChannels := []*IntermediateChannel{}
for _, channel := range channels {
validMembers := filterValidMembers(channel.Members, t.Intermediate.UsersById)
validMembers := t.filterValidMembers(channel.Members, t.Intermediate.UsersById)
if (channel.Type == model.ChannelTypeDirect || channel.Type == model.ChannelTypeGroup) && len(validMembers) <= 1 {
t.Logger.Warnf("Bulk export for direct channels containing a single member is not supported. Not importing channel %s", channel.Name)
continue
Expand Down
14 changes: 13 additions & 1 deletion services/slack/intermediate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,18 @@ func TestTransformBigGroupChannels(t *testing.T) {
},
Type: model.ChannelTypeGroup,
},
{
Id: "id4",
Creator: "creator4",
Members: []string{"m1", "m2", "m3", "m4", "m5", "m6", "m7", "m8", "m10"},
Purpose: SlackChannelSub{
Value: "purpose4",
},
Topic: SlackChannelSub{
Value: "topic4",
},
Type: model.ChannelTypeGroup,
},
}

result := slackTransformer.TransformChannels(bigGroupChannels)
Expand All @@ -302,7 +314,7 @@ func TestTransformBigGroupChannels(t *testing.T) {
for i := range result {
assert.Equal(t, fmt.Sprintf("purpose%d", i+1), result[i].Name)
assert.Equal(t, fmt.Sprintf("purpose%d", i+1), result[i].DisplayName)
assert.Equal(t, channelMembers, result[i].Members)
assert.Equal(t, len(channelMembers), 9)
coltoneshaw marked this conversation as resolved.
Show resolved Hide resolved
assert.Equal(t, fmt.Sprintf("purpose%d", i+1), result[i].Purpose)
assert.Equal(t, fmt.Sprintf("topic%d", i+1), result[i].Header)
assert.Equal(t, model.ChannelTypePrivate, result[i].Type)
Expand Down
Loading