fix: modify tenant API

Author: lu-yg

base/src/test/java/com/tinyengine/it/common/handler/MyMetaObjectHandlerTest.java

@@ -36,7 +36,7 @@ void testInsertFill() throws NoSuchFieldException, IllegalAccessException {
         when(param.hasSetter("tenantId")).thenReturn(true);
         TestUtil.setPrivateValue(myMetaObjectHandler, "loginUserContext", new MockUserContext());
         myMetaObjectHandler.insertFill(param);
-        verify(param, times(6)).hasSetter(anyString());
+        verify(param, times(5)).hasSetter(anyString());
     }
 
     @Test

base/src/test/java/com/tinyengine/it/service/app/impl/AppServiceImplTest.java

@@ -65,10 +65,6 @@ class AppServiceImplTest {
     @InjectMocks
     private AppServiceImpl appServiceImpl;
 
-    @Mock
-    LoginUserContext loginUserContext;
-
-    private String TENANTID = loginUserContext.getTenantId();
     @BeforeEach
     void setUp() {
         MockitoAnnotations.openMocks(this);
@@ -78,7 +74,7 @@ void setUp() {
     @Test
     void testQueryAllApp() {
         List<App> mockData = Arrays.<App>asList(new App());
-        when(appMapper.queryAllApp(TENANTID)).thenReturn(mockData);
+        when(appMapper.queryAllApp("1")).thenReturn(mockData);
 
         List<App> result = appServiceImpl.queryAllApp();
         Assertions.assertEquals(mockData, result);
@@ -87,7 +83,7 @@ void testQueryAllApp() {
     @Test
     void testQueryAppById() {
         App app = new App();
-        when(appMapper.queryAppById(1, TENANTID)).thenReturn(app);
+        when(appMapper.queryAppById(1, "1")).thenReturn(app);
 
         Result<App> result = appServiceImpl.queryAppById(1);
         Assertions.assertEquals(app, result.getData());
@@ -105,8 +101,8 @@ void testQueryAppByCondition() {
     @Test
     void testDeleteAppById() {
         App app = new App();
-        when(appMapper.queryAppById(1, TENANTID)).thenReturn(app);
-        when(appMapper.deleteAppById(1, TENANTID)).thenReturn(2);
+        when(appMapper.queryAppById(1, "1")).thenReturn(app);
+        when(appMapper.deleteAppById(1, "1")).thenReturn(2);
 
         Result<App> result = appServiceImpl.deleteAppById(1);
         Assertions.assertEquals(app, result.getData());
@@ -120,7 +116,7 @@ void testUpdateAppById() {
 
         resultApp.setExtendConfig(mockConfig);
         int appId = 1;
-        when(appMapper.queryAppById(appId, TENANTID)).thenReturn(resultApp);
+        when(appMapper.queryAppById(appId, "1")).thenReturn(resultApp);
         App param = new App();
         param.setId(appId);
 

base/src/test/java/com/tinyengine/it/service/material/impl/BlockServiceImplTest.java

@@ -290,7 +290,7 @@ void testListNewWhenGroupIdNotEmpty() {
 
         App app = new App();
         app.setId(1);
-        when(appMapper.queryAppById(anyInt())).thenReturn(app);
+        when(appMapper.queryAppById(anyInt(), anyString())).thenReturn(app);
 
         Result<List<Block>> result = blockServiceImpl.listNew("1", "1");
         Assertions.assertEquals(blocksList, result.getData());
@@ -307,7 +307,7 @@ void testListNewWhenGroupIdIsEmpty() {
 
         App app = new App();
         app.setId(1);
-        when(appMapper.queryAppById(anyInt())).thenReturn(app);
+        when(appMapper.queryAppById(anyInt(), anyString())).thenReturn(app);
 
         HashMap<String, String> param = new HashMap<>();
 

base/src/test/java/com/tinyengine/it/service/platform/impl/TenantServiceImplTest.java

@@ -90,13 +90,4 @@ void testUpdateTenantById() {
         Integer result = tenantServiceImpl.updateTenantById(param);
         Assertions.assertEquals(2, result);
     }
-
-    @Test
-    void testCreateTenant() {
-        Tenant param = new Tenant();
-        when(tenantMapper.createTenant(param)).thenReturn(2);
-
-        Integer result = tenantServiceImpl.createTenant(param);
-        Assertions.assertEquals(2, result);
-    }
 }