feat: active inactive user phase 3

api/auth/user/UserRestHandler.go

@@ -21,6 +21,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	util2 "github.com/devtron-labs/devtron/api/auth/user/util"
 	"github.com/devtron-labs/devtron/pkg/auth/user/helper"
 	"github.com/gorilla/schema"
 	"net/http"
@@ -110,6 +111,23 @@ func (handler UserRestHandlerImpl) CreateUser(w http.ResponseWriter, r *http.Req
 	userInfo.UserId = userId
 	handler.logger.Infow("request payload, CreateUser", "payload", userInfo)
 
+	// struct Validations
+	handler.logger.Infow("request payload, CreateUser ", "payload", userInfo)
+	err = handler.validator.Struct(userInfo)
+	if err != nil {
+		handler.logger.Errorw("validation err, CreateUser", "err", err, "payload", userInfo)
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+	// Doing this as api is not compatible with previous release of dashboard, groups has been migrated to userRoleGroups
+	isGroupsPresent := util2.IsGroupsPresent(userInfo.Groups)
+	if isGroupsPresent {
+		handler.logger.Errorw("validation error , createUser ", "err", err, "payload", userInfo)
+		err := &util.ApiError{Code: "406", HttpStatusCode: 406, UserMessage: "Not compatible with request", InternalMessage: "Not compatible with the request payload, as groups has been migrated to userRoleGroups"}
+		common.WriteJsonResp(w, err, nil, http.StatusNotAcceptable)
+		return
+	}
+
 	// RBAC enforcer applying
 	token := r.Header.Get("token")
 	isActionUserSuperAdmin := false
@@ -143,8 +161,8 @@ func (handler UserRestHandlerImpl) CreateUser(w http.ResponseWriter, r *http.Req
 	}
 
 	// auth check inside groups
-	if len(userInfo.Groups) > 0 {
-		groupRoles, err := handler.roleGroupService.FetchRolesForGroups(userInfo.Groups)
+	if len(userInfo.UserRoleGroup) > 0 {
+		groupRoles, err := handler.roleGroupService.FetchRolesForUserRoleGroups(userInfo.UserRoleGroup)
 		if err != nil && err != pg.ErrNoRows {
 			handler.logger.Errorw("service err, UpdateUser", "err", err, "payload", userInfo)
 			common.WriteJsonResp(w, err, "", http.StatusInternalServerError)
@@ -173,14 +191,6 @@ func (handler UserRestHandlerImpl) CreateUser(w http.ResponseWriter, r *http.Req
 	}
 	//RBAC enforcer Ends
 
-	handler.logger.Infow("request payload, CreateUser ", "payload", userInfo)
-	err = handler.validator.Struct(userInfo)
-	if err != nil {
-		handler.logger.Errorw("validation err, CreateUser", "err", err, "payload", userInfo)
-		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
-		return
-	}
-
 	res, err := handler.userService.CreateUser(&userInfo, token, handler.CheckManagerAuth)
 	if err != nil {
 		handler.logger.Errorw("service err, CreateUser", "err", err, "payload", userInfo)
@@ -222,6 +232,14 @@ func (handler UserRestHandlerImpl) UpdateUser(w http.ResponseWriter, r *http.Req
 		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
 		return
 	}
+	// Doing this as api is not compatible with previous release of dashboard,groups has been migrated to userRoleGroups
+	isGroupsPresent := util2.IsGroupsPresent(userInfo.Groups)
+	if isGroupsPresent {
+		handler.logger.Errorw("validation error , createUser ", "err", err, "payload", userInfo)
+		err := &util.ApiError{Code: "406", HttpStatusCode: 406, UserMessage: "Not compatible with request, please update to latest version", InternalMessage: "Not compatible with the request payload, as groups has been migrated to userRoleGroups"}
+		common.WriteJsonResp(w, err, nil, http.StatusNotAcceptable)
+		return
+	}
 
 	res, rolesChanged, groupsModified, restrictedGroups, err := handler.userService.UpdateUser(&userInfo, token, handler.CheckManagerAuth)
 
@@ -327,10 +345,10 @@ func (handler UserRestHandlerImpl) GetAllV2(w http.ResponseWriter, r *http.Reque
 			return
 		}
 		var roleFilters []bean.RoleFilter
-		if len(user.Groups) > 0 {
-			groupRoleFilters, err := handler.userService.GetRoleFiltersByGroupNames(user.Groups)
+		if len(user.UserRoleGroup) > 0 {
+			groupRoleFilters, err := handler.userService.GetRoleFiltersByUserRoleGroups(user.UserRoleGroup)
 			if err != nil {
-				handler.logger.Errorw("Error in getting role filters by group names", "err", err, "groupNames", user.Groups)
+				handler.logger.Errorw("Error in getting role filters by group names", "err", err, "UserRoleGroup", user.UserRoleGroup)
 				common.WriteJsonResp(w, err, "", http.StatusInternalServerError)
 				return
 			}
@@ -397,10 +415,10 @@ func (handler UserRestHandlerImpl) GetAll(w http.ResponseWriter, r *http.Request
 			return
 		}
 		var roleFilters []bean.RoleFilter
-		if len(user.Groups) > 0 {
-			groupRoleFilters, err := handler.userService.GetRoleFiltersByGroupNames(user.Groups)
+		if len(user.UserRoleGroup) > 0 {
+			groupRoleFilters, err := handler.userService.GetRoleFiltersByUserRoleGroups(user.UserRoleGroup)
 			if err != nil {
-				handler.logger.Errorw("Error in getting role filters by group names", "err", err, "groupNames", user.Groups)
+				handler.logger.Errorw("Error in getting role filters by group names", "err", err, "UserRoleGroup", user.UserRoleGroup)
 				common.WriteJsonResp(w, err, "", http.StatusInternalServerError)
 				return
 			}
@@ -784,10 +802,10 @@ func (handler UserRestHandlerImpl) FetchRoleGroupsV2(w http.ResponseWriter, r *h
 			return
 		}
 		var roleFilters []bean.RoleFilter
-		if len(user.Groups) > 0 {
-			groupRoleFilters, err := handler.userService.GetRoleFiltersByGroupNames(user.Groups)
+		if len(user.UserRoleGroup) > 0 {
+			groupRoleFilters, err := handler.userService.GetRoleFiltersByUserRoleGroups(user.UserRoleGroup)
 			if err != nil {
-				handler.logger.Errorw("Error in getting role filters by group names", "err", err, "groupNames", user.Groups)
+				handler.logger.Errorw("Error in getting role filters by group names", "err", err, "UserRoleGroup", user.UserRoleGroup)
 				common.WriteJsonResp(w, err, "", http.StatusInternalServerError)
 				return
 			}
@@ -855,10 +873,10 @@ func (handler UserRestHandlerImpl) FetchRoleGroups(w http.ResponseWriter, r *htt
 			return
 		}
 		var roleFilters []bean.RoleFilter
-		if len(user.Groups) > 0 {
-			groupRoleFilters, err := handler.userService.GetRoleFiltersByGroupNames(user.Groups)
+		if len(user.UserRoleGroup) > 0 {
+			groupRoleFilters, err := handler.userService.GetRoleFiltersByUserRoleGroups(user.UserRoleGroup)
 			if err != nil {
-				handler.logger.Errorw("Error in getting role filters by group names", "err", err, "groupNames", user.Groups)
+				handler.logger.Errorw("Error in getting role filters by group names", "err", err, "UserRoleGroup", user.UserRoleGroup)
 				common.WriteJsonResp(w, err, "", http.StatusInternalServerError)
 				return
 			}

api/auth/user/util/util.go

@@ -0,0 +1,8 @@
+package util
+
+func IsGroupsPresent(groups []string) bool {
+	if len(groups) > 0 {
+		return true
+	}
+	return false
+}

api/bean/AppView.go

@@ -72,6 +72,7 @@ type JobContainer struct {
 	JobActualName  string                  `json:"appName""`
 	Description    GenericNoteResponseBean `json:"description"`
 	JobCiPipelines []JobCIPipeline         `json:"ciPipelines"'`
+	ProjectId      int                     `json:"projectId"`
 }
 
 type JobCIPipeline struct {
@@ -98,6 +99,7 @@ type JobListingContainer struct {
 	EnvironmentName              string    `sql:"environment_name" json:"environmentName"`
 	LastTriggeredEnvironmentName string    `sql:"last_triggered_environment_name" json:"lastTriggeredEnvironmentName"`
 	LastTriggeredEnvironmentId   int       `sql:"last_triggered_environment_id" json:"lastEnvironmentId"`
+	ProjectId                    int       `sql:"team_id" json:"projectId"`
 }
 
 type CiPipelineLastSucceededTime struct {

api/bean/UserRequest.go

@@ -30,20 +30,21 @@ type UserRole struct {
 }
 
 type UserInfo struct {
-	Id            int32        `json:"id" validate:"number,not-system-admin-userid"`
-	EmailId       string       `json:"email_id" validate:"required,not-system-admin-user"` // TODO : have to migrate json key to emailId and also handle backward compatibility
-	Roles         []string     `json:"roles,omitempty"`
-	AccessToken   string       `json:"access_token,omitempty"`
-	RoleFilters   []RoleFilter `json:"roleFilters"`
-	Status        string       `json:"status,omitempty"`
-	Groups        []string     `json:"groups"` // this will be deprecated in future do not use
-	SuperAdmin    bool         `json:"superAdmin,notnull"`
-	LastLoginTime time.Time    `json:"lastLoginTime"`
-	UserType      string       `json:"-"`
-	LastUsedAt    time.Time    `json:"-"`
-	LastUsedByIp  string       `json:"-"`
-	Exist         bool         `json:"-"`
-	UserId        int32        `json:"-"` // created or modified user id
+	Id            int32           `json:"id" validate:"number,not-system-admin-userid"`
+	EmailId       string          `json:"email_id" validate:"required,not-system-admin-user"` // TODO : have to migrate json key to emailId and also handle backward compatibility
+	Roles         []string        `json:"roles,omitempty"`
+	AccessToken   string          `json:"access_token,omitempty"`
+	RoleFilters   []RoleFilter    `json:"roleFilters"`
+	Status        string          `json:"status,omitempty"`
+	Groups        []string        `json:"groups"`         // this will be deprecated in future do not use
+	UserRoleGroup []UserRoleGroup `json:"userRoleGroups"` // role group with metadata
+	SuperAdmin    bool            `json:"superAdmin,notnull"`
+	LastLoginTime time.Time       `json:"lastLoginTime"`
+	UserType      string          `json:"-"`
+	LastUsedAt    time.Time       `json:"-"`
+	LastUsedByIp  string          `json:"-"`
+	Exist         bool            `json:"-"`
+	UserId        int32           `json:"-"` // created or modified user id
 }
 
 type RoleGroup struct {
@@ -145,3 +146,7 @@ type BulkDeleteRequest struct {
 	ListingRequest *ListingRequest `json:"listingRequest,omitempty"`
 	LoggedInUserId int32           `json:"-"`
 }
+
+type UserRoleGroup struct {
+	RoleGroup *RoleGroup `json:"roleGroup"`
+}

internal/sql/repository/appWorkflow/AppWorkflowRepository.go

@@ -500,6 +500,7 @@ func (impl AppWorkflowRepositoryImpl) FindByComponentId(componentId int) ([]*App
 		Where("app_workflow_mapping.component_id= ?", componentId).
 		Where("app_workflow.active = ?", true).
 		Where("app_workflow_mapping.active = ?", true).
+		Where("app_workflow_mapping.type = ?", CIPIPELINE).
 		Select()
 	return appWorkflowsMapping, err
 }

internal/sql/repository/helper/AppListingRepositoryQueryBuilder.go

@@ -72,7 +72,7 @@ const (
 
 func (impl AppListingRepositoryQueryBuilder) BuildJobListingQuery(appIDs []int, statuses []string, environmentIds []int, sortOrder string) string {
 	query := "select ci_pipeline.name as ci_pipeline_name,ci_pipeline.id as ci_pipeline_id,app.id as job_id,app.display_name " +
-		"as job_name, app.app_name,app.description,cwr.started_on,cwr.status,cem.environment_id,cwr.environment_id as last_triggered_environment_id from app left join ci_pipeline on" +
+		"as job_name, app.app_name,app.description,app.team_id,cwr.started_on,cwr.status,cem.environment_id,cwr.environment_id as last_triggered_environment_id from app left join ci_pipeline on" +
 		" app.id = ci_pipeline.app_id and ci_pipeline.active=true left join (select cw.ci_pipeline_id, cw.status, cw.started_on, cw.environment_id " +
 		" from ci_workflow cw inner join (select ci_pipeline_id, MAX(started_on) max_started_on from ci_workflow group by ci_pipeline_id ) " +
 		"cws on cw.ci_pipeline_id = cws.ci_pipeline_id " +

pkg/app/AppListingService.go

@@ -477,6 +477,7 @@ func BuildJobListingResponse(jobContainers []*bean.JobListingContainer, JobsLast
 			val.JobId = jobContainer.JobId
 			val.JobName = jobContainer.JobName
 			val.JobActualName = jobContainer.JobActualName
+			val.ProjectId = jobContainer.ProjectId
 		}
 
 		if len(val.JobCiPipelines) == 0 {

pkg/auth/user/RoleGroupService.go

@@ -47,7 +47,7 @@ type RoleGroupService interface {
 	FetchRoleGroupsByName(name string) ([]*bean.RoleGroup, error)
 	DeleteRoleGroup(model *bean.RoleGroup) (bool, error)
 	BulkDeleteRoleGroups(request *bean.BulkDeleteRequest) (bool, error)
-	FetchRolesForGroups(groupNames []string) ([]*bean.RoleFilter, error)
+	FetchRolesForUserRoleGroups(userRoleGroups []bean.UserRoleGroup) ([]*bean.RoleFilter, error)
 }
 
 type RoleGroupServiceImpl struct {
@@ -938,7 +938,11 @@ func (impl RoleGroupServiceImpl) deleteMappingsFromCasbin(groupCasbinNames []str
 	return nil
 }
 
-func (impl RoleGroupServiceImpl) FetchRolesForGroups(groupNames []string) ([]*bean.RoleFilter, error) {
+func (impl RoleGroupServiceImpl) FetchRolesForUserRoleGroups(userRoleGroups []bean.UserRoleGroup) ([]*bean.RoleFilter, error) {
+	groupNames := make([]string, 0)
+	for _, userRoleGroup := range userRoleGroups {
+		groupNames = append(groupNames, userRoleGroup.RoleGroup.Name)
+	}
 	if len(groupNames) == 0 {
 		return nil, nil
 	}