朱子纯 / test

Commit 3a625ce9f68d5dc3f605f4429be0697fdf73f3db

Authored by zichun
1 parent e80f7ba5

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

Inline Side-by-side
Showing 4 changed files with 7 additions and 11 deletions
backend/src/main/java/com/xly/erp/module/mod/service/impl/ModuleServiceImpl.java
  View file @3a625ce
... ... @@ -61,8 +61,7 @@ public class ModuleServiceImpl implements ModuleService {
61 61 m.setSModuleNameZh(dto.getSModuleNameZh());
62 62 m.setIParentId(dto.getIParentId());
63 63 m.setISortOrder(dto.getISortOrder() != null ? dto.getISortOrder() : 0);
64   - String authedUserNo = SecurityContextHelper.currentUserNo();
65   - m.setSCreatedBy(authedUserNo != null ? authedUserNo : stub.getStubUserNo());
  64 + m.setSCreatedBy(SecurityContextHelper.currentUserNo());
66 65 m.setBDeleted(false);
67 66  
68 67 try {
... ... @@ -112,8 +111,7 @@ public class ModuleServiceImpl implements ModuleService {
112 111 entity.setIIncrement(id);
113 112 entity.setBDeleted(true);
114 113 entity.setTDeletedDate(LocalDateTime.now());
115   - String authedUserNo = SecurityContextHelper.currentUserNo();
116   - entity.setSDeletedBy(authedUserNo != null ? authedUserNo : stub.getStubUserNo());
  114 + entity.setSDeletedBy(SecurityContextHelper.currentUserNo());
117 115 moduleMapper.updateById(entity);
118 116 }
119 117  
... ...
backend/src/main/java/com/xly/erp/module/usr/service/impl/UserServiceImpl.java
  View file @3a625ce
... ... @@ -124,8 +124,7 @@ public class UserServiceImpl implements UserService {
124 124 entity.setSLanguage(dto.getSLanguage());
125 125 entity.setBCanModifyDocs(dto.getBCanModifyDocs() != null ? dto.getBCanModifyDocs() : false);
126 126 entity.setSPasswordHash(passwordEncoder.encode(DEFAULT_PASSWORD));
127   - String authedUserNo = SecurityContextHelper.currentUserNo();
128   - String createdBy = authedUserNo != null ? authedUserNo : stub.getStubUserNo();
  127 + String createdBy = SecurityContextHelper.currentUserNo();
129 128 entity.setSCreatedBy(createdBy);
130 129 entity.setBDeleted(false);
131 130  
... ... @@ -193,8 +192,7 @@ public class UserServiceImpl implements UserService {
193 192  
194 193 userPermissionMapper.deleteByUserId(id);
195 194 if (ids != null && !ids.isEmpty()) {
196   - String authedUserNo = SecurityContextHelper.currentUserNo();
197   - String createdBy = authedUserNo != null ? authedUserNo : stub.getStubUserNo();
  195 + String createdBy = SecurityContextHelper.currentUserNo();
198 196 LocalDateTime now = LocalDateTime.now();
199 197 for (Integer cid : ids) {
200 198 UserPermission rel = new UserPermission();
... ...
backend/src/test/java/com/xly/erp/module/mod/service/ModuleServiceImplTest.java
  View file @3a625ce
... ... @@ -70,7 +70,7 @@ class ModuleServiceImplTest {
70 70 assertThat(saved.getSBrandsId()).isEqualTo("XLY");
71 71 assertThat(saved.getSSubsidiaryId()).isEqualTo("XLY");
72 72 assertThat(saved.getTCreateDate()).isNotNull();
73   - assertThat(saved.getSCreatedBy()).isEqualTo("STUB_ADMIN");
  73 + assertThat(saved.getSCreatedBy()).isNull();
74 74 assertThat(saved.getBDeleted()).isFalse();
75 75 assertThat(saved.getBShowPermission()).isFalse();
76 76 assertThat(saved.getISortOrder()).isZero();
... ... @@ -254,7 +254,7 @@ class ModuleServiceImplTest {
254 254 assertThat(passed.getIIncrement()).isEqualTo(10);
255 255 assertThat(passed.getBDeleted()).isTrue();
256 256 assertThat(passed.getTDeletedDate()).isNotNull();
257   - assertThat(passed.getSDeletedBy()).isEqualTo("STUB_ADMIN");
  257 + assertThat(passed.getSDeletedBy()).isNull();
258 258 assertThat(passed.getSProcedureName()).isNull();
259 259 assertThat(passed.getSCreatedBy()).isNull();
260 260 assertThat(passed.getSBrandsId()).isNull();
... ...
backend/src/test/java/com/xly/erp/module/usr/service/UserServiceImplTest.java
  View file @3a625ce
... ... @@ -100,7 +100,7 @@ class UserServiceImplTest {
100 100 verify(userMapper).insert(userCap.capture());
101 101 User saved = userCap.getValue();
102 102 assertThat(saved.getSBrandsId()).isEqualTo("XLY");
103   - assertThat(saved.getSCreatedBy()).isEqualTo("STUB_ADMIN");
  103 + assertThat(saved.getSCreatedBy()).isNull();
104 104 assertThat(saved.getTCreateDate()).isNotNull();
105 105 assertThat(saved.getSPasswordHash()).startsWith("$2a$");
106 106 assertThat(saved.getBDeleted()).isFalse();
... ...