add Strength option by Functional Options Pattern #9
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tim-ywliu
reviewed
Aug 7, 2023
mongoapi/mongoapi.go
Outdated
| } | ||
|
|
||
| func findOneAndDecode(collection *mongo.Collection, filter bson.M) (map[string]interface{}, error) { | ||
| func findOneAndDecode(collection *mongo.Collection, filter bson.M, argOpt ...int) (map[string]interface{}, error) { |
Collaborator
There was a problem hiding this comment.
func findOneAndDecode(collection *mongo.Collection, filter bson.M, strength int) (map[string]interface{}, error) {
tim-ywliu
reviewed
Aug 7, 2023
mongoapi/mongoapi.go
Outdated
|
|
||
| func getOrigData(collection *mongo.Collection, filter bson.M) (map[string]interface{}, error) { | ||
| result, err := findOneAndDecode(collection, filter) | ||
| func getOrigData(collection *mongo.Collection, filter bson.M, argOpt ...int) ( |
Collaborator
There was a problem hiding this comment.
func getOrigData(collection *mongo.Collection, filter bson.M, strength int) (
result map[string]interface{}, err error,
)
tim-ywliu
reviewed
Aug 7, 2023
mongoapi/mongoapi.go
Outdated
| } | ||
|
|
||
| func RestfulAPIGetMany(collName string, filter bson.M) ([]map[string]interface{}, error) { | ||
| func RestfulAPIGetMany(collName string, filter bson.M, argOpt ...int) ([]map[string]interface{}, error) { |
Collaborator
There was a problem hiding this comment.
Add
func RestfulAPIGetManyWithStrength(collName string, filter bson.M, strength int) ([]map[string]interface{}, error) {
Keep
func RestfulAPIGetMany(collName string, filter bson.M) ([]map[string]interface{}, error) {
tim-ywliu
reviewed
Aug 8, 2023
mongoapi/mongoapi.go
Outdated
| } | ||
|
|
||
| func findOneAndDecode(collection *mongo.Collection, filter bson.M) (map[string]interface{}, error) { | ||
| func findOneAndDecode(collection *mongo.Collection, filter bson.M, strength int) (map[string]interface{}, error) { |
Collaborator
There was a problem hiding this comment.
func findOneAndDecode(collection *mongo.Collection, filter bson.M, argOpt ...interface{}) (map[string]interface{}, error) {
var result map[string]interface{}
opts := new(options.FindOneOptions)
if len(argOpt) > 0 {
strength, ok := argOpt[0].(int)
if !ok {
return nil, fmt.Errorf("argOpt[0] type is not int")
}
myCollation := &options.Collation{Locale: "en_US", Strength: strength}
opts.SetCollation(myCollation)
}
if err := collection.FindOne(context.TODO(), filter, opts).Decode(&result); err != nil {
...
tim-ywliu
reviewed
Aug 8, 2023
mongoapi/mongoapi.go
Outdated
|
|
||
| func getOrigData(collection *mongo.Collection, filter bson.M) (map[string]interface{}, error) { | ||
| result, err := findOneAndDecode(collection, filter) | ||
| func getOrigData(collection *mongo.Collection, filter bson.M, strength int) ( |
Collaborator
There was a problem hiding this comment.
func getOrigData(collection *mongo.Collection, filter bson.M, argOpt ...interface{}) (
result map[string]interface{}, err error,
) {
result, err = findOneAndDecode(collection, filter, argOpt...)
if err != nil {
return nil, err
}
...
tim-ywliu
reviewed
Aug 8, 2023
mongoapi/mongoapi.go
Outdated
|
|
||
| func checkDataExisted(collection *mongo.Collection, filter bson.M) (bool, error) { | ||
| result, err := findOneAndDecode(collection, filter) | ||
| func checkDataExistedWithStrength(collection *mongo.Collection, filter bson.M, strength int) (bool, error) { |
Collaborator
There was a problem hiding this comment.
func checkDataExisted(collection *mongo.Collection, filter bson.M, argOpt ...interface{}) (bool, error) {
result, err := findOneAndDecode(collection, filter, argOpt...)
if err != nil {
tim-ywliu
reviewed
Aug 8, 2023
mongoapi/mongoapi.go
Outdated
| return RestfulAPIGetOneWithStrength(collName, filter, 3) | ||
| } | ||
|
|
||
| func RestfulAPIGetOneWithStrength(collName string, filter bson.M, strength int) ( |
Collaborator
There was a problem hiding this comment.
// argOpt[0] is strength (type int)
func RestfulAPIGetOneWithArg(collName string, filter bson.M, argOpt ...interface{}) (
result map[string]interface{}, err error,
) {
collection := Client.Database(dbName).Collection(collName)
result, err = getOrigData(collection, filter, argOpt...)
...
afb1211 to
61da5d7
Compare
tim-ywliu
reviewed
Aug 9, 2023
mongoapi/mongoapi.go
Outdated
| return RestfulAPIGetOneWithStrength(collName, filter, 3) | ||
| } | ||
|
|
||
| func RestfulAPIGetOneWithStrength(collName string, filter bson.M, argOpt ...interface{}) ( |
Collaborator
There was a problem hiding this comment.
rename to RestfulAPIGetOneWithArg()
tim-ywliu
reviewed
Aug 9, 2023
mongoapi/mongoapi.go
Outdated
| return RestfulAPIGetManyWithStrength(collName, filter, 3) | ||
| } | ||
|
|
||
| func RestfulAPIGetManyWithStrength(collName string, filter bson.M, strength int) ([]map[string]interface{}, error) { |
Collaborator
There was a problem hiding this comment.
func RestfulAPIGetManyWithArg(collName string, filter bson.M, argOpt ...interface{}) ([]map[string]interface{}, error) {
tim-ywliu
reviewed
Aug 9, 2023
mongoapi/mongoapi.go
Outdated
| } | ||
|
|
||
| func RestfulAPIGetOne(collName string, filter bson.M) (map[string]interface{}, error) { | ||
| func RestfulAPIGetOne(collName string, filter bson.M, argOpt ...int) (result map[string]interface{}, err error) { |
Collaborator
There was a problem hiding this comment.
func RestfulAPIGetOne(collName string, filter bson.M) (result map[string]interface{}, err error) {
return RestfulAPIGetOneWithArg(collName, filter)
}
tim-ywliu
reviewed
Aug 9, 2023
mongoapi/mongoapi.go
Outdated
| } | ||
|
|
||
| func RestfulAPIGetMany(collName string, filter bson.M) ([]map[string]interface{}, error) { | ||
| return RestfulAPIGetManyWithStrength(collName, filter, 3) |
Collaborator
There was a problem hiding this comment.
return RestfulAPIGetManyWithStrength(collName, filter)
tim-ywliu
reviewed
Aug 9, 2023
Collaborator
tim-ywliu
left a comment
There was a problem hiding this comment.
replace all function name to xxxWithArg(..., argOpt ...interface{})
tim-ywliu
reviewed
Aug 11, 2023
| } | ||
|
|
||
| func findOneAndDecode(collection *mongo.Collection, filter bson.M) (map[string]interface{}, error) { | ||
| func findOneAndDecode(collection *mongo.Collection, filter bson.M, argOpt ...interface{}) ( |
Collaborator
There was a problem hiding this comment.
add
func getCollation(argOpt ...interface{}) *options.Collation {
if len(argOpt) == 0 {
return nil
}
strength, ok := argOpt[0].(int)
if !ok {
return nil
}
// Strength 2: Case insensitive, 3: Case sensitive (default)
return &options.Collation{Locale: "en_US", Strength: strength}
}
tim-ywliu
reviewed
Aug 11, 2023
mongoapi/mongoapi.go
Outdated
| ) { | ||
| var result map[string]interface{} | ||
| if err := collection.FindOne(context.TODO(), filter).Decode(&result); err != nil { | ||
| opts := new(options.FindOneOptions) |
Collaborator
There was a problem hiding this comment.
modify to
var err error
collation := getCollation(argOpt...)
if collation != nil {
opts := new(options.FindOneOptions)
opts.SetCollation(collation)
err = collection.FindOne(context.TODO(), filter, opts).Decode(&result)
} else {
err = collection.FindOne(context.TODO(), filter).Decode(&result)
}
if err != nil {
// ErrNoDocuments means that the filter did not match any documents in
// the collection.
if err == mongo.ErrNoDocuments {
return nil, nil
}
return nil, err
}
return result, nil
tim-ywliu
reviewed
Aug 11, 2023
mongoapi/mongoapi.go
Outdated
| defer cancel() | ||
| cur, err := collection.Find(ctx, filter) | ||
|
|
||
| opts := new(options.FindOptions) |
Collaborator
There was a problem hiding this comment.
modify to
var cur XXX
var err error
collation := getCollation(argOpt...)
if collation != nil {
opts := new(options.FindOptions)
opts.SetCollation(collation)
cur, err = collection.Find(ctx, filter, opts)
} else {
cur, err = collection.Find(ctx, filter)
}
if err != nil {
...
}
tim-ywliu
reviewed
Aug 11, 2023
mongoapi/mongoapi.go
Outdated
| collection := Client.Database(dbName).Collection(collName) | ||
| if _, err := collection.UpdateOne(context.TODO(), filter, bson.M{"$pull": putData}); err != nil { | ||
|
|
||
| opts := new(options.UpdateOptions) |
Collaborator
There was a problem hiding this comment.
tim-ywliu
reviewed
Aug 11, 2023
mongoapi/mongoapi.go
Outdated
| collection := Client.Database(dbName).Collection(collName) | ||
|
|
||
| if _, err := collection.DeleteOne(context.TODO(), filter); err != nil { | ||
| opts := new(options.DeleteOptions) |
Collaborator
There was a problem hiding this comment.
tim-ywliu
reviewed
Aug 11, 2023
mongoapi/mongoapi.go
Outdated
| collection := Client.Database(dbName).Collection(collName) | ||
|
|
||
| if _, err := collection.DeleteMany(context.TODO(), filter); err != nil { | ||
| opts := new(options.DeleteOptions) |
Collaborator
There was a problem hiding this comment.
tim-ywliu
reviewed
Aug 11, 2023
mongoapi/mongoapi.go
Outdated
| } | ||
| if _, err := collection.UpdateOne(context.TODO(), filter, bson.M{"$set": modifiedData}); err != nil { | ||
|
|
||
| opts := new(options.UpdateOptions) |
Collaborator
There was a problem hiding this comment.
tim-ywliu
reviewed
Aug 11, 2023
mongoapi/mongoapi.go
Outdated
| } | ||
| if _, err := collection.UpdateOne(context.TODO(), filter, bson.M{"$set": modifiedData}); err != nil { | ||
|
|
||
| opts := new(options.UpdateOptions) |
Collaborator
There was a problem hiding this comment.
tim-ywliu
reviewed
Aug 11, 2023
mongoapi/mongoapi.go
Outdated
| } | ||
| if _, err := collection.UpdateOne(context.TODO(), filter, bson.M{"$set": bson.M{dataName: modifiedData}}); err != nil { | ||
|
|
||
| opts := new(options.UpdateOptions) |
Collaborator
There was a problem hiding this comment.
tim-ywliu
approved these changes
Aug 16, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is for SD value case insensitive purpose.