#12 Refactor methods forming entities from dto in DtoFactoryService