fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Merge branch 'main' into org_api

internal/api/grpc/object/v2beta/converter.go

@@ -99,12 +99,6 @@ func DomainToPb(d *query.Domain) *org_pb.Domain {
 		IsVerified:     d.IsVerified,
 		IsPrimary:      d.IsPrimary,
 		ValidationType: DomainValidationTypeFromModel(d.ValidationType),
-		Details: ToViewDetailsPb(
-			d.Sequence,
-			d.CreationDate,
-			d.ChangeDate,
-			d.OrgID,
-		),
 	}
 }
 

internal/api/grpc/org/v2beta/helper.go

@@ -76,9 +76,9 @@ func OrgStateToPb(state domain.OrgState) v2beta_org.OrgState {
 }
 
 func createdOrganizationToPb(createdOrg *command.CreatedOrg) (_ *org.CreateOrganizationResponse, err error) {
-	admins := make([]*org.CreateOrganizationResponse_CreatedAdmin, len(createdOrg.CreatedAdmins))
+	admins := make([]*org.CreatedAdmin, len(createdOrg.CreatedAdmins))
 	for i, admin := range createdOrg.CreatedAdmins {
-		admins[i] = &org.CreateOrganizationResponse_CreatedAdmin{
+		admins[i] = &org.CreatedAdmin{
 			UserId:    admin.ID,
 			EmailCode: admin.EmailCode,
 			PhoneCode: admin.PhoneCode,

internal/api/grpc/org/v2beta/org_test.go

@@ -147,7 +147,7 @@ func Test_createdOrganizationToPb(t *testing.T) {
 			want: &org.CreateOrganizationResponse{
 				CreatedDate: timestamppb.New(now),
 				Id:          "orgID",
-				CreatedAdmins: []*org.CreateOrganizationResponse_CreatedAdmin{
+				CreatedAdmins: []*org.CreatedAdmin{
 					{
 						UserId:    "id",
 						EmailCode: gu.Ptr("emailCode"),