From 36d07c7ce21503c83cca0dce3fd6fa51a0dda768 Mon Sep 17 00:00:00 2001 From: Amitesh Vijaykumar Magar Date: Thu, 27 Feb 2025 15:51:13 +0530 Subject: [PATCH] NTP-42029 | API for Houston-UI (#482) * NTP-42029 | Created a reverse mapper for UI. * NTP-42029 | Comment resolution. * NTP-42029 | external team label change. * NTP-42029 | Updated mock. * NTP-42029 | Upgraded dependecy versions in go. * NTP-42029 | Update go.mod * NTP-42029 | Changes in mod file. * NTP-42029 | Upgraded GO version in Dockerfile. * NTP-42029 | Correcting version of GoLang used. * NTP-42029 | Removed breaking fonts installation from dockerfile. * NTP-42029 | Last minute changes. --- Dockerfile.houston | 6 +- common/util/constant.go | 6 + go.mod | 186 ++++++++++---------- service/response/team_response_v2.go | 1 + service/teamService/team_service_v2.go | 7 + service/teamService/team_service_v2_test.go | 1 + 6 files changed, 112 insertions(+), 95 deletions(-) diff --git a/Dockerfile.houston b/Dockerfile.houston index e0a07a1..4b4ce1d 100644 --- a/Dockerfile.houston +++ b/Dockerfile.houston @@ -1,7 +1,7 @@ -#ARG GOLANG_TAG=193044292705.dkr.ecr.ap-south-1.amazonaws.com/common/golang:1.19 +#ARG GOLANG_TAG=193044292705.dkr.ecr.ap-south-1.amazonaws.com/common/golang:1.23.3 # To run locally, use -ARG GOLANG_TAG=registry.cmd.navi-tech.in/common/golang:1.19 +ARG GOLANG_TAG=registry.cmd.navi-tech.in/common/golang:1.23.3 FROM ${GOLANG_TAG} as builder @@ -19,7 +19,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key RUN apt-get update RUN apt-get -y install libxpm4 libxrender1 libgtk2.0-0 libnss3 libgconf-2-4 RUN apt-get -y install xvfb gtk2-engines-pixbuf -RUN apt-get -y install xfonts-cyrillic xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable +# RUN apt-get -y install xfonts-cyrillic xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable RUN apt-get -y install google-chrome-stable # drop back to the regular jenkins user - good practice diff --git a/common/util/constant.go b/common/util/constant.go index 8874997..735db97 100644 --- a/common/util/constant.go +++ b/common/util/constant.go @@ -161,3 +161,9 @@ var ValidTeamTypes = map[string]struct{}{ string(BusinessFunctionTeam): {}, string(DefaultTeam): {}, } + +var InternalTeamTypeMap = map[string]string{ + "CX": "CX-Team", + "BF": "Business-Function Team", + "DEFAULT": "Default (Tech-Team)", +} diff --git a/go.mod b/go.mod index 977b929..898e95e 100644 --- a/go.mod +++ b/go.mod @@ -1,125 +1,127 @@ module houston -go 1.19 +go 1.23 require ( - github.com/aws/aws-sdk-go v1.44.262 - github.com/aws/aws-sdk-go-v2/config v1.18.25 - github.com/aws/aws-sdk-go-v2/service/s3 v1.33.1 - github.com/gin-contrib/zap v0.1.0 - github.com/gin-gonic/gin v1.9.1 - github.com/gojuno/minimock/v3 v3.1.3 + github.com/aws/aws-sdk-go v1.55.6 + github.com/aws/aws-sdk-go-v2/config v1.29.7 + github.com/aws/aws-sdk-go-v2/service/s3 v1.77.1 + github.com/gin-contrib/zap v1.1.4 + github.com/gin-gonic/gin v1.10.0 + github.com/gojuno/minimock/v3 v3.4.5 github.com/google/uuid v1.6.0 - github.com/jackc/pgx/v5 v5.5.4 + github.com/jackc/pgx/v5 v5.7.2 github.com/joho/godotenv v1.5.1 github.com/lib/pq v1.10.9 github.com/pkg/errors v0.9.1 - github.com/slack-go/slack v0.12.1 - github.com/spf13/cobra v1.6.1 - github.com/spf13/viper v1.16.0 - github.com/stretchr/testify v1.8.4 + github.com/slack-go/slack v0.16.0 + github.com/spf13/cobra v1.9.1 + github.com/spf13/viper v1.19.0 + github.com/stretchr/testify v1.10.0 github.com/thoas/go-funk v0.9.3 - go.uber.org/zap v1.24.0 - golang.org/x/exp v0.0.0-20231006140011-7918f672742d - golang.org/x/oauth2 v0.18.0 - gorm.io/datatypes v1.2.0 - gorm.io/driver/postgres v1.5.7 - gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde + go.uber.org/zap v1.27.0 + golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa + golang.org/x/oauth2 v0.27.0 + gorm.io/datatypes v1.2.5 + gorm.io/driver/postgres v1.5.11 + gorm.io/gorm v1.25.12 ) require ( - cloud.google.com/go/compute v1.23.4 // indirect - cloud.google.com/go/compute/metadata v0.2.3 // indirect - github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.24 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.25 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.28 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 // indirect - github.com/aws/smithy-go v1.13.5 // indirect + cloud.google.com/go/auth v0.15.0 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect + cloud.google.com/go/compute/metadata v0.6.0 // indirect + filippo.io/edwards25519 v1.1.0 // indirect + github.com/aws/aws-sdk-go-v2 v1.36.2 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.17.60 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.29 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.33 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.33 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.33 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.6.1 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.14 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.14 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.24.16 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.15 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.33.15 // indirect + github.com/aws/smithy-go v1.22.3 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect + github.com/bytedance/sonic/loader v0.2.3 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/cloudwego/base64x v0.1.5 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/felixge/httpsnoop v1.0.4 // indirect - github.com/gabriel-vasile/mimetype v1.4.2 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/gabriel-vasile/mimetype v1.4.8 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-sql-driver/mysql v1.7.1 // indirect - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.3 // indirect - github.com/google/s2a-go v0.1.7 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect - github.com/googleapis/gax-go/v2 v2.12.3 // indirect - github.com/jackc/puddle/v2 v2.2.1 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.42.0 // indirect - github.com/prometheus/procfs v0.9.0 // indirect - go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect - go.opentelemetry.io/otel/metric v1.24.0 // indirect - golang.org/x/sync v0.6.0 // indirect - google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect - google.golang.org/grpc v1.62.1 // indirect - gorm.io/driver/mysql v1.4.7 // indirect + github.com/go-sql-driver/mysql v1.9.0 // indirect + github.com/google/s2a-go v0.1.9 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect + github.com/googleapis/gax-go/v2 v2.14.1 // indirect + github.com/jackc/puddle/v2 v2.2.2 // indirect + github.com/klauspost/compress v1.18.0 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.62.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect + github.com/sagikazarmark/locafero v0.7.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect + github.com/sourcegraph/conc v0.3.0 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect + go.opentelemetry.io/otel/metric v1.34.0 // indirect + golang.org/x/sync v0.11.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250219182151-9fdb1cabc7b2 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99 // indirect + google.golang.org/grpc v1.70.0 // indirect + gorm.io/driver/mysql v1.5.7 // indirect ) require ( - github.com/bytedance/sonic v1.9.1 // indirect - github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/gin-contrib/sse v0.1.0 // indirect + github.com/bytedance/sonic v1.12.9 // indirect + github.com/fsnotify/fsnotify v1.8.0 // indirect + github.com/gin-contrib/sse v1.0.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.14.0 // indirect - github.com/goccy/go-json v0.10.2 // indirect - github.com/gorilla/websocket v1.5.0 // indirect + github.com/go-playground/validator/v10 v10.25.0 // indirect + github.com/goccy/go-json v0.10.5 // indirect + github.com/gorilla/websocket v1.5.3 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect + github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/cpuid/v2 v2.2.4 // indirect - github.com/leodido/go-urn v1.2.4 // indirect - github.com/magiconair/properties v1.8.7 - github.com/mattn/go-isatty v0.0.19 // indirect + github.com/klauspost/cpuid/v2 v2.2.10 // indirect + github.com/leodido/go-urn v1.4.0 // indirect + github.com/magiconair/properties v1.8.9 + github.com/mattn/go-isatty v0.0.20 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pelletier/go-toml/v2 v2.0.8 // indirect - github.com/prometheus/client_golang v1.15.0 - github.com/spf13/afero v1.9.5 // indirect - github.com/spf13/cast v1.5.1 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/spf13/pflag v1.0.5 // indirect - github.com/subosito/gotenv v1.4.2 // indirect + github.com/pelletier/go-toml/v2 v2.2.3 // indirect + github.com/prometheus/client_golang v1.21.0 + github.com/spf13/afero v1.12.0 // indirect + github.com/spf13/cast v1.7.1 // indirect + github.com/spf13/pflag v1.0.6 // indirect + github.com/subosito/gotenv v1.6.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect - github.com/ugorji/go/codec v1.2.11 // indirect - go.opentelemetry.io/otel v1.24.0 // indirect - go.opentelemetry.io/otel/trace v1.24.0 // indirect - go.uber.org/atomic v1.10.0 // indirect - go.uber.org/goleak v1.1.12 // indirect - go.uber.org/multierr v1.9.0 // indirect - golang.org/x/arch v0.3.0 // indirect - golang.org/x/crypto v0.21.0 // indirect - golang.org/x/net v0.23.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/api v0.170.0 - google.golang.org/protobuf v1.33.0 // indirect + github.com/ugorji/go/codec v1.2.12 // indirect + go.opentelemetry.io/otel v1.34.0 // indirect + go.opentelemetry.io/otel/trace v1.34.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/arch v0.14.0 // indirect + golang.org/x/crypto v0.35.0 // indirect + golang.org/x/net v0.35.0 // indirect + golang.org/x/sys v0.30.0 // indirect + golang.org/x/text v0.22.0 // indirect + google.golang.org/api v0.223.0 + google.golang.org/protobuf v1.36.5 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/service/response/team_response_v2.go b/service/response/team_response_v2.go index 43b4b84..3f2c94e 100644 --- a/service/response/team_response_v2.go +++ b/service/response/team_response_v2.go @@ -11,6 +11,7 @@ type TeamResponseV2 struct { PseOnCall *BotResponse `json:"pse_oncall"` SeverityMembersMap map[uint][]User `json:"severity_members_map,omitempty"` ManagerDetails ManagerDetails `json:"manager_details"` + TeamType string `json:"team_type"` } type SlackChannel struct { diff --git a/service/teamService/team_service_v2.go b/service/teamService/team_service_v2.go index 363d6d1..e10efc4 100644 --- a/service/teamService/team_service_v2.go +++ b/service/teamService/team_service_v2.go @@ -264,6 +264,13 @@ func (teamService *TeamServiceV2) GetTeam(teamId uint) (*service.TeamResponseV2, UpdatedAt: teamEntity.UpdatedAt, } + teamType, exists := util.InternalTeamTypeMap[teamEntity.TeamType] + if !exists { + return nil, customErrors.NewDataAccessError("Team Type is not valid") + } else { + teamResponse.TeamType = teamType + } + err = teamService.fillParticipantDetails(teamEntity, &teamResponse, teamSeveritiesMap, teamUsers) if err != nil { return nil, err diff --git a/service/teamService/team_service_v2_test.go b/service/teamService/team_service_v2_test.go index 3de34f7..c53ec37 100644 --- a/service/teamService/team_service_v2_test.go +++ b/service/teamService/team_service_v2_test.go @@ -889,6 +889,7 @@ func GetMockTeamEntity() *team.TeamEntity { Active: true, ManagerHandle: "123", SlackUserIds: []string{"test"}, + TeamType: string(util.CXTeam), } }