Added the new fields photo, description and invite_link to the Chat object

Author: pengrad

library/src/main/java/com/pengrad/telegrambot/model/Chat.java

@@ -12,7 +12,7 @@ public class Chat implements Serializable {
     private final static long serialVersionUID = 0L;
 
     public enum Type {
-        @SerializedName("private") Private, group, supergroup, channel
+        @SerializedName("private")Private, group, supergroup, channel
     }
 
     private Long id;
@@ -30,6 +30,10 @@ public enum Type {
 
     private Boolean all_members_are_administrators;
 
+    private ChatPhoto photo;
+    private String description;
+    private String invite_link;
+
     public Long id() {
         return id;
     }
@@ -58,6 +62,18 @@ public Boolean allMembersAreAdministrators() {
         return all_members_are_administrators;
     }
 
+    public ChatPhoto photo() {
+        return photo;
+    }
+
+    public String description() {
+        return description;
+    }
+
+    public String inviteLink() {
+        return invite_link;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -71,7 +87,11 @@ public boolean equals(Object o) {
         if (last_name != null ? !last_name.equals(chat.last_name) : chat.last_name != null) return false;
         if (username != null ? !username.equals(chat.username) : chat.username != null) return false;
         if (title != null ? !title.equals(chat.title) : chat.title != null) return false;
-        return all_members_are_administrators != null ? all_members_are_administrators.equals(chat.all_members_are_administrators) : chat.all_members_are_administrators == null;
+        if (all_members_are_administrators != null ? !all_members_are_administrators.equals(chat.all_members_are_administrators) : chat.all_members_are_administrators != null)
+            return false;
+        if (photo != null ? !photo.equals(chat.photo) : chat.photo != null) return false;
+        if (description != null ? !description.equals(chat.description) : chat.description != null) return false;
+        return invite_link != null ? invite_link.equals(chat.invite_link) : chat.invite_link == null;
     }
 
     @Override
@@ -89,6 +109,9 @@ public String toString() {
                 ", username='" + username + '\'' +
                 ", title='" + title + '\'' +
                 ", all_members_are_administrators=" + all_members_are_administrators +
+                ", photo=" + photo +
+                ", description='" + description + '\'' +
+                ", invite_link='" + invite_link + '\'' +
                 '}';
     }
 }

library/src/main/java/com/pengrad/telegrambot/model/ChatPhoto.java

@@ -0,0 +1,49 @@
+package com.pengrad.telegrambot.model;
+
+import java.io.Serializable;
+
+/**
+ * Stas Parshin
+ * 01 July 2017
+ */
+public class ChatPhoto implements Serializable {
+    private final static long serialVersionUID = 0L;
+
+    private String small_file_id;
+    private String big_file_id;
+
+    public String smallFileId() {
+        return small_file_id;
+    }
+
+    public String bigFileId() {
+        return big_file_id;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        ChatPhoto chatPhoto = (ChatPhoto) o;
+
+        if (small_file_id != null ? !small_file_id.equals(chatPhoto.small_file_id) : chatPhoto.small_file_id != null)
+            return false;
+        return big_file_id != null ? big_file_id.equals(chatPhoto.big_file_id) : chatPhoto.big_file_id == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = small_file_id != null ? small_file_id.hashCode() : 0;
+        result = 31 * result + (big_file_id != null ? big_file_id.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "ChatPhoto{" +
+                "small_file_id='" + small_file_id + '\'' +
+                ", big_file_id='" + big_file_id + '\'' +
+                '}';
+    }
+}

library/src/test/java/com/pengrad/telegrambot/ChatPhotoTest.java

@@ -0,0 +1,18 @@
+package com.pengrad.telegrambot;
+
+import com.pengrad.telegrambot.model.ChatPhoto;
+
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Stas Parshin
+ * 01 July 2017
+ */
+public class ChatPhotoTest {
+
+    public static void check(ChatPhoto photo) {
+        assertNotNull(photo.smallFileId());
+        assertNotNull(photo.bigFileId());
+    }
+
+}

library/src/test/java/com/pengrad/telegrambot/ChatTest.java

@@ -13,6 +13,7 @@ public class ChatTest {
     public static void checkChat(Chat chat) {
         assertNotNull(chat.id());
         assertNotNull(chat.type());
+        if (chat.photo() != null) ChatPhotoTest.check(chat.photo());
     }
 
 }

library/src/test/java/com/pengrad/telegrambot/ModelTest.java

@@ -27,6 +27,7 @@ public void setClasses() {
                 CallbackQuery.class,
                 Chat.class,
                 ChatMember.class,
+                ChatPhoto.class,
                 ChosenInlineResult.class,
                 Contact.class,
                 Document.class,

library/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java

@@ -12,6 +12,9 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -321,10 +324,13 @@ private CallbackQuery getLastCallbackQuery() {
     }
 
     @Test
-    public void getChat() {
-        GetChatResponse getChatResponse = bot.execute(new GetChat(chatId));
-        assertTrue(getChatResponse.toString().contains(chatId.toString()));
-        ChatTest.checkChat(getChatResponse.chat());
+    public void getChat() throws MalformedURLException, URISyntaxException {
+        Chat chat = bot.execute(new GetChat(groupId)).chat();
+        ChatTest.checkChat(chat);
+        assertEquals(chat.type(), Chat.Type.supergroup);
+        assertTrue(chat.title().contains("Test Bot Group"));
+        assertTrue(chat.description().contains("New desc"));
+        assertNotNull(new URL(chat.inviteLink()).toURI());
     }
 
     @Test