bc: entproto: convert field.Int into int64 proto fields (#254)

ent · Mar 8, 2022 · 45a28d7 · 45a28d7
1 parent 7dbb7a6
commit 45a28d7
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 97 deletions.
diff --git a/entproto/internal/todo/ent/proto/entpb/attachment_service_test.go b/entproto/internal/todo/ent/proto/entpb/attachment_service_test.go
@@ -73,13 +73,13 @@ func TestAttachmentService_MultiEdge(t *testing.T) {
 	}
 	att, err := svc.Create(ctx, &CreateAttachmentRequest{Attachment: &Attachment{
 		User: &User{
-			Id: int32(users[0].ID),
+			Id: int64(users[0].ID),
 		},
 		Recipients: []*User{
-			{Id: int32(users[1].ID)},
-			{Id: int32(users[2].ID)},
-			{Id: int32(users[3].ID)},
-			{Id: int32(users[4].ID)},
+			{Id: int64(users[1].ID)},
+			{Id: int64(users[2].ID)},
+			{Id: int64(users[3].ID)},
+			{Id: int64(users[4].ID)},
 		},
 	}})
 	all := client.Attachment.Query().WithRecipients(func(query *ent.UserQuery) {

diff --git a/entproto/internal/todo/ent/proto/entpb/entpb.pb.go b/entproto/internal/todo/ent/proto/entpb/entpb.pb.go
diff --git a/entproto/internal/todo/ent/proto/entpb/entpb.proto b/entproto/internal/todo/ent/proto/entpb/entpb.proto
@@ -68,15 +68,15 @@ message ListAttachmentResponse {
 }
 
 message Group {
-  int32 id = 1;
+  int64 id = 1;
 
   string name = 2;
 
   repeated User users = 3;
 }
 
 message MultiWordSchema {
-  int32 id = 1;
+  int64 id = 1;
 
   Unit unit = 2;
 
@@ -92,7 +92,7 @@ message CreateMultiWordSchemaRequest {
 }
 
 message GetMultiWordSchemaRequest {
-  int32 id = 1;
+  int64 id = 1;
 
   View view = 2;
 
@@ -110,7 +110,7 @@ message UpdateMultiWordSchemaRequest {
 }
 
 message DeleteMultiWordSchemaRequest {
-  int32 id = 1;
+  int64 id = 1;
 }
 
 message ListMultiWordSchemaRequest {
@@ -136,7 +136,7 @@ message ListMultiWordSchemaResponse {
 }
 
 message NilExample {
-  int32 id = 1;
+  int64 id = 1;
 
   google.protobuf.StringValue str_nil = 2;
 
@@ -148,7 +148,7 @@ message CreateNilExampleRequest {
 }
 
 message GetNilExampleRequest {
-  int32 id = 1;
+  int64 id = 1;
 
   View view = 2;
 
@@ -166,7 +166,7 @@ message UpdateNilExampleRequest {
 }
 
 message DeleteNilExampleRequest {
-  int32 id = 1;
+  int64 id = 1;
 }
 
 message ListNilExampleRequest {
@@ -192,7 +192,7 @@ message ListNilExampleResponse {
 }
 
 message Pet {
-  int32 id = 1;
+  int64 id = 1;
 
   User owner = 2;
 }
@@ -202,7 +202,7 @@ message CreatePetRequest {
 }
 
 message GetPetRequest {
-  int32 id = 1;
+  int64 id = 1;
 
   View view = 2;
 
@@ -220,7 +220,7 @@ message UpdatePetRequest {
 }
 
 message DeletePetRequest {
-  int32 id = 1;
+  int64 id = 1;
 }
 
 message ListPetRequest {
@@ -246,7 +246,7 @@ message ListPetResponse {
 }
 
 message Todo {
-  int32 id = 1;
+  int64 id = 1;
 
   string task = 2;
 
@@ -264,7 +264,7 @@ message Todo {
 }
 
 message User {
-  int32 id = 1;
+  int64 id = 1;
 
   string user_name = 2;
 
@@ -276,23 +276,23 @@ message User {
 
   Status status = 6;
 
-  int32 external_id = 8;
+  int64 external_id = 8;
 
   bytes crm_id = 9;
 
   bool banned = 10;
 
   uint64 custom_pb = 12;
 
-  google.protobuf.Int32Value opt_num = 13;
+  google.protobuf.Int64Value opt_num = 13;
 
   google.protobuf.StringValue opt_str = 14;
 
   google.protobuf.BoolValue opt_bool = 15;
 
   google.protobuf.StringValue big_int = 17;
 
-  google.protobuf.Int32Value b_user_1 = 18;
+  google.protobuf.Int64Value b_user_1 = 18;
 
   float height_in_cm = 19;
 
@@ -320,7 +320,7 @@ message CreateUserRequest {
 }
 
 message GetUserRequest {
-  int32 id = 1;
+  int64 id = 1;
 
   View view = 2;
 
@@ -338,7 +338,7 @@ message UpdateUserRequest {
 }
 
 message DeleteUserRequest {
-  int32 id = 1;
+  int64 id = 1;
 }
 
 message ListUserRequest {

diff --git a/entproto/internal/todo/ent/proto/entpb/entpb_attachment_service.go b/entproto/internal/todo/ent/proto/entpb/entpb_attachment_service.go
diff --git a/entproto/internal/todo/ent/proto/entpb/entpb_multi_word_schema_service.go b/entproto/internal/todo/ent/proto/entpb/entpb_multi_word_schema_service.go
diff --git a/entproto/internal/todo/ent/proto/entpb/entpb_nil_example_service.go b/entproto/internal/todo/ent/proto/entpb/entpb_nil_example_service.go
diff --git a/entproto/internal/todo/ent/proto/entpb/entpb_pet_service.go b/entproto/internal/todo/ent/proto/entpb/entpb_pet_service.go
diff --git a/entproto/internal/todo/ent/proto/entpb/entpb_user_service.go b/entproto/internal/todo/ent/proto/entpb/entpb_user_service.go
diff --git a/entproto/internal/todo/ent/proto/entpb/multi_word_schema_test.go b/entproto/internal/todo/ent/proto/entpb/multi_word_schema_test.go
@@ -30,7 +30,7 @@ func TestMultiWordSchemaService_Get(t *testing.T) {
 	entry := client.MultiWordSchema.Create().
 		SetUnit(multiwordschema.UnitFt).
 		SaveX(ctx)
-	get, err := svc.Get(ctx, &GetMultiWordSchemaRequest{Id: int32(entry.ID)})
+	get, err := svc.Get(ctx, &GetMultiWordSchemaRequest{Id: int64(entry.ID)})
 	require.NoError(t, err)
 	require.EqualValues(t, MultiWordSchema_FT, get.GetUnit())
 }
diff --git a/entproto/internal/todo/ent/proto/entpb/nil_service_test.go b/entproto/internal/todo/ent/proto/entpb/nil_service_test.go
@@ -34,7 +34,7 @@ func TestNilExampleService_Get(t *testing.T) {
 		SetStrNil("str").
 		SetTimeNil(time.Now()).
 		SaveX(ctx)
-	get, err := svc.Get(ctx, &GetNilExampleRequest{Id: int32(nex.ID)})
+	get, err := svc.Get(ctx, &GetNilExampleRequest{Id: int64(nex.ID)})
 	require.NoError(t, err)
 	require.EqualValues(t, nex.TimeNil.Unix(), get.GetTimeNil().AsTime().Unix())
 	require.EqualValues(t, *nex.StrNil, get.GetStrNil().GetValue())

diff --git a/entproto/internal/todo/ent/proto/entpb/user_service_test.go b/entproto/internal/todo/ent/proto/entpb/user_service_test.go
@@ -53,7 +53,7 @@ func TestUserService_Create(t *testing.T) {
 		Status:     User_ACTIVE,
 		ExternalId: 1,
 		Group: &Group{
-			Id: int32(group.ID),
+			Id: int64(group.ID),
 		},
 		CrmId:          crmID,
 		Attachment:     &Attachment{Id: attachmentID},
@@ -104,7 +104,7 @@ func TestUserService_Get(t *testing.T) {
 		SetAccountBalance(2000.50).
 		SaveX(ctx)
 	get, err := svc.Get(ctx, &GetUserRequest{
-		Id: int32(created.ID),
+		Id: int64(created.ID),
 	})
 	require.NoError(t, err)
 	require.EqualValues(t, created.UserName, get.UserName)
@@ -138,7 +138,7 @@ func TestUserService_Delete(t *testing.T) {
 		SetCustomPb(1).
 		SaveX(ctx)
 	d, err := svc.Delete(ctx, &DeleteUserRequest{
-		Id: int32(created.ID),
+		Id: int64(created.ID),
 	})
 	require.NoError(t, err)
 	require.NotNil(t, d)
@@ -180,15 +180,15 @@ func TestUserService_Update(t *testing.T) {
 	require.NoError(t, err, "Converting UUID to Bytes: %v", crmID)
 
 	inputUser := &User{
-		Id:         int32(created.ID),
+		Id:         int64(created.ID),
 		UserName:   "rotemtam",
 		Joined:     timestamppb.Now(),
 		Exp:        999,
 		Points:     999,
 		ExternalId: 1,
 		Status:     User_ACTIVE,
 		Group: &Group{
-			Id: int32(group.ID),
+			Id: int64(group.ID),
 		},
 		Attachment: &Attachment{
 			Id: attachmentID,

diff --git a/entproto/service.go b/entproto/service.go
@@ -173,7 +173,7 @@ func (a *Adapter) genMethodProtos(genType *gen.Type, m Method) (methodResources,
 		outputName = "google.protobuf.Empty"
 		messages = append(messages, input)
 	case MethodList:
-		if !(genType.ID.IsInt() || genType.ID.IsUUID() || genType.ID.IsString()) {
+		if !(genType.ID.IsInt() || genType.ID.IsInt64() || genType.ID.IsUUID() || genType.ID.IsString()) {
 			return methodResources{}, fmt.Errorf("entproto: list method does not support schema %q id type %q",
 				genType.Name, genType.ID.Type.String())
 		}

diff --git a/entproto/types.go b/entproto/types.go
@@ -31,7 +31,7 @@ var typeMap = map[field.Type]typeConfig{
 		return pascal(fld.Name)
 	}},
 	field.TypeString:  {pbType: descriptorpb.FieldDescriptorProto_TYPE_STRING, optionalType: "google.protobuf.StringValue"},
-	field.TypeInt:     {pbType: descriptorpb.FieldDescriptorProto_TYPE_INT32, optionalType: "google.protobuf.Int32Value"},
+	field.TypeInt:     {pbType: descriptorpb.FieldDescriptorProto_TYPE_INT64, optionalType: "google.protobuf.Int64Value"},
 	field.TypeInt8:    {pbType: descriptorpb.FieldDescriptorProto_TYPE_INT32, optionalType: "google.protobuf.Int32Value"},
 	field.TypeInt16:   {pbType: descriptorpb.FieldDescriptorProto_TYPE_INT32, optionalType: "google.protobuf.Int32Value"},
 	field.TypeInt32:   {pbType: descriptorpb.FieldDescriptorProto_TYPE_INT32, optionalType: "google.protobuf.Int32Value"},