From c494dba5abb23d19a9af52e575d749d37e488d96 Mon Sep 17 00:00:00 2001 From: mr Date: Fri, 19 Jul 2024 09:36:46 +0200 Subject: [PATCH] validator not work --- models/resources/data/data_mongo_accessor.go | 2 +- models/resources/datacenter/datacenter_mongo_accessor.go | 2 +- models/resources/processing/processing_mongo_accessor.go | 2 +- models/resources/storage/storage_mongo_accessor.go | 2 +- models/resources/workflow/workflow_mongo_accessor.go | 2 +- models/utils/abstracts.go | 6 +----- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/models/resources/data/data_mongo_accessor.go b/models/resources/data/data_mongo_accessor.go index 5f6baa2..6555d09 100644 --- a/models/resources/data/data_mongo_accessor.go +++ b/models/resources/data/data_mongo_accessor.go @@ -18,7 +18,7 @@ func (dma *DataMongoAccessor) UpdateOne(set map[string]interface{}, id string) ( } func (dma *DataMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, error) { - err := dma.Validate(data.(*Data)) + err := utils.Validate.Struct(data) if err != nil { return nil, err } diff --git a/models/resources/datacenter/datacenter_mongo_accessor.go b/models/resources/datacenter/datacenter_mongo_accessor.go index 7f15dd1..700abea 100644 --- a/models/resources/datacenter/datacenter_mongo_accessor.go +++ b/models/resources/datacenter/datacenter_mongo_accessor.go @@ -18,7 +18,7 @@ func (dca *DatacenterMongoAccessor) UpdateOne(set map[string]interface{}, id str } func (dca *DatacenterMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, error) { - err := dca.Validate(data.(*Datacenter)) + err := utils.Validate.Struct(data) if err != nil { return nil, err } diff --git a/models/resources/processing/processing_mongo_accessor.go b/models/resources/processing/processing_mongo_accessor.go index 40c2098..85dd413 100644 --- a/models/resources/processing/processing_mongo_accessor.go +++ b/models/resources/processing/processing_mongo_accessor.go @@ -18,7 +18,7 @@ func (pma *ProcessingMongoAccessor) UpdateOne(set map[string]interface{}, id str } func (pma *ProcessingMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, error) { - err := pma.Validate(data.(*Processing)) + err := utils.Validate.Struct(data) if err != nil { return nil, err } diff --git a/models/resources/storage/storage_mongo_accessor.go b/models/resources/storage/storage_mongo_accessor.go index 2fe45fe..6fb1c2f 100644 --- a/models/resources/storage/storage_mongo_accessor.go +++ b/models/resources/storage/storage_mongo_accessor.go @@ -18,7 +18,7 @@ func (sma *StorageMongoAccessor) UpdateOne(set map[string]interface{}, id string } func (sma *StorageMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, error) { - err := sma.Validate(data.(*Storage)) + err := utils.Validate.Struct(data) if err != nil { return nil, err } diff --git a/models/resources/workflow/workflow_mongo_accessor.go b/models/resources/workflow/workflow_mongo_accessor.go index 5d19868..7689353 100644 --- a/models/resources/workflow/workflow_mongo_accessor.go +++ b/models/resources/workflow/workflow_mongo_accessor.go @@ -18,7 +18,7 @@ func (wfa *WorkflowMongoAccessor) UpdateOne(set map[string]interface{}, id strin } func (wfa *WorkflowMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, error) { - err := wfa.Validate(data.(*Workflow)) + err := utils.Validate.Struct(data) if err != nil { return nil, err } diff --git a/models/utils/abstracts.go b/models/utils/abstracts.go index 7505f3d..4d89dfb 100644 --- a/models/utils/abstracts.go +++ b/models/utils/abstracts.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog" ) -var validate = validator.New(validator.WithRequiredStructEnabled()) +var Validate = validator.New(validator.WithRequiredStructEnabled()) type AbstractAccessor struct { Logger zerolog.Logger @@ -19,10 +19,6 @@ func (dma *AbstractAccessor) GetType() string { return dma.Type } -func (dma *AbstractAccessor) Validate(d DBObject) error { - return validate.Struct(d) -} - func (dma *AbstractAccessor) SetLogger(t resources.ResourceType) { dma.Logger = logs.CreateLogger(t.String(), "") dma.Type = t.String()