fix: modify tenant API

Author: lu-yg

base/src/test/java/com/tinyengine/it/controller/UserControllerTest.java

@@ -12,13 +12,16 @@
 
 package com.tinyengine.it.controller;
 
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 
 import com.tinyengine.it.common.base.Result;
 import com.tinyengine.it.common.context.LoginUserContext;
 import com.tinyengine.it.common.handler.MockUserContext;
 import com.tinyengine.it.common.utils.TestUtil;
+import com.tinyengine.it.mapper.AuthUsersUnitsRolesMapper;
+import com.tinyengine.it.model.entity.Tenant;
 import com.tinyengine.it.model.entity.User;
 import com.tinyengine.it.service.app.UserService;
 
@@ -29,6 +32,9 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * test case
  *
@@ -42,7 +48,7 @@ class UserControllerTest {
     private UserController userController;
 
     @Mock
-    private LoginUserContext loginUserContext = new MockUserContext();
+    private AuthUsersUnitsRolesMapper authUsersUnitsRolesMapper;
 
     @BeforeEach
     void setUp() throws NoSuchFieldException, IllegalAccessException {
@@ -53,7 +59,11 @@ void setUp() throws NoSuchFieldException, IllegalAccessException {
     void testMe() throws NoSuchFieldException, IllegalAccessException {
         TestUtil.setPrivateValue(userController, "loginUserContext", new MockUserContext());
         User mockData = new User();
+        Tenant tenant = new Tenant();
+        List<Tenant> tenants = new ArrayList<>();
+        tenants.add(tenant);
         when(userService.queryUserById(anyString())).thenReturn(mockData);
+        when(authUsersUnitsRolesMapper.queryAllTenantByUserId(anyInt())).thenReturn(tenants);
         Result<User> result = userController.me();
         Assertions.assertEquals(mockData, result.getData());
     }

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

@@ -20,6 +20,8 @@
 import cn.hutool.core.util.ReflectUtil;
 import com.tinyengine.it.common.base.Result;
 import com.tinyengine.it.common.context.LoginUserContext;
+import com.tinyengine.it.common.handler.MockUserContext;
+import com.tinyengine.it.common.utils.TestUtil;
 import com.tinyengine.it.mapper.AppMapper;
 import com.tinyengine.it.mapper.I18nEntryMapper;
 import com.tinyengine.it.model.dto.I18nEntryDto;
@@ -69,6 +71,7 @@ class AppServiceImplTest {
     void setUp() {
         MockitoAnnotations.openMocks(this);
         ReflectUtil.setFieldValue(appServiceImpl, "baseMapper", appMapper);
+        ReflectUtil.setFieldValue(appServiceImpl, "loginUserContext", new MockUserContext());
     }
 
     @Test
@@ -135,6 +138,7 @@ void testUpdateAppById() {
     void testCreateApp() {
         List<App> appResult = new ArrayList<>();
         App param = new App();
+        param.setTenantId("1");
         when(appMapper.queryAppByCondition(param)).thenReturn(appResult);
         when(appMapper.createApp(param)).thenReturn(1);
 

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

@@ -24,6 +24,7 @@
 import com.tinyengine.it.common.base.Result;
 import com.tinyengine.it.common.context.LoginUserContext;
 import com.tinyengine.it.common.enums.Enums;
+import com.tinyengine.it.common.handler.MockUserContext;
 import com.tinyengine.it.mapper.AppExtensionMapper;
 import com.tinyengine.it.mapper.AppMapper;
 import com.tinyengine.it.mapper.BlockMapper;
@@ -95,6 +96,7 @@ class PageServiceImplTest {
     void setUp() {
         MockitoAnnotations.openMocks(this);
         ReflectUtil.setFieldValue(pageServiceImpl, "baseMapper", pageMapper);
+        ReflectUtil.setFieldValue(pageServiceImpl, "loginUserContext", new MockUserContext());
     }
 
     @Test

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

@@ -16,6 +16,7 @@
 import static org.mockito.Mockito.when;
 
 import cn.hutool.core.util.ReflectUtil;
+import com.tinyengine.it.common.handler.MockUserContext;
 import com.tinyengine.it.login.service.impl.LoginServiceImpl;
 import com.tinyengine.it.mapper.UserMapper;
 import com.tinyengine.it.model.entity.User;
@@ -27,6 +28,7 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -49,6 +51,7 @@ class UserServiceImplTest {
     void setUp() {
         MockitoAnnotations.openMocks(this);
         ReflectUtil.setFieldValue(userServiceImpl, "baseMapper", userMapper);
+        ReflectUtil.setFieldValue(loginServiceImpl, "baseMapper", userMapper);
     }
 
     @Test
@@ -95,13 +98,4 @@ void testUpdateUserById() {
         Integer result = userServiceImpl.updateUserById(param);
         Assertions.assertEquals(1, result);
     }
-
-    @Test
-    void testCreateUser() throws Exception {
-        User param = new User();
-        when(userMapper.createUser(param)).thenReturn(1);
-        when(userMapper.queryUserById(any())).thenReturn(param);
-        User result = loginServiceImpl.createUser(param);
-        Assertions.assertEquals(param, result);
-    }
 }

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

@@ -17,7 +17,9 @@
 import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.when;
 
+import cn.hutool.core.util.ReflectUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.tinyengine.it.common.handler.MockUserContext;
 import com.tinyengine.it.common.utils.JsonUtils;
 import com.tinyengine.it.mapper.AppExtensionMapper;
 import com.tinyengine.it.mapper.AppMapper;
@@ -73,9 +75,6 @@ class AppV1ServiceImplTest {
     @Mock
     private I18nEntryMapper i18nEntryMapper;
 
-    @Mock
-    private I18nEntryService i18nEntryService;
-
     @Mock
     private AppExtensionMapper appExtensionMapper;
 
@@ -98,12 +97,17 @@ class AppV1ServiceImplTest {
     private PlatformService platformService;
     @Mock
     private ComponentLibraryMapper componentLibraryMapper;
+
+    @Mock
+    private I18nEntryService i18nEntryService;
     @InjectMocks
     private AppV1ServiceImpl appV1ServiceImpl;
 
     @BeforeEach
     void setUp() {
+
         MockitoAnnotations.openMocks(this);
+        ReflectUtil.setFieldValue(appV1ServiceImpl, "loginUserContext", new MockUserContext());
     }
 
     @Test
@@ -140,7 +144,9 @@ void testAppSchema() throws JsonProcessingException {
 
         when(platformService.queryPlatformById(any())).thenReturn(platform);
         List<ComponentLibrary> componentLibraryList = new ArrayList<>();
+        SchemaI18n schemaI18n = new SchemaI18n();
         when(componentLibraryMapper.queryAllComponentLibrary()).thenReturn(componentLibraryList);
+        when(i18nEntryService.formatEntriesList(any())).thenReturn(schemaI18n);
         SchemaDto result = appV1ServiceImpl.appSchema(appId);
         Assertions.assertEquals("2", result.getMeta().getAppId());
     }

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

@@ -80,6 +80,7 @@ class BlockServiceImplTest {
     void setUp() {
         MockitoAnnotations.openMocks(this);
         when(loginUserContext.getLoginUserId()).thenReturn("1");
+        when(loginUserContext.getTenantId()).thenReturn("1");
         ReflectUtil.setFieldValue(blockServiceImpl, "baseMapper", blockMapper);
     }