Add city and end_group_date to Trip model