enum changed
dao refactor
dao refactor
test refactor