Upstream sync

This commit is contained in:
Senad Uka
2018-05-28 08:31:58 +02:00
parent 94229831e0
commit d8737a558b
13 changed files with 180 additions and 122 deletions

View File

@@ -217,7 +217,7 @@ func (s *organizationService) AddOrganization(organization viewmodel.Organizatio
address := entity.OrganizationAddress{
InternalID: provider.MukID,
Name: "Main Address",
Address: fmt.Sprintf("%s %s - %s, %s (%s)", provider.StreetName1, provider.StreetName2, provider.CityName, provider.State, provider.ZipCode),
Address: fmt.Sprintf("%s %s - %s, %s (%s)", provider.StreetName1, provider.StreetName2, provider.CityName, provider.State, provider.ZipCode[:5]),
Latitude: lat,
Longitude: long,
CreatedUser: enOrg.Author,
@@ -248,5 +248,5 @@ func (s *organizationService) AddOrganization(organization viewmodel.Organizatio
return viewmodel.Organization{}, nil
}
return s.GetByUUID(enOrg.UUID, user)
return s.mapEntity.Organization.ToOrganizationModel(enOrg), nil
}