feat(cp): refine wedoc doc and smartsheet helpers

Author: Copilot

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/doc/WxCpDocData.java

@@ -36,6 +36,10 @@ public class WxCpDocData extends WxCpBaseResp implements Serializable {
   @SerializedName("next_cursor")
   private String nextCursor;
 
+  public JsonElement getEffectiveContent() {
+    return this.content != null ? this.content : this.docContent;
+  }
+
   public static WxCpDocData fromJson(String json) {
     return WxCpGsonBuilder.create().fromJson(json, WxCpDocData.class);
   }

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/doc/WxCpDocGetDataRequest.java

@@ -1,5 +1,6 @@
 package me.chanjar.weixin.cp.bean.oa.doc;
 
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.SerializedName;
 import lombok.AllArgsConstructor;
@@ -42,10 +43,37 @@ public String toJson() {
     JsonObject jsonObject = new JsonObject();
     jsonObject.addProperty("docid", this.docId);
     if (this.extra != null) {
-      for (Map.Entry<String, com.google.gson.JsonElement> entry : this.extra.entrySet()) {
+      for (Map.Entry<String, JsonElement> entry : this.extra.entrySet()) {
         jsonObject.add(entry.getKey(), entry.getValue());
       }
     }
     return WxCpGsonBuilder.create().toJson(jsonObject);
   }
+
+  public WxCpDocGetDataRequest addExtra(String key, String value) {
+    ensureExtra().addProperty(key, value);
+    return this;
+  }
+
+  public WxCpDocGetDataRequest addExtra(String key, Number value) {
+    ensureExtra().addProperty(key, value);
+    return this;
+  }
+
+  public WxCpDocGetDataRequest addExtra(String key, Boolean value) {
+    ensureExtra().addProperty(key, value);
+    return this;
+  }
+
+  public WxCpDocGetDataRequest addExtra(String key, JsonElement value) {
+    ensureExtra().add(key, value);
+    return this;
+  }
+
+  private JsonObject ensureExtra() {
+    if (this.extra == null) {
+      this.extra = new JsonObject();
+    }
+    return this.extra;
+  }
 }

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/doc/WxCpDocImageUploadResult.java

@@ -26,9 +26,16 @@ public class WxCpDocImageUploadResult extends WxCpBaseResp implements Serializab
   @SerializedName("imageid")
   private String imageId;
 
+  @SerializedName("media_id")
+  private String mediaId;
+
   @SerializedName("md5")
   private String md5;
 
+  public String getEffectiveUrl() {
+    return this.imageUrl != null ? this.imageUrl : this.url;
+  }
+
   public static WxCpDocImageUploadResult fromJson(String json) {
     return WxCpGsonBuilder.create().fromJson(json, WxCpDocImageUploadResult.class);
   }

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/doc/WxCpDocModifyRequest.java

@@ -1,5 +1,6 @@
 package me.chanjar.weixin.cp.bean.oa.doc;
 
+import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.SerializedName;
@@ -58,4 +59,40 @@ public String toJson() {
     }
     return WxCpGsonBuilder.create().toJson(jsonObject);
   }
+
+  public WxCpDocModifyRequest addRequest(JsonObject request) {
+    JsonArray requestArray = this.requests != null && this.requests.isJsonArray()
+      ? this.requests.getAsJsonArray()
+      : new JsonArray();
+    requestArray.add(request);
+    this.requests = requestArray;
+    return this;
+  }
+
+  public WxCpDocModifyRequest addExtra(String key, String value) {
+    ensureExtra().addProperty(key, value);
+    return this;
+  }
+
+  public WxCpDocModifyRequest addExtra(String key, Number value) {
+    ensureExtra().addProperty(key, value);
+    return this;
+  }
+
+  public WxCpDocModifyRequest addExtra(String key, Boolean value) {
+    ensureExtra().addProperty(key, value);
+    return this;
+  }
+
+  public WxCpDocModifyRequest addExtra(String key, JsonElement value) {
+    ensureExtra().add(key, value);
+    return this;
+  }
+
+  private JsonObject ensureExtra() {
+    if (this.extra == null) {
+      this.extra = new JsonObject();
+    }
+    return this.extra;
+  }
 }

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/doc/WxCpDocSmartSheetAuth.java

@@ -33,6 +33,16 @@ public class WxCpDocSmartSheetAuth extends WxCpBaseResp implements Serializable
   @SerializedName("record_auth")
   private JsonElement recordAuth;
 
+  public JsonElement getEffectiveAuthInfo() {
+    if (this.authInfo != null) {
+      return this.authInfo;
+    }
+    if (this.fieldAuth != null) {
+      return this.fieldAuth;
+    }
+    return this.recordAuth;
+  }
+
   public static WxCpDocSmartSheetAuth fromJson(String json) {
     return WxCpGsonBuilder.create().fromJson(json, WxCpDocSmartSheetAuth.class);
   }

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

