added permanent messages

src/main/java/com/gcc/flagpoles/controller/ApiController.java

@@ -43,6 +43,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.gcc.flagpoles.service.RequestService;
+import com.gcc.flagpoles.service.SMSService;
 
 // import com.dumpregistration.configuration.AppConfig;
 // import com.dumpregistration.constants.AppConstants;
@@ -72,8 +73,8 @@ public class ApiController {
     @Autowired
     private FileUploadService fileUploadService;
 
-    // @Autowired
-    // private PaymentService paymentService ;
+    @Autowired
+    private SMSService smsService;
 
     @Autowired
     private AppConfig appConfig;
@@ -850,4 +851,24 @@ public class ApiController {
         return response;
     }
 
+    @GetMapping("/sendRestorationMessage")
+    public String sendRestorationMessage(@RequestParam String mobileNo, @RequestParam String streetName,
+            @RequestParam String amount, @RequestParam String requestId) {
+        return smsService.restorationflagpoleSms(mobileNo, streetName, amount, requestId);
+    }
+
+    @GetMapping("/sendUnauthorizedMessage")
+    public String sendUnauthorizedMessage(@RequestParam String mobileNo,
+            @RequestParam String streetName,
+            @RequestParam String fineAmount,
+            @RequestParam String requestId) {
+
+        return smsService.unauthorizedFlagPoleSms(mobileNo, streetName, fineAmount, requestId);
+    }
+
+    @GetMapping("/sentRequestRaisedPermanent")
+    public String sentRequestRaisedPermanent(@RequestParam String mobileNo, @RequestParam String requestId) {
+        return smsService.sendBookingSuccesssmspermanent(mobileNo, requestId);
+    }
+
 }

src/main/java/com/gcc/flagpoles/service/RequestService.java

@@ -380,6 +380,7 @@ public class RequestService {
         int id = kh.getKey().intValue();
 
         // ---------- REFID ----------
+
         String refId = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + id;
 
         mysqlJdbcTemplate.update("""
@@ -448,6 +449,25 @@ public class RequestService {
                     id,
                     refId);
 
+            // ================= SMS SECTION =================
+
+        }
+
+        // ================= SMS SECTION =================
+
+        String mobileNo = mysqlJdbcTemplate.queryForObject("""
+                SELECT mobile_number
+                FROM user_request_details
+                WHERE id = ?
+                """, String.class, id);
+
+        if (mobileNo != null && !mobileNo.isBlank()) {
+            try {
+                smsService.sendBookingSuccesssmspermanent(mobileNo, refId);
+            } catch (Exception e) {
+                System.err.println("SMS failed for requestId: " + refId);
+                e.printStackTrace();
+            }
         }
 
         return refId;

src/main/java/com/gcc/flagpoles/service/SMSService.java

@@ -223,4 +223,34 @@ public class SMSService {
         }
     }
 
+    ///// for permanent flagpole/statue messages
+
+    public String sendBookingSuccesssmspermanent(String mobileNo, String requestId) {
+
+        String message = "Your Permanent Flag Pole / Statue permission request has been submitted successfully. "
+                + "Request ID: " + requestId
+                + ". You will be notified once the status is updated. By GCC";
+
+        // Encode message and fix colon issue (gateway not decoding %3A)
+        String encodedMsg = URLEncoder.encode(message, StandardCharsets.UTF_8)
+                .replace("%3A", ":")
+                .replace("%2F", "/");
+
+        String urlString = appConfig.getGetOtpUrl()
+                + "from=GCCCRP"
+                + "&key=" + key
+                + "&sender=GCCCRP"
+                + "&to=" + mobileNo
+                + "&body=" + encodedMsg
+                + "&entityid=1401572690000011081"
+                + "&templateid=1407177062205821043";
+
+        System.out.println("SMS URL:- " + urlString);
+
+        String response = messageUtility.sendSMS(urlString);
+        System.out.println("SMS RESPONSE:- " + response);
+
+        return response;
+    }
+
 }

src/main/resources/templates/modules/flagpolesregistration/requestform.html

@@ -3252,6 +3252,11 @@
 						Swal.fire('Missing Field', 'Select Pole Material.', 'warning');
 						return;
 					}
+
+					if (!streetData.flagmaterial) {
+						Swal.fire('Missing Field', 'Select Flag Material.', 'warning');
+						return;
+					}
 				}
 
 				/* ================= PERMANENT STATUE ================= */