Upstream sync

2018-06-01 10:39:46 +02:00
parent f1ac874276
commit 69853b026b
20 changed files with 427 additions and 594 deletions
--- a/application/entitymapping/user.go
+++ b/application/entitymapping/user.go
@@ -51,6 +51,7 @@ func (mapping *userMapping) ToUserModel(item entity.User) viewmodel.User {
 		Organizations: mapping.mapper.Organization.ToOrganizationModelSlice(item.Organizations),
 		Types:         mapping.mapper.Organization.ToOrganizationTypeModelSlice(item.Types),
 		Type:          &item.Type,
+		Test:          item.Test,
 	}
 }

@@ -78,6 +79,7 @@ func (mapping *userMapping) ToUserEntity(item viewmodel.User) entity.User {
 		Profiles:      mapping.mapper.Profile.ToProfileEntitySlice(item.Profiles),
 		Organizations: mapping.mapper.Organization.ToOrganizationEntitySlice(item.Organizations),
 		Types:         mapping.mapper.Organization.ToOrganizationTypeEntitySlice(item.Types),
+		Test:          item.Test,
 	}

 	if item.Type == nil {