royalcat/repogen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove ignoring One from query ()

Browse source
This commit is contained in:
sunboyy 2023-04-14 11:16:51 +07:00 • committed by GitHub
parent 1e0ab5d701
commit b00c2ac77a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 85 additions and 86 deletions

8
internal/code/extractor_test.go
View file

@ -94,7 +94,7 @@ type UserModel struct {
Source: `package user
type UserRepository interface {
FindOneByID(ctx context.Context, id primitive.ObjectID) (*UserModel, error)
FindByID(ctx context.Context, id primitive.ObjectID) (*UserModel, error)
FindAll(context.Context) ([]*UserModel, error)
FindByAgeBetween(ctx context.Context, fromAge, toAge int) ([]*UserModel, error)
InsertOne(ctx context.Context, user *UserModel) (interface{}, error)
@ -113,7 +113,7 @@ type UserRepository interface {
Name: "UserRepository",
Methods: []code.Method{
{
Name: "FindOneByID",
Name: "FindByID",
Params: []code.Param{
{Name: "ctx", Type: code.ExternalType{PackageAlias: "context", Name: "Context"}},
{Name: "id", Type: code.ExternalType{PackageAlias: "primitive", Name: "ObjectID"}},
@ -251,7 +251,7 @@ type UserModel struct {
}
type UserRepository interface {
FindOneByID(ctx context.Context, id primitive.ObjectID) (*UserModel, error)
FindByID(ctx context.Context, id primitive.ObjectID) (*UserModel, error)
FindAll(ctx context.Context) ([]*UserModel, error)
}
`,
@ -289,7 +289,7 @@ type UserRepository interface {
Name: "UserRepository",
Methods: []code.Method{
{
Name: "FindOneByID",
Name: "FindByID",
Params: []code.Param{
{Name: "ctx", Type: code.ExternalType{PackageAlias: "context", Name: "Context"}},
{Name: "id", Type: code.ExternalType{PackageAlias: "primitive", Name: "ObjectID"}},

108
internal/spec/parser_test.go
View file

@ -175,9 +175,9 @@ func TestParseInterfaceMethod_Insert(t *testing.T) {
func TestParseInterfaceMethod_Find(t *testing.T) {
testTable := []ParseInterfaceMethodTestCase{
{
Name: "FindOneByArg method",
Name: "FindByArg one-mode method",
Method: code.Method{
Name: "FindOneByID",
Name: "FindByID",
Params: []code.Param{
{Type: code.ExternalType{PackageAlias: "context", Name: "Context"}},
{Type: code.ExternalType{PackageAlias: "primitive", Name: "ObjectID"}},
@ -195,9 +195,29 @@ func TestParseInterfaceMethod_Find(t *testing.T) {
},
},
{
Name: "FindOneByMultiWordArg method",
Name: "FindByArg many-mode method",
Method: code.Method{
Name: "FindOneByPhoneNumber",
Name: "FindByCity",
Params: []code.Param{
{Type: code.ExternalType{PackageAlias: "context", Name: "Context"}},
{Type: code.TypeString},
},
Returns: []code.Type{
code.ArrayType{ContainedType: code.PointerType{ContainedType: code.SimpleType("UserModel")}},
code.TypeError,
},
},
ExpectedOperation: spec.FindOperation{
Mode: spec.QueryModeMany,
Query: spec.QuerySpec{Predicates: []spec.Predicate{
{FieldReference: spec.FieldReference{cityField}, Comparator: spec.ComparatorEqual, ParamIndex: 1},
}},
},
},
{
Name: "FindByMultiWordArg method",
Method: code.Method{
Name: "FindByPhoneNumber",
Params: []code.Param{
{Type: code.ExternalType{PackageAlias: "context", Name: "Context"}},
{Type: code.TypeString},
@ -218,26 +238,6 @@ func TestParseInterfaceMethod_Find(t *testing.T) {
}},
},
},
{
Name: "FindByArg method",
Method: code.Method{
Name: "FindByCity",
Params: []code.Param{
{Type: code.ExternalType{PackageAlias: "context", Name: "Context"}},
{Type: code.TypeString},
},
Returns: []code.Type{
code.ArrayType{ContainedType: code.PointerType{ContainedType: code.SimpleType("UserModel")}},
code.TypeError,
},
},
ExpectedOperation: spec.FindOperation{
Mode: spec.QueryModeMany,
Query: spec.QuerySpec{Predicates: []spec.Predicate{
{FieldReference: spec.FieldReference{cityField}, Comparator: spec.ComparatorEqual, ParamIndex: 1},
}},
},
},
{
Name: "FindByDeepArg method",
Method: code.Method{
@ -1044,9 +1044,9 @@ func TestParseInterfaceMethod_Update(t *testing.T) {
func TestParseInterfaceMethod_Delete(t *testing.T) {
testTable := []ParseInterfaceMethodTestCase{
{
Name: "DeleteOneByArg method",
Name: "DeleteByArg one-mode method",
Method: code.Method{
Name: "DeleteOneByID",
Name: "DeleteByID",
Params: []code.Param{
{Type: code.ExternalType{PackageAlias: "context", Name: "Context"}},
{Type: code.ExternalType{PackageAlias: "primitive", Name: "ObjectID"}},
@ -1064,9 +1064,29 @@ func TestParseInterfaceMethod_Delete(t *testing.T) {
},
},
{
Name: "DeleteOneByMultiWordArg method",
Name: "DeleteByArg many-mode method",
Method: code.Method{
Name: "DeleteOneByPhoneNumber",
Name: "DeleteByCity",
Params: []code.Param{
{Type: code.ExternalType{PackageAlias: "context", Name: "Context"}},
{Type: code.TypeString},
},
Returns: []code.Type{
code.TypeInt,
code.TypeError,
},
},
ExpectedOperation: spec.DeleteOperation{
Mode: spec.QueryModeMany,
Query: spec.QuerySpec{Predicates: []spec.Predicate{
{FieldReference: spec.FieldReference{cityField}, Comparator: spec.ComparatorEqual, ParamIndex: 1},
}},
},
},
{
Name: "DeleteByMultiWordArg method",
Method: code.Method{
Name: "DeleteByPhoneNumber",
Params: []code.Param{
{Type: code.ExternalType{PackageAlias: "context", Name: "Context"}},
{Type: code.TypeString},
@ -1087,26 +1107,6 @@ func TestParseInterfaceMethod_Delete(t *testing.T) {
}},
},
},
{
Name: "DeleteByArg method",
Method: code.Method{
Name: "DeleteByCity",
Params: []code.Param{
{Type: code.ExternalType{PackageAlias: "context", Name: "Context"}},
{Type: code.TypeString},
},
Returns: []code.Type{
code.TypeInt,
code.TypeError,
},
},
ExpectedOperation: spec.DeleteOperation{
Mode: spec.QueryModeMany,
Query: spec.QuerySpec{Predicates: []spec.Predicate{
{FieldReference: spec.FieldReference{cityField}, Comparator: spec.ComparatorEqual, ParamIndex: 1},
}},
},
},
{
Name: "DeleteAll method",
Method: code.Method{
@ -1572,7 +1572,7 @@ func TestParseInterfaceMethod_Find_Invalid(t *testing.T) {
{
Name: "invalid number of returns",
Method: code.Method{
Name: "FindOneByID",
Name: "FindByID",
Returns: []code.Type{
code.SimpleType("UserModel"),
code.TypeInt,
@ -1584,7 +1584,7 @@ func TestParseInterfaceMethod_Find_Invalid(t *testing.T) {
{
Name: "unsupported return types from find method",
Method: code.Method{
Name: "FindOneByID",
Name: "FindByID",
Returns: []code.Type{
code.SimpleType("UserModel"),
code.TypeError,
@ -1595,7 +1595,7 @@ func TestParseInterfaceMethod_Find_Invalid(t *testing.T) {
{
Name: "error return not provided",
Method: code.Method{
Name: "FindOneByID",
Name: "FindByID",
Returns: []code.Type{
code.SimpleType("UserModel"),
code.TypeInt,
@ -2139,7 +2139,7 @@ func TestParseInterfaceMethod_Delete_Invalid(t *testing.T) {
{
Name: "invalid number of returns",
Method: code.Method{
Name: "DeleteOneByID",
Name: "DeleteByID",
Returns: []code.Type{
code.SimpleType("UserModel"),
code.TypeInt,
@ -2151,7 +2151,7 @@ func TestParseInterfaceMethod_Delete_Invalid(t *testing.T) {
{
Name: "unsupported return types from delete method",
Method: code.Method{
Name: "DeleteOneByID",
Name: "DeleteByID",
Returns: []code.Type{
code.TypeFloat64,
code.TypeError,
@ -2162,7 +2162,7 @@ func TestParseInterfaceMethod_Delete_Invalid(t *testing.T) {
{
Name: "error return not provided",
Method: code.Method{
Name: "DeleteOneByID",
Name: "DeleteByID",
Returns: []code.Type{
code.TypeInt,
code.TypeBool,

3
internal/spec/query.go
View file

@ -96,9 +96,6 @@ func (p queryParser) parseQuery(rawTokens []string, paramIndex int) (QuerySpec,
return QuerySpec{}, nil
}
if tokens[0] == "One" {
tokens = tokens[1:]
}
if tokens[0] == "By" {
tokens = tokens[1:]
}