Skip to content

Adding has_inbox_seat to the admin user model #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SeanHealy33 merged 2 commits into from
Apr 27, 2021
Merged

Adding has_inbox_seat to the admin user model #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c34b2ae
Adding has_inbox_seat to the admin user model
Feb 3, 2020
38c166b
Merge branch 'master' into master
SeanHealy33 Apr 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions intercom-java/src/main/java/io/intercom/api/Admin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ public static Admin setAwayMode(String id, boolean away_mode_enabled, boolean aw

@JsonProperty("away_mode_reassign")
private boolean awayModeReassign;

@JsonProperty("has_inbox_seat")
private boolean hasInboxSeat;

@JsonProperty("avatar")
private Avatar avatar;
Expand Down Expand Up @@ -151,6 +154,10 @@ public boolean getAwayModeReassign(){
return awayModeReassign;
}

public boolean getHasInboxSeat(){
return hasInboxSeat;
}

public Avatar getAvatar(){
return avatar;
}
Expand Down
2 changes: 2 additions & 0 deletions intercom-java/src/test/java/io/intercom/api/AdminTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public void TestAdminParseJson() throws Exception {
assertEquals("[email protected]", admin.getEmail());
assertTrue(admin.getAwayModeEnabled());
assertFalse(admin.getAwayModeReassign());
assertTrue(admin.getHasInboxSeat());
assertEquals( "https://avatarurl.com/image.jpg", admin.getAvatar().getImageURL().toString());
assertNotNull(admin.getTeamIds());
assertEquals(3, admin.getTeamIds().size());
Expand All @@ -48,6 +49,7 @@ public void TestAdminTeamParseJson() throws Exception {
assertEquals("[email protected]", admin.getEmail());
assertFalse(admin.getAwayModeEnabled());
assertFalse(admin.getAwayModeReassign());
assertTrue(admin.getHasInboxSeat());
assertEquals("https://domain.com/avatar", admin.getAvatar().getImageURL().toString());
assertNotNull(admin.getAdminIds());
assertEquals(3, admin.getAdminIds().size());
Expand Down
1 change: 1 addition & 0 deletions intercom-java/src/test/resources/admin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"email": "[email protected]",
"away_mode_enabled": true,
"away_mode_reassign": false,
"has_inbox_seat": true,
"avatar": {
"image_url": "https://avatarurl.com/image.jpg"
},
Expand Down
1 change: 1 addition & 0 deletions intercom-java/src/test/resources/admin_team.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"email": "[email protected]",
"away_mode_enabled": false,
"away_mode_reassign": false,
"has_inbox_seat": true,
"avatar": {
"image_url": "https://domain.com/avatar"
},
Expand Down
5 changes: 5 additions & 0 deletions intercom-java/src/test/resources/admins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"email": "[email protected]",
"away_mode_enabled": true,
"away_mode_reassign": false,
"has_inbox_seat": true,
"avatar": {
"image_url": "https://avatarurl.com/image.jpg"
},
Expand All @@ -24,6 +25,7 @@
"email": "[email protected]",
"away_mode_enabled": false,
"away_mode_reassign": false,
"has_inbox_seat": false,
"avatar": {
"image_url": "https://avatarurl.com/image2.jpg"
},
Expand All @@ -39,6 +41,7 @@
"email": "[email protected]",
"away_mode_enabled": false,
"away_mode_reassign": false,
"has_inbox_seat": true,
"avatar": {
"image_url": "https://domain.com/avatar"
},
Expand All @@ -54,6 +57,7 @@
"email": "[email protected]",
"away_mode_enabled": false,
"away_mode_reassign": false,
"has_inbox_seat": true,
"avatar": {
"image_url": "https://domain.com/avatar2"
},
Expand All @@ -68,6 +72,7 @@
"email": "[email protected]",
"away_mode_enabled": false,
"away_mode_reassign": false,
"has_inbox_seat": false,
"avatar": {
"image_url": "https://domain.com/avatar3"
},
Expand Down