From aedd6c624ef344bcbecd524ecbeae19080d5cb56 Mon Sep 17 00:00:00 2001 From: Alan Yeh Date: Sat, 4 Jan 2025 08:53:00 +0800 Subject: [PATCH] =?UTF-8?q?[UPDATE]=20=E4=BF=AE=E5=A4=8D=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alan Yeh --- .../graphql/authority/TestMenuProvider.java | 12 +++---- .../authority/TestPermissionProvider.java | 32 +++++++++---------- .../graphql/authority/TestRoleProvider.java | 12 +++---- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/central-provider/src/test/java/central/studio/provider/graphql/authority/TestMenuProvider.java b/central-provider/src/test/java/central/studio/provider/graphql/authority/TestMenuProvider.java index b232e32f..09ef3eaf 100644 --- a/central-provider/src/test/java/central/studio/provider/graphql/authority/TestMenuProvider.java +++ b/central-provider/src/test/java/central/studio/provider/graphql/authority/TestMenuProvider.java @@ -147,7 +147,7 @@ public void case1() { assertEquals(insert.getModifierId(), findById.getModifierId()); // test countBy - var count = this.provider.countBy(Conditions.of(Menu.class).like(Menu::getCode, "test%"), tenant.getCode()); + var count = this.provider.countBy(Conditions.of(Menu.class).eq(Menu::getApplicationId, application.getId()).like(Menu::getCode, "test%"), tenant.getCode()); assertEquals(1, count); // test update @@ -179,7 +179,7 @@ public void case1() { count = this.provider.deleteByIds(List.of(insert.getId()), tenant.getCode()); assertEquals(1, count); - count = this.persistence.countBy(Conditions.of(MenuEntity.class).like(MenuEntity::getCode, "test%"), tenant.getCode()); + count = this.persistence.countBy(Conditions.of(MenuEntity.class).eq(MenuEntity::getApplicationId, application.getId()).like(MenuEntity::getCode, "test%"), tenant.getCode()); assertEquals(0, count); } @@ -231,7 +231,7 @@ public void case2() { assertTrue(insertBatch.stream().noneMatch(it -> it.getParent() != null)); // test findBy - var findBy = this.provider.findBy(null, null, Conditions.of(Menu.class).like(Menu::getCode, "test%"), null, tenant.getCode()); + var findBy = this.provider.findBy(null, null, Conditions.of(Menu.class).eq(Menu::getApplicationId, application.getId()).like(Menu::getCode, "test%"), null, tenant.getCode()); assertNotNull(findBy); assertEquals(2, findBy.size()); assertTrue(findBy.stream().anyMatch(it -> it.getCode().equals("test"))); @@ -247,7 +247,7 @@ public void case2() { this.provider.updateBatch(List.of(child.toInput().parentId(parent.getId()).build()), "syssa", tenant.getCode()); // test pageBy - var pageBy = this.provider.pageBy(1L, 10L, Conditions.of(Menu.class).like(Menu::getCode, "test%"), null, tenant.getCode()); + var pageBy = this.provider.pageBy(1L, 10L, Conditions.of(Menu.class).eq(Menu::getApplicationId, application.getId()).like(Menu::getCode, "test%"), null, tenant.getCode()); assertNotNull(pageBy); assertEquals(1, pageBy.getPager().getPageIndex()); assertEquals(10, pageBy.getPager().getPageSize()); @@ -265,10 +265,10 @@ public void case2() { assertEquals(parent.getId(), child.getParent().getId()); // test deleteBy - var count = this.provider.deleteBy(Conditions.of(Menu.class).like(Menu::getCode, "test%"), tenant.getCode()); + var count = this.provider.deleteBy(Conditions.of(Menu.class).eq(Menu::getApplicationId, application.getId()).like(Menu::getCode, "test%"), tenant.getCode()); assertEquals(2, count); - count = this.persistence.countBy(Conditions.of(MenuEntity.class).like(MenuEntity::getCode, "test%"), tenant.getCode()); + count = this.persistence.countBy(Conditions.of(MenuEntity.class).eq(MenuEntity::getApplicationId, application.getId()).like(MenuEntity::getCode, "test%"), tenant.getCode()); assertEquals(0, count); } } diff --git a/central-provider/src/test/java/central/studio/provider/graphql/authority/TestPermissionProvider.java b/central-provider/src/test/java/central/studio/provider/graphql/authority/TestPermissionProvider.java index 9178b53a..b619510e 100644 --- a/central-provider/src/test/java/central/studio/provider/graphql/authority/TestPermissionProvider.java +++ b/central-provider/src/test/java/central/studio/provider/graphql/authority/TestPermissionProvider.java @@ -123,8 +123,8 @@ public void case1() { var input = PermissionInput.builder() .applicationId(application.getId()) .menuId(menu.getId()) - .code("add") - .name("添加") + .code("test") + .name("测试权限") .build(); // test insert @@ -156,11 +156,11 @@ public void case1() { assertEquals(insert.getModifierId(), findById.getModifierId()); // test countBy - var count = this.provider.countBy(Conditions.of(Permission.class).eq(Permission::getApplicationId, application.getId()), tenant.getCode()); + var count = this.provider.countBy(Conditions.of(Permission.class).eq(Permission::getApplicationId, application.getId()).like(Permission::getCode, "test%"), tenant.getCode()); assertEquals(1, count); // test update - this.provider.update(insert.toInput().code("add2").name("添加2").build(), "syssa", tenant.getCode()); + this.provider.update(insert.toInput().code("test2").name("测试权限2").build(), "syssa", tenant.getCode()); // test findByIds var findByIds = this.provider.findByIds(List.of(insert.getId()), tenant.getCode()); @@ -174,8 +174,8 @@ public void case1() { assertEquals(insert.getApplication().getId(), fetched.getApplication().getId()); assertEquals(insert.getMenuId(), fetched.getMenuId()); assertEquals(insert.getMenu().getId(), fetched.getMenu().getId()); - assertEquals("add2", fetched.getCode()); - assertEquals("添加2", fetched.getName()); + assertEquals("test2", fetched.getCode()); + assertEquals("测试权限2", fetched.getName()); assertEquals(insert.getCreatorId(), fetched.getCreatorId()); assertEquals(insert.getModifierId(), fetched.getModifierId()); assertNotEquals(fetched.getCreateDate(), fetched.getModifyDate()); // 修改日期不同 @@ -184,7 +184,7 @@ public void case1() { count = this.provider.deleteByIds(List.of(insert.getId()), tenant.getCode()); assertEquals(1, count); - count = this.persistence.countBy(Conditions.of(PermissionEntity.class).eq(PermissionEntity::getApplicationId, application.getId()), tenant.getCode()); + count = this.persistence.countBy(Conditions.of(PermissionEntity.class).eq(PermissionEntity::getApplicationId, application.getId()).like(PermissionEntity::getCode, "test%"), tenant.getCode()); assertEquals(0, count); } @@ -216,8 +216,8 @@ public void case2() { var input = PermissionInput.builder() .applicationId(application.getId()) .menuId(menu.getId()) - .code("add") - .name("添加") + .code("test") + .name("测试权限") .build(); // test insertBatch @@ -240,7 +240,7 @@ public void case2() { assertNotNull(entity); // test findBy - var findBy = this.provider.findBy(null, null, Conditions.of(Permission.class).eq(Permission::getApplicationId, application.getId()), null, tenant.getCode()); + var findBy = this.provider.findBy(null, null, Conditions.of(Permission.class).eq(Permission::getApplicationId, application.getId()).like(Permission::getCode, "test%"), null, tenant.getCode()); assertNotNull(findBy); assertEquals(1, findBy.size()); @@ -257,10 +257,10 @@ public void case2() { assertEquals(insert.getModifierId(), fetched.getModifierId()); // test updateBatch - this.provider.updateBatch(List.of(insert.toInput().code("add2").name("添加2").build()), "syssa", tenant.getCode()); + this.provider.updateBatch(List.of(insert.toInput().code("test2").name("测试权限2").build()), "syssa", tenant.getCode()); // test pageBy - var pageBy = this.provider.pageBy(1, 10, Conditions.of(Permission.class).eq(Permission::getApplicationId, application.getId()), null, tenant.getCode()); + var pageBy = this.provider.pageBy(1, 10, Conditions.of(Permission.class).eq(Permission::getApplicationId, application.getId()).like(Permission::getCode, "test%"), null, tenant.getCode()); assertNotNull(pageBy); assertEquals(1, pageBy.getPager().getPageIndex()); assertEquals(10, pageBy.getPager().getPageSize()); @@ -275,17 +275,17 @@ public void case2() { assertEquals(insert.getApplication().getId(), fetched.getApplication().getId()); assertEquals(insert.getMenuId(), fetched.getMenuId()); assertEquals(insert.getMenu().getId(), fetched.getMenu().getId()); - assertEquals("add2", fetched.getCode()); - assertEquals("添加2", fetched.getName()); + assertEquals("test2", fetched.getCode()); + assertEquals("测试权限2", fetched.getName()); assertEquals(insert.getCreatorId(), fetched.getCreatorId()); assertEquals(insert.getModifierId(), fetched.getModifierId()); assertNotEquals(fetched.getCreateDate(), fetched.getModifyDate()); // test deleteBy - var count = this.provider.deleteBy(Conditions.of(Permission.class).eq(Permission::getApplicationId, application.getId()), tenant.getCode()); + var count = this.provider.deleteBy(Conditions.of(Permission.class).eq(Permission::getApplicationId, application.getId()).like(Permission::getCode, "test%"), tenant.getCode()); assertEquals(1, count); - count = this.persistence.countBy(Conditions.of(PermissionEntity.class).eq(PermissionEntity::getApplicationId, application.getId()), tenant.getCode()); + count = this.persistence.countBy(Conditions.of(PermissionEntity.class).eq(PermissionEntity::getApplicationId, application.getId()).like(PermissionEntity::getCode, "test%"), tenant.getCode()); assertEquals(0, count); } } diff --git a/central-provider/src/test/java/central/studio/provider/graphql/authority/TestRoleProvider.java b/central-provider/src/test/java/central/studio/provider/graphql/authority/TestRoleProvider.java index 5e63a9b7..54f7bd1b 100644 --- a/central-provider/src/test/java/central/studio/provider/graphql/authority/TestRoleProvider.java +++ b/central-provider/src/test/java/central/studio/provider/graphql/authority/TestRoleProvider.java @@ -181,7 +181,7 @@ public void case1() { assertEquals(insert.getRemark(), findById.getRemark()); // test countBy - var count = this.provider.countBy(Conditions.of(Role.class).eq(Role::getApplicationId, application.getId()), tenant.getCode()); + var count = this.provider.countBy(Conditions.of(Role.class).eq(Role::getApplicationId, application.getId()).like(Role::getCode, "test%"), tenant.getCode()); assertEquals(1, count); // test update @@ -208,7 +208,7 @@ public void case1() { count = this.provider.deleteByIds(List.of(insert.getId()), tenant.getCode()); assertEquals(1, count); - count = this.persistence.countBy(Conditions.of(RoleEntity.class).eq(RoleEntity::getApplicationId, application.getId()), tenant.getCode()); + count = this.persistence.countBy(Conditions.of(RoleEntity.class).eq(RoleEntity::getApplicationId, application.getId()).like(RoleEntity::getCode, "test%"), tenant.getCode()); assertEquals(0, count); } @@ -255,7 +255,7 @@ public void case2() { assertNotNull(entity); // test findBy - var findBy = this.provider.findBy(null, null, Conditions.of(Role.class).eq(Role::getApplicationId, application.getId()), null, tenant.getCode()); + var findBy = this.provider.findBy(null, null, Conditions.of(Role.class).eq(Role::getApplicationId, application.getId()).like(Role::getCode, "test%"), null, tenant.getCode()); assertNotNull(findBy); assertEquals(1, findBy.size()); @@ -275,7 +275,7 @@ public void case2() { this.provider.updateBatch(List.of(fetched.toInput().code("test2").enabled(Boolean.FALSE).build()), "syssa", tenant.getCode()); // test pageBy - var pageBy = this.provider.pageBy(1, 10, Conditions.of(Role.class).eq(Role::getApplicationId, application.getId()), null, tenant.getCode()); + var pageBy = this.provider.pageBy(1, 10, Conditions.of(Role.class).eq(Role::getApplicationId, application.getId()).like(Role::getCode, "test%"), null, tenant.getCode()); assertNotNull(pageBy); assertEquals(1, pageBy.getPager().getPageIndex()); assertEquals(10, pageBy.getPager().getPageSize()); @@ -296,10 +296,10 @@ public void case2() { assertEquals(insert.getRemark(), fetched.getRemark()); // test deleteBy - var count = this.provider.deleteBy(Conditions.of(Role.class).eq(Role::getApplicationId, application.getId()), tenant.getCode()); + var count = this.provider.deleteBy(Conditions.of(Role.class).eq(Role::getApplicationId, application.getId()).like(Role::getCode, "test%"), tenant.getCode()); assertEquals(1, count); - count = this.persistence.countBy(Conditions.of(RoleEntity.class).eq(RoleEntity::getApplicationId, application.getId()), tenant.getCode()); + count = this.persistence.countBy(Conditions.of(RoleEntity.class).eq(RoleEntity::getApplicationId, application.getId()).like(RoleEntity::getCode, "test%"), tenant.getCode()); assertEquals(0, count); } }