99import com .park .utmstack .service .dto .UtmConfigurationParameterCriteria ;
1010import com .park .utmstack .service .mail_config .MailConfigService ;
1111import com .park .utmstack .service .validators .email .EmailValidatorService ;
12+ import com .park .utmstack .service .validators .tw_config .TwConfigValidatorService ;
1213import com .park .utmstack .util .ResponseUtil ;
1314import com .park .utmstack .util .exceptions .UtmMailException ;
1415import com .park .utmstack .web .rest .util .PaginationUtil ;
16+ import lombok .RequiredArgsConstructor ;
1517import org .slf4j .Logger ;
1618import org .slf4j .LoggerFactory ;
1719import org .springdoc .api .annotations .ParameterObject ;
3537 * REST controller for managing UtmConfigurationParameter.
3638 */
3739@ RestController
40+ @ RequiredArgsConstructor
3841@ RequestMapping ("/api" )
3942public class UtmConfigurationParameterResource {
4043
@@ -48,19 +51,7 @@ public class UtmConfigurationParameterResource {
4851 private final EmailValidatorService emailValidatorService ;
4952 private final MailConfigService mailConfigService ;
5053 private final UtmStackService utmStackService ;
51- public UtmConfigurationParameterResource (UtmConfigurationParameterService utmConfigurationParameterService ,
52- UtmConfigurationParameterQueryService utmConfigurationParameterQueryService ,
53- ApplicationEventService applicationEventService ,
54- EmailValidatorService emailValidatorService ,
55- MailConfigService mailConfigService ,
56- UtmStackService utmStackService ) {
57- this .utmConfigurationParameterService = utmConfigurationParameterService ;
58- this .utmConfigurationParameterQueryService = utmConfigurationParameterQueryService ;
59- this .applicationEventService = applicationEventService ;
60- this .emailValidatorService = emailValidatorService ;
61- this .mailConfigService = mailConfigService ;
62- this .utmStackService = utmStackService ;
63- }
54+ private final TwConfigValidatorService twConfigValidatorService ;
6455
6556 /**
6657 * PUT /utm-configuration-parameters : Updates an existing utmConfigurationParameter.
@@ -76,16 +67,21 @@ public ResponseEntity<Void> updateConfigurationParameters(@Valid @RequestBody Li
7667 try {
7768 Assert .notEmpty (parameters , "There isn't any parameter to update" );
7869 for (UtmConfigurationParameter parameter : parameters ) {
70+ Errors errors = new BeanPropertyBindingResult (parameter , "utmConfigurationParameter" );
71+
72+ if (parameter .getConfParamShort ().equals ("utmstack.tw.enable" )){
73+ twConfigValidatorService .validate (parameter , errors );
74+ }
75+
7976 if (StringUtils .hasText (parameter .getConfParamRegexp ())){
80- Errors errors = new BeanPropertyBindingResult (parameter , "utmConfigurationParameter" );
8177 emailValidatorService .validate (parameter , errors );
78+ }
8279
83- if (errors .hasErrors ()) {
84- String msg = String .format ("Validation failed for field %s." , parameter .getConfParamShort ());
85- log .error (msg );
86- applicationEventService .createEvent (msg , ApplicationEventType .ERROR );
87- return ResponseUtil .buildPreconditionFailedResponse (msg );
88- }
80+ if (errors .hasErrors ()) {
81+ String msg = String .format ("Validation failed for field %s." , parameter .getConfParamShort ());
82+ log .error (msg );
83+ applicationEventService .createEvent (msg , ApplicationEventType .ERROR );
84+ return ResponseUtil .buildPreconditionFailedResponse (msg );
8985 }
9086 }
9187 utmConfigurationParameterService .saveAll (parameters );
0 commit comments