feat: add meeting urls

README.md

@@ -13,6 +13,7 @@ Go to **System Console > Plugins > Management** upload and enable the plugin.
 - **Recurrence** - daily, weekly or monthly meetings.
 - **Initial text** - The text that will be send to the users when is time to chat.
 - **Number of users per meeting** - Minimum users per meeting.
+- **MeetingRooms** - urls separated by commas added to every meeting start message.
 
 ## Usage
 

plugin.json

@@ -64,6 +64,12 @@
                 "display_name": "Number of users per meeting",
                 "type": "number",
                 "default": 3
+            },
+            {
+                "key": "MeetingRooms",
+                "display_name": "Meeting rooms",
+                "type": "text",
+                "default": ""
             }
         ]
     }

server/configuration.go

@@ -22,6 +22,7 @@ type configuration struct {
 	CustomCron         string
 	InitText           string
 	NumUsersPerMeeting int
+	MeetingRooms       string
 }
 
 // Clone shallow copies the configuration. Your implementation may require a deep copy if

server/meetings.go

@@ -94,9 +94,10 @@ func getMeetingCandidates(userInMeeting []string, users []string, previousMeetin
 		for index, userId := range usersList {
 			maxCount := len(previousMeetings)
 			lenUsers := len(users)
+			defaultMaxCount := lenUsers * lenUsers
 
-			if maxCount > 40 {
-				maxCount = lenUsers * lenUsers
+			if maxCount > defaultMaxCount {
+				maxCount = defaultMaxCount - 1
 			}
 
 			count := getCountUserMeet(userMeeting, userId, previousMeetings[:maxCount])
@@ -157,7 +158,7 @@ func getMeetings(users []string, usersPerMeeting int, previousMeetings [][]strin
 			}
 		}
 
-		if len(meeting) < usersPerMeeting {
+		if len(meeting) < usersPerMeeting-1 {
 			for _, userIdFromIncrompleMeeting := range meeting {
 				meetings = sortMeetingBySize(meetings)
 				meetings[0] = append(meetings[0], userIdFromIncrompleMeeting)

server/meetings_test.go

@@ -118,7 +118,7 @@ func TestGetUserListByDate(t *testing.T) {
 func TestOddGetMeetings(t *testing.T) {
 	assert := assert.New(t)
 
-	users := []string{"user1", "user2", "user3", "user4", "user5", "user6", "user7"}
+	users := []string{"user1", "user2", "user3", "user4", "user5", "user6", "user7", "user8", "user9", "user10", "user11"}
 
 	previousMeetings := [][]string{
 		{"user1", "user2", "user3"},
@@ -127,12 +127,15 @@ func TestOddGetMeetings(t *testing.T) {
 		{"user2", "user4", "user7"},
 	}
 
-	result := getMeetings(users, 3, previousMeetings)
+	result := getMeetings(users, 4, previousMeetings)
+
+	assert.Equal(3, len(result))
+
+	users = Remove(users, "user1")
+
+	result = getMeetings(users, 4, previousMeetings)
 
 	assert.Equal(2, len(result))
-	// todo: random fail
-	assert.True(meetingExist([]string{"user1", "user3", "user4", "user7"}, result))
-	assert.True(meetingExist([]string{"user2", "user5", "user6"}, result))
 }
 
 // need work

server/plugin.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"strings"
 	"sync"
 
 	"github.com/mattermost/mattermost-server/v5/model"
@@ -54,15 +55,23 @@ func (p *Plugin) addCronFunc() {
 
 func (p *Plugin) runMeetings() {
 	users := p.getAvailableUsers()
+	config := p.getConfiguration()
 
 	meetings := getMeetingsShuffleUsers(users, p.configuration.NumUsersPerMeeting, p.usersMeetings)
+	rooms := strings.Split(config.MeetingRooms, ",")
+
+	for index, meeting := range meetings {
+		meetingUrl := ""
+
+		if len(rooms) > index {
+			meetingUrl = rooms[index]
+		}
 
-	for _, meeting := range meetings {
-		p.startMeeting(meeting)
+		p.startMeeting(meeting, meetingUrl)
 	}
 }
 
-func (p *Plugin) startMeeting(meeting []string) {
+func (p *Plugin) startMeeting(meeting []string, meetingUrl string) {
 	maxMeetings := 100
 
 	p.usersMeetings = PrependSlice(p.usersMeetings, meeting)
@@ -85,6 +94,16 @@ func (p *Plugin) startMeeting(meeting []string) {
 
 	p.persistMeetings()
 	p.API.CreatePost(post)
+
+	if len(meetingUrl) > 0 {
+		post := &model.Post{
+			UserId:    p.botUserID,
+			ChannelId: channel.Id,
+			Message:   meetingUrl,
+		}
+
+		p.API.CreatePost(post)
+	}
 }
 
 func (p *Plugin) UserHasLeftTeam(c *plugin.Context, teamMember *model.TeamMember) {