Commit 245e557309b2416013f149416ead333f66383e3c
1 parent
2ba4dec0
system:将 check 方法,统一成 validate 方法
Showing
3 changed files
with
24 additions
and
24 deletions
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
| @@ -76,7 +76,7 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService { | @@ -76,7 +76,7 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService { | ||
| 76 | @Override | 76 | @Override |
| 77 | public Long createNotifyTemplate(NotifyTemplateCreateReqVO createReqVO) { | 77 | public Long createNotifyTemplate(NotifyTemplateCreateReqVO createReqVO) { |
| 78 | // 校验站内信编码是否重复 | 78 | // 校验站内信编码是否重复 |
| 79 | - checkNotifyTemplateCodeDuplicate(null, createReqVO.getCode()); | 79 | + validateNotifyTemplateCodeDuplicate(null, createReqVO.getCode()); |
| 80 | 80 | ||
| 81 | // 插入 | 81 | // 插入 |
| 82 | NotifyTemplateDO notifyTemplate = NotifyTemplateConvert.INSTANCE.convert(createReqVO); | 82 | NotifyTemplateDO notifyTemplate = NotifyTemplateConvert.INSTANCE.convert(createReqVO); |
| @@ -93,7 +93,7 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService { | @@ -93,7 +93,7 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService { | ||
| 93 | // 校验存在 | 93 | // 校验存在 |
| 94 | validateNotifyTemplateExists(updateReqVO.getId()); | 94 | validateNotifyTemplateExists(updateReqVO.getId()); |
| 95 | // 校验站内信编码是否重复 | 95 | // 校验站内信编码是否重复 |
| 96 | - checkNotifyTemplateCodeDuplicate(updateReqVO.getId(), updateReqVO.getCode()); | 96 | + validateNotifyTemplateCodeDuplicate(updateReqVO.getId(), updateReqVO.getCode()); |
| 97 | 97 | ||
| 98 | // 更新 | 98 | // 更新 |
| 99 | NotifyTemplateDO updateObj = NotifyTemplateConvert.INSTANCE.convert(updateReqVO); | 99 | NotifyTemplateDO updateObj = NotifyTemplateConvert.INSTANCE.convert(updateReqVO); |
| @@ -136,7 +136,7 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService { | @@ -136,7 +136,7 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService { | ||
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | @VisibleForTesting | 138 | @VisibleForTesting |
| 139 | - public void checkNotifyTemplateCodeDuplicate(Long id, String code) { | 139 | + public void validateNotifyTemplateCodeDuplicate(Long id, String code) { |
| 140 | NotifyTemplateDO template = notifyTemplateMapper.selectByCode(code); | 140 | NotifyTemplateDO template = notifyTemplateMapper.selectByCode(code); |
| 141 | if (template == null) { | 141 | if (template == null) { |
| 142 | return; | 142 | return; |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java
| @@ -105,11 +105,11 @@ public class SmsTemplateServiceImpl implements SmsTemplateService { | @@ -105,11 +105,11 @@ public class SmsTemplateServiceImpl implements SmsTemplateService { | ||
| 105 | @Override | 105 | @Override |
| 106 | public Long createSmsTemplate(SmsTemplateCreateReqVO createReqVO) { | 106 | public Long createSmsTemplate(SmsTemplateCreateReqVO createReqVO) { |
| 107 | // 校验短信渠道 | 107 | // 校验短信渠道 |
| 108 | - SmsChannelDO channelDO = checkSmsChannel(createReqVO.getChannelId()); | 108 | + SmsChannelDO channelDO = validateSmsChannel(createReqVO.getChannelId()); |
| 109 | // 校验短信编码是否重复 | 109 | // 校验短信编码是否重复 |
| 110 | - checkSmsTemplateCodeDuplicate(null, createReqVO.getCode()); | 110 | + validateSmsTemplateCodeDuplicate(null, createReqVO.getCode()); |
| 111 | // 校验短信模板 | 111 | // 校验短信模板 |
| 112 | - checkApiTemplate(createReqVO.getChannelId(), createReqVO.getApiTemplateId()); | 112 | + validateApiTemplate(createReqVO.getChannelId(), createReqVO.getApiTemplateId()); |
| 113 | 113 | ||
| 114 | // 插入 | 114 | // 插入 |
| 115 | SmsTemplateDO template = SmsTemplateConvert.INSTANCE.convert(createReqVO); | 115 | SmsTemplateDO template = SmsTemplateConvert.INSTANCE.convert(createReqVO); |
| @@ -127,11 +127,11 @@ public class SmsTemplateServiceImpl implements SmsTemplateService { | @@ -127,11 +127,11 @@ public class SmsTemplateServiceImpl implements SmsTemplateService { | ||
| 127 | // 校验存在 | 127 | // 校验存在 |
| 128 | validateSmsTemplateExists(updateReqVO.getId()); | 128 | validateSmsTemplateExists(updateReqVO.getId()); |
| 129 | // 校验短信渠道 | 129 | // 校验短信渠道 |
| 130 | - SmsChannelDO channelDO = checkSmsChannel(updateReqVO.getChannelId()); | 130 | + SmsChannelDO channelDO = validateSmsChannel(updateReqVO.getChannelId()); |
| 131 | // 校验短信编码是否重复 | 131 | // 校验短信编码是否重复 |
| 132 | - checkSmsTemplateCodeDuplicate(updateReqVO.getId(), updateReqVO.getCode()); | 132 | + validateSmsTemplateCodeDuplicate(updateReqVO.getId(), updateReqVO.getCode()); |
| 133 | // 校验短信模板 | 133 | // 校验短信模板 |
| 134 | - checkApiTemplate(updateReqVO.getChannelId(), updateReqVO.getApiTemplateId()); | 134 | + validateApiTemplate(updateReqVO.getChannelId(), updateReqVO.getApiTemplateId()); |
| 135 | 135 | ||
| 136 | // 更新 | 136 | // 更新 |
| 137 | SmsTemplateDO updateObj = SmsTemplateConvert.INSTANCE.convert(updateReqVO); | 137 | SmsTemplateDO updateObj = SmsTemplateConvert.INSTANCE.convert(updateReqVO); |
| @@ -184,7 +184,7 @@ public class SmsTemplateServiceImpl implements SmsTemplateService { | @@ -184,7 +184,7 @@ public class SmsTemplateServiceImpl implements SmsTemplateService { | ||
| 184 | } | 184 | } |
| 185 | 185 | ||
| 186 | @VisibleForTesting | 186 | @VisibleForTesting |
| 187 | - public SmsChannelDO checkSmsChannel(Long channelId) { | 187 | + public SmsChannelDO validateSmsChannel(Long channelId) { |
| 188 | SmsChannelDO channelDO = smsChannelService.getSmsChannel(channelId); | 188 | SmsChannelDO channelDO = smsChannelService.getSmsChannel(channelId); |
| 189 | if (channelDO == null) { | 189 | if (channelDO == null) { |
| 190 | throw exception(SMS_CHANNEL_NOT_EXISTS); | 190 | throw exception(SMS_CHANNEL_NOT_EXISTS); |
| @@ -196,7 +196,7 @@ public class SmsTemplateServiceImpl implements SmsTemplateService { | @@ -196,7 +196,7 @@ public class SmsTemplateServiceImpl implements SmsTemplateService { | ||
| 196 | } | 196 | } |
| 197 | 197 | ||
| 198 | @VisibleForTesting | 198 | @VisibleForTesting |
| 199 | - public void checkSmsTemplateCodeDuplicate(Long id, String code) { | 199 | + public void validateSmsTemplateCodeDuplicate(Long id, String code) { |
| 200 | SmsTemplateDO template = smsTemplateMapper.selectByCode(code); | 200 | SmsTemplateDO template = smsTemplateMapper.selectByCode(code); |
| 201 | if (template == null) { | 201 | if (template == null) { |
| 202 | return; | 202 | return; |
| @@ -217,7 +217,7 @@ public class SmsTemplateServiceImpl implements SmsTemplateService { | @@ -217,7 +217,7 @@ public class SmsTemplateServiceImpl implements SmsTemplateService { | ||
| 217 | * @param apiTemplateId API 模板编号 | 217 | * @param apiTemplateId API 模板编号 |
| 218 | */ | 218 | */ |
| 219 | @VisibleForTesting | 219 | @VisibleForTesting |
| 220 | - public void checkApiTemplate(Long channelId, String apiTemplateId) { | 220 | + public void validateApiTemplate(Long channelId, String apiTemplateId) { |
| 221 | // 获得短信模板 | 221 | // 获得短信模板 |
| 222 | SmsClient smsClient = smsClientFactory.getSmsClient(channelId); | 222 | SmsClient smsClient = smsClientFactory.getSmsClient(channelId); |
| 223 | Assert.notNull(smsClient, String.format("短信客户端(%d) 不存在", channelId)); | 223 | Assert.notNull(smsClient, String.format("短信客户端(%d) 不存在", channelId)); |
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImplTest.java
| @@ -279,7 +279,7 @@ public class SmsTemplateServiceImplTest extends BaseDbUnitTest { | @@ -279,7 +279,7 @@ public class SmsTemplateServiceImplTest extends BaseDbUnitTest { | ||
| 279 | } | 279 | } |
| 280 | 280 | ||
| 281 | @Test | 281 | @Test |
| 282 | - public void testCheckSmsChannel_success() { | 282 | + public void testValidateSmsChannel_success() { |
| 283 | // 准备参数 | 283 | // 准备参数 |
| 284 | Long channelId = randomLongId(); | 284 | Long channelId = randomLongId(); |
| 285 | // mock 方法 | 285 | // mock 方法 |
| @@ -290,23 +290,23 @@ public class SmsTemplateServiceImplTest extends BaseDbUnitTest { | @@ -290,23 +290,23 @@ public class SmsTemplateServiceImplTest extends BaseDbUnitTest { | ||
| 290 | when(smsChannelService.getSmsChannel(eq(channelId))).thenReturn(channelDO); | 290 | when(smsChannelService.getSmsChannel(eq(channelId))).thenReturn(channelDO); |
| 291 | 291 | ||
| 292 | // 调用 | 292 | // 调用 |
| 293 | - SmsChannelDO returnChannelDO = smsTemplateService.checkSmsChannel(channelId); | 293 | + SmsChannelDO returnChannelDO = smsTemplateService.validateSmsChannel(channelId); |
| 294 | // 断言 | 294 | // 断言 |
| 295 | assertPojoEquals(returnChannelDO, channelDO); | 295 | assertPojoEquals(returnChannelDO, channelDO); |
| 296 | } | 296 | } |
| 297 | 297 | ||
| 298 | @Test | 298 | @Test |
| 299 | - public void testCheckSmsChannel_notExists() { | 299 | + public void testValidateSmsChannel_notExists() { |
| 300 | // 准备参数 | 300 | // 准备参数 |
| 301 | Long channelId = randomLongId(); | 301 | Long channelId = randomLongId(); |
| 302 | 302 | ||
| 303 | // 调用,校验异常 | 303 | // 调用,校验异常 |
| 304 | - assertServiceException(() -> smsTemplateService.checkSmsChannel(channelId), | 304 | + assertServiceException(() -> smsTemplateService.validateSmsChannel(channelId), |
| 305 | SMS_CHANNEL_NOT_EXISTS); | 305 | SMS_CHANNEL_NOT_EXISTS); |
| 306 | } | 306 | } |
| 307 | 307 | ||
| 308 | @Test | 308 | @Test |
| 309 | - public void testCheckSmsChannel_disable() { | 309 | + public void testValidateSmsChannel_disable() { |
| 310 | // 准备参数 | 310 | // 准备参数 |
| 311 | Long channelId = randomLongId(); | 311 | Long channelId = randomLongId(); |
| 312 | // mock 方法 | 312 | // mock 方法 |
| @@ -317,30 +317,30 @@ public class SmsTemplateServiceImplTest extends BaseDbUnitTest { | @@ -317,30 +317,30 @@ public class SmsTemplateServiceImplTest extends BaseDbUnitTest { | ||
| 317 | when(smsChannelService.getSmsChannel(eq(channelId))).thenReturn(channelDO); | 317 | when(smsChannelService.getSmsChannel(eq(channelId))).thenReturn(channelDO); |
| 318 | 318 | ||
| 319 | // 调用,校验异常 | 319 | // 调用,校验异常 |
| 320 | - assertServiceException(() -> smsTemplateService.checkSmsChannel(channelId), | 320 | + assertServiceException(() -> smsTemplateService.validateSmsChannel(channelId), |
| 321 | SMS_CHANNEL_DISABLE); | 321 | SMS_CHANNEL_DISABLE); |
| 322 | } | 322 | } |
| 323 | 323 | ||
| 324 | @Test | 324 | @Test |
| 325 | - public void testCheckDictDataValueUnique_success() { | 325 | + public void testValidateDictDataValueUnique_success() { |
| 326 | // 调用,成功 | 326 | // 调用,成功 |
| 327 | - smsTemplateService.checkSmsTemplateCodeDuplicate(randomLongId(), randomString()); | 327 | + smsTemplateService.validateSmsTemplateCodeDuplicate(randomLongId(), randomString()); |
| 328 | } | 328 | } |
| 329 | 329 | ||
| 330 | @Test | 330 | @Test |
| 331 | - public void testCheckSmsTemplateCodeDuplicate_valueDuplicateForCreate() { | 331 | + public void testValidateSmsTemplateCodeDuplicate_valueDuplicateForCreate() { |
| 332 | // 准备参数 | 332 | // 准备参数 |
| 333 | String code = randomString(); | 333 | String code = randomString(); |
| 334 | // mock 数据 | 334 | // mock 数据 |
| 335 | smsTemplateMapper.insert(randomSmsTemplateDO(o -> o.setCode(code))); | 335 | smsTemplateMapper.insert(randomSmsTemplateDO(o -> o.setCode(code))); |
| 336 | 336 | ||
| 337 | // 调用,校验异常 | 337 | // 调用,校验异常 |
| 338 | - assertServiceException(() -> smsTemplateService.checkSmsTemplateCodeDuplicate(null, code), | 338 | + assertServiceException(() -> smsTemplateService.validateSmsTemplateCodeDuplicate(null, code), |
| 339 | SMS_TEMPLATE_CODE_DUPLICATE, code); | 339 | SMS_TEMPLATE_CODE_DUPLICATE, code); |
| 340 | } | 340 | } |
| 341 | 341 | ||
| 342 | @Test | 342 | @Test |
| 343 | - public void testCheckDictDataValueUnique_valueDuplicateForUpdate() { | 343 | + public void testValidateDictDataValueUnique_valueDuplicateForUpdate() { |
| 344 | // 准备参数 | 344 | // 准备参数 |
| 345 | Long id = randomLongId(); | 345 | Long id = randomLongId(); |
| 346 | String code = randomString(); | 346 | String code = randomString(); |
| @@ -348,7 +348,7 @@ public class SmsTemplateServiceImplTest extends BaseDbUnitTest { | @@ -348,7 +348,7 @@ public class SmsTemplateServiceImplTest extends BaseDbUnitTest { | ||
| 348 | smsTemplateMapper.insert(randomSmsTemplateDO(o -> o.setCode(code))); | 348 | smsTemplateMapper.insert(randomSmsTemplateDO(o -> o.setCode(code))); |
| 349 | 349 | ||
| 350 | // 调用,校验异常 | 350 | // 调用,校验异常 |
| 351 | - assertServiceException(() -> smsTemplateService.checkSmsTemplateCodeDuplicate(id, code), | 351 | + assertServiceException(() -> smsTemplateService.validateSmsTemplateCodeDuplicate(id, code), |
| 352 | SMS_TEMPLATE_CODE_DUPLICATE, code); | 352 | SMS_TEMPLATE_CODE_DUPLICATE, code); |
| 353 | } | 353 | } |
| 354 | 354 |