From 65913a8644a4fad9177dfa16e51558a167bcd171 Mon Sep 17 00:00:00 2001
From: Shubham Kirve <shubham.kirve@navi.com>
Date: Wed, 26 Apr 2023 22:14:47 +0530
Subject: [PATCH] adding lastupdatedBy in team and severity, fixing empty user
 list issue (#40)

* TP-0000 | fixing get incident issue

* TP-0000 | adding lastupdatedBy in team and severity, fixing empty user list issue

* TP-0000 | reformatting

* TP-0000 | reformatting

* TP-0000 | reformatting

* TP-0000 | reformatting
---
 pkg/slackbot/users.go                 |  3 +++
 service/response/severity_response.go |  3 +++
 service/response/team_response.go     | 21 ++++++++++++---------
 service/severity_service.go           |  1 +
 service/users_service.go              |  2 +-
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/pkg/slackbot/users.go b/pkg/slackbot/users.go
index 58e74a0..eedabd7 100644
--- a/pkg/slackbot/users.go
+++ b/pkg/slackbot/users.go
@@ -9,6 +9,9 @@ import (
 )
 
 func (c *Client) GetUsersInfo(users ...string) (*[]slack.User, error) {
+	if len(users) == 0 {
+		return &[]slack.User{}, nil
+	}
 	userInfo, err := c.socketModeClient.GetUsersInfo(users...)
 	if err != nil {
 		c.logger.Error("get users info failed", zap.Any("users", users), zap.Error(err))
diff --git a/service/response/severity_response.go b/service/response/severity_response.go
index e438d61..f4304d3 100644
--- a/service/response/severity_response.go
+++ b/service/response/severity_response.go
@@ -2,6 +2,7 @@ package service
 
 import (
 	"houston/model/severity"
+	"time"
 
 	"github.com/lib/pq"
 )
@@ -13,6 +14,7 @@ type SeverityResponse struct {
 	Sla          int            `json:"sla"`
 	SlackUserIds pq.StringArray `json:"slackUserIds"`
 	Participants []UserResponse `json:"participants,omitempty"`
+	UpdatedAt    time.Time      `json:"lastUpdatedAt,omitempty"`
 }
 
 func ConvertToSeverityResponse(severityEntity severity.SeverityEntity) SeverityResponse {
@@ -22,5 +24,6 @@ func ConvertToSeverityResponse(severityEntity severity.SeverityEntity) SeverityR
 		Description:  severityEntity.Description,
 		Sla:          severityEntity.Sla,
 		SlackUserIds: severityEntity.SlackUserIds,
+		UpdatedAt:    severityEntity.Model.UpdatedAt,
 	}
 }
diff --git a/service/response/team_response.go b/service/response/team_response.go
index 36e0448..846a15a 100644
--- a/service/response/team_response.go
+++ b/service/response/team_response.go
@@ -2,21 +2,24 @@ package service
 
 import (
 	"houston/model/team"
+	"time"
 
 	"github.com/lib/pq"
 )
 
 type TeamResponse struct {
-	ID				uint			`json:"id"`
-	Name         	string         	`json:"name"`
-	SlackUserIds 	pq.StringArray 	`json:"slackUserIds"`	
-	Participants	[]UserResponse	`json:"participants,omitempty"`
+	ID           uint           `json:"id"`
+	Name         string         `json:"name"`
+	SlackUserIds pq.StringArray `json:"slackUserIds"`
+	Participants []UserResponse `json:"participants,omitempty"`
+	UpdatedAt    time.Time      `json:"lastUpdatedAt,omitempty"`
 }
 
-func ConvertToTeamResponse(teamEntity team.TeamEntity) (TeamResponse) {
-	return TeamResponse {
-		ID: teamEntity.ID,
-		Name: teamEntity.Name,
+func ConvertToTeamResponse(teamEntity team.TeamEntity) TeamResponse {
+	return TeamResponse{
+		ID:           teamEntity.ID,
+		Name:         teamEntity.Name,
 		SlackUserIds: teamEntity.SlackUserIds,
+		UpdatedAt:    teamEntity.Model.UpdatedAt,
 	}
-}
\ No newline at end of file
+}
diff --git a/service/severity_service.go b/service/severity_service.go
index 042b899..5fe6b4e 100644
--- a/service/severity_service.go
+++ b/service/severity_service.go
@@ -85,6 +85,7 @@ func (s *severityService) GetSeverities(c *gin.Context) {
 			Description:  severity.Description,
 			Sla:          severity.Sla,
 			SlackUserIds: severity.SlackUserIds,
+			UpdatedAt: 	  severity.Model.UpdatedAt,
 		})
 	}
 
diff --git a/service/users_service.go b/service/users_service.go
index 01da2e9..f8240b6 100644
--- a/service/users_service.go
+++ b/service/users_service.go
@@ -59,7 +59,7 @@ func(u *userService) GetUsersInConversation(c *gin.Context) {
 		return
 	}
 	usersData := *usersInfo
-	var usersResponses []service.UserResponse
+	var usersResponses []service.UserResponse = []service.UserResponse{}
 	
 	for userInfo := range usersData {
 		usersResponses = append(usersResponses, service.UserResponse{