Uphrh 7903 mobile otp

Created by: shishirsuman092

src/main/java/org/upsmf/grievance/service/impl/TicketServiceImpl.java

@@ -80,6 +80,9 @@ public class TicketServiceImpl implements TicketService {
     @Value("${feedback.base.url}")
     private String feedbackBaseUrl;
 
+    @Value("${ticket.otp.enable}")
+    private Boolean otpEnabled = true;
+
     @Autowired
     private EmailService emailService;
 
@@ -178,17 +181,19 @@ public class TicketServiceImpl implements TicketService {
         validateTicketRequest(ticketRequest);
 
         // validate OTP
-        boolean isValid = otpService.validateOtp(ticketRequest.getEmail(), ticketRequest.getOtp());
-        if(!isValid) {
-            throw new TicketException("Invalid mail OTP, Please enter correct OTP", ErrorCode.TKT_001,
-                    "Error while matching mail OTP");
-        } else {
-            boolean isMobileOtpValid = otpService.validateMobileOtp(ticketRequest.getPhone(),
-                    ticketRequest.getMobileOtp());
+        if(otpEnabled) {
+            boolean isValid = otpService.validateOtp(ticketRequest.getEmail(), ticketRequest.getOtp());
+            if(!isValid) {
+                throw new TicketException("Invalid mail OTP, Please enter correct OTP", ErrorCode.TKT_001,
+                        "Error while matching mail OTP");
+            } else {
+                boolean isMobileOtpValid = otpService.validateMobileOtp(ticketRequest.getPhone(),
+                        ticketRequest.getMobileOtp());
 
-            if (!isMobileOtpValid) {
-                throw new TicketException("Invalid mobile OTP, Please enter correct OTP", ErrorCode.TKT_001,
-                        "Error while matching mobile OTP");
+                if (!isMobileOtpValid) {
+                    throw new TicketException("Invalid mobile OTP, Please enter correct OTP", ErrorCode.TKT_001,
+                            "Error while matching mobile OTP");
+                }
             }
         }
         // set default value for creating ticket

src/main/resources/application.properties

@@ -119,4 +119,6 @@ otp.email.subject=OTP Verification Mail
 
 nightly.job.cron.expression=0 1 0 * * ?
 escalation.job.cron.expression=0 0 */4 * * ?
-ticket.aggregator.job.cron.expression=0 */5 * * * ?
\ No newline at end of file
+ticket.aggregator.job.cron.expression=0 */5 * * * ?
+dynamic.scheduler.fixed.value=14
+ticket.otp.enable=false