Refactor activityType conversion, getModel from Dao return null, TimeReportService unit tests