chore: change create project api to support the new console (#1308)

Signed-off-by: Alessandro Yuichi Okimoto <yuichijpn@gmail.com>

Author: cre8ivejp

api-description/web-api.swagger.yaml

@@ -3554,18 +3554,15 @@ definitions:
   environmentCreateProjectCommand:
     type: object
     properties:
-      id:
+      organizationId:
+        type: string
+      name:
         type: string
       description:
         type: string
         title: optional
-      name:
-        type: string
       urlCode:
         type: string
-      ownerEmail:
-        type: string
-    description: 'TODO: add organizationID once we support organization create UI.'
   environmentCreateProjectRequest:
     type: object
     properties:

manifests/bucketeer/charts/web/values.yaml

@@ -255,49 +255,14 @@ func (s *EnvironmentService) CreateProject(
 	}
 	name := strings.TrimSpace(req.Command.Name)
 	urlCode := strings.TrimSpace(req.Command.UrlCode)
-	// TODO: Temporary implementations that create Organization at the same time as Project.
-	// This should be removed when the Organization management page is added.
-	organization, err := domain.NewOrganization(
+	project, err := domain.NewProject(
 		name,
 		urlCode,
-		req.Command.OwnerEmail,
 		req.Command.Description,
-		false,
+		editor.Email,
+		req.Command.OrganizationId,
 		false,
 	)
-	if err != nil {
-		s.logger.Error(
-			"Failed to create organization",
-			log.FieldsFromImcomingContext(ctx).AddFields(
-				zap.Error(err),
-			)...,
-		)
-		return nil, err
-	}
-	createOrgCmd := &environmentproto.CreateOrganizationCommand{
-		Name:        organization.Name,
-		UrlCode:     organization.UrlCode,
-		Description: organization.Description,
-		IsTrial:     false,
-	}
-	if err = s.createOrganization(ctx, createOrgCmd, organization, editor, localizer); err != nil {
-		s.logger.Error(
-			"Failed to save organization",
-			log.FieldsFromImcomingContext(ctx).AddFields(
-				zap.Error(err),
-			)...,
-		)
-		return nil, err
-	}
-	s.logger.Info(
-		`Organization is created at the same time as Project.
-This is a temporary implementation during the transition period.`,
-		zap.String("organization_id", organization.Id),
-		zap.String("organization_name", organization.Name),
-		zap.String("organization_url_code", organization.UrlCode),
-	)
-
-	project, err := domain.NewProject(name, urlCode, req.Command.Description, editor.Email, organization.Id, false)
 	if err != nil {
 		s.logger.Error(
 			"Failed to create project",
@@ -356,16 +321,6 @@ func validateCreateProjectRequest(req *environmentproto.CreateProjectRequest, lo
 		}
 		return dt.Err()
 	}
-	if !emailRegex.MatchString(req.Command.OwnerEmail) {
-		dt, err := statusInvalidProjectCreatorEmail.WithDetails(&errdetails.LocalizedMessage{
-			Locale:  localizer.GetLocale(),
-			Message: localizer.MustLocalizeWithTemplate(locale.InvalidArgumentError, "owner_email"),
-		})
-		if err != nil {
-			return statusInternal.Err()
-		}
-		return dt.Err()
-	}
 	return nil
 }
 
@@ -580,7 +535,7 @@ func validateCreateTrialProjectRequest(
 	if !emailRegex.MatchString(req.Command.Email) {
 		dt, err := statusInvalidProjectCreatorEmail.WithDetails(&errdetails.LocalizedMessage{
 			Locale:  localizer.GetLocale(),
-			Message: localizer.MustLocalizeWithTemplate(locale.InvalidArgumentError, "email"),
+			Message: localizer.MustLocalizeWithTemplate(locale.InvalidArgumentError, "owner_email"),
 		})
 		if err != nil {
 			return statusInternal.Err()

pkg/environment/api/project.go

@@ -286,17 +286,13 @@ func TestCreateProjectMySQL(t *testing.T) {
 		{
 			desc: "err: ErrProjectAlreadyExists: duplicate id",
 			setup: func(s *EnvironmentService) {
-				s.mysqlClient.(*mysqlmock.MockClient).EXPECT().BeginTx(gomock.Any()).Return(nil, nil)
-				s.mysqlClient.(*mysqlmock.MockClient).EXPECT().RunInTransaction(
-					gomock.Any(), gomock.Any(), gomock.Any(),
-				).Return(nil)
 				s.mysqlClient.(*mysqlmock.MockClient).EXPECT().BeginTx(gomock.Any()).Return(nil, nil)
 				s.mysqlClient.(*mysqlmock.MockClient).EXPECT().RunInTransaction(
 					gomock.Any(), gomock.Any(), gomock.Any(),
 				).Return(v2es.ErrProjectAlreadyExists)
 			},
 			req: &proto.CreateProjectRequest{
-				Command: &proto.CreateProjectCommand{Name: "id-0", UrlCode: "id-0", OwnerEmail: "test@test.org"},
+				Command: &proto.CreateProjectCommand{OrganizationId: "organization-id", Name: "id-0", UrlCode: "id-0"},
 			},
 			expectedErr: createError(statusProjectAlreadyExists, localizer.MustLocalize(locale.AlreadyExistsError)),
 		},
@@ -309,7 +305,7 @@ func TestCreateProjectMySQL(t *testing.T) {
 				).Return(errors.New("error"))
 			},
 			req: &proto.CreateProjectRequest{
-				Command: &proto.CreateProjectCommand{Name: "id-1", UrlCode: "id-1", OwnerEmail: "test@test.org"},
+				Command: &proto.CreateProjectCommand{OrganizationId: "organization-id", Name: "id-1", UrlCode: "id-1"},
 			},
 			expectedErr: createError(statusInternal, localizer.MustLocalize(locale.InternalServerError)),
 		},
@@ -320,17 +316,13 @@ func TestCreateProjectMySQL(t *testing.T) {
 				s.mysqlClient.(*mysqlmock.MockClient).EXPECT().RunInTransaction(
 					gomock.Any(), gomock.Any(), gomock.Any(),
 				).Return(nil)
-				s.mysqlClient.(*mysqlmock.MockClient).EXPECT().BeginTx(gomock.Any()).Return(nil, nil)
-				s.mysqlClient.(*mysqlmock.MockClient).EXPECT().RunInTransaction(
-					gomock.Any(), gomock.Any(), gomock.Any(),
-				).Return(nil)
 			},
 			req: &proto.CreateProjectRequest{
 				Command: &proto.CreateProjectCommand{
-					Name:        projExpected.Name,
-					UrlCode:     projExpected.UrlCode,
-					Description: projExpected.Description,
-					OwnerEmail:  "test@test.org",
+					OrganizationId: "organization-id",
+					Name:           projExpected.Name,
+					UrlCode:        projExpected.UrlCode,
+					Description:    projExpected.Description,
 				},
 			},
 			expected:    projExpected.Project,
@@ -439,7 +431,7 @@ func TestCreateTrialProjectMySQL(t *testing.T) {
 			req: &proto.CreateTrialProjectRequest{
 				Command: &proto.CreateTrialProjectCommand{Name: "id-0", Email: "email"},
 			},
-			expectedErr: createError(statusInvalidProjectCreatorEmail, localizer.MustLocalizeWithTemplate(locale.InvalidArgumentError, "email")),
+			expectedErr: createError(statusInvalidProjectCreatorEmail, localizer.MustLocalizeWithTemplate(locale.InvalidArgumentError, "owner_email")),
 		},
 		{
 			desc: "err: ErrProjectAlreadyExists: trial exists",