Merge pull request #34 from neuronlabs/develop

Release v0.8.0

Author: kucjac

config/processor.go

@@ -81,6 +81,7 @@ func DefaultProcessorConfig() map[string]interface{} {
 			internal.ProcessFillEmptyFieldset,
 			internal.ProcessConvertRelationFiltersSafe,
 			internal.ProcessHookBeforeGet,
+			internal.ProcessDeletedAtFilter,
 			internal.ProcessCheckPagination,
 			internal.ProcessConvertRelationFiltersSafe,
 			internal.ProcessGet,
@@ -93,6 +94,7 @@ func DefaultProcessorConfig() map[string]interface{} {
 			internal.ProcessFillEmptyFieldset,
 			internal.ProcessConvertRelationFiltersSafe,
 			internal.ProcessHookBeforeList,
+			internal.ProcessDeletedAtFilter,
 			internal.ProcessCheckPagination,
 			internal.ProcessConvertRelationFiltersSafe,
 			internal.ProcessList,
@@ -104,6 +106,7 @@ func DefaultProcessorConfig() map[string]interface{} {
 			internal.ProcessTxBegin,
 			internal.ProcessReducePrimaryFilters,
 			internal.ProcessHookBeforePatch,
+			internal.ProcessDeletedAtFilter,
 			internal.ProcessReducePrimaryFilters,
 			internal.ProcessPatchBelongsToRelations,
 			internal.ProcessPatch,
@@ -124,6 +127,7 @@ func DefaultProcessorConfig() map[string]interface{} {
 		"count_processes": []string{
 			internal.ProcessConvertRelationFiltersSafe,
 			internal.ProcessHookBeforeCount,
+			internal.ProcessDeletedAtFilter,
 			internal.ProcessCount,
 			internal.ProcessHookAfterCount,
 		},
@@ -148,6 +152,7 @@ func ThreadSafeProcessor() *Processor {
 			internal.ProcessFillEmptyFieldset,
 			internal.ProcessConvertRelationFiltersSafe,
 			internal.ProcessHookBeforeGet,
+			internal.ProcessDeletedAtFilter,
 			internal.ProcessConvertRelationFiltersSafe,
 			internal.ProcessGet,
 			internal.ProcessGetForeignRelations,
@@ -159,6 +164,7 @@ func ThreadSafeProcessor() *Processor {
 			internal.ProcessFillEmptyFieldset,
 			internal.ProcessConvertRelationFiltersSafe,
 			internal.ProcessHookBeforeList,
+			internal.ProcessDeletedAtFilter,
 			internal.ProcessCheckPagination,
 			internal.ProcessConvertRelationFiltersSafe,
 			internal.ProcessList,
@@ -170,6 +176,7 @@ func ThreadSafeProcessor() *Processor {
 			internal.ProcessTxBegin,
 			internal.ProcessReducePrimaryFilters,
 			internal.ProcessHookBeforePatch,
+			internal.ProcessDeletedAtFilter,
 			internal.ProcessReducePrimaryFilters,
 			internal.ProcessPatchBelongsToRelations,
 			internal.ProcessPatch,
@@ -190,6 +197,7 @@ func ThreadSafeProcessor() *Processor {
 		CountProcesses: ProcessList{
 			internal.ProcessConvertRelationFiltersSafe,
 			internal.ProcessHookBeforeCount,
+			internal.ProcessDeletedAtFilter,
 			internal.ProcessCount,
 			internal.ProcessHookAfterCount,
 		},
@@ -215,6 +223,7 @@ func ConcurrentProcessor() *Processor {
 			internal.ProcessFillEmptyFieldset,
 			internal.ProcessConvertRelationFilters,
 			internal.ProcessHookBeforeGet,
+			internal.ProcessDeletedAtFilter,
 			internal.ProcessCheckPagination,
 			internal.ProcessConvertRelationFilters,
 			internal.ProcessGet,
@@ -226,6 +235,7 @@ func ConcurrentProcessor() *Processor {
 			internal.ProcessFillEmptyFieldset,
 			internal.ProcessConvertRelationFilters,
 			internal.ProcessHookBeforeList,
+			internal.ProcessDeletedAtFilter,
 			internal.ProcessCheckPagination,
 			internal.ProcessConvertRelationFilters,
 			internal.ProcessList,
@@ -237,6 +247,7 @@ func ConcurrentProcessor() *Processor {
 			internal.ProcessTxBegin,
 			internal.ProcessReducePrimaryFilters,
 			internal.ProcessHookBeforePatch,
+			internal.ProcessDeletedAtFilter,
 			internal.ProcessReducePrimaryFilters,
 			internal.ProcessPatchBelongsToRelations,
 			internal.ProcessPatch,
@@ -257,6 +268,7 @@ func ConcurrentProcessor() *Processor {
 		CountProcesses: ProcessList{
 			internal.ProcessConvertRelationFilters,
 			internal.ProcessHookBeforeCount,
+			internal.ProcessDeletedAtFilter,
 			internal.ProcessCount,
 			internal.ProcessHookAfterCount,
 		},
@@ -282,6 +294,7 @@ func DefaultConcurrentProcessorConfig() map[string]interface{} {
 			internal.ProcessFillEmptyFieldset,
 			internal.ProcessConvertRelationFilters,
 			internal.ProcessHookBeforeGet,
+			internal.ProcessDeletedAtFilter,
 			internal.ProcessCheckPagination,
 			internal.ProcessConvertRelationFilters,
 			internal.ProcessGet,
@@ -292,6 +305,7 @@ func DefaultConcurrentProcessorConfig() map[string]interface{} {
 			internal.ProcessFillEmptyFieldset,
 			internal.ProcessConvertRelationFilters,
 			internal.ProcessHookBeforeList,
+			internal.ProcessDeletedAtFilter,
 			internal.ProcessCheckPagination,
 			internal.ProcessConvertRelationFilters,
 			internal.ProcessList,
@@ -303,6 +317,7 @@ func DefaultConcurrentProcessorConfig() map[string]interface{} {
 			internal.ProcessTxBegin,
 			internal.ProcessReducePrimaryFilters,
 			internal.ProcessHookBeforePatch,
+			internal.ProcessDeletedAtFilter,
 			internal.ProcessReducePrimaryFilters,
 			internal.ProcessPatchBelongsToRelations,
 			internal.ProcessPatch,
@@ -323,6 +338,7 @@ func DefaultConcurrentProcessorConfig() map[string]interface{} {
 		"count_processes": []string{
 			internal.ProcessConvertRelationFilters,
 			internal.ProcessHookBeforeCount,
+			internal.ProcessDeletedAtFilter,
 			internal.ProcessCount,
 			internal.ProcessHookAfterCount,
 		},

doc.go

@@ -1,19 +1,21 @@
 // Package ncore is the cloud-native, distributed ORM implementation.
-// It's design allows to use the separate repository
-// for each model, with a possiblity to have different
-// relationships types between them.
-// It consits the following packages:
+//
+// It's design allows to use the separate repository for each model, with a possiblity
+// to have different relationships types between them.
+//
+// Neuron-core consists of following packages:
 // - ncore - (Neuron Core) the root package that gives easy access to all subpackages.
 // - common - contains common variables and constants for neuron derivates.
-// - controller - 	is the neuron's core, that registers and stores the models and
-// 	 				contains configurations required by other packages.
+// - controller - is the neuron's core, that registers and stores the models and
+// 	 			  contains configurations required by other packages.
 // - config - contains the configurations for all packages.
-// - query - used to query the model's repositories.
+// - query - used to create queries, filters, sorts, paginations on base of mapped models.
 // - mapping - contains the information about the mapped models their fields and settings.
 // - class - contains errors classification system for the neuron packages.
 // - log - is the logging interface for the neuron based applications.
 // - i18n - is the neuron based application supported internationalization.
 // - repository - is a package used to store and register the repositories.
+//
 //	It is also used to get the repository/factory per model. A modular design
 //  allows to use and compile only required repositories.
 package ncore

internal/processes.go

@@ -16,6 +16,7 @@ const (
 
 	// Get processes
 	ProcessFillEmptyFieldset          = "fill_empty_fieldset"
+	ProcessDeletedAtFilter            = "deleted_at_filter"
 	ProcessConvertRelationFilters     = "convert_relation_filters"
 	ProcessConvertRelationFiltersSafe = "convert_relation_filters_safe"
 	ProcessHookBeforeGet              = "hook_before_get"

mapping/map.go

@@ -170,6 +170,10 @@ func (m *ModelMap) RegisterModels(models ...interface{}) error {
 	if err = m.setRelationships(); err != nil {
 		return err
 	}
+
+	for _, model := range m.models {
+		model.structFieldCount = len(model.StructFields())
+	}
 	return nil
 }
 

mapping/model-structs.go

@@ -38,10 +38,11 @@ type ModelStruct struct {
 	// filterKeys is a container for the filter keys
 	filterKeys map[string]*StructField
 	// sortScopeCount is the number of sortable fields in the model
-	sortScopeCount int
-	isJoin         bool
-	cfg            *config.ModelConfig
-	store          map[interface{}]interface{}
+	sortScopeCount   int
+	isJoin           bool
+	cfg              *config.ModelConfig
+	store            map[interface{}]interface{}
+	structFieldCount int
 }
 
 // newModelStruct creates new model struct for given type.
@@ -103,9 +104,9 @@ func (m *ModelStruct) Config() *config.ModelConfig {
 func (m *ModelStruct) DeletedAt() (*StructField, bool) {
 	field, ok := m.StoreGet(deletedAt)
 	if ok {
-		return field.(*StructField), ok
+		return field.(*StructField), true
 	}
-	return nil, ok
+	return nil, false
 }
 
 // FieldByName returns field for provided name.
@@ -336,6 +337,11 @@ func (m *ModelStruct) StructFields() (fields []*StructField) {
 	return fields
 }
 
+// StructFieldCount returns the number of struct fields.
+func (m *ModelStruct) StructFieldCount() int {
+	return m.structFieldCount
+}
+
 // Type returns model's reflect.Type.
 func (m *ModelStruct) Type() reflect.Type {
 	return m.modelType

query/const.go

@@ -23,18 +23,18 @@ const (
 	operatorEqualRaw        = "$eq"
 	operatorInRaw           = "$in"
 	operatorNotEqualRaw     = "$ne"
-	operatorNotInRaw        = "$notin"
+	operatorNotInRaw        = "$not_in"
 	operatorGreaterThanRaw  = "$gt"
 	operatorGreaterEqualRaw = "$ge"
 	operatorLessThanRaw     = "$lt"
 	operatorLessEqualRaw    = "$le"
-	operatorIsNullRaw       = "$isnull"
-	operatorNotNullRaw      = "$notnull"
+	operatorIsNullRaw       = "$is_null"
+	operatorNotNullRaw      = "$not_null"
 	operatorExistsRaw       = "$exists"
-	operatorNotExistsRaw    = "$notexists"
+	operatorNotExistsRaw    = "$not_exists"
 	operatorContainsRaw     = "$contains"
-	operatorStartsWithRaw   = "$startswith"
-	operatorEndsWithRaw     = "$endswith"
+	operatorStartsWithRaw   = "$starts_with"
+	operatorEndsWithRaw     = "$ends_with"
 )
 
 // Processes constant names.
@@ -47,6 +47,7 @@ const (
 	ProcessPatchForeignRelationsSafe = internal.ProcessPatchForeignRelationsSafe
 	ProcessHookAfterCreate           = internal.ProcessHookAfterCreate
 
+	ProcessDeletedAtFilter            = internal.ProcessDeletedAtFilter
 	ProcessFillEmptyFieldset          = internal.ProcessFillEmptyFieldset
 	ProcessConvertRelationFilters     = internal.ProcessConvertRelationFilters
 	ProcessConvertRelationFiltersSafe = internal.ProcessConvertRelationFiltersSafe

query/process-count.go

@@ -11,7 +11,7 @@ import (
 )
 
 func countProcessFunc(ctx context.Context, s *Scope) error {
-	if _, ok := s.StoreGet(processErrorKey); ok {
+	if s.Error != nil {
 		return nil
 	}
 
@@ -37,7 +37,7 @@ func countProcessFunc(ctx context.Context, s *Scope) error {
 
 func beforeCountProcessFunc(ctx context.Context, s *Scope) error {
 	var ok bool
-	if _, ok = s.StoreGet(processErrorKey); ok {
+	if s.Error != nil {
 		return nil
 	}
 
@@ -60,7 +60,7 @@ func beforeCountProcessFunc(ctx context.Context, s *Scope) error {
 
 func afterCountProcessFunc(ctx context.Context, s *Scope) error {
 	var ok bool
-	if _, ok = s.StoreGet(processErrorKey); ok {
+	if s.Error != nil {
 		return nil
 	}
 	if ok = s.Struct().IsAfterCounter(); !ok {

query/process-count_test.go

@@ -2,13 +2,15 @@ package query
 
 import (
 	"context"
-	"github.com/neuronlabs/errors"
-	"github.com/neuronlabs/neuron-core/class"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+
+	"github.com/neuronlabs/errors"
+
+	"github.com/neuronlabs/neuron-core/class"
 )
 
 type countModel1 struct {

query/process-create.go

@@ -14,7 +14,7 @@ import (
 )
 
 func createFunc(ctx context.Context, s *Scope) error {
-	if _, ok := s.StoreGet(processErrorKey); ok {
+	if s.Error != nil {
 		return nil
 	}
 
@@ -33,24 +33,18 @@ func createFunc(ctx context.Context, s *Scope) error {
 	createdAtField, ok := s.Struct().CreatedAt()
 	if ok {
 		// by default scope has auto selected fields setCreatedAt should be true
-		setCreatedAt := s.autoSelectedFields
+		setCreatedAt := s.autosetFields
 		if !setCreatedAt {
-			var found bool
+			_, found := s.Fieldset[createdAtField.NeuronName()]
 			// if the fields were not auto selected check if the field is selected by user
-			for _, field := range s.SelectedFields {
-				if createdAtField == field {
-					found = true
-					break
-				}
-			}
 			setCreatedAt = !found
 		}
 
 		if setCreatedAt {
 			// Check if the value of the created at field is not already set by the user.
 			v := reflect.ValueOf(s.Value).Elem().FieldByIndex(createdAtField.ReflectField().Index)
 
-			if s.autoSelectedFields {
+			if s.autosetFields {
 				setCreatedAt = reflect.DeepEqual(v.Interface(), reflect.Zero(createdAtField.ReflectField().Type).Interface())
 			}
 
@@ -63,7 +57,7 @@ func createFunc(ctx context.Context, s *Scope) error {
 					v.Set(reflect.ValueOf(time.Now()))
 				}
 
-				s.SelectedFields = append(s.SelectedFields, createdAtField)
+				s.Fieldset[createdAtField.NeuronName()] = createdAtField
 
 			}
 		}
@@ -79,7 +73,7 @@ func createFunc(ctx context.Context, s *Scope) error {
 
 // beforeCreate is the function that is used before the create process
 func beforeCreateFunc(ctx context.Context, s *Scope) error {
-	if _, ok := s.StoreGet(processErrorKey); ok {
+	if s.Error != nil {
 		return nil
 	}
 
@@ -99,7 +93,7 @@ func beforeCreateFunc(ctx context.Context, s *Scope) error {
 // afterCreate is the function that is used after the create process
 // It uses AfterCreateR hook if the model implements it.
 func afterCreateFunc(ctx context.Context, s *Scope) error {
-	if _, ok := s.StoreGet(processErrorKey); ok {
+	if s.Error != nil {
 		return nil
 	}
 
@@ -116,7 +110,7 @@ func afterCreateFunc(ctx context.Context, s *Scope) error {
 }
 
 func storeScopePrimaries(ctx context.Context, s *Scope) error {
-	if _, ok := s.StoreGet(processErrorKey); ok {
+	if s.Error != nil {
 		return nil
 	}