git-sync/crawlab
1
0
Fork 0
mirror of https://github.com/crawlab-team/crawlab.git synced 2026-01-21 17:21:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: enhance model base service with BSON ID normalization

Browse Source 
- Added utility function to normalize BSON ObjectId in query parameters for gRPC methods.
- Updated GetOne, GetMany, DeleteOne, DeleteMany, UpdateOne, UpdateMany, ReplaceOne, and UpsertOne methods to utilize the new normalization function.
- Introduced new DependencyConfigSetup model instance in base model definitions for improved structure.
This commit is contained in:
Marvin Zhang
2024-12-21 22:07:54 +08:00
parent 29af5a366b
commit e44b416e34
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/grpc/server/model_base_service_server.go
View File

@@ -3,6 +3,7 @@ package server
import (
"context"
"encoding/json"
"github.com/crawlab-team/crawlab/core/utils"
"go.mongodb.org/mongo-driver/mongo/options"
"reflect"
"sync"
@@ -58,13 +59,14 @@ func (svr ModelBaseServiceServer) GetOne(_ context.Context, req *grpc.ModelServi
if err != nil {
return HandleError(err)
}
var options mongo.FindOptions
err = json.Unmarshal(req.FindOptions, &options)
query = utils.NormalizeBsonMObjectId(query)
var opts mongo.FindOptions
err = json.Unmarshal(req.FindOptions, &opts)
if err != nil {
return HandleError(err)
}
modelSvc := service.NewModelServiceWithColName[bson.M](typeNameColNameMap[req.ModelType])
data, err := modelSvc.GetOne(query, &options)
data, err := modelSvc.GetOne(query, &opts)
if err != nil {
return HandleError(err)
}
@@ -77,13 +79,14 @@ func (svr ModelBaseServiceServer) GetMany(_ context.Context, req *grpc.ModelServ
if err != nil {
return HandleError(err)
}
var options mongo.FindOptions
err = json.Unmarshal(req.FindOptions, &options)
query = utils.NormalizeBsonMObjectId(query)
var opts mongo.FindOptions
err = json.Unmarshal(req.FindOptions, &opts)
if err != nil {
return HandleError(err)
}
modelSvc := service.NewModelServiceWithColName[bson.M](typeNameColNameMap[req.ModelType])
data, err := modelSvc.GetMany(query, &options)
data, err := modelSvc.GetMany(query, &opts)
if err != nil {
return HandleError(err)
}
@@ -109,6 +112,7 @@ func (svr ModelBaseServiceServer) DeleteOne(_ context.Context, req *grpc.ModelSe
if err != nil {
return HandleError(err)
}
query = utils.NormalizeBsonMObjectId(query)
modelSvc := GetModelService[bson.M](req.ModelType)
err = modelSvc.DeleteOne(query)
if err != nil {
@@ -123,6 +127,7 @@ func (svr ModelBaseServiceServer) DeleteMany(_ context.Context, req *grpc.ModelS
if err != nil {
return HandleError(err)
}
query = utils.NormalizeBsonMObjectId(query)
modelSvc := GetModelService[bson.M](req.ModelType)
err = modelSvc.DeleteMany(query)
if err != nil {
@@ -155,11 +160,13 @@ func (svr ModelBaseServiceServer) UpdateOne(_ context.Context, req *grpc.ModelSe
if err != nil {
return HandleError(err)
}
query = utils.NormalizeBsonMObjectId(query)
var update bson.M
err = json.Unmarshal(req.Update, &update)
if err != nil {
return HandleError(err)
}
update = utils.NormalizeBsonMObjectId(update)
modelSvc := GetModelService[bson.M](req.ModelType)
err = modelSvc.UpdateOne(query, update)
if err != nil {
@@ -174,11 +181,13 @@ func (svr ModelBaseServiceServer) UpdateMany(_ context.Context, req *grpc.ModelS
if err != nil {
return HandleError(err)
}
query = utils.NormalizeBsonMObjectId(query)
var update bson.M
err = json.Unmarshal(req.Update, &update)
if err != nil {
return HandleError(err)
}
update = utils.NormalizeBsonMObjectId(update)
modelSvc := GetModelService[bson.M](req.ModelType)
err = modelSvc.UpdateMany(query, update)
if err != nil {
@@ -213,6 +222,7 @@ func (svr ModelBaseServiceServer) ReplaceOne(_ context.Context, req *grpc.ModelS
if err != nil {
return HandleError(err)
}
query = utils.NormalizeBsonMObjectId(query)
model := GetOneInstanceModel(req.ModelType)
modelType := reflect.TypeOf(model)
modelValuePtr := reflect.New(modelType).Interface()
@@ -283,6 +293,7 @@ func (svr ModelBaseServiceServer) UpsertOne(_ context.Context, req *grpc.ModelSe
if err != nil {
return HandleError(err)
}
query = utils.NormalizeBsonMObjectId(query)
modelSvc := GetModelService[bson.M](req.ModelType)
opts := &options.ReplaceOptions{}
opts.SetUpsert(true)

1
core/models/models/base.go
View File

@@ -74,6 +74,7 @@ func GetModelInstances() []any {
*new(Dependency),
*new(DependencyLog),
*new(DependencyConfig),
*new(DependencyConfigSetup),
*new(DependencyRepo),
*new(Environment),
*new(Git),