Merge pull request #446 from seratch/add-types-to-subteam-events

Add channel_count to subteam_created / subteam_updated events

Author: seratch

json-logs/samples/events/SubteamCreatedPayload.json

@@ -28,7 +28,8 @@
         "groups": [
           ""
         ]
-      }
+      },
+      "channel_count": 12345
     },
     "event_ts": "0000000000.000000"
   },

json-logs/samples/events/SubteamUpdatedPayload.json

@@ -33,7 +33,8 @@
         "W00000000"
       ],
       "user_count": 12345,
-      "deleted_by": "W00000000"
+      "deleted_by": "W00000000",
+      "channel_count": 12345
     },
     "event_ts": "0000000000.000000"
   },

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

@@ -41,7 +41,8 @@ public static class Subteam {
         private String updatedBy;
         private String deletedBy;
         private Prefs prefs;
-        private String userCount;
+        private Integer userCount;
+        private Integer channelCount;
     }
 
     @Data

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

@@ -48,7 +48,8 @@ public static class Subteam {
         private String deletedBy;
         private Prefs prefs;
         private List<String> users;
-        private String userCount;
+        private Integer userCount;
+        private Integer channelCount;
     }
 
     @Data

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

@@ -53,7 +53,7 @@ public void deserialize() {
         assertThat(event.getSubteam().getAutoType(), is(nullValue()));
         assertThat(event.getSubteam().getPrefs().getChannels(), is(notNullValue()));
         assertThat(event.getSubteam().getPrefs().getGroups(), is(notNullValue()));
-        assertThat(event.getSubteam().getUserCount(), is("0"));
+        assertThat(event.getSubteam().getUserCount(), is(0));
     }
 
     @Test

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

@@ -52,7 +52,7 @@ public void deserialize() {
         SubteamUpdatedEvent event = GsonFactory.createSnakeCase().fromJson(json, SubteamUpdatedEvent.class);
         assertThat(event.getType(), is("subteam_updated"));
         assertThat(event.getSubteam().getId(), is("S0614TZR7"));
-        assertThat(event.getSubteam().getUserCount(), is("4"));
+        assertThat(event.getSubteam().getUserCount(), is(4));
         assertThat(event.getSubteam().getUsers().size(), is(4));
     }
 

slack-app-backend/src/test/java/test_locally/app_backend/events/payload/SamplePayloadParsingTest.java

@@ -0,0 +1,51 @@
+package test_locally.app_backend.events.payload;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonParseException;
+import com.slack.api.SlackConfig;
+import com.slack.api.app_backend.events.payload.EventsApiPayload;
+import com.slack.api.util.json.GsonFactory;
+import config.SlackTestConfig;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.stream.Collectors.joining;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class SamplePayloadParsingTest {
+
+    static String readWholeAsString(Path path) throws IOException {
+        return Files.readAllLines(path, UTF_8).stream().collect(joining());
+    }
+
+    @Test
+    public void readAll() throws Exception {
+        SlackConfig testConfig = SlackTestConfig.get();
+        Gson gson = GsonFactory.createSnakeCase(testConfig);
+        List<Path> files = Files.list(Paths.get("../json-logs/samples/events")).collect(Collectors.toList());
+        for (Path jsonFile : files) {
+            String json = readWholeAsString(jsonFile);
+            String className = jsonFile.getFileName().toString().replaceFirst("\\.json$", "");
+            String fqdn = "com.slack.api.app_backend.events.payload." + className;
+            Class<EventsApiPayload<?>> clazz = (Class<EventsApiPayload<?>>) Class.forName(fqdn);
+            try {
+                EventsApiPayload<?> payload = gson.fromJson(json, clazz);
+                assertThat(payload, is(notNullValue()));
+            } catch (JsonParseException e) {
+                String message = "Check " + fqdn + " : " + e.getMessage();
+                throw new RuntimeException(message, e);
+            }
+        }
+    }
+
+
+}