@@ -51,7 +51,7 @@ public void testNewApisUseExpectedPaths() throws WxErrorException {
     when(cpService.post(eq("https://api.test/mod_doc"), anyString()))
       .thenReturn("{\"errcode\":0,\"errmsg\":\"ok\"}");
     when(cpService.upload(eq("https://api.test/upload_doc_image"), any()))
-      .thenReturn("{\"errcode\":0,\"errmsg\":\"ok\",\"url\":\"https://img.test/a.png\"}");
+      .thenReturn("{\"errcode\":0,\"errmsg\":\"ok\",\"image_url\":\"https://img.test/a.png\",\"media_id\":\"media-1\"}");
     when(cpService.post(eq("https://api.test/smartsheet/get_sheet_auth"), anyString()))
       .thenReturn("{\"errcode\":0,\"errmsg\":\"ok\",\"docid\":\"doc1\",\"sheet_id\":\"sheet1\"}");
     when(cpService.post(eq("https://api.test/smartsheet/mod_sheet_auth"), anyString()))
@@ -82,7 +82,8 @@ public void testNewApisUseExpectedPaths() throws WxErrorException {
     verify(cpService).post(eq("https://api.test/mod_doc"), anyString());
 
     WxCpDocImageUploadResult uploadResult = service.docUploadImage(new File("demo.png"));
-    assertThat(uploadResult.getUrl()).isEqualTo("https://img.test/a.png");
+    assertThat(uploadResult.getEffectiveUrl()).isEqualTo("https://img.test/a.png");
+    assertThat(uploadResult.getMediaId()).isEqualTo("media-1");
     verify(cpService).upload(eq("https://api.test/upload_doc_image"), any());
 
     WxCpDocSmartSheetAuthRequest authRequest = WxCpDocSmartSheetAuthRequest.builder()

weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/oa/doc/WxCpOaWeDocJsonTest.java

@@ -1,6 +1,5 @@
 package me.chanjar.weixin.cp.bean.oa.doc;
 
-import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import me.chanjar.weixin.cp.api.WxCpService;
 import me.chanjar.weixin.cp.api.impl.WxCpServiceImpl;
@@ -157,29 +156,23 @@ public void testFormStatisticAndAnswerFromJson() {
 
   @Test
   public void testDocGetDataAndModifyJson() {
-    JsonObject extra = new JsonObject();
-    extra.addProperty("start", 0);
-    extra.addProperty("limit", 20);
-
     WxCpDocGetDataRequest getDataRequest = WxCpDocGetDataRequest.builder()
       .docId("doc123")
-      .extra(extra)
       .build();
+    getDataRequest.addExtra("start", 0).addExtra("limit", 20);
     assertThat(getDataRequest.toJson()).contains("\"docid\":\"doc123\"");
     assertThat(getDataRequest.toJson()).contains("\"limit\":20");
 
-    JsonArray requests = new JsonArray();
     JsonObject insertRequest = new JsonObject();
     insertRequest.addProperty("op", "insert_text");
     insertRequest.addProperty("text", "hello");
-    requests.add(insertRequest);
-
     WxCpDocModifyRequest modifyRequest = WxCpDocModifyRequest.builder()
       .docId("doc123")
-      .requests(requests)
       .build();
+    modifyRequest.addRequest(insertRequest).addExtra("client_token", "token-1");
     assertThat(modifyRequest.toJson()).contains("\"requests\"");
     assertThat(modifyRequest.toJson()).contains("\"insert_text\"");
+    assertThat(modifyRequest.toJson()).contains("\"client_token\":\"token-1\"");
 
     String json = "{"
       + "\"errcode\":0,"
@@ -192,22 +185,34 @@ public void testDocGetDataAndModifyJson() {
     WxCpDocData result = WxCpDocData.fromJson(json);
     assertThat(result.getDocId()).isEqualTo("doc123");
     assertThat(result.getContent().getAsJsonObject().getAsJsonArray("blocks")).hasSize(1);
+    assertThat(result.getEffectiveContent().getAsJsonObject().getAsJsonArray("blocks")).hasSize(1);
     assertThat(result.getHasMore()).isTrue();
     assertThat(result.getNextCursor()).isEqualTo("cursor-1");
+
+    String docContentJson = "{"
+      + "\"errcode\":0,"
+      + "\"errmsg\":\"ok\","
+      + "\"docid\":\"doc123\","
+      + "\"doc_content\":{\"blocks\":[{\"block_id\":\"blk2\"}]}"
+      + "}";
+    WxCpDocData docContentResult = WxCpDocData.fromJson(docContentJson);
+    assertThat(docContentResult.getEffectiveContent().getAsJsonObject().getAsJsonArray("blocks")).hasSize(1);
   }
 
   @Test
   public void testDocUploadImageAndSmartSheetAuthJson() {
     String uploadJson = "{"
       + "\"errcode\":0,"
       + "\"errmsg\":\"ok\","
-      + "\"url\":\"https://wedoc.test/image.png\","
+      + "\"image_url\":\"https://wedoc.test/image.png\","
       + "\"imageid\":\"img123\","
+      + "\"media_id\":\"media123\","
       + "\"md5\":\"abc\""
       + "}";
     WxCpDocImageUploadResult uploadResult = WxCpDocImageUploadResult.fromJson(uploadJson);
-    assertThat(uploadResult.getUrl()).isEqualTo("https://wedoc.test/image.png");
+    assertThat(uploadResult.getEffectiveUrl()).isEqualTo("https://wedoc.test/image.png");
     assertThat(uploadResult.getImageId()).isEqualTo("img123");
+    assertThat(uploadResult.getMediaId()).isEqualTo("media123");
 
     JsonObject smartExtra = new JsonObject();
     smartExtra.addProperty("view_type", "field");
@@ -241,5 +246,6 @@ public void testDocUploadImageAndSmartSheetAuthJson() {
     assertThat(smartSheetAuth.getDocId()).isEqualTo("doc456");
     assertThat(smartSheetAuth.getAuthInfo().getAsJsonObject().get("mode").getAsString()).isEqualTo("custom");
     assertThat(smartSheetAuth.getFieldAuth().getAsJsonObject().getAsJsonArray("columns")).hasSize(1);
+    assertThat(smartSheetAuth.getEffectiveAuthInfo().getAsJsonObject().get("mode").getAsString()).isEqualTo("custom");
   }
 }