Replace findOneById by findPk