[UPDATE] 更新单元测试及对应的 BUG

Signed-off-by: Alan Yeh <[email protected]>
central-x · Oct 12, 2024 · 804dafa · 804dafa
1 parent 655dd9d
commit 804dafa
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 31 deletions.
diff --git a/...ntity/src/main/java/central/studio/identity/controller/index/IdentityIndexController.java b/...ntity/src/main/java/central/studio/identity/controller/index/IdentityIndexController.java
@@ -109,8 +109,8 @@ public View index(@Validated IndexParams params,
     /**
      * 获取当前已登录的用户信息
      */
-    @GetMapping("/api/account")
     @ResponseBody
+    @GetMapping("/api/account")
     public Account getAccount(WebMvcRequest request) {
         // 检测会话有效性
         var cookie = request.getRequiredAttribute(SessionAttributes.COOKIE);

diff --git a/...-identity/src/test/java/central/studio/identity/controller/index/TestIndexController.java b/...-identity/src/test/java/central/studio/identity/controller/index/TestIndexController.java
@@ -173,7 +173,9 @@ public void case4(@Autowired MockMvc mvc) throws Exception {
      * @see IdentityIndexController#logout
      */
     @Test
-    public void case5(@Autowired MockMvc mvc, @Autowired final CookieStore cookieStore) throws Exception {
+    public void case5(@Autowired MockMvc mvc) throws Exception {
+        var cookieStore = new CookieStore();
+
         // 获取当前用户信息请求
         ThrowableSupplier<MockHttpServletRequestBuilder, Exception> accountRequestSupplier = () -> MockMvcRequestBuilders.get("/identity/api/account")
                 .cookie(cookieStore.getCookies("/identity/api/account"))

diff --git a/central-multicast/src/test/resources/application.yml b/central-multicast/src/test/resources/application.yml
@@ -32,4 +32,6 @@ studio:
     url: http://127.0.0.1:${server.port}
     fetchers:
       - saas
-      - multicast
+      - multicast
+  multicast:
+    url: http://127.0.0.1:${server.port}
diff --git a/central-provider/src/main/resources/central/graphql/authority/mutation/menuMutation.graphql b/central-provider/src/main/resources/central/graphql/authority/mutation/menuMutation.graphql
@@ -14,6 +14,8 @@ input MenuInput {
     name:                   String
     "图标"
     icon:                   String
+    "地址"
+    url:                    String
     "类型"
     type:                   String
     "是否启用"

diff --git a/central-provider/src/main/resources/central/graphql/authority/query/menuQuery.graphql b/central-provider/src/main/resources/central/graphql/authority/query/menuQuery.graphql
@@ -14,6 +14,8 @@ type Menu implements Entity & Modifiable {
     name:                   String!
     "图标"
     icon:                   String
+    "地址"
+    url:                    String
     "类型（业务菜单: business, 管理菜单: admin）"
     type:                   String!
     "是否启用"

diff --git a/...al-provider/src/test/java/central/studio/provider/graphql/authority/TestMenuProvider.java b/...al-provider/src/test/java/central/studio/provider/graphql/authority/TestMenuProvider.java
@@ -109,6 +109,7 @@ public void case1() {
         parentEntity.setCode("test-parent");
         parentEntity.setName("测试父菜单");
         parentEntity.setIcon("icon-parent");
+        parentEntity.setUrl("");
         parentEntity.setType(MenuType.BACKEND.getValue());
         parentEntity.setEnabled(Boolean.TRUE);
         parentEntity.setOrder(0);
@@ -123,6 +124,7 @@ public void case1() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("@/test");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);
@@ -137,6 +139,7 @@ public void case1() {
         childEntity.setCode("test-child");
         childEntity.setName("测试子菜单");
         childEntity.setIcon("icon-child");
+        childEntity.setUrl("@/test-child");
         childEntity.setType(MenuType.BACKEND.getValue());
         childEntity.setEnabled(Boolean.TRUE);
         childEntity.setOrder(0);
@@ -189,6 +192,7 @@ public void case2() {
         parentEntity.setCode("test-parent");
         parentEntity.setName("测试父菜单");
         parentEntity.setIcon("icon-parent");
+        parentEntity.setUrl("");
         parentEntity.setType(MenuType.BACKEND.getValue());
         parentEntity.setEnabled(Boolean.TRUE);
         parentEntity.setOrder(0);
@@ -203,6 +207,7 @@ public void case2() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("@/test");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);
@@ -217,6 +222,7 @@ public void case2() {
         childEntity.setCode("test-child");
         childEntity.setName("测试子菜单");
         childEntity.setIcon("icon-child");
+        childEntity.setUrl("@/test-child");
         childEntity.setType(MenuType.BACKEND.getValue());
         childEntity.setEnabled(Boolean.TRUE);
         childEntity.setOrder(0);
@@ -273,6 +279,7 @@ public void case3() {
         parentEntity.setCode("test-parent");
         parentEntity.setName("测试父菜单");
         parentEntity.setIcon("icon-parent");
+        parentEntity.setUrl("");
         parentEntity.setType(MenuType.BACKEND.getValue());
         parentEntity.setEnabled(Boolean.TRUE);
         parentEntity.setOrder(0);
@@ -287,6 +294,7 @@ public void case3() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("@/test");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);
@@ -301,6 +309,7 @@ public void case3() {
         childEntity.setCode("test-child");
         childEntity.setName("测试子菜单");
         childEntity.setIcon("icon-child");
+        childEntity.setUrl("@/test-child");
         childEntity.setType(MenuType.BACKEND.getValue());
         childEntity.setEnabled(Boolean.TRUE);
         childEntity.setOrder(0);
@@ -357,6 +366,7 @@ public void case4() {
         parentEntity.setCode("test-parent");
         parentEntity.setName("测试父菜单");
         parentEntity.setIcon("icon-parent");
+        parentEntity.setUrl("");
         parentEntity.setType(MenuType.BACKEND.getValue());
         parentEntity.setEnabled(Boolean.TRUE);
         parentEntity.setOrder(0);
@@ -371,6 +381,7 @@ public void case4() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("@/test");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);
@@ -385,6 +396,7 @@ public void case4() {
         childEntity.setCode("test-child");
         childEntity.setName("测试子菜单");
         childEntity.setIcon("icon-child");
+        childEntity.setUrl("@/test-child");
         childEntity.setType(MenuType.BACKEND.getValue());
         childEntity.setEnabled(Boolean.TRUE);
         childEntity.setOrder(0);
@@ -445,6 +457,7 @@ public void case5() {
         parentEntity.setCode("test-parent");
         parentEntity.setName("测试父菜单");
         parentEntity.setIcon("icon-parent");
+        parentEntity.setUrl("");
         parentEntity.setType(MenuType.BACKEND.getValue());
         parentEntity.setEnabled(Boolean.TRUE);
         parentEntity.setOrder(0);
@@ -459,6 +472,7 @@ public void case5() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("@/test");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);
@@ -473,6 +487,7 @@ public void case5() {
         childEntity.setCode("test-child");
         childEntity.setName("测试子菜单");
         childEntity.setIcon("icon-child");
+        childEntity.setUrl("@/test-child");
         childEntity.setType(MenuType.BACKEND.getValue());
         childEntity.setEnabled(Boolean.TRUE);
         childEntity.setOrder(0);
@@ -510,6 +525,7 @@ public void case6() {
                 .code("test")
                 .name("测试菜单")
                 .icon("icon")
+                .url("@/test")
                 .type(MenuType.BACKEND.getValue())
                 .enabled(Boolean.TRUE)
                 .order(0)
@@ -551,6 +567,7 @@ public void case7() {
                 .code("test")
                 .name("测试菜单")
                 .icon("icon")
+                .url("@/test")
                 .type(MenuType.BACKEND.getValue())
                 .enabled(Boolean.TRUE)
                 .order(0)
@@ -593,6 +610,7 @@ public void case8() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("@/test");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);
@@ -642,6 +660,7 @@ public void case9() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("@/test");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);
@@ -695,6 +714,7 @@ public void case10() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("@/test");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);
@@ -733,6 +753,7 @@ public void case11() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("@/test");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);

diff --git a/...vider/src/test/java/central/studio/provider/graphql/authority/TestPermissionProvider.java b/...vider/src/test/java/central/studio/provider/graphql/authority/TestPermissionProvider.java
@@ -53,7 +53,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
- * Provider Provider Test Cases
+ * Permission Provider Test Cases
  * 权限测试
  *
  * @author Alan Yeh
@@ -108,6 +108,7 @@ public void case1() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);
@@ -165,6 +166,7 @@ public void case2() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);
@@ -226,6 +228,7 @@ public void case4() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);
@@ -291,6 +294,7 @@ public void case5() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);
@@ -337,6 +341,7 @@ public void case6() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);
@@ -385,6 +390,7 @@ public void case7() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);
@@ -436,6 +442,7 @@ public void case8() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);
@@ -494,6 +501,7 @@ public void case9() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);
@@ -556,6 +564,7 @@ public void case10() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);
@@ -603,6 +612,7 @@ public void case11() {
         menuEntity.setCode("test");
         menuEntity.setName("测试菜单");
         menuEntity.setIcon("icon");
+        menuEntity.setUrl("");
         menuEntity.setType(MenuType.BACKEND.getValue());
         menuEntity.setEnabled(Boolean.TRUE);
         menuEntity.setOrder(0);

diff --git a/central-storage/src/main/java/central/studio/storage/controller/ObjectController.java b/central-storage/src/main/java/central/studio/storage/controller/ObjectController.java
@@ -321,7 +321,7 @@ public List<StorageObject> findByIds(@PathVariable String code, @Validated ListQ
         this.validate(query.getToken(), bucket, Permission.VIEW, query.getIds());
 
         return this.provider.findBy(null, null,
-                        Conditions.of(StorageObject.class).eq(StorageObject::getBucketId, bucket.getData().getId()).in(StorageObject::getId, query.getIds()),
+                        Conditions.of(query.build()).eq(StorageObject::getBucketId, bucket.getData().getId()),
                         null, tenant).stream()
                 // 忽略存储键，以防泄露
                 .peek(it -> it.setKey(null))

diff --git a/central-storage/src/main/java/central/studio/storage/controller/query/ListQuery.java b/central-storage/src/main/java/central/studio/storage/controller/query/ListQuery.java
@@ -24,6 +24,7 @@
 
 package central.studio.storage.controller.query;
 
+import central.data.storage.StorageObject;
 import central.starter.web.query.IdsQuery;
 import central.validation.Label;
 import jakarta.validation.constraints.NotBlank;
@@ -45,7 +46,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-public class ListQuery extends IdsQuery {
+public class ListQuery extends IdsQuery<StorageObject> {
     @Serial
     private static final long serialVersionUID = 3281007876039123204L;
 

diff --git a/central-storage/src/test/resources/application.yml b/central-storage/src/test/resources/application.yml
@@ -32,4 +32,6 @@ studio:
     url: http://127.0.0.1:${server.port}
     fetchers:
       - saas
-      - storage
+      - storage
+  storage:
+    url: http://127.0.0.1:${server.port}
diff --git a/central-studio-library/src/main/java/central/data/authority/Menu.java b/central-studio-library/src/main/java/central/data/authority/Menu.java
@@ -83,6 +83,12 @@ public class Menu extends ModifiableEntity implements Codeable, Available, Remar
     @Nullable
     private String icon;
 
+    /**
+     * 地址
+     */
+    @Nullable
+    private String url;
+
     /**
      * 菜单类型
      *
@@ -163,6 +169,7 @@ public MenuInput toInput() {
                 .code(this.getCode())
                 .name(this.getName())
                 .icon(this.getIcon())
+                .url(this.getUrl())
                 .type(this.getType())
                 .enabled(this.getEnabled())
                 .order(this.getOrder())