refactor(usr): remove stub fallback in services REQ-USR-004

zichun
1 parent e80f7ba5
Showing 4 changed files with 7 additions and 11 deletions
backend/src/main/java/com/xly/erp/module/mod/service/impl/ModuleServiceImpl.java
backend/src/main/java/com/xly/erp/module/usr/service/impl/UserServiceImpl.java
backend/src/test/java/com/xly/erp/module/mod/service/ModuleServiceImplTest.java
backend/src/test/java/com/xly/erp/module/usr/service/UserServiceImplTest.java
@@ -61,8 +61,7 @@ public class ModuleServiceImpl implements ModuleService {
         m.setSModuleNameZh(dto.getSModuleNameZh());
         m.setIParentId(dto.getIParentId());
         m.setISortOrder(dto.getISortOrder() != null ? dto.getISortOrder() : 0);
-        String authedUserNo = SecurityContextHelper.currentUserNo();
-        m.setSCreatedBy(authedUserNo != null ? authedUserNo : stub.getStubUserNo());
+        m.setSCreatedBy(SecurityContextHelper.currentUserNo());
         m.setBDeleted(false);
         try {
@@ -112,8 +111,7 @@ public class ModuleServiceImpl implements ModuleService {
         entity.setIIncrement(id);
         entity.setBDeleted(true);
         entity.setTDeletedDate(LocalDateTime.now());
-        String authedUserNo = SecurityContextHelper.currentUserNo();
-        entity.setSDeletedBy(authedUserNo != null ? authedUserNo : stub.getStubUserNo());
+        entity.setSDeletedBy(SecurityContextHelper.currentUserNo());
         moduleMapper.updateById(entity);
     }
@@ -124,8 +124,7 @@ public class UserServiceImpl implements UserService {
         entity.setSLanguage(dto.getSLanguage());
         entity.setBCanModifyDocs(dto.getBCanModifyDocs() != null ? dto.getBCanModifyDocs() : false);
         entity.setSPasswordHash(passwordEncoder.encode(DEFAULT_PASSWORD));
-        String authedUserNo = SecurityContextHelper.currentUserNo();
-        String createdBy = authedUserNo != null ? authedUserNo : stub.getStubUserNo();
+        String createdBy = SecurityContextHelper.currentUserNo();
         entity.setSCreatedBy(createdBy);
         entity.setBDeleted(false);
@@ -193,8 +192,7 @@ public class UserServiceImpl implements UserService {
         userPermissionMapper.deleteByUserId(id);
         if (ids != null && !ids.isEmpty()) {
-            String authedUserNo = SecurityContextHelper.currentUserNo();
-            String createdBy = authedUserNo != null ? authedUserNo : stub.getStubUserNo();
+            String createdBy = SecurityContextHelper.currentUserNo();
             LocalDateTime now = LocalDateTime.now();
             for (Integer cid : ids) {
                 UserPermission rel = new UserPermission();
@@ -70,7 +70,7 @@ class ModuleServiceImplTest {
         assertThat(saved.getSBrandsId()).isEqualTo("XLY");
         assertThat(saved.getSSubsidiaryId()).isEqualTo("XLY");
         assertThat(saved.getTCreateDate()).isNotNull();
-        assertThat(saved.getSCreatedBy()).isEqualTo("STUB_ADMIN");
+        assertThat(saved.getSCreatedBy()).isNull();
         assertThat(saved.getBDeleted()).isFalse();
         assertThat(saved.getBShowPermission()).isFalse();
         assertThat(saved.getISortOrder()).isZero();
@@ -254,7 +254,7 @@ class ModuleServiceImplTest {
         assertThat(passed.getIIncrement()).isEqualTo(10);
         assertThat(passed.getBDeleted()).isTrue();
         assertThat(passed.getTDeletedDate()).isNotNull();
-        assertThat(passed.getSDeletedBy()).isEqualTo("STUB_ADMIN");
+        assertThat(passed.getSDeletedBy()).isNull();
         assertThat(passed.getSProcedureName()).isNull();
         assertThat(passed.getSCreatedBy()).isNull();
         assertThat(passed.getSBrandsId()).isNull();
@@ -100,7 +100,7 @@ class UserServiceImplTest {
         verify(userMapper).insert(userCap.capture());
         User saved = userCap.getValue();
         assertThat(saved.getSBrandsId()).isEqualTo("XLY");
-        assertThat(saved.getSCreatedBy()).isEqualTo("STUB_ADMIN");
+        assertThat(saved.getSCreatedBy()).isNull();
         assertThat(saved.getTCreateDate()).isNotNull();
         assertThat(saved.getSPasswordHash()).startsWith("$2a$");
         assertThat(saved.getBDeleted()).isFalse();