changed repository and dao api, fixed monitoring service test case