[MM-228] Add feature to update custom status and status of the user during meeting #359
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -110,7 +110,7 @@ func (m *mscalendar) retrieveUsersToSync(userIndex store.UserIndex, syncJobSumma | |
| } | ||
|
|
||
| // If user does not have the proper features enabled, just go to the next one | ||
| if !(user.IsConfiguredForStatusUpdates() || user.IsConfiguredForCustomStatusUpdates() || user.Settings.ReceiveReminders) { | ||
| continue | ||
| } | ||
|
|
||
|
|
@@ -154,6 +154,13 @@ func (m *mscalendar) retrieveUsersToSync(userIndex store.UserIndex, syncJobSumma | |
| return users, calendarViews, fmt.Errorf("no calendar views found") | ||
| } | ||
|
|
||
| for _, view := range calendarViews { | ||
ayusht2810 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| event := view.Events | ||
ayusht2810 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| sort.Slice(event, func(i, j int) bool { | ||
| return event[i].Start.Time().UnixMicro() < event[j].Start.Time().UnixMicro() | ||
| }) | ||
| } | ||
|
|
||
| return users, calendarViews, nil | ||
| } | ||
|
|
||
|
|
@@ -231,7 +238,7 @@ func (m *mscalendar) setUserStatuses(users []*store.User, calendarViews []*remot | |
| numberOfLogs, numberOfUserStatusChange, numberOfUserErrorInStatusChange := 0, 0, 0 | ||
| toUpdate := []*store.User{} | ||
| for _, u := range users { | ||
| if u.IsConfiguredForStatusUpdates() || u.IsConfiguredForCustomStatusUpdates() { | ||
| toUpdate = append(toUpdate, u) | ||
| } | ||
| } | ||
|
|
@@ -279,9 +286,12 @@ func (m *mscalendar) setUserStatuses(users []*store.User, calendarViews []*remot | |
| continue | ||
| } | ||
|
|
||
| events := filterBusyAndAttendeeEvents(view.Events) | ||
| events = getMergedEvents(events) | ||
|
|
||
| var err error | ||
| if user.IsConfiguredForStatusUpdates() { | ||
| res, isStatusChanged, err = m.setStatusFromCalendarView(user, status, events) | ||
| if err != nil { | ||
| if numberOfLogs < logTruncateLimit { | ||
| m.Logger.Warnf("Error setting user %s status. err=%v", user.MattermostUserID, err) | ||
|
|
@@ -296,11 +306,11 @@ func (m *mscalendar) setUserStatuses(users []*store.User, calendarViews []*remot | |
| } | ||
| } | ||
|
|
||
| if user.IsConfiguredForCustomStatusUpdates() { | ||
| res, isStatusChanged, err = m.setCustomStatusFromCalendarView(user, events) | ||
| if err != nil { | ||
| if numberOfLogs < logTruncateLimit { | ||
| m.Logger.Warnf("Error setting user %s custom status. err=%v", user.MattermostUserID, err) | ||
| } else if numberOfLogs == logTruncateLimit { | ||
| m.Logger.Warnf(logTruncateMsg) | ||
| } | ||
|
|
@@ -309,7 +319,7 @@ func (m *mscalendar) setUserStatuses(users []*store.User, calendarViews []*remot | |
| } | ||
|
|
||
| // Increment count only when we have not updated the status of the user from the options to have status change count per user. | ||
| if isStatusChanged && user.Settings.UpdateStatusFromOptions == store.NotSetStatusOption { | ||
| numberOfUserStatusChange++ | ||
| } | ||
| } | ||
|
|
@@ -322,13 +332,12 @@ func (m *mscalendar) setUserStatuses(users []*store.User, calendarViews []*remot | |
| return utils.JSONBlock(calendarViews), numberOfUserStatusChange, numberOfUserErrorInStatusChange, nil | ||
| } | ||
|
|
||
| func (m *mscalendar) setCustomStatusFromCalendarView(user *store.User, events []*remote.Event) (string, bool, error) { | ||
| isStatusChanged := false | ||
| if !user.IsConfiguredForCustomStatusUpdates() { | ||
| return "User doesn't want to set custom status", isStatusChanged, nil | ||
| } | ||
|
|
||
| if len(events) == 0 { | ||
| if user.IsCustomStatusSet { | ||
| if err := m.PluginAPI.RemoveMattermostUserCustomStatus(user.MattermostUserID); err != nil { | ||
|
|
@@ -343,23 +352,14 @@ func (m *mscalendar) setCustomStatusFromCalendarView(user *store.User, res *remo | |
| return "No event present to set custom status", isStatusChanged, nil | ||
| } | ||
|
|
||
| currentUser, err := m.PluginAPI.GetMattermostUser(user.MattermostUserID) | ||
| if err != nil { | ||
| return "", isStatusChanged, err | ||
| } | ||
|
|
||
| currentCustomStatus := currentUser.GetCustomStatus() | ||
| if currentCustomStatus != nil && !user.IsCustomStatusSet { | ||
| return "User already has a custom status set, ignoring custom status change", isStatusChanged, nil | ||
| } | ||
|
|
||
| if appErr := m.PluginAPI.UpdateMattermostUserCustomStatus(user.MattermostUserID, &model.CustomStatus{ | ||
|
|
@@ -379,25 +379,19 @@ func (m *mscalendar) setCustomStatusFromCalendarView(user *store.User, res *remo | |
| return "", isStatusChanged, nil | ||
| } | ||
|
|
||
| func (m *mscalendar) setStatusFromCalendarView(user *store.User, status *model.Status, events []*remote.Event) (string, bool, error) { | ||
| isStatusChanged := false | ||
| currentStatus := status.Status | ||
| if !user.IsConfiguredForStatusUpdates() { | ||
| return "No value set from options to update status", isStatusChanged, nil | ||
| } | ||
|
|
||
| if currentStatus == model.StatusOffline && !user.Settings.GetConfirmation { | ||
| return "User offline and does not want status change confirmations. No status change", isStatusChanged, nil | ||
| } | ||
|
|
||
| busyStatus := model.StatusDnd | ||
| if user.Settings.UpdateStatusFromOptions == store.AwayStatusOption { | ||
| busyStatus = model.StatusAway | ||
| } | ||
|
|
||
|
|
@@ -426,15 +420,6 @@ func (m *mscalendar) setStatusFromCalendarView(user *store.User, status *model.S | |
| return message, isStatusChanged, nil | ||
| } | ||
|
|
||
| remoteHashes := []string{} | ||
| for _, e := range events { | ||
| if e.IsCancelled { | ||
|
|
@@ -521,7 +506,7 @@ func (m *mscalendar) setStatusOrAskUser(user *store.User, currentStatus *model.S | |
|
|
||
| if !isFree { | ||
| toSet = model.StatusDnd | ||
| if user.Settings.UpdateStatusFromOptions == store.AwayStatusOption { | ||
| toSet = model.StatusAway | ||
| } | ||
| if !user.Settings.GetConfirmation { | ||
|
|
@@ -660,27 +645,32 @@ func (m *mscalendar) notifyUpcomingEvents(mattermostUserID string, events []*rem | |
| } | ||
| } | ||
|
|
||
| func filterBusyAndAttendeeEvents(events []*remote.Event) []*remote.Event { | ||
| result := []*remote.Event{} | ||
| for _, e := range events { | ||
| // Not setting custom status for events without attendees since those are unlikely to be meetings. | ||
| if e.ShowAs == "busy" && !e.IsCancelled && len(e.Attendees) >= 1 { | ||
| result = append(result, e) | ||
| } | ||
| } | ||
| return result | ||
| } | ||
|
|
||
| // getMergedEvents accepts a sorted array of events, and returns events after merging them, if overlapping or if the meeting duration is less than StatusSyncJobInterval. | ||
| func getMergedEvents(events []*remote.Event) []*remote.Event { | ||
| if len(events) <= 1 { | ||
| return events | ||
| } | ||
|
|
||
| idx := 0 | ||
| for i := 1; i < len(events); i++ { | ||
| if (events[idx].End.Time().UnixMicro() >= events[i].Start.Time().UnixMicro()) || (events[idx].End.Time().Sub(events[idx].Start.Time()) <= StatusSyncJobInterval && events[i].Start.Time().Sub(events[idx].End.Time()) <= StatusSyncJobInterval) { | ||
| events[idx].End = events[i].End | ||
| } else { | ||
| idx++ | ||
| events[idx] = events[i] | ||
| } | ||
| } | ||
|
|
||
| return events[0 : idx+1] | ||
|
There was a problem hiding this comment. It would be good to put the body of this loop in its own function, and have it unit tested to show/document how it works There was a problem hiding this comment. @mickmister Added a comment to it. I don't think we need to separately test the function as it is already covered by its parent function. |
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I would expect these methods to be defined on
user.Settings, though I don't think it matters. This current way allows for less typing throughout the usages of the method