Skip to content

Clean up implementation if same struct type check. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nphmuller merged 1 commit into from
Jul 9, 2020
Merged

Clean up implementation if same struct type check. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion automapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func MapLoose(source, dest interface{}) {

func mapValues(sourceVal, destVal reflect.Value, loose bool) {
destType := destVal.Type()
if destType.Kind() == reflect.Struct && !sourceTypeEqualsDestType(sourceVal, destVal) {
if destType.Kind() == reflect.Struct && sourceVal.Type() != destVal.Type() {
if sourceVal.Type().Kind() == reflect.Ptr {
if sourceVal.IsNil() {
// If source is nil, it maps to an empty struct
Expand Down
10 changes: 5 additions & 5 deletions automapper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,15 +257,15 @@ func TestWithLooseOption(t *testing.T) {
assert.Equal(t, dest.Bar, 0)
}

func TestStructCanBeSet(t *testing.T) {
type MainType struct {
func TestSetStructOfSameTypeDirectly(t *testing.T) {
type FooType struct {
time.Time
}
source := struct {
Foo MainType
}{MainType{Time: time.Now().UTC()}}
Foo FooType
}{FooType{Time: time.Now().UTC()}}
dest := struct {
Foo MainType
Foo FooType
}{}
Map(&source, &dest)
assert.Equal(t, source.Foo.String(), dest.Foo.String())
Expand Down