updated data Repository Service with TDD