Fix join room request. Add getRoomById request. Resolve #20

Gitteroid · Oct 1, 2016 · aea8b1c · aea8b1c
1 parent b579fca
commit aea8b1c
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 37 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -13,4 +13,6 @@
 
 **Rx,Async,Sync:**
 - Add `delete` room API
-- Remove channels API
+- Remove channels API
+- Fix `joinRoom` API
+- Add `getRoomById` API
diff --git a/library/async/src/main/java/com/amatkivskiy/gitter/sdk/async/api/AsyncGitterApi.java b/library/async/src/main/java/com/amatkivskiy/gitter/sdk/async/api/AsyncGitterApi.java
@@ -53,16 +53,20 @@ void searchUsers(
   void searchUsers(@Query("q") String searchTerm, Callback<SearchUsersResponse> callback);
 
   // Rooms Api
+  @GET("/rooms/{roomId}")
+  void getRoomById(@Path("roomId") String roomId, Callback<RoomResponse> callback);
+
+  @POST("/user/{userId}/rooms")
+  @FormUrlEncoded
+  void joinRoom(@Path("userId") String userId, @Field("id") String roomId,
+                Callback<RoomResponse> callback);
+
   @GET("/rooms/{roomId}/users")
   void getRoomUsers(@Path("roomId") String roomId, Callback<List<UserResponse>> callback);
 
   @GET("/user/{userId}/rooms")
   void getUserRooms(@Path("userId") String userId, Callback<List<RoomResponse>> callback);
 
-  @POST("/rooms")
-  @FormUrlEncoded
-  void joinRoom(@Field("uri") String roomUri, Callback<RoomResponse> callback);
-
   @PUT("/rooms/{roomId}")
   void updateRoom(@Path("roomId") String roomId, @Body UpdateRoomRequestParam param,
                   Callback<RoomResponse> callback);

diff --git a/...ary/async/src/main/java/com/amatkivskiy/gitter/sdk/async/client/AsyncGitterApiClient.java b/...ary/async/src/main/java/com/amatkivskiy/gitter/sdk/async/client/AsyncGitterApiClient.java
@@ -91,8 +91,8 @@ public void getCurrentUserRooms(Callback<List<RoomResponse>> callback) {
     api.getCurrentUserRooms(callback);
   }
 
-  public void joinRoom(String roomUri, Callback<RoomResponse> callback) {
-    api.joinRoom(roomUri, callback);
+  public void joinRoom(String userId, String roomId, Callback<RoomResponse> callback) {
+    api.joinRoom(userId, roomId, callback);
   }
 
   public void updateRoom(String roomId, UpdateRoomRequestParam params,

diff --git a/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/api/RxGitterApi.java b/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/api/RxGitterApi.java
@@ -46,6 +46,9 @@ public interface RxGitterApi {
   Observable<SearchUsersResponse> searchUsers(@Query("q") String searchTerm);
 
   // Rooms API
+  @GET("/rooms/{roomId}")
+  Observable<RoomResponse> getRoomById(@Path("roomId") String roomId);
+
   @GET("/user/{userId}/rooms")
   Observable<List<RoomResponse>> getUserRooms(@Path("userId") String userId);
 
@@ -55,9 +58,9 @@ public interface RxGitterApi {
   @GET("/rooms/{roomId}/users")
   Observable<List<UserResponse>> getRoomUsers(@Path("roomId") String roomId);
 
-  @POST("/rooms")
+  @POST("/user/{userId}/rooms")
   @FormUrlEncoded
-  Observable<RoomResponse> joinRoom(@Field("uri") String roomUri);
+  Observable<RoomResponse> joinRoom(@Path("userId") String userId, @Field("id") String roomId);
 
   @PUT("/rooms/{roomId}")
   Observable<RoomResponse> updateRoom(@Path("roomId") String roomId, @Body UpdateRoomRequestParam param);

diff --git a/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/client/RxGitterApiClient.java b/library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/client/RxGitterApiClient.java
@@ -68,6 +68,10 @@ public List<UserResponse> call(SearchUsersResponse searchUsersResponse) {
   }
 
   // Rooms API
+  public Observable<RoomResponse> getRoomById(String roomId) {
+    return api.getRoomById(roomId);
+  }
+
   public Observable<List<RoomResponse>> getUserRooms(String userId) {
     return api.getUserRooms(userId);
   }
@@ -80,8 +84,8 @@ public Observable<List<UserResponse>> getRoomUsers(String roomId) {
     return api.getRoomUsers(roomId);
   }
 
-  public Observable<RoomResponse> joinRoom(String roomUri) {
-    return api.joinRoom(roomUri);
+  public Observable<RoomResponse> joinRoom(String userId, String roomId) {
+    return api.joinRoom(userId, roomId);
   }
 
   public Observable<RoomResponse> updateRoom(String roomId, UpdateRoomRequestParam params) {

diff --git a/library/sync/src/main/java/com/amatkivskiy/gitter/sdk/sync/api/SyncGitterApi.java b/library/sync/src/main/java/com/amatkivskiy/gitter/sdk/sync/api/SyncGitterApi.java
@@ -48,9 +48,12 @@ public interface SyncGitterApi {
   SearchUsersResponse searchUsers(@Query("q") String searchTerm);
 
   // Rooms API
-  @POST("/rooms")
+  @GET("/rooms/{roomId}")
+  RoomResponse getRoomById(@Path("roomId") String roomId);
+
+  @POST("/user/{userId}/rooms")
   @FormUrlEncoded
-  RoomResponse joinRoom(@Field("uri") String roomUri);
+  RoomResponse joinRoom(@Path("userId") String userId, @Field("id") String roomId);
 
   @GET("/rooms/{roomId}/users")
   List<UserResponse> getRoomUsers(@Path("roomId") String roomId);

diff --git a/library/sync/src/main/java/com/amatkivskiy/gitter/sdk/sync/client/SyncGitterApiClient.java b/library/sync/src/main/java/com/amatkivskiy/gitter/sdk/sync/client/SyncGitterApiClient.java
@@ -70,8 +70,8 @@ public List<UserResponse> getRoomUsers(String roomId) {
     return api.getRoomUsers(roomId);
   }
 
-  public RoomResponse joinRoom(String roomUri) {
-    return api.joinRoom(roomUri);
+  public RoomResponse joinRoom(String userId, String roomId) {
+    return api.joinRoom(userId, roomId);
   }
 
   public RoomResponse updateRoom(String roomId, UpdateRoomRequestParam params) {

diff --git a/samples/src/main/java/com/amatkivskiy/gitter/sdk/samples/RxSamples.java b/samples/src/main/java/com/amatkivskiy/gitter/sdk/samples/RxSamples.java
@@ -37,28 +37,16 @@ public static void main(String[] args) {
 //    This is required only for authentication.
     GitterDeveloperCredentials.init(new SimpleGitterCredentialsProvider(OAUTH_KEY, OAUTH_SECRET, REDIRECT_URL));
 
-//    getAccessTokenSample();
-//    getUserSample();
-//    getRoomChatMessages();
-//    roomMessagesStreamSample();
-//    leaveRoomSample();
-//    searchRoomsSample();
-//    searchUsersSample();
-//    markMessagesRead();
-//    getSuggestedRooms();
-//    roomEventsStreamSample();
-    testMethod();
-  }
-
-  private static void testMethod() {
-    RxGitterApiClient client = new RxGitterApiClient.Builder()
-        .withAccountToken("c2fc54dc5bc835317b7b29f389383611d8940987")
-        .build();
-
-    BooleanResponse result = client.deleteRooom("57edcee740f3a6eec068229e").toBlocking().first();
-    System.out.println(String.format("success : %s", result.success));
-
-    System.exit(0);
+    getAccessTokenSample();
+    getUserSample();
+    getRoomChatMessages();
+    roomMessagesStreamSample();
+    leaveRoomSample();
+    searchRoomsSample();
+    searchUsersSample();
+    markMessagesRead();
+    getSuggestedRooms();
+    roomEventsStreamSample();
   }
 
   private static void roomEventsStreamSample() {