service controller - replace inline query with usage of data mapper