feat: add organization creator email (#1255)

Author: Ubisoft-potato

api-description/web-api.swagger.yaml

@@ -3353,6 +3353,8 @@ definitions:
       userCount:
         type: integer
         format: int32
+      ownerEmail:
+        type: string
   environmentArchiveEnvironmentV2Command:
     type: object
   environmentArchiveEnvironmentV2Request:
@@ -3460,6 +3462,8 @@ definitions:
         type: boolean
       isSystemAdmin:
         type: boolean
+      ownerEmail:
+        type: string
   environmentCreateOrganizationRequest:
     type: object
     properties:
@@ -3482,6 +3486,8 @@ definitions:
         type: string
       urlCode:
         type: string
+      ownerEmail:
+        type: string
     description: 'TODO: add organizationID once we support organization create UI.'
   environmentCreateProjectRequest:
     type: object
@@ -3504,6 +3510,8 @@ definitions:
         type: string
       urlCode:
         type: string
+      ownerEmail:
+        type: string
   environmentCreateTrialProjectRequest:
     type: object
     properties:
@@ -3643,6 +3651,7 @@ definitions:
       - URL_CODE
       - CREATED_AT
       - UPDATED_AT
+      - FEATURE_COUNT
     default: DEFAULT
   environmentListEnvironmentsV2RequestOrderDirection:
     type: string
@@ -3690,6 +3699,9 @@ definitions:
       - UPDATED_AT
       - NAME
       - URL_CODE
+      - PROJECT_COUNT
+      - ENVIRONMENT_COUNT
+      - USER_COUNT
     default: DEFAULT
   environmentListOrganizationsRequestOrderDirection:
     type: string
@@ -3739,6 +3751,8 @@ definitions:
       - UPDATED_AT
       - NAME
       - URL_CODE
+      - ENVIRONMENT_COUNT
+      - FEATURE_COUNT
     default: DEFAULT
   environmentListProjectsRequestOrderDirection:
     type: string

manifests/bucketeer/charts/web/values.yaml

@@ -82,6 +82,7 @@ web:
       email: demo@bucketeer.io
       password: demo
       organizationId: demo
+      organizationOwnerEmail: demo@bucketeer.io
       projectId: demo
       environmentId: demo
       isSystemAdmin: true

manifests/bucketeer/values.dev.yaml

@@ -0,0 +1,2 @@
+-- Modify "organization" table
+ALTER TABLE `organization` ADD COLUMN `owner_email` varchar(255) NOT NULL;

migration/mysql/20240923154451_update_organization_table.sql

@@ -1,4 +1,4 @@
-h1:Zj1F3npMVz6OWIvqb3wR3UtbkbwrIU4D278BYxc10Y4=
+h1:4nKDaGsoVgDy9YoQUWW3GyfQOic4Zs5DK7+JUW5Sj+4=
 20240626022133_initialization.sql h1:u9qmPkwWX7PN92qEcDDfR92lrMpwadQSMxUJgv6LjQ0=
 20240708065726_update_audit_log_table.sql h1:k7gK8Njv1yHMsYXAQtSgMaSbXy4lxyZ9MPzbJyMyyoM=
 20240815043128_update_auto_ops_rule_table.sql h1:6ib+XfS1uu9AUO3qESvkpUfOu3qUsLwHm9KHcrGEz0E=
@@ -7,3 +7,4 @@ h1:Zj1F3npMVz6OWIvqb3wR3UtbkbwrIU4D278BYxc10Y4=
 20240821105619_update_push_table.sql h1:i4oKP1T9rtGGmgQ21SA1o7tVQ4gAaeNyVSckKSYDoB0=
 20240822110001_update_push_table.sql h1:NG45/qGmJDgDlFrKhKLDqmLXMp94S9GOlQ8k/HObCe4=
 20240827085123_update_environment_id_table.sql h1:VbtGa+UP5wjRjrffXtLTg9eWSZZH047MzMaT4c3JJSE=
+20240923154451_update_organization_table.sql h1:AmFazbhx6ZzuW+JMcrpX2kyAKx7TUMUnASJIePRuvBk=

migration/mysql/atlas.sum

@@ -493,6 +493,7 @@ func (s *authService) PrepareDemoUser() {
 						Id:          config.OrganizationId,
 						Name:        "Demo organization",
 						UrlCode:     "demo",
+						OwnerEmail:  config.OrganizationOwnerEmail,
 						Description: "This organization is for demo users",
 						Disabled:    false,
 						Archived:    false,

pkg/auth/api/api.go

@@ -44,13 +44,14 @@ type GoogleConfig struct {
 }
 
 type DemoSignInConfig struct {
-	Enabled        bool   `json:"enabled"`
-	Password       string `json:"password"`
-	Email          string `json:"email"`
-	OrganizationId string `json:"organizationId"`
-	ProjectId      string `json:"projectId"`
-	EnvironmentId  string `json:"environmentId"`
-	IsSystemAdmin  bool   `json:"isSystemAdmin"`
+	Enabled                bool   `json:"enabled"`
+	Password               string `json:"password"`
+	Email                  string `json:"email"`
+	OrganizationId         string `json:"organizationId"`
+	OrganizationOwnerEmail string `json:"organizationOwnerEmail"`
+	ProjectId              string `json:"projectId"`
+	EnvironmentId          string `json:"environmentId"`
+	IsSystemAdmin          bool   `json:"isSystemAdmin"`
 }
 
 type OAuthConfig struct {

pkg/auth/interface.go

@@ -190,6 +190,8 @@ func (s *EnvironmentService) newEnvironmentV2ListOrders(
 		column = "environment_v2.created_at"
 	case environmentproto.ListEnvironmentsV2Request_UPDATED_AT:
 		column = "environment_v2.updated_at"
+	case environmentproto.ListEnvironmentsV2Request_FEATURE_COUNT:
+		column = "feature_count"
 	default:
 		dt, err := statusInvalidOrderBy.WithDetails(&errdetails.LocalizedMessage{
 			Locale:  localizer.GetLocale(),

pkg/environment/api/environment_v2.go

@@ -25,17 +25,18 @@ var (
 	statusInvalidCursor = gstatus.New(codes.InvalidArgument, "environment: cursor is invalid")
 	// Essentially, the id field is required, but no validation is performed because some older services do not have ID.
 	//statusEnvironmentIDRequired = gstatus.New(codes.InvalidArgument, "environment: environment id must be specified")
-	statusEnvironmentNameRequired    = gstatus.New(codes.InvalidArgument, "environment: environment name must be specified") // nolint:lll
-	statusInvalidEnvironmentName     = gstatus.New(codes.InvalidArgument, "environment: invalid environment name")
-	statusInvalidEnvironmentUrlCode  = gstatus.New(codes.InvalidArgument, "environment: invalid environment url code")
-	statusProjectIDRequired          = gstatus.New(codes.InvalidArgument, "environment: project id must be specified")
-	statusProjectNameRequired        = gstatus.New(codes.InvalidArgument, "environment: project name must be specified")
-	statusInvalidProjectName         = gstatus.New(codes.InvalidArgument, "environment: invalid project name")
-	statusInvalidProjectUrlCode      = gstatus.New(codes.InvalidArgument, "environment: invalid project url code")
-	statusInvalidProjectCreatorEmail = gstatus.New(codes.InvalidArgument, "environment: invalid project creator email")
-	statusInvalidOrderBy             = gstatus.New(codes.InvalidArgument, "environment: order_by is invalid")
-	statusOrganizationIDRequired     = gstatus.New(codes.InvalidArgument, "environment: organization id must be specified")
-	statusOrganizationNameRequired   = gstatus.New(
+	statusEnvironmentNameRequired         = gstatus.New(codes.InvalidArgument, "environment: environment name must be specified") // nolint:lll
+	statusInvalidEnvironmentName          = gstatus.New(codes.InvalidArgument, "environment: invalid environment name")           // nolint:lll
+	statusInvalidEnvironmentUrlCode       = gstatus.New(codes.InvalidArgument, "environment: invalid environment url code")       // nolint:lll
+	statusProjectIDRequired               = gstatus.New(codes.InvalidArgument, "environment: project id must be specified")       // nolint:lll
+	statusProjectNameRequired             = gstatus.New(codes.InvalidArgument, "environment: project name must be specified")     // nolint:lll
+	statusInvalidProjectName              = gstatus.New(codes.InvalidArgument, "environment: invalid project name")               // nolint:lll
+	statusInvalidProjectUrlCode           = gstatus.New(codes.InvalidArgument, "environment: invalid project url code")           // nolint:lll
+	statusInvalidProjectCreatorEmail      = gstatus.New(codes.InvalidArgument, "environment: invalid project creator email")      // nolint:lll
+	statusInvalidOrganizationCreatorEmail = gstatus.New(codes.InvalidArgument, "environment: invalid organization creator email") // nolint:lll
+	statusInvalidOrderBy                  = gstatus.New(codes.InvalidArgument, "environment: order_by is invalid")                // nolint:lll
+	statusOrganizationIDRequired          = gstatus.New(codes.InvalidArgument, "environment: organization id must be specified")  // nolint:lll
+	statusOrganizationNameRequired        = gstatus.New(
 		codes.InvalidArgument,
 		"environment: organization name must be specified",
 	)

pkg/environment/api/error.go

@@ -201,6 +201,13 @@ func (s *EnvironmentService) newOrganizationListOrders(
 		column = "organization.created_at"
 	case environmentproto.ListOrganizationsRequest_UPDATED_AT:
 		column = "organization.updated_at"
+	case environmentproto.ListOrganizationsRequest_ENVIRONMENT_COUNT:
+		column = "environments"
+	case environmentproto.ListOrganizationsRequest_PROJECT_COUNT:
+		column = "projects"
+	case environmentproto.ListOrganizationsRequest_USER_COUNT:
+		column = "users"
+
 	default:
 		dt, err := statusInvalidOrderBy.WithDetails(&errdetails.LocalizedMessage{
 			Locale:  localizer.GetLocale(),
@@ -235,6 +242,7 @@ func (s *EnvironmentService) CreateOrganization(
 	organization, err := domain.NewOrganization(
 		name,
 		urlCode,
+		req.Command.OwnerEmail,
 		req.Command.Description,
 		req.Command.IsTrial,
 		req.Command.IsSystemAdmin,
@@ -302,6 +310,16 @@ func (s *EnvironmentService) validateCreateOrganizationRequest(
 		}
 		return dt.Err()
 	}
+	if !emailRegex.MatchString(req.Command.OwnerEmail) {
+		dt, err := statusInvalidOrganizationCreatorEmail.WithDetails(&errdetails.LocalizedMessage{
+			Locale:  localizer.GetLocale(),
+			Message: localizer.MustLocalizeWithTemplate(locale.InvalidArgumentError, "owner_email"),
+		})
+		if err != nil {
+			return statusInternal.Err()
+		}
+		return dt.Err()
+	}
 	return nil
 }