Skip to content

Commit 989f0e1

Browse files
authored
Add missing properties to ChannelDeletedEvent (#994)
1 parent 97ba7fa commit 989f0e1

File tree

8 files changed

+44
-20
lines changed

8 files changed

+44
-20
lines changed

json-logs/samples/events/ChannelDeletedPayload.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
"event_context": "",
2626
"event": {
2727
"type": "channel_deleted",
28-
"channel": ""
28+
"channel": "",
29+
"actor_id": "",
30+
"event_ts": ""
2931
}
3032
}
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
22
"type": "channel_deleted",
3-
"channel": ""
3+
"channel": "",
4+
"actor_id": "",
5+
"event_ts": ""
46
}

slack-api-model/src/main/java/com/slack/api/model/event/ChannelDeletedEvent.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@ public class ChannelDeletedEvent implements Event {
1515

1616
private final String type = TYPE_NAME;
1717
private String channel;
18+
private String actorId;
19+
private String eventTs;
1820
}

slack-api-model/src/test/java/test_locally/api/model/event/ChannelCreatedEventTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@ public void deserialize() {
2222
" \"type\": \"channel_created\",\n" +
2323
" \"channel\": {\n" +
2424
" \"id\": \"C024BE91L\",\n" +
25+
" \"is_channel\": true,\n" +
26+
" \"is_org_shared\": false,\n" +
27+
" \"is_shared\": false,\n" +
2528
" \"name\": \"fun\",\n" +
29+
" \"name\": \"fun\",\n" +
30+
" \"name_normalized\": \"fun\",\n" +
2631
" \"created\": 1360782804,\n" +
2732
" \"creator\": \"U024BE7LH\"\n" +
2833
" }\n" +

slack-api-model/src/test/java/test_locally/api/model/event/ChannelDeletedEventTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ public void typeName() {
1818
@Test
1919
public void deserialize() {
2020
String json = "{\n" +
21-
" \"type\": \"channel_deleted\",\n" +
22-
" \"channel\": \"C024BE91L\"\n" +
21+
" \"channel\": \"C024BE91L\",\n" +
22+
" \"actor_id\": \"U03E94MK0\",\n" +
23+
" \"type\": \"channel_deleted\",\n" +
24+
" \"event_ts\": \"1654751431.047500\"\n" +
2325
"}";
2426
ChannelDeletedEvent event = GsonFactory.createSnakeCase().fromJson(json, ChannelDeletedEvent.class);
2527
assertThat(event.getType(), is("channel_deleted"));

slack-api-model/src/test/java/test_locally/api/model/event/ChannelRenameEventTest.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,22 @@ public void typeName() {
1919
@Test
2020
public void deserialize() {
2121
String json = "{\n" +
22-
" \"type\": \"channel_rename\",\n" +
23-
" \"channel\": {\n" +
24-
" \"id\":\"C02ELGNBH\",\n" +
25-
" \"name\":\"new_name\",\n" +
26-
" \"created\":1360782804\n" +
27-
" }\n" +
22+
" \"type\": \"channel_rename\",\n" +
23+
" \"channel\": {\n" +
24+
" \"id\": \"C02ELGNBH\",\n" +
25+
" \"is_channel\": true,\n" +
26+
" \"is_mpim\": false,\n" +
27+
" \"name\": \"channel-renamed\",\n" +
28+
" \"name_normalized\": \"channel-renamed\",\n" +
29+
" \"created\": 1360782804\n" +
30+
" },\n" +
31+
" \"event_ts\": \"1654751422.047200\"\n" +
2832
"}";
2933
ChannelRenameEvent event = GsonFactory.createSnakeCase().fromJson(json, ChannelRenameEvent.class);
3034
assertThat(event.getType(), is("channel_rename"));
3135
assertThat(event.getChannel(), is(notNullValue()));
3236
assertThat(event.getChannel().getId(), is("C02ELGNBH"));
33-
assertThat(event.getChannel().getName(), is("new_name"));
37+
assertThat(event.getChannel().getName(), is("channel-renamed"));
3438
assertThat(event.getChannel().getCreated(), is(1360782804));
3539
}
3640

slack-api-model/src/test/java/test_locally/api/model/event/GroupDeletedEventTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@ public void typeName() {
1818
@Test
1919
public void deserialize() {
2020
String json = "{\n" +
21-
" \"type\": \"group_deleted\",\n" +
22-
" \"channel\": \"G0QN9RGTT\"\n" +
23-
"}\n";
21+
" \"channel\": \"G0QN9RGTT\",\n" +
22+
" \"date_deleted\": 1654752053,\n" +
23+
" \"actor_id\": \"U03E94MK0\",\n" +
24+
" \"type\": \"group_deleted\",\n" +
25+
" \"event_ts\": \"1654752053.000400\"\n" +
26+
"}";
2427
GroupDeletedEvent event = GsonFactory.createSnakeCase().fromJson(json, GroupDeletedEvent.class);
2528
assertThat(event.getType(), is("group_deleted"));
2629
assertThat(event.getChannel(), is("G0QN9RGTT"));

slack-api-model/src/test/java/test_locally/api/model/event/GroupRenameEventTest.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,16 @@ public void typeName() {
1818
@Test
1919
public void deserialize() {
2020
String json = "{\n" +
21-
" \"type\": \"group_rename\",\n" +
22-
" \"channel\": {\n" +
23-
" \"id\":\"G02ELGNBH\",\n" +
24-
" \"name\":\"new_name\",\n" +
25-
" \"created\":1360782804\n" +
26-
" }\n" +
21+
" \"type\": \"group_rename\",\n" +
22+
" \"channel\": {\n" +
23+
" \"id\": \"G02ELGNBH\",\n" +
24+
" \"is_channel\": true,\n" +
25+
" \"is_mpim\": false,\n" +
26+
" \"name\": \"new_name\",\n" +
27+
" \"name_normalized\": \"new_name\",\n" +
28+
" \"created\": 1360782804\n" +
29+
" },\n" +
30+
" \"event_ts\": \"1654751965.000300\"\n" +
2731
"}";
2832
GroupRenameEvent event = GsonFactory.createSnakeCase().fromJson(json, GroupRenameEvent.class);
2933
assertThat(event.getType(), is("group_rename"));

0 commit comments

Comments
 (0)