From 8a9c15cccca947c1bce600d51236b03e3685f5cd Mon Sep 17 00:00:00 2001 From: Shashank Shekhar Date: Wed, 6 Mar 2024 14:56:51 +0530 Subject: [PATCH] INFRA-3000 | FIX: adding oncall into houston incidents (#391) --- service/incident/impl/incident_service_v2.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/service/incident/impl/incident_service_v2.go b/service/incident/impl/incident_service_v2.go index 7f262f0..c3c0f89 100644 --- a/service/incident/impl/incident_service_v2.go +++ b/service/incident/impl/incident_service_v2.go @@ -834,18 +834,16 @@ func addMembersToIncident( severityEntity *severity.SeverityEntity, incidentName string, ) error { - // 1. get list of team members, list of members by severity - var allUserFromDB []string var allUserToBeAddedIntoIncident []string var houstonUserList []string var notHoustonUserList []string if teamEntity.OncallHandle != "" { - allUserFromDB = append(allUserFromDB, teamEntity.OncallHandle) + allUserToBeAddedIntoIncident = append(allUserToBeAddedIntoIncident, teamEntity.OncallHandle) } if teamEntity.PseOncallHandle != "" { - allUserFromDB = append(allUserFromDB, teamEntity.PseOncallHandle) + allUserToBeAddedIntoIncident = append(allUserToBeAddedIntoIncident, teamEntity.PseOncallHandle) } teamUsers, err := i.teamUserService.GetTeamUsersWithMinimumSeverityIdLessThanOrEqualToGivenSeverity(teamEntity.ID, severityEntity.ID) @@ -860,11 +858,9 @@ func addMembersToIncident( } } - for _, u := range houstonUserList { - allUserToBeAddedIntoIncident = append(allUserToBeAddedIntoIncident, u) - } + allUserToBeAddedIntoIncident = append(allUserToBeAddedIntoIncident, houstonUserList...) - uniqueUsersFromDB := util.RemoveDuplicate[string](allUserFromDB) + uniqueUsersToBeAdded := util.RemoveDuplicate[string](allUserToBeAddedIntoIncident) var invalidUsersString string var invalidUserCount uint @@ -891,12 +887,12 @@ func addMembersToIncident( _ = err } - err = i.slackService.InviteUsersToConversation(channel.ID, allUserToBeAddedIntoIncident[:]...) + err = i.slackService.InviteUsersToConversation(channel.ID, uniqueUsersToBeAdded[:]...) if err != nil { logger.Error( fmt.Sprintf( "%s [%s] Error in adding members [%+v] to the channel %s", - logTag, incidentName, uniqueUsersFromDB, channel.Name, + logTag, incidentName, uniqueUsersToBeAdded, channel.Name, ), zap.Error(err), )