#705 企业微信增加获取外部联系人详情接口

weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpUserServiceImplTest.java

@@ -1,22 +1,23 @@
 package me.chanjar.weixin.cp.api.impl;
 
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.testng.annotations.*;
+
 import com.google.common.collect.Lists;
 import com.google.inject.Inject;
+import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.cp.api.ApiTestModule;
 import me.chanjar.weixin.cp.api.WxCpService;
 import me.chanjar.weixin.cp.bean.Gender;
 import me.chanjar.weixin.cp.bean.WxCpInviteResult;
 import me.chanjar.weixin.cp.bean.WxCpUser;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.testng.annotations.Guice;
-import org.testng.annotations.Test;
+import me.chanjar.weixin.cp.bean.WxCpUserExternalContactInfo;
 
-import java.util.List;
-import java.util.Map;
-
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.*;
 
 /**
  * <pre>
@@ -109,4 +110,11 @@ public class WxCpUserServiceImplTest {
     System.out.println(result);
     assertNotNull(result);
   }
+
+  @Test
+  public void testGetExternalContact() throws WxErrorException {
+    WxCpUserExternalContactInfo result = this.wxCpService.getUserService().getExternalContact(userId);
+    System.out.println(result);
+    assertNotNull(result);
+  }
 }

weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpUserExternalContactInfoTest.java

@@ -0,0 +1,129 @@
+package me.chanjar.weixin.cp.bean;
+
+import java.util.List;
+
+import org.testng.annotations.*;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * <pre>
+ *
+ * Created by Binary Wang on 2018/9/16.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public class WxCpUserExternalContactInfoTest {
+
+  @Test
+  public void testFromJson() {
+    final String json = "{\n" +
+      "  \"errcode\": 0,\n" +
+      "  \"errmsg\": \"ok\",\n" +
+      "  \"external_contact\": {\n" +
+      "    \"external_userid\": \"woAJ2GCAAAXtWyujaWJHDDGi0mACH71w\",\n" +
+      "    \"name\": \"李四\",\n" +
+      "    \"position\": \"Mangaer\",\n" +
+      "    \"avatar\": \"http://p.qlogo.cn/bizmail/IcsdgagqefergqerhewSdage/0\",\n" +
+      "    \"corp_name\": \"腾讯\",\n" +
+      "    \"corp_full_name\": \"腾讯科技有限公司\",\n" +
+      "    \"type\": 2,\n" +
+      "    \"gender\": 1,\n" +
+      "    \"unionid\": \"ozynqsulJFCZ2z1aYeS8h-nuasdfR1\",\n" +
+      "    \"external_profile\": {\n" +
+      "      \"external_attr\": [\n" +
+      "        {\n" +
+      "          \"type\": 0,\n" +
+      "          \"name\": \"文本名称\",\n" +
+      "          \"text\": {\n" +
+      "            \"value\": \"文本\"\n" +
+      "          }\n" +
+      "        },\n" +
+      "        {\n" +
+      "          \"type\": 1,\n" +
+      "          \"name\": \"网页名称\",\n" +
+      "          \"web\": {\n" +
+      "            \"url\": \"http://www.test.com\",\n" +
+      "            \"title\": \"标题\"\n" +
+      "          }\n" +
+      "        },\n" +
+      "        {\n" +
+      "          \"type\": 2,\n" +
+      "          \"name\": \"测试app\",\n" +
+      "          \"miniprogram\": {\n" +
+      "            \"appid\": \"wx8bd80126147df384\",\n" +
+      "            \"pagepath\": \"/index\",\n" +
+      "            \"title\": \"my miniprogram\"\n" +
+      "          }\n" +
+      "        }\n" +
+      "      ]\n" +
+      "    }\n" +
+      "  },\n" +
+      "  \"follow_user\": [\n" +
+      "    {\n" +
+      "      \"userid\": \"rocky\",\n" +
+      "      \"remark\": \"李部长\",\n" +
+      "      \"description\": \"对接采购事物\",\n" +
+      "      \"createtime\": 1525779812\n" +
+      "    },\n" +
+      "    {\n" +
+      "      \"userid\": \"tommy\",\n" +
+      "      \"remark\": \"李总\",\n" +
+      "      \"description\": \"采购问题咨询\",\n" +
+      "      \"createtime\": 1525881637\n" +
+      "    }\n" +
+      "  ]\n" +
+      "}";
+
+    final WxCpUserExternalContactInfo contactInfo = WxCpUserExternalContactInfo.fromJson(json);
+    assertThat(contactInfo).isNotNull();
+    assertThat(contactInfo.getExternalContact()).isNotNull();
+
+    assertThat(contactInfo.getExternalContact().getExternalUserId()).isEqualTo("woAJ2GCAAAXtWyujaWJHDDGi0mACH71w");
+    assertThat(contactInfo.getExternalContact().getPosition()).isEqualTo("Mangaer");
+    assertThat(contactInfo.getExternalContact().getAvatar()).isEqualTo("http://p.qlogo.cn/bizmail/IcsdgagqefergqerhewSdage/0");
+    assertThat(contactInfo.getExternalContact().getCorpName()).isEqualTo("腾讯");
+    assertThat(contactInfo.getExternalContact().getCorpFullName()).isEqualTo("腾讯科技有限公司");
+    assertThat(contactInfo.getExternalContact().getType()).isEqualTo(2);
+    assertThat(contactInfo.getExternalContact().getGender()).isEqualTo(1);
+    assertThat(contactInfo.getExternalContact().getUnionId()).isEqualTo("ozynqsulJFCZ2z1aYeS8h-nuasdfR1");
+    assertThat(contactInfo.getExternalContact().getName()).isEqualTo("李四");
+
+    assertThat(contactInfo.getExternalContact().getExternalProfile()).isNotNull();
+
+    final List<WxCpUserExternalContactInfo.ExternalAttribute> externalAttrs = contactInfo.getExternalContact().getExternalProfile().getExternalAttrs();
+    assertThat(externalAttrs).isNotEmpty();
+
+    final WxCpUserExternalContactInfo.ExternalAttribute externalAttr1 = externalAttrs.get(0);
+    assertThat(externalAttr1.getType()).isEqualTo(0);
+    assertThat(externalAttr1.getName()).isEqualTo("文本名称");
+    assertThat(externalAttr1.getText().getValue()).isEqualTo("文本");
+
+    final WxCpUserExternalContactInfo.ExternalAttribute externalAttr2 = externalAttrs.get(1);
+    assertThat(externalAttr2.getType()).isEqualTo(1);
+    assertThat(externalAttr2.getName()).isEqualTo("网页名称");
+    assertThat(externalAttr2.getWeb().getUrl()).isEqualTo("http://www.test.com");
+    assertThat(externalAttr2.getWeb().getTitle()).isEqualTo("标题");
+
+    final WxCpUserExternalContactInfo.ExternalAttribute externalAttr3 = externalAttrs.get(2);
+    assertThat(externalAttr3.getType()).isEqualTo(2);
+    assertThat(externalAttr3.getName()).isEqualTo("测试app");
+    assertThat(externalAttr3.getMiniProgram().getAppid()).isEqualTo("wx8bd80126147df384");
+    assertThat(externalAttr3.getMiniProgram().getPagePath()).isEqualTo("/index");
+    assertThat(externalAttr3.getMiniProgram().getTitle()).isEqualTo("my miniprogram");
+
+
+    List<WxCpUserExternalContactInfo.FollowedUser> followedUsers = contactInfo.getFollowedUsers();
+    assertThat(followedUsers).isNotEmpty();
+    assertThat(followedUsers.get(0).getUserId()).isEqualTo("rocky");
+    assertThat(followedUsers.get(0).getRemark()).isEqualTo("李部长");
+    assertThat(followedUsers.get(0).getDescription()).isEqualTo("对接采购事物");
+    assertThat(followedUsers.get(0).getCreateTime()).isEqualTo(1525779812);
+
+    assertThat(followedUsers.get(1).getUserId()).isEqualTo("tommy");
+    assertThat(followedUsers.get(1).getRemark()).isEqualTo("李总");
+    assertThat(followedUsers.get(1).getDescription()).isEqualTo("采购问题咨询");
+    assertThat(followedUsers.get(1).getCreateTime()).isEqualTo(1525881637);
+  }
+}

weixin-java-cp/src/test/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapterTest.java

@@ -78,18 +78,18 @@ public class WxCpUserGsonAdapterTest {
     assertThat(user).isNotNull();
     assertThat(user.getExternalAttrs()).isNotEmpty();
 
-    final WxCpUser.ExternalAttr externalAttr1 = user.getExternalAttrs().get(0);
+    final WxCpUser.ExternalAttribute externalAttr1 = user.getExternalAttrs().get(0);
     assertThat(externalAttr1.getType()).isEqualTo(0);
     assertThat(externalAttr1.getName()).isEqualTo("文本名称");
     assertThat(externalAttr1.getValue()).isEqualTo("文本");
 
-    final WxCpUser.ExternalAttr externalAttr2 = user.getExternalAttrs().get(1);
+    final WxCpUser.ExternalAttribute externalAttr2 = user.getExternalAttrs().get(1);
     assertThat(externalAttr2.getType()).isEqualTo(1);
     assertThat(externalAttr2.getName()).isEqualTo("网页名称");
     assertThat(externalAttr2.getUrl()).isEqualTo("http://www.test.com");
     assertThat(externalAttr2.getTitle()).isEqualTo("标题");
 
-    final WxCpUser.ExternalAttr externalAttr3 = user.getExternalAttrs().get(2);
+    final WxCpUser.ExternalAttribute externalAttr3 = user.getExternalAttrs().get(2);
     assertThat(externalAttr3.getType()).isEqualTo(2);
     assertThat(externalAttr3.getName()).isEqualTo("测试app");
     assertThat(externalAttr3.getAppid()).isEqualTo("wx8bd80126147df384");
@@ -100,18 +100,18 @@ public class WxCpUserGsonAdapterTest {
   @Test
   public void testSerialize() {
     WxCpUser user = new WxCpUser();
-    user.addExternalAttr(WxCpUser.ExternalAttr.builder()
+    user.addExternalAttr(WxCpUser.ExternalAttribute.builder()
       .type(0)
       .name("文本名称")
       .value("文本")
       .build());
-    user.addExternalAttr(WxCpUser.ExternalAttr.builder()
+    user.addExternalAttr(WxCpUser.ExternalAttribute.builder()
       .type(1)
       .name("网页名称")
       .url("http://www.test.com")
       .title("标题")
       .build());
-    user.addExternalAttr(WxCpUser.ExternalAttr.builder()
+    user.addExternalAttr(WxCpUser.ExternalAttribute.builder()
       .type(2)
       .name("测试app")
       .appid("wx8bd80126147df384")