From ca8aa11a002f03b4ddfa35603a3632e04c219a68 Mon Sep 17 00:00:00 2001 From: nefrace Date: Tue, 24 Jan 2023 02:23:31 +0300 Subject: [PATCH] Primitive methods, fixed connection --- go.mod | 4 ++-- go.sum | 11 +++++++++-- item.go | 2 ++ primitives.go | 15 +++++++++++++++ store.go | 15 ++++++++------- 5 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 primitives.go diff --git a/go.mod b/go.mod index 4b3173a..f075e2e 100644 --- a/go.mod +++ b/go.mod @@ -2,9 +2,10 @@ module git.nefrace.ru/nefrace/tongo go 1.19 +require go.mongodb.org/mongo-driver v1.11.1 + require ( github.com/golang/snappy v0.0.1 // indirect - github.com/joho/godotenv v1.4.0 // indirect github.com/klauspost/compress v1.13.6 // indirect github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect github.com/pkg/errors v0.9.1 // indirect @@ -12,7 +13,6 @@ require ( github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect - go.mongodb.org/mongo-driver v1.11.1 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect golang.org/x/text v0.3.7 // indirect diff --git a/go.sum b/go.sum index 86db0da..56a2f76 100644 --- a/go.sum +++ b/go.sum @@ -1,22 +1,27 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg= -github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= @@ -41,8 +46,10 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/item.go b/item.go index a7f38fb..9e969eb 100644 --- a/item.go +++ b/item.go @@ -2,6 +2,8 @@ package tongo import "go.mongodb.org/mongo-driver/bson/primitive" +type OID primitive.ObjectID + type Collectable interface { Coll() string GetID() primitive.ObjectID diff --git a/primitives.go b/primitives.go new file mode 100644 index 0000000..3ef28a0 --- /dev/null +++ b/primitives.go @@ -0,0 +1,15 @@ +package tongo + +import "go.mongodb.org/mongo-driver/bson" + +func D(es ...bson.E) bson.D { + d := bson.D{} + for _, e := range es { + d = append(d, e) + } + return d +} + +func E(Key string, Value interface{}) bson.E { + return bson.E{Key: Key, Value: Value} +} diff --git a/store.go b/store.go index 2338d74..1b76568 100644 --- a/store.go +++ b/store.go @@ -19,7 +19,7 @@ type Database struct { } func NewConnection(uri string, database string) (*Database, error) { - client, err := mongo.Connect(context.Background()) + client, err := mongo.Connect(context.Background(), options.Client().ApplyURI(uri)) if err != nil { return nil, err } @@ -30,11 +30,12 @@ func (d *Database) Collection(col string) *mongo.Collection { return d.client.Database(d.database).Collection(col) } -func getFilter(f *bson.D) bson.D { - if f == nil { - return bson.D{} +func getFilter(es []primitive.E) bson.D { + filter := bson.D{} + for _, e := range es { + filter = append(filter, e) } - return *f + return filter } func QueryFilter(q *url.Values) bson.D { @@ -92,7 +93,7 @@ func (s Store[T]) GetById(ctx context.Context, id primitive.ObjectID) (*T, error return &item, nil } -func (s Store[T]) GetOne(ctx context.Context, filter *bson.D) (*T, error) { +func (s Store[T]) GetOne(ctx context.Context, filter ...bson.E) (*T, error) { f := getFilter(filter) res := s.Coll.FindOne(ctx, f) if res.Err() != nil { @@ -103,7 +104,7 @@ func (s Store[T]) GetOne(ctx context.Context, filter *bson.D) (*T, error) { return &item, nil } -func (s Store[T]) GetMany(ctx context.Context, filter *bson.D) ([]*T, error) { +func (s Store[T]) GetMany(ctx context.Context, filter ...bson.E) ([]*T, error) { f := getFilter(filter) cur, err := s.Coll.Find(ctx, f) if err != nil {