Fix embedded primary field (#349)

document_meta.go

@@ -99,8 +99,8 @@ func (cdm *cachedDocumentMeta) mergeEmbedded(other cachedDocumentMeta, indexPref
 	cdm.hasOne = appendWithPrefix(cdm.hasOne, other.hasOne, namePrefix)
 	cdm.hasMany = appendWithPrefix(cdm.hasMany, other.hasMany, namePrefix)
 	cdm.primaryField = appendWithPrefix(cdm.primaryField, other.primaryField, namePrefix)
-	for index := range other.primaryIndex {
-		cdm.primaryIndex = append(cdm.primaryIndex, append([]int{indexPrefix}, index))
+	for _, index := range other.primaryIndex {
+		cdm.primaryIndex = append(cdm.primaryIndex, append([]int{indexPrefix}, index...))
 	}
 	cdm.preload = appendWithPrefix(cdm.preload, other.preload, namePrefix)
 	cdm.flag |= other.flag

document_test.go

@@ -262,7 +262,7 @@ func TestDocument_IndexFieldEmbedded(t *testing.T) {
 	assert.Equal(t, index, doc.Index())
 }
 
-func TestDocument_EmbeddedNameConfict(t *testing.T) {
+func TestDocument_embeddedNameConfict(t *testing.T) {
 	type Embedded struct {
 		Name string
 	}
@@ -276,6 +276,37 @@ func TestDocument_EmbeddedNameConfict(t *testing.T) {
 	})
 }
 
+func TestDocument_embeddedNested(t *testing.T) {
+	type Base struct {
+		ID string
+	}
+
+	type Audited struct {
+		Base
+		CreatedAt time.Time
+		UpdatedAt time.Time
+	}
+	type Contact struct {
+		Audited
+		Name string
+	}
+
+	var (
+		contact Contact
+		doc     = NewDocument(&contact)
+		index   = map[string][]int{
+			"id":         {0, 0, 0},
+			"created_at": {0, 1},
+			"updated_at": {0, 2},
+			"name":       {1},
+		}
+	)
+
+	assert.Equal(t, index, doc.Index())
+	assert.Equal(t, []string{"id"}, doc.meta.primaryField)
+	assert.Equal(t, [][]int{{0, 0, 0}}, doc.meta.primaryIndex)
+}
+
 func TestDocument_Types(t *testing.T) {
 	var (
 		entity = struct {

repository_test.go

@@ -1465,6 +1465,61 @@ func TestRepository_Update_lockVersion(t *testing.T) {
 	adapter.AssertExpectations(t)
 }
 
+func TestRepository_Update_embed(t *testing.T) {
+	type Base struct {
+		Id string
+	}
+
+	type Audited struct {
+		Base
+		CreatedAt time.Time
+		UpdatedAt time.Time
+	}
+
+	type Contact struct {
+		Audited
+		Name string
+	}
+
+	var (
+		adapter = &testAdapter{}
+		repo    = New(adapter)
+		contact = Contact{
+			Audited: Audited{
+				Base: Base{
+					Id: "1",
+				},
+				CreatedAt: Now(),
+				UpdatedAt: Now(),
+			},
+			Name: "name",
+		}
+		mutates = map[string]Mutate{
+			"id":         Set("id", "1"),
+			"name":       Set("name", "name"),
+			"created_at": Set("created_at", Now()),
+			"updated_at": Set("updated_at", Now()),
+		}
+		queries = From("contacts").Where(Eq("id", contact.Id))
+	)
+
+	adapter.On("Update", queries, "id", mutates).Return(1, nil).Once()
+
+	assert.Nil(t, repo.Update(context.TODO(), &contact))
+	assert.Equal(t, Contact{
+		Audited: Audited{
+			Base: Base{
+				Id: "1",
+			},
+			CreatedAt: Now(),
+			UpdatedAt: Now(),
+		},
+		Name: "name",
+	}, contact)
+
+	adapter.AssertExpectations(t)
+}
+
 func TestRepository_Update_notFound(t *testing.T) {
 	var (
 		user     = User{ID: 1}