add data fix code & integration test for ActivityService