Merge pull request #64 from buckett/additional-role-attributes

Add workflow_state and is_account_role fields

src/main/java/edu/ksu/canvas/model/Role.java

@@ -15,6 +15,8 @@ public class Role extends BaseCanvasModel implements Serializable {
  private long id;
  private String label;
  private String baseRoleType;
+ private boolean isAccountRole;
+ private String workflowState;
 
  public long getId() {
  return id;
@@ -34,4 +36,20 @@ public String getBaseRoleType() {
  public void setBaseRoleType(String baseRoleType) {
  this.baseRoleType = baseRoleType;
  }
+
+ public boolean isAccountRole() {
+ return isAccountRole;
+ }
+
+ public void setAccountRole(boolean accountRole) {
+ isAccountRole = accountRole;
+ }
+
+ public String getWorkflowState() {
+ return workflowState;
+ }
+
+ public void setWorkflowState(String workflowState) {
+ this.workflowState = workflowState;
+ }
 }

src/test/java/edu/ksu/canvas/tests/roles/RolesUTest.java

@@ -36,6 +36,13 @@ public void testListRoles() throws Exception {
  List<Role> rolesList = roleReader.listRoles(options);
  Assert.assertNotNull(rolesList);
  Assert.assertEquals(1, rolesList.size());
+ Role role = rolesList.iterator().next();
+ Assert.assertEquals(1, role.getId());
+ Assert.assertEquals("Account Admin", role.getLabel());
+ Assert.assertEquals("AccountMembership", role.getBaseRoleType());
+ Assert.assertEquals(true, role.isAccountRole());
+ Assert.assertEquals("built_in", role.getWorkflowState());
+
  }
 
 }

src/test/resources/SampleJson/role/Role.json

@@ -5,6 +5,7 @@
  "label": "Account Admin",
  "base_role_type": "AccountMembership",
  "workflow_state": "built_in",
+ "is_account_role": true,
  "permissions": {
  "view_analytics": {
  "enabled": true,