Use the provided model method rather than inlining queries
Remove unnecessary controller check and respective test

This logic is handled by the validation so no need for it here.