Just on the naming convention for this. getAll() is fine but then if you are adding a condition then it would be getByCondition so getAllForNhsNo should really be getAllByNhsNo and since we aren't talking about all the records (ignoring the other methods with 'All' and a condition) then we should go with getByNhsNo. Also although this shouldn't really apply for this pull request (maintenance vs develop) a getUserMappingByPatient() would probably get rid of a lot of these methods.