Skip to content
Snippets Groups Projects
Commit 2fcf77f2 authored by Pavel Antonov's avatar Pavel Antonov :asterisk:
Browse files

Merge branch 'feature/3216-SchemaPatch' into 'master' 

Добавлен методы Collection.Merge, IsEqual, Schema.IsEqual

See merge request perxis/perxis-go!460
parents 47f15972 647db849
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
pkg/collections/collection.go
+ 132
− 4
View file @ 2fcf77f2
...@@ -101,16 +101,27 @@ type Collection struct { ...@@ -101,16 +101,27 @@ type Collection struct {
} }
// GetID возвращает идентификатор коллекции // GetID возвращает идентификатор коллекции
func (c Collection) GetID() string { func (c *Collection) GetID() string {
return c.ID return c.ID
} }
func (c Collection) GetSpaceID() string { func (c *Collection) GetSpaceID() string {
return c.SpaceID return c.SpaceID
} }
// Equal сравнивает две коллекции, за исключением Schema, Access, StateInfo и Config // Equal сравнивает две коллекции, за исключением Schema, Access, StateInfo и Config
func (c Collection) Equal(other *Collection) bool { // Deprecated: используйте метод IsEqual
func (c *Collection) Equal(other *Collection) bool {
return c.IsEqual(other)
}
func (c *Collection) IsEqual(other *Collection) bool {
if c == other {
return true
}
if c == nil || other == nil {
return false
}
if c.ID != other.ID || if c.ID != other.ID ||
c.SpaceID != other.SpaceID || c.SpaceID != other.SpaceID ||
c.EnvID != other.EnvID || c.EnvID != other.EnvID ||
...@@ -132,6 +143,10 @@ func (c Collection) Equal(other *Collection) bool { ...@@ -132,6 +143,10 @@ func (c Collection) Equal(other *Collection) bool {
return true return true
} }
func IsEqual(c1, c2 *Collection) bool {
return c1.IsEqual(c2)
}
type View struct { type View struct {
SpaceID string `json:"space_id" bson:"space_id"` // SpaceID оригинальной коллекции SpaceID string `json:"space_id" bson:"space_id"` // SpaceID оригинальной коллекции
EnvID string `json:"environment_id" bson:"environment_id"` // EnvID оригинальной коллекции EnvID string `json:"environment_id" bson:"environment_id"` // EnvID оригинальной коллекции
...@@ -185,7 +200,7 @@ const ( ...@@ -185,7 +200,7 @@ const (
StateChanged StateChanged
) )
func (c Collection) Clone() *Collection { func (c *Collection) Clone() *Collection {
clone := &Collection{ clone := &Collection{
ID: c.ID, ID: c.ID,
SpaceID: c.SpaceID, SpaceID: c.SpaceID,
...@@ -294,3 +309,116 @@ func RuleFromAccess(access *Access) *permission.Rule { ...@@ -294,3 +309,116 @@ func RuleFromAccess(access *Access) *permission.Rule {
Hidden: access.Hidden, Hidden: access.Hidden,
} }
} }
// Merge объединяет две коллекции, возвращая новую коллекцию
// с объединенными данными. Если данные второй коллекции не пустые,
// то данные из второй коллекции перезаписывают данные из первой.
func (c *Collection) Merge(other *Collection) *Collection {
if c == nil {
if other == nil {
return nil
}
return other.Clone()
}
if other == nil {
return c.Clone()
}
merged := c.Clone()
merged.mergeScalarFields(other)
merged.mergePointerFields(other)
merged.mergeComplexFields(other)
return merged
}
// mergeScalarFields копирует скалярные поля из other коллекции в текущую коллекцию.
func (c *Collection) mergeScalarFields(other *Collection) {
if other.ID != "" {
c.ID = other.ID
}
if other.Name != "" {
c.Name = other.Name
}
if other.SpaceID != "" {
c.SpaceID = other.SpaceID
}
if other.EnvID != "" {
c.EnvID = other.EnvID
}
if other.Hidden {
c.Hidden = other.Hidden
}
if other.NoPublish {
c.NoPublish = other.NoPublish
}
if other.NoArchive {
c.NoArchive = other.NoArchive
}
if other.NoRevisions {
c.NoRevisions = other.NoRevisions
}
if other.MaxRevisions > 0 {
c.MaxRevisions = other.MaxRevisions
}
if other.RevisionTTL > 0 {
c.RevisionTTL = other.RevisionTTL
}
}
// mergePointerFields копирует указатели из other коллекции в текущую коллекцию.
func (c *Collection) mergePointerFields(other *Collection) {
if other.NoData != nil {
c.NoData = other.NoData
}
if other.Single != nil {
single := *other.Single
c.Single = &single
}
if other.System != nil {
system := *other.System
c.System = &system
}
if other.StateInfo != nil {
info := *other.StateInfo
c.StateInfo = &info
}
if other.View != nil {
view := *other.View
c.View = &view
}
if other.Config != nil {
cfg := *other.Config
c.Config = &cfg
}
}
// mergeComplexFields копирует сложные поля из other коллекции в текущую коллекцию.
func (c *Collection) mergeComplexFields(other *Collection) {
if other.Schema != nil {
c.Schema = other.Schema.Clone(false)
}
if other.Access != nil {
c.Access = other.Access.Clone()
}
if other.Tags != nil {
tags := make([]string, len(other.Tags))
copy(tags, other.Tags)
c.Tags = tags
}
if len(other.Translations) > 0 {
translations := make(map[string]map[string]string, len(other.Translations))
for k, v := range other.Translations {
translations[k] = maps.Clone(v)
}
c.Translations = translations
}
}
// Merge объединяет две коллекции, возвращая новую коллекцию
// с объединенными данными. Если данные второй коллекции не пустые,
// то данные из второй коллекции перезаписывают данные из первой.
func Merge(c1, c2 *Collection) *Collection {
return c1.Merge(c2)
}
pkg/collections/collection_test.go
+ 224
− 0
View file @ 2fcf77f2
...@@ -2,7 +2,9 @@ package collections ...@@ -2,7 +2,9 @@ package collections
import ( import (
"testing" "testing"
"time"
"git.perx.ru/perxis/perxis-go/pkg/schema"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
...@@ -100,3 +102,225 @@ func TestView_Equal(t *testing.T) { ...@@ -100,3 +102,225 @@ func TestView_Equal(t *testing.T) {
}) })
} }
} }
func Test_Merge(t *testing.T) {
boolTrue := true
boolFalse := false
// Create schema objects with Title field
schema1 := schema.New()
schema1.Title = "schema1"
schema2 := schema.New()
schema2.Title = "schema2"
testCases := []struct {
name string
c1 *Collection
c2 *Collection
want *Collection
}{
{
name: "Both collections are nil",
c1: nil,
c2: nil,
want: nil,
},
{
name: "First collection is nil",
c1: nil,
c2: &Collection{
ID: "id2",
Name: "name2",
},
want: &Collection{
ID: "id2",
Name: "name2",
},
},
{
name: "Second collection is nil",
c1: &Collection{
ID: "id1",
Name: "name1",
},
c2: nil,
want: &Collection{
ID: "id1",
Name: "name1",
},
},
{
name: "Merge primitive fields",
c1: &Collection{
ID: "id1",
SpaceID: "space1",
EnvID: "env1",
Name: "name1",
Hidden: false,
NoPublish: false,
NoArchive: false,
NoRevisions: false,
MaxRevisions: 5,
RevisionTTL: time.Hour,
},
c2: &Collection{
ID: "id2",
SpaceID: "space2",
EnvID: "env2",
Name: "name2",
Hidden: true,
NoPublish: true,
NoArchive: true,
NoRevisions: true,
MaxRevisions: 10,
RevisionTTL: time.Hour * 2,
},
want: &Collection{
ID: "id2",
SpaceID: "space2",
EnvID: "env2",
Name: "name2",
Hidden: true,
NoPublish: true,
NoArchive: true,
NoRevisions: true,
MaxRevisions: 10,
RevisionTTL: time.Hour * 2,
},
},
{
name: "Merge pointer fields",
c1: &Collection{
NoData: &boolFalse,
Single: &boolFalse,
System: &boolFalse,
},
c2: &Collection{
NoData: &boolTrue,
Single: &boolTrue,
System: &boolTrue,
},
want: &Collection{
NoData: &boolTrue,
Single: &boolTrue,
System: &boolTrue,
},
},
{
name: "Merge complex fields",
c1: &Collection{
Schema: schema1,
View: &View{
SpaceID: "space1",
EnvID: "env1",
CollectionID: "collection1",
Filter: "filter1",
},
Tags: []string{"tag1", "tag2"},
Translations: map[string]map[string]string{
"en": {
"key1": "value1",
},
},
},
c2: &Collection{
Schema: schema2,
View: &View{
SpaceID: "space2",
EnvID: "env2",
CollectionID: "collection2",
Filter: "filter2",
},
Tags: []string{"tag3", "tag4"},
Translations: map[string]map[string]string{
"fr": {
"key2": "value2",
},
},
},
want: &Collection{
Schema: schema2,
View: &View{
SpaceID: "space2",
EnvID: "env2",
CollectionID: "collection2",
Filter: "filter2",
},
Tags: []string{"tag3", "tag4"},
Translations: map[string]map[string]string{
"fr": {
"key2": "value2",
},
},
},
},
{
name: "Merge with empty second collection",
c1: &Collection{
ID: "id1",
SpaceID: "space1",
EnvID: "env1",
Name: "name1",
NoData: &boolTrue,
Single: &boolTrue,
System: &boolTrue,
Schema: schema1,
Tags: []string{"tag1", "tag2"},
},
c2: &Collection{},
want: &Collection{
ID: "id1",
SpaceID: "space1",
EnvID: "env1",
Name: "name1",
NoData: &boolTrue,
Single: &boolTrue,
System: &boolTrue,
Schema: schema1,
Tags: []string{"tag1", "tag2"},
},
},
{
name: "Merge with partial second collection",
c1: &Collection{
ID: "id1",
SpaceID: "space1",
EnvID: "env1",
Name: "name1",
NoData: &boolFalse,
Single: &boolFalse,
System: &boolFalse,
Schema: schema1,
Tags: []string{"tag1", "tag2"},
},
c2: &Collection{
Name: "name2",
NoData: &boolTrue,
Schema: schema2,
},
want: &Collection{
ID: "id1",
SpaceID: "space1",
EnvID: "env1",
Name: "name2",
NoData: &boolTrue,
Single: &boolFalse,
System: &boolFalse,
Schema: schema2,
Tags: []string{"tag1", "tag2"},
},
},
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
result := Merge(tc.c1, tc.c2)
require.True(t, IsEqual(result, tc.want))
if result != nil && tc.want != nil {
require.True(t, schema.IsEqual(result.Schema, tc.want.Schema))
}
})
}
}
pkg/schema/schema.go
+ 17
− 7
View file @ 2fcf77f2
...@@ -48,14 +48,24 @@ func (s *Schema) ClearState() *Schema { ...@@ -48,14 +48,24 @@ func (s *Schema) ClearState() *Schema {
return s return s
} }
func (s *Schema) Equal(sch *Schema) bool { // Equal compares two schemas for equality.
if s == sch { // Deprecated: use `IsEqual` method instead.
func (s *Schema) Equal(other *Schema) bool {
return s.IsEqual(other)
}
func (s *Schema) IsEqual(other *Schema) bool {
if s == other {
return true return true
} }
if s == nil || sch == nil { if s == nil || other == nil {
return false return false
} }
return reflect.DeepEqual(s.Field, sch.Field) return reflect.DeepEqual(s.Field, other.Field)
}
func IsEqual(s1, s2 *Schema) bool {
return s1.IsEqual(s2)
} }
func (s Schema) WithIncludes(includes ...interface{}) *Schema { func (s Schema) WithIncludes(includes ...interface{}) *Schema {
...@@ -78,9 +88,9 @@ func (s Schema) SetMetadata(md map[string]string) *Schema { ...@@ -78,9 +88,9 @@ func (s Schema) SetMetadata(md map[string]string) *Schema {
return &s return &s
} }
func (f Schema) SetSingleLocale(r bool) *Schema { func (s Schema) SetSingleLocale(r bool) *Schema {
f.SingleLocale = r s.SingleLocale = r
return &f return &s
} }
func (s *Schema) ConvertTypes() error { func (s *Schema) ConvertTypes() error {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment