Add team.billing.info and team.preferences.list APIs (#878)

seratch · web-flow · commit 13f5b77fd7c5 · 2021-10-29T23:54:54.000+09:00
diff --git a/json-logs/samples/api/team.billing.info.json b/json-logs/samples/api/team.billing.info.json
@@ -0,0 +1,7 @@
+{
+  "ok": false,
+  "error": "",
+  "needed": "",
+  "provided": "",
+  "plan": ""
+}
diff --git a/json-logs/samples/api/team.preferences.list.json b/json-logs/samples/api/team.preferences.list.json
@@ -0,0 +1,11 @@
+{
+  "ok": false,
+  "msg_edit_window_mins": 12345,
+  "allow_message_deletion": false,
+  "display_real_names": false,
+  "disable_file_uploads": "",
+  "who_can_post_general": "",
+  "error": "",
+  "needed": "",
+  "provided": ""
+}
diff --git a/metadata/web-api/rate_limit_tiers.json b/metadata/web-api/rate_limit_tiers.json
@@ -220,8 +220,10 @@
   "stars.remove": "Tier2",
   "team.accessLogs": "Tier2",
   "team.billableInfo": "Tier2",
+  "team.billing.info": "Tier3",
   "team.info": "Tier3",
   "team.integrationLogs": "Tier2",
+  "team.preferences.list": "Tier3",
   "team.profile.get": "Tier3",
   "usergroups.create": "Tier2",
   "usergroups.disable": "Tier2",
diff --git a/slack-api-client/src/main/java/com/slack/api/methods/AsyncMethodsClient.java b/slack-api-client/src/main/java/com/slack/api/methods/AsyncMethodsClient.java
@@ -75,10 +75,7 @@
 import com.slack.api.methods.request.stars.StarsAddRequest;
 import com.slack.api.methods.request.stars.StarsListRequest;
 import com.slack.api.methods.request.stars.StarsRemoveRequest;
-import com.slack.api.methods.request.team.TeamAccessLogsRequest;
-import com.slack.api.methods.request.team.TeamBillableInfoRequest;
-import com.slack.api.methods.request.team.TeamInfoRequest;
-import com.slack.api.methods.request.team.TeamIntegrationLogsRequest;
+import com.slack.api.methods.request.team.*;
 import com.slack.api.methods.request.team.profile.TeamProfileGetRequest;
 import com.slack.api.methods.request.usergroups.*;
 import com.slack.api.methods.request.usergroups.users.UsergroupsUsersListRequest;
@@ -167,10 +164,7 @@
 import com.slack.api.methods.response.stars.StarsAddResponse;
 import com.slack.api.methods.response.stars.StarsListResponse;
 import com.slack.api.methods.response.stars.StarsRemoveResponse;
-import com.slack.api.methods.response.team.TeamAccessLogsResponse;
-import com.slack.api.methods.response.team.TeamBillableInfoResponse;
-import com.slack.api.methods.response.team.TeamInfoResponse;
-import com.slack.api.methods.response.team.TeamIntegrationLogsResponse;
+import com.slack.api.methods.response.team.*;
 import com.slack.api.methods.response.team.profile.TeamProfileGetResponse;
 import com.slack.api.methods.response.usergroups.*;
 import com.slack.api.methods.response.usergroups.users.UsergroupsUsersListResponse;
@@ -1096,6 +1090,14 @@ CompletableFuture<AdminConversationsWhitelistListGroupsLinkedToChannelResponse>
 
     CompletableFuture<TeamProfileGetResponse> teamProfileGet(RequestConfigurator<TeamProfileGetRequest.TeamProfileGetRequestBuilder> req);
 
+    CompletableFuture<TeamBillingInfoResponse> teamBillingInfo(TeamBillingInfoRequest req);
+
+    CompletableFuture<TeamBillingInfoResponse> teamBillingInfo(RequestConfigurator<TeamBillingInfoRequest.TeamBillingInfoRequestBuilder> req);
+
+    CompletableFuture<TeamPreferencesListResponse> teamPreferencesList(TeamPreferencesListRequest req);
+
+    CompletableFuture<TeamPreferencesListResponse> teamPreferencesList(RequestConfigurator<TeamPreferencesListRequest.TeamPreferencesListRequestBuilder> req);
+
     // ------------------------------
     // usergroups
     // ------------------------------
diff --git a/slack-api-client/src/main/java/com/slack/api/methods/Methods.java b/slack-api-client/src/main/java/com/slack/api/methods/Methods.java
@@ -546,6 +546,8 @@ private Methods() {
     public static final String TEAM_BILLABLE_INFO = "team.billableInfo";
     public static final String TEAM_INFO = "team.info";
     public static final String TEAM_INTEGRATION_LOGS = "team.integrationLogs";
+    public static final String TEAM_BILLING_INFO = "team.billing.info";
+    public static final String TEAM_PREFERENCES_LIST = "team.preferences.list";
 
     // ------------------------------
     // team.profile
diff --git a/slack-api-client/src/main/java/com/slack/api/methods/MethodsClient.java b/slack-api-client/src/main/java/com/slack/api/methods/MethodsClient.java
@@ -88,10 +88,7 @@
 import com.slack.api.methods.request.stars.StarsAddRequest;
 import com.slack.api.methods.request.stars.StarsListRequest;
 import com.slack.api.methods.request.stars.StarsRemoveRequest;
-import com.slack.api.methods.request.team.TeamAccessLogsRequest;
-import com.slack.api.methods.request.team.TeamBillableInfoRequest;
-import com.slack.api.methods.request.team.TeamInfoRequest;
-import com.slack.api.methods.request.team.TeamIntegrationLogsRequest;
+import com.slack.api.methods.request.team.*;
 import com.slack.api.methods.request.team.profile.TeamProfileGetRequest;
 import com.slack.api.methods.request.usergroups.*;
 import com.slack.api.methods.request.usergroups.users.UsergroupsUsersListRequest;
@@ -193,10 +190,7 @@
 import com.slack.api.methods.response.stars.StarsAddResponse;
 import com.slack.api.methods.response.stars.StarsListResponse;
 import com.slack.api.methods.response.stars.StarsRemoveResponse;
-import com.slack.api.methods.response.team.TeamAccessLogsResponse;
-import com.slack.api.methods.response.team.TeamBillableInfoResponse;
-import com.slack.api.methods.response.team.TeamInfoResponse;
-import com.slack.api.methods.response.team.TeamIntegrationLogsResponse;
+import com.slack.api.methods.response.team.*;
 import com.slack.api.methods.response.team.profile.TeamProfileGetResponse;
 import com.slack.api.methods.response.usergroups.*;
 import com.slack.api.methods.response.usergroups.users.UsergroupsUsersListResponse;
@@ -1635,6 +1629,14 @@ AdminUsergroupsRemoveChannelsResponse adminUsergroupsRemoveChannels(
 
     TeamProfileGetResponse teamProfileGet(RequestConfigurator<TeamProfileGetRequest.TeamProfileGetRequestBuilder> req) throws IOException, SlackApiException;
 
+    TeamBillingInfoResponse teamBillingInfo(TeamBillingInfoRequest req) throws IOException, SlackApiException;
+
+    TeamBillingInfoResponse teamBillingInfo(RequestConfigurator<TeamBillingInfoRequest.TeamBillingInfoRequestBuilder> req) throws IOException, SlackApiException;
+
+    TeamPreferencesListResponse teamPreferencesList(TeamPreferencesListRequest req) throws IOException, SlackApiException;
+
+    TeamPreferencesListResponse teamPreferencesList(RequestConfigurator<TeamPreferencesListRequest.TeamPreferencesListRequestBuilder> req) throws IOException, SlackApiException;
+
     // ------------------------------
     // usergroups
     // ------------------------------
diff --git a/slack-api-client/src/main/java/com/slack/api/methods/MethodsRateLimits.java b/slack-api-client/src/main/java/com/slack/api/methods/MethodsRateLimits.java
@@ -359,6 +359,8 @@ public static void setRateLimitTier(String methodName, MethodsRateLimitTier tier
         setRateLimitTier(TEAM_INFO, Tier3);
         setRateLimitTier(TEAM_INTEGRATION_LOGS, Tier2);
         setRateLimitTier(TEAM_PROFILE_GET, Tier3);
+        setRateLimitTier(TEAM_BILLING_INFO, Tier3);
+        setRateLimitTier(TEAM_PREFERENCES_LIST, Tier3);
 
         setRateLimitTier(USERGROUPS_CREATE, Tier2);
         setRateLimitTier(USERGROUPS_DISABLE, Tier2);
diff --git a/slack-api-client/src/main/java/com/slack/api/methods/RequestFormBuilder.java b/slack-api-client/src/main/java/com/slack/api/methods/RequestFormBuilder.java
@@ -86,10 +86,7 @@
 import com.slack.api.methods.request.stars.StarsAddRequest;
 import com.slack.api.methods.request.stars.StarsListRequest;
 import com.slack.api.methods.request.stars.StarsRemoveRequest;
-import com.slack.api.methods.request.team.TeamAccessLogsRequest;
-import com.slack.api.methods.request.team.TeamBillableInfoRequest;
-import com.slack.api.methods.request.team.TeamInfoRequest;
-import com.slack.api.methods.request.team.TeamIntegrationLogsRequest;
+import com.slack.api.methods.request.team.*;
 import com.slack.api.methods.request.team.profile.TeamProfileGetRequest;
 import com.slack.api.methods.request.usergroups.*;
 import com.slack.api.methods.request.usergroups.users.UsergroupsUsersListRequest;
@@ -2123,6 +2120,16 @@ public static FormBody.Builder toForm(TeamProfileGetRequest req) {
         return form;
     }
 
+    public static FormBody.Builder toForm(TeamBillingInfoRequest req) {
+        FormBody.Builder form = new FormBody.Builder();
+        return form;
+    }
+
+    public static FormBody.Builder toForm(TeamPreferencesListRequest req) {
+        FormBody.Builder form = new FormBody.Builder();
+        return form;
+    }
+
     public static FormBody.Builder toForm(UsergroupsCreateRequest req) {
         FormBody.Builder form = new FormBody.Builder();
         setIfNotNull("name", req.getName(), form);
diff --git a/slack-api-client/src/main/java/com/slack/api/methods/impl/AsyncMethodsClientImpl.java b/slack-api-client/src/main/java/com/slack/api/methods/impl/AsyncMethodsClientImpl.java
@@ -79,10 +79,7 @@
 import com.slack.api.methods.request.stars.StarsAddRequest;
 import com.slack.api.methods.request.stars.StarsListRequest;
 import com.slack.api.methods.request.stars.StarsRemoveRequest;
-import com.slack.api.methods.request.team.TeamAccessLogsRequest;
-import com.slack.api.methods.request.team.TeamBillableInfoRequest;
-import com.slack.api.methods.request.team.TeamInfoRequest;
-import com.slack.api.methods.request.team.TeamIntegrationLogsRequest;
+import com.slack.api.methods.request.team.*;
 import com.slack.api.methods.request.team.profile.TeamProfileGetRequest;
 import com.slack.api.methods.request.usergroups.*;
 import com.slack.api.methods.request.usergroups.users.UsergroupsUsersListRequest;
@@ -171,10 +168,7 @@
 import com.slack.api.methods.response.stars.StarsAddResponse;
 import com.slack.api.methods.response.stars.StarsListResponse;
 import com.slack.api.methods.response.stars.StarsRemoveResponse;
-import com.slack.api.methods.response.team.TeamAccessLogsResponse;
-import com.slack.api.methods.response.team.TeamBillableInfoResponse;
-import com.slack.api.methods.response.team.TeamInfoResponse;
-import com.slack.api.methods.response.team.TeamIntegrationLogsResponse;
+import com.slack.api.methods.response.team.*;
 import com.slack.api.methods.response.team.profile.TeamProfileGetResponse;
 import com.slack.api.methods.response.usergroups.*;
 import com.slack.api.methods.response.usergroups.users.UsergroupsUsersListResponse;
@@ -1978,6 +1972,26 @@ public CompletableFuture<TeamProfileGetResponse> teamProfileGet(RequestConfigura
         return teamProfileGet(req.configure(TeamProfileGetRequest.builder()).build());
     }
 
+    @Override
+    public CompletableFuture<TeamBillingInfoResponse> teamBillingInfo(TeamBillingInfoRequest req) {
+        return executor.execute(TEAM_BILLING_INFO, toMap(req), () -> methods.teamBillingInfo(req));
+    }
+
+    @Override
+    public CompletableFuture<TeamBillingInfoResponse> teamBillingInfo(RequestConfigurator<TeamBillingInfoRequest.TeamBillingInfoRequestBuilder> req) {
+        return teamBillingInfo(req.configure(TeamBillingInfoRequest.builder()).build());
+    }
+
+    @Override
+    public CompletableFuture<TeamPreferencesListResponse> teamPreferencesList(TeamPreferencesListRequest req) {
+        return executor.execute(TEAM_PREFERENCES_LIST, toMap(req), () -> methods.teamPreferencesList(req));
+    }
+
+    @Override
+    public CompletableFuture<TeamPreferencesListResponse> teamPreferencesList(RequestConfigurator<TeamPreferencesListRequest.TeamPreferencesListRequestBuilder> req) {
+        return teamPreferencesList(req.configure(TeamPreferencesListRequest.builder()).build());
+    }
+
     @Override
     public CompletableFuture<UsergroupsCreateResponse> usergroupsCreate(UsergroupsCreateRequest req) {
         return executor.execute(USERGROUPS_CREATE, toMap(req), () -> methods.usergroupsCreate(req));
diff --git a/slack-api-client/src/main/java/com/slack/api/methods/impl/MethodsClientImpl.java b/slack-api-client/src/main/java/com/slack/api/methods/impl/MethodsClientImpl.java
@@ -90,10 +90,7 @@
 import com.slack.api.methods.request.stars.StarsAddRequest;
 import com.slack.api.methods.request.stars.StarsListRequest;
 import com.slack.api.methods.request.stars.StarsRemoveRequest;
-import com.slack.api.methods.request.team.TeamAccessLogsRequest;
-import com.slack.api.methods.request.team.TeamBillableInfoRequest;
-import com.slack.api.methods.request.team.TeamInfoRequest;
-import com.slack.api.methods.request.team.TeamIntegrationLogsRequest;
+import com.slack.api.methods.request.team.*;
 import com.slack.api.methods.request.team.profile.TeamProfileGetRequest;
 import com.slack.api.methods.request.usergroups.*;
 import com.slack.api.methods.request.usergroups.users.UsergroupsUsersListRequest;
@@ -195,10 +192,7 @@
 import com.slack.api.methods.response.stars.StarsAddResponse;
 import com.slack.api.methods.response.stars.StarsListResponse;
 import com.slack.api.methods.response.stars.StarsRemoveResponse;
-import com.slack.api.methods.response.team.TeamAccessLogsResponse;
-import com.slack.api.methods.response.team.TeamBillableInfoResponse;
-import com.slack.api.methods.response.team.TeamInfoResponse;
-import com.slack.api.methods.response.team.TeamIntegrationLogsResponse;
+import com.slack.api.methods.response.team.*;
 import com.slack.api.methods.response.team.profile.TeamProfileGetResponse;
 import com.slack.api.methods.response.usergroups.*;
 import com.slack.api.methods.response.usergroups.users.UsergroupsUsersListResponse;
@@ -2611,6 +2605,26 @@ public TeamProfileGetResponse teamProfileGet(RequestConfigurator<TeamProfileGetR
         return teamProfileGet(req.configure(TeamProfileGetRequest.builder()).build());
     }
 
+    @Override
+    public TeamBillingInfoResponse teamBillingInfo(TeamBillingInfoRequest req) throws IOException, SlackApiException {
+        return postFormWithTokenAndParseResponse(toForm(req), Methods.TEAM_BILLING_INFO, getToken(req), TeamBillingInfoResponse.class);
+    }
+
+    @Override
+    public TeamBillingInfoResponse teamBillingInfo(RequestConfigurator<TeamBillingInfoRequest.TeamBillingInfoRequestBuilder> req) throws IOException, SlackApiException {
+        return teamBillingInfo(req.configure(TeamBillingInfoRequest.builder()).build());
+    }
+
+    @Override
+    public TeamPreferencesListResponse teamPreferencesList(TeamPreferencesListRequest req) throws IOException, SlackApiException {
+        return postFormWithTokenAndParseResponse(toForm(req), Methods.TEAM_PREFERENCES_LIST, getToken(req), TeamPreferencesListResponse.class);
+    }
+
+    @Override
+    public TeamPreferencesListResponse teamPreferencesList(RequestConfigurator<TeamPreferencesListRequest.TeamPreferencesListRequestBuilder> req) throws IOException, SlackApiException {
+        return teamPreferencesList(req.configure(TeamPreferencesListRequest.builder()).build());
+    }
+
     @Override
     public UsergroupsCreateResponse usergroupsCreate(UsergroupsCreateRequest req) throws IOException, SlackApiException {
         return postFormWithTokenAndParseResponse(toForm(req), Methods.USERGROUPS_CREATE, getToken(req), UsergroupsCreateResponse.class);
diff --git a/slack-api-client/src/main/java/com/slack/api/methods/request/team/TeamBillingInfoRequest.java b/slack-api-client/src/main/java/com/slack/api/methods/request/team/TeamBillingInfoRequest.java
@@ -0,0 +1,16 @@
+package com.slack.api.methods.request.team;
+
+import com.slack.api.methods.SlackApiRequest;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class TeamBillingInfoRequest implements SlackApiRequest {
+
+    /**
+     * Authentication token. Requires scope: `team.billing:read`
+     */
+    private String token;
+
+}
diff --git a/slack-api-client/src/main/java/com/slack/api/methods/request/team/TeamPreferencesListRequest.java b/slack-api-client/src/main/java/com/slack/api/methods/request/team/TeamPreferencesListRequest.java
@@ -0,0 +1,16 @@
+package com.slack.api.methods.request.team;
+
+import com.slack.api.methods.SlackApiRequest;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class TeamPreferencesListRequest implements SlackApiRequest {
+
+    /**
+     * Authentication token. Requires scope: `team.preferences:read`
+     */
+    private String token;
+
+}
diff --git a/slack-api-client/src/main/java/com/slack/api/methods/response/team/TeamBillingInfoResponse.java b/slack-api-client/src/main/java/com/slack/api/methods/response/team/TeamBillingInfoResponse.java
@@ -0,0 +1,20 @@
+package com.slack.api.methods.response.team;
+
+import com.slack.api.methods.SlackApiTextResponse;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class TeamBillingInfoResponse implements SlackApiTextResponse {
+
+    private boolean ok;
+    private String warning;
+    private String error;
+    private String needed;
+    private String provided;
+    private transient Map<String, List<String>> httpResponseHeaders;
+
+    private String plan;
+}
diff --git a/slack-api-client/src/main/java/com/slack/api/methods/response/team/TeamPreferencesListResponse.java b/slack-api-client/src/main/java/com/slack/api/methods/response/team/TeamPreferencesListResponse.java
@@ -0,0 +1,24 @@
+package com.slack.api.methods.response.team;
+
+import com.slack.api.methods.SlackApiTextResponse;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class TeamPreferencesListResponse implements SlackApiTextResponse {
+
+    private boolean ok;
+    private String warning;
+    private String error;
+    private String needed;
+    private String provided;
+    private transient Map<String, List<String>> httpResponseHeaders;
+
+    private Integer msgEditWindowMins;
+    private Boolean allowMessageDeletion;
+    private Boolean displayRealNames;
+    private String disableFileUploads; // "allow_all"
+    private String whoCanPostGeneral; // "ra"
+}
diff --git a/slack-api-client/src/test/java/test_locally/api/MethodsTest.java b/slack-api-client/src/test/java/test_locally/api/MethodsTest.java
@@ -42,10 +42,7 @@ public void verifyTheCoverage() {
                 "apps.manifest.export",
                 "apps.manifest.update",
                 "apps.manifest.validate",
-                "tooling.tokens.rotate",
-                // TODO: Add new endpoints for rtm.start users
-                "team.billing.info",
-                "team.preferences.list"
+                "tooling.tokens.rotate"
         );
         List<String> methodNames = new ArrayList<>();
         for (String methodName : allMethodNames) {
diff --git a/slack-api-client/src/test/java/test_locally/api/methods/FieldValidation_o_to_z_Test.java b/slack-api-client/src/test/java/test_locally/api/methods/FieldValidation_o_to_z_Test.java
@@ -22,10 +22,7 @@
 import com.slack.api.methods.response.stars.StarsAddResponse;
 import com.slack.api.methods.response.stars.StarsListResponse;
 import com.slack.api.methods.response.stars.StarsRemoveResponse;
-import com.slack.api.methods.response.team.TeamAccessLogsResponse;
-import com.slack.api.methods.response.team.TeamBillableInfoResponse;
-import com.slack.api.methods.response.team.TeamInfoResponse;
-import com.slack.api.methods.response.team.TeamIntegrationLogsResponse;
+import com.slack.api.methods.response.team.*;
 import com.slack.api.methods.response.team.profile.TeamProfileGetResponse;
 import com.slack.api.methods.response.usergroups.*;
 import com.slack.api.methods.response.usergroups.users.UsergroupsUsersListResponse;
@@ -341,6 +338,18 @@ public void team_profile_get() throws Exception {
         );
     }
 
+    @Test
+    public void team_billing_info() throws Exception {
+        TeamBillingInfoResponse obj = parse("team.billing.info", TeamBillingInfoResponse.class);
+        verifyIfAllGettersReturnNonNull(obj);
+    }
+
+    @Test
+    public void team_preferences_list() throws Exception {
+        TeamPreferencesListResponse obj = parse("team.preferences.list", TeamPreferencesListResponse.class);
+        verifyIfAllGettersReturnNonNull(obj);
+    }
+
     @Test
     public void usergroups_create() throws Exception {
         UsergroupsCreateResponse obj = parse("usergroups.create", UsergroupsCreateResponse.class);
diff --git a/slack-api-client/src/test/java/test_locally/api/methods/TeamTest.java b/slack-api-client/src/test/java/test_locally/api/methods/TeamTest.java
diff --git a/slack-api-client/src/test/java/test_with_remote_apis/methods/team_Test.java b/slack-api-client/src/test/java/test_with_remote_apis/methods/team_Test.java
