From fdc315e96e11ab7019458c9137bebbb7271a5e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=91=AB=E5=BD=AA?= Date: Thu, 7 Dec 2023 14:53:02 +0800 Subject: [PATCH] feat:add a 'namespace' parameter to the data processing API interface. --- .../go-server/graph/generated/generated.go | 106 +++++++++++++++++- .../go-server/graph/generated/models_gen.go | 7 +- .../go-server/graph/schema/dataprocessing.gql | 1 + .../graph/schema/dataprocessing.graphqls | 5 + 4 files changed, 115 insertions(+), 4 deletions(-) diff --git a/graphql-server/go-server/graph/generated/generated.go b/graphql-server/go-server/graph/generated/generated.go index c104c1aa1..0719c7725 100644 --- a/graphql-server/go-server/graph/generated/generated.go +++ b/graphql-server/go-server/graph/generated/generated.go @@ -106,6 +106,7 @@ type ComplexityRoot struct { DataProcessDetailsItem struct { Config func(childComplexity int) int + Creator func(childComplexity int) int EndTime func(childComplexity int) int FileNum func(childComplexity int) int FileType func(childComplexity int) int @@ -759,6 +760,13 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.DataProcessDetailsItem.Config(childComplexity), true + case "DataProcessDetailsItem.creator": + if e.complexity.DataProcessDetailsItem.Creator == nil { + break + } + + return e.complexity.DataProcessDetailsItem.Creator(childComplexity), true + case "DataProcessDetailsItem.end_time": if e.complexity.DataProcessDetailsItem.EndTime == nil { break @@ -2898,10 +2906,12 @@ input AllDataProcessListByPageInput { pageIndex: Int! pageSize: Int! keyword: String! + namespace: String! } input AllDataProcessListByCountInput { keyword: String! + namespace: String! } input AddDataProcessInput { @@ -2915,6 +2925,8 @@ input AddDataProcessInput { data_process_config_info: [DataProcessConfigItem!] bucket_name: String! version_data_set_name: String! + namespace: String! + creator: String! } # 文件条目 @@ -3020,6 +3032,7 @@ type DataProcessDetailsItem { file_num: Int! start_time: String! end_time: String! + creator: String! config: [DataProcessConfig!] } @@ -6240,6 +6253,8 @@ func (ec *executionContext) fieldContext_DataProcessDetails_data(ctx context.Con return ec.fieldContext_DataProcessDetailsItem_start_time(ctx, field) case "end_time": return ec.fieldContext_DataProcessDetailsItem_end_time(ctx, field) + case "creator": + return ec.fieldContext_DataProcessDetailsItem_creator(ctx, field) case "config": return ec.fieldContext_DataProcessDetailsItem_config(ctx, field) } @@ -6777,6 +6792,50 @@ func (ec *executionContext) fieldContext_DataProcessDetailsItem_end_time(ctx con return fc, nil } +func (ec *executionContext) _DataProcessDetailsItem_creator(ctx context.Context, field graphql.CollectedField, obj *DataProcessDetailsItem) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_DataProcessDetailsItem_creator(ctx, field) + if err != nil { + return graphql.Null + } + ctx = graphql.WithFieldContext(ctx, fc) + defer func() { + if r := recover(); r != nil { + ec.Error(ctx, ec.Recover(ctx, r)) + ret = graphql.Null + } + }() + resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { + ctx = rctx // use context from middleware stack in children + return obj.Creator, nil + }) + if err != nil { + ec.Error(ctx, err) + return graphql.Null + } + if resTmp == nil { + if !graphql.HasFieldError(ctx, fc) { + ec.Errorf(ctx, "must not be null") + } + return graphql.Null + } + res := resTmp.(string) + fc.Result = res + return ec.marshalNString2string(ctx, field.Selections, res) +} + +func (ec *executionContext) fieldContext_DataProcessDetailsItem_creator(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "DataProcessDetailsItem", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return nil, errors.New("field of type String does not have child fields") + }, + } + return fc, nil +} + func (ec *executionContext) _DataProcessDetailsItem_config(ctx context.Context, field graphql.CollectedField, obj *DataProcessDetailsItem) (ret graphql.Marshaler) { fc, err := ec.fieldContext_DataProcessDetailsItem_config(ctx, field) if err != nil { @@ -20372,7 +20431,7 @@ func (ec *executionContext) unmarshalInputAddDataProcessInput(ctx context.Contex asMap[k] = v } - fieldsInOrder := [...]string{"name", "file_type", "pre_data_set_name", "pre_data_set_version", "file_names", "post_data_set_name", "post_data_set_version", "data_process_config_info", "bucket_name", "version_data_set_name"} + fieldsInOrder := [...]string{"name", "file_type", "pre_data_set_name", "pre_data_set_version", "file_names", "post_data_set_name", "post_data_set_version", "data_process_config_info", "bucket_name", "version_data_set_name", "namespace", "creator"} for _, k := range fieldsInOrder { v, ok := asMap[k] if !ok { @@ -20469,6 +20528,24 @@ func (ec *executionContext) unmarshalInputAddDataProcessInput(ctx context.Contex return it, err } it.VersionDataSetName = data + case "namespace": + var err error + + ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("namespace")) + data, err := ec.unmarshalNString2string(ctx, v) + if err != nil { + return it, err + } + it.Namespace = data + case "creator": + var err error + + ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("creator")) + data, err := ec.unmarshalNString2string(ctx, v) + if err != nil { + return it, err + } + it.Creator = data } } @@ -20482,7 +20559,7 @@ func (ec *executionContext) unmarshalInputAllDataProcessListByCountInput(ctx con asMap[k] = v } - fieldsInOrder := [...]string{"keyword"} + fieldsInOrder := [...]string{"keyword", "namespace"} for _, k := range fieldsInOrder { v, ok := asMap[k] if !ok { @@ -20498,6 +20575,15 @@ func (ec *executionContext) unmarshalInputAllDataProcessListByCountInput(ctx con return it, err } it.Keyword = data + case "namespace": + var err error + + ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("namespace")) + data, err := ec.unmarshalNString2string(ctx, v) + if err != nil { + return it, err + } + it.Namespace = data } } @@ -20511,7 +20597,7 @@ func (ec *executionContext) unmarshalInputAllDataProcessListByPageInput(ctx cont asMap[k] = v } - fieldsInOrder := [...]string{"pageIndex", "pageSize", "keyword"} + fieldsInOrder := [...]string{"pageIndex", "pageSize", "keyword", "namespace"} for _, k := range fieldsInOrder { v, ok := asMap[k] if !ok { @@ -20545,6 +20631,15 @@ func (ec *executionContext) unmarshalInputAllDataProcessListByPageInput(ctx cont return it, err } it.Keyword = data + case "namespace": + var err error + + ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("namespace")) + data, err := ec.unmarshalNString2string(ctx, v) + if err != nil { + return it, err + } + it.Namespace = data } } @@ -23457,6 +23552,11 @@ func (ec *executionContext) _DataProcessDetailsItem(ctx context.Context, sel ast if out.Values[i] == graphql.Null { out.Invalids++ } + case "creator": + out.Values[i] = ec._DataProcessDetailsItem_creator(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } case "config": out.Values[i] = ec._DataProcessDetailsItem_config(ctx, field, obj) default: diff --git a/graphql-server/go-server/graph/generated/models_gen.go b/graphql-server/go-server/graph/generated/models_gen.go index 208f41a94..e0aa8dc75 100644 --- a/graphql-server/go-server/graph/generated/models_gen.go +++ b/graphql-server/go-server/graph/generated/models_gen.go @@ -21,16 +21,20 @@ type AddDataProcessInput struct { DataProcessConfigInfo []*DataProcessConfigItem `json:"data_process_config_info,omitempty"` BucketName string `json:"bucket_name"` VersionDataSetName string `json:"version_data_set_name"` + Namespace string `json:"namespace"` + Creator string `json:"creator"` } type AllDataProcessListByCountInput struct { - Keyword string `json:"keyword"` + Keyword string `json:"keyword"` + Namespace string `json:"namespace"` } type AllDataProcessListByPageInput struct { PageIndex int `json:"pageIndex"` PageSize int `json:"pageSize"` Keyword string `json:"keyword"` + Namespace string `json:"namespace"` } type AuthInput struct { @@ -273,6 +277,7 @@ type DataProcessDetailsItem struct { FileNum int `json:"file_num"` StartTime string `json:"start_time"` EndTime string `json:"end_time"` + Creator string `json:"creator"` Config []*DataProcessConfig `json:"config,omitempty"` } diff --git a/graphql-server/go-server/graph/schema/dataprocessing.gql b/graphql-server/go-server/graph/schema/dataprocessing.gql index 707e1eef1..93c9e4a1b 100644 --- a/graphql-server/go-server/graph/schema/dataprocessing.gql +++ b/graphql-server/go-server/graph/schema/dataprocessing.gql @@ -62,6 +62,7 @@ query dataProcessDetails($input: DataProcessDetailsInput){ file_num start_time end_time + creator config { name description diff --git a/graphql-server/go-server/graph/schema/dataprocessing.graphqls b/graphql-server/go-server/graph/schema/dataprocessing.graphqls index cb826b25e..5af75b702 100644 --- a/graphql-server/go-server/graph/schema/dataprocessing.graphqls +++ b/graphql-server/go-server/graph/schema/dataprocessing.graphqls @@ -24,10 +24,12 @@ input AllDataProcessListByPageInput { pageIndex: Int! pageSize: Int! keyword: String! + namespace: String! } input AllDataProcessListByCountInput { keyword: String! + namespace: String! } input AddDataProcessInput { @@ -41,6 +43,8 @@ input AddDataProcessInput { data_process_config_info: [DataProcessConfigItem!] bucket_name: String! version_data_set_name: String! + namespace: String! + creator: String! } # 文件条目 @@ -146,6 +150,7 @@ type DataProcessDetailsItem { file_num: Int! start_time: String! end_time: String! + creator: String! config: [DataProcessConfig!] }