From d73cb87a15ed66d0767ad8412e8c9dd98ec972e3 Mon Sep 17 00:00:00 2001
From: KaNi-04 <136799210+KaNi-04@users.noreply.github.com>
Date: Mon, 13 Jul 2026 14:36:01 +0530
Subject: [PATCH] Hall creation and Gcc Blocking(New) concept implemented in
the Admin, HQ and officer login
---
.classpath | 6 -
.gitignore | 1 +
jwtToken.txt | 2 +-
.../controller/AdminAPIController.java | 115 +-
.../controller/Admincontroller.java | 487 ++-
.../controller/HQAPIController.java | 1502 ++++++++++
.../controller/HeadquartersController.java | 74 +
.../controller/OfficerAPIController.java | 1119 ++++---
.../controller/OfficerController.java | 20 +
.../controller/UserAPIController.java | 58 +-
.../communityHall/entity/FloorDetails.java | 142 +-
.../gcc/communityHall/entity/HallDetails.java | 2 +
.../TransactionResponseRepository.java | 85 +-
.../repository/BookingCalendarRepository.java | 80 +-
.../repository/BookingDetailsRepository.java | 3 +
.../repository/FloorDetailsRepository.java | 22 +-
.../repository/GccBlockingDateRepository.java | 29 +-
.../communityHall/service/BookingService.java | 258 +-
.../service/HallDetailService.java | 99 +-
.../service/Impl/BookingServiceImpl.java | 350 ++-
.../service/Impl/HallDetailServiceImpl.java | 264 +-
src/main/resources/paymentConfig.properties | 2 +-
.../resources/templates/admin/developer.html | 467 +--
.../templates/admin/gccblocking-new.html | 1033 +++++++
.../templates/admin/halldetailslist.html | 2669 ++++++++---------
.../templates/admin/login-creation.html | 1543 ++++++++++
.../templates/fragments/adminMenu.html | 21 +-
.../templates/fragments/headquartersMenu.html | 18 +-
.../templates/fragments/menuOfficer.html | 6 +
.../headquarters/gccblocking-new.html | 1044 +++++++
.../headquarters/halldetailslist.html | 1862 ++++++++++++
.../templates/officer/gccblocking-new.html | 1154 +++++++
.../resources/templates/officiallogin.html | 1265 ++++----
.../templates/user/hallbookingform.html | 132 +-
.../templates/user/viewhallform.html | 1204 ++++----
.../resources/templates/user/viewhistory.html | 61 +-
36 files changed, 13278 insertions(+), 3921 deletions(-)
create mode 100644 src/main/java/com/gcc/communityHall/controller/HQAPIController.java
create mode 100644 src/main/resources/templates/admin/gccblocking-new.html
create mode 100644 src/main/resources/templates/admin/login-creation.html
create mode 100644 src/main/resources/templates/headquarters/gccblocking-new.html
create mode 100644 src/main/resources/templates/headquarters/halldetailslist.html
create mode 100644 src/main/resources/templates/officer/gccblocking-new.html
diff --git a/.classpath b/.classpath
index d91be04b..2d9bac5e 100644
--- a/.classpath
+++ b/.classpath
@@ -39,17 +39,11 @@
-
-
-
-
-
-
diff --git a/.gitignore b/.gitignore
index c2187eec..422e7586 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ target/classes/
target/classes/application-dev.properties
target/classes/application-prod.properties
+/communityHallDocuments_test
diff --git a/jwtToken.txt b/jwtToken.txt
index 944441b6..9014d974 100644
--- a/jwtToken.txt
+++ b/jwtToken.txt
@@ -1 +1 @@
-eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyVHlwZSI6ImhlYWRxdWFydGVycyIsImhhbGxJZCI6MywiaGFsbElkcyI6IjMiLCJtb2JpbGVOdW1iZXIiOjEyMzQ1Njc4OTEsImVtcGxveWVlSWQiOiI2Iiwiem9uZSI6IjAwIiwiZXhwIjoxNzgxNTA2NDEwfQ.GsMmYYsPT_S2rsgB_q1hFaX-2uu3Z1HvKwijAbA1Ck5ruG9Q2JaV_ZGZGic-Jl0LLRUPHi5Xs_6jCvfg6UbiNA
\ No newline at end of file
+eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyVHlwZSI6ImhlYWRxdWFydGVycyIsImhhbGxJZCI6MCwiaGFsbElkcyI6IiIsIm1vYmlsZU51bWJlciI6OTUxNzUzODUyNCwiem9uZSI6IjAwIiwiZXhwIjoxNzgzOTI4NDY4fQ.JDuWljfRXzemAjgmLj4MFq3DgmL9Z1hbE8_LoLpQQ0jLZp4wBbyvmEopk9BHmWtzh8SlDN6dxQHEJDsxTRt0_Q
\ No newline at end of file
diff --git a/src/main/java/com/gcc/communityHall/controller/AdminAPIController.java b/src/main/java/com/gcc/communityHall/controller/AdminAPIController.java
index 02c703a8..946aea7c 100644
--- a/src/main/java/com/gcc/communityHall/controller/AdminAPIController.java
+++ b/src/main/java/com/gcc/communityHall/controller/AdminAPIController.java
@@ -543,16 +543,8 @@ public class AdminAPIController {
@Operation(summary = " GCC Blocked Booking Details REST API", description = "REST API to get the GCC Blocked BookingDetails")
// retrieving the GCC Blocked BookingDetails
@GetMapping("/blockedevents")
- public ResponseEntity> getBlockedEvents(
- @RequestParam("fromDate") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate fromDate,
- @RequestParam("toDate") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate toDate,
- @RequestParam("hallIds") List hallIds) {
- // System.out.println("Blocked Events Request - fromDate: " + fromDate + ",
- // toDate: " + toDate + ", hallIds: " + hallIds );
- List blockedBookings = bookingService.getBlockedEvents(fromDate, toDate, hallIds);
-
- // List bookingDetails =
- // bookingService.getByBookingId(fromDate,toDate,hallIds,blockingId,bookingId);
+ public ResponseEntity> getBlockedEvents() {
+ List blockedBookings = bookingService.getBlockedEvents();
if (blockedBookings.isEmpty()) {
// System.out.println("No blocked bookings found.");
@@ -579,50 +571,69 @@ public class AdminAPIController {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Blocking ID not found.");
}
- // Get the booking IDs from the blocking date entity
+ // Get the booking IDs from the blocking date entity (may be null/empty for
+ // block-only entries)
String bookingIds = blockingDate.getBookingIds();
String hallIds = blockingDate.getHallId();
- // Convert the booking IDs to a list of integers
- List bookingIdList = Arrays.stream(bookingIds.split(","))
- .map(Integer::parseInt)
- .collect(Collectors.toList());
+ // Parse booking IDs only if present
+ List bookingIdList = (bookingIds != null && !bookingIds.trim().isEmpty())
+ ? Arrays.stream(bookingIds.split(","))
+ .map(String::trim)
+ .filter(s -> !s.isEmpty())
+ .map(Integer::parseInt)
+ .collect(Collectors.toList())
+ : Collections.emptyList();
// Convert the hall IDs to a list of longs if provided
- List hallIdList = hallIds != null ? Arrays.stream(hallIds.split(","))
- .map(Long::parseLong)
- .collect(Collectors.toList())
+ List hallIdList = (hallIds != null && !hallIds.trim().isEmpty())
+ ? Arrays.stream(hallIds.split(","))
+ .map(Long::parseLong)
+ .collect(Collectors.toList())
: Collections.emptyList();
// Fetch the booking calendar entries within the date range
List bookingCalendars = bookingService.getBookedslots(fromDate, endDate, hallIdList);
- if (bookingCalendars.isEmpty()) {
- return ResponseEntity.status(HttpStatus.NOT_FOUND)
- .body("No booking slots found for the given date range and hall IDs.");
- }
-
- // Iterate over bookingCalendars and update them as needed
+ // ── Smart unblock: per-slot decision ──────────────────────────────────
+ // If morning+evening+is_blocked are all true AND an APPROVED user booking
+ // exists for that hall/date → only clear is_blocked (leave slots intact).
+ // Otherwise (GCC-owned slot) → clear everything.
for (BookingCalendar bookingslots : bookingCalendars) {
- bookingslots.setBookingId_1(null);
- bookingslots.setBookingId_2(null);
- bookingslots.setMorningSlot(false);
- bookingslots.setEveningSlot(false);
- bookingslots.setIs_blocked(false);
+ if (bookingslots.isMorningSlot() && bookingslots.isEveningSlot() && bookingslots.getIs_blocked()) {
+ List approvedBookings = bookingDetailsRepository.findByHallIdAndDate(
+ bookingslots.getBdate(), bookingslots.getHallId());
+ if (!approvedBookings.isEmpty()) {
+ // Approved user booking owns the slots — only remove gcc flag
+ bookingslots.setIs_blocked(false);
+ } else {
+ // GCC owned this slot fully — release everything
+ bookingslots.setBookingId_1(null);
+ bookingslots.setBookingId_2(null);
+ bookingslots.setMorningSlot(false);
+ bookingslots.setEveningSlot(false);
+ bookingslots.setIs_blocked(false);
+ }
+ } else {
+ // Partial slot scenario — only clear the gcc overlay flag
+ bookingslots.setIs_blocked(false);
+ }
bookingCalendarRepository.save(bookingslots);
}
blockingDate.setBlockedStatus(GccBlockingDate.BlockedStatus.UNBLOCKED);
blockingDateRepository.save(blockingDate);
- // Process each bookingId and update the booking details
+ // Update GCC_BLOCKED booking_details entries back to GCC_UNBLOCKED
for (int bookingId : bookingIdList) {
Optional bookingDetails = bookingDetailsRepo.findById(bookingId);
if (bookingDetails.isPresent()) {
BookingDetails bookings = bookingDetails.get();
- bookings.setBookingStatus(BookingDetails.BookingStatus.GCC_UNBLOCKED);
- bookings.setRefundStatus(BookingDetails.RefundStatus.NA);
- bookingDetailsRepo.save(bookings);
+ if (bookings.getBookingStatus() == BookingDetails.BookingStatus.GCC_BLOCKED) {
+ bookings.setBookingStatus(BookingDetails.BookingStatus.GCC_UNBLOCKED);
+ bookings.setRefundStatus(BookingDetails.RefundStatus.NA);
+ bookingDetailsRepo.save(bookings);
+ }
}
}
String adminname = (String) session.getAttribute("usertype");
@@ -755,6 +766,44 @@ public class AdminAPIController {
return hallService.getHallImages(hallId);
}
+ @Operation(summary = "GCC Block Without Cancelling REST API", description = "REST API to Block halls without cancelling existing bookings (smart slot logic)")
+ @PostMapping("/blockWithoutCancel")
+ public ResponseEntity blockWithoutCancel(
+ @RequestParam("fromDate") String fromDate,
+ @RequestParam("toDate") String toDate,
+ @RequestParam("hallID") String hallID,
+ @RequestParam("reasonforblocking") String reasonforblocking,
+ @RequestParam(value = "description", required = false) String[] descriptions,
+ @RequestParam(value = "document", required = false) MultipartFile[] documents,
+ HttpSession session) {
+
+ String updatedBy = (String) session.getAttribute("employeeId");
+ List hallIdsList = Arrays.stream(hallID.split(","))
+ .map(Long::parseLong)
+ .collect(Collectors.toList());
+
+ bookingService.blockWithoutCancellingBookings(fromDate, toDate, hallIdsList, reasonforblocking,
+ updatedBy, descriptions, documents);
+
+ String adminname = (String) session.getAttribute("usertype");
+ Integer loginid = (Integer) session.getAttribute("id");
+ ApplicationLogs logs = new ApplicationLogs();
+ logs.setComments("Action by " + adminname);
+ logs.setLoginId(loginid);
+ logs.setLogType("Gcc Block Without Cancel for the Reason:-" + reasonforblocking);
+ InetAddress inetAddress;
+ try {
+ inetAddress = InetAddress.getLocalHost();
+ String hostname = InetAddress.getLocalHost().getHostName();
+ logs.setIpaddress(inetAddress.getHostAddress());
+ logs.setSystemName(hostname);
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ applicationLogsRepository.save(logs);
+ return ResponseEntity.ok("Success");
+ }
+
@Operation(summary = "GCC Blocking REST API", description = "REST API to Block the Halls by Admin")
// GccBlocking Api
@PostMapping("/cancelAll")
diff --git a/src/main/java/com/gcc/communityHall/controller/Admincontroller.java b/src/main/java/com/gcc/communityHall/controller/Admincontroller.java
index 355ae670..045ff91c 100644
--- a/src/main/java/com/gcc/communityHall/controller/Admincontroller.java
+++ b/src/main/java/com/gcc/communityHall/controller/Admincontroller.java
@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
import org.springframework.web.multipart.MultipartFile;
@@ -43,6 +44,8 @@ import com.gcc.communityHall.entity.HallDetails;
import com.gcc.communityHall.entity.Notification;
import com.gcc.communityHall.entity.Settlement;
import com.gcc.communityHall.entity.Users;
+import com.gcc.communityHall.entity.Login;
+import com.gcc.communityHall.entity.LoginHallId;
import com.gcc.communityHall.others.UserSession;
import com.gcc.communityHall.paymentService.entity.TransactionResponse;
import com.gcc.communityHall.paymentService.repository.TransactionResponseRepository;
@@ -54,12 +57,15 @@ import com.gcc.communityHall.repository.HallDetailsRepository;
import com.gcc.communityHall.repository.NotificationRepository;
import com.gcc.communityHall.repository.SettlementRepository;
import com.gcc.communityHall.repository.UsersRepository;
+import com.gcc.communityHall.repository.LoginHallIdRepository;
+import com.gcc.communityHall.repository.LoginRepository;
import com.gcc.communityHall.service.BookingService;
import com.gcc.communityHall.service.HallDetailService;
import com.gcc.communityHall.service.ReasonMasterService;
import com.gcc.communityHall.service.UserService;
import jakarta.servlet.http.HttpSession;
+import jakarta.transaction.Transactional;
@Controller
@RequestMapping("/communityhall/admin")
@@ -110,6 +116,12 @@ public class Admincontroller {
@Autowired
private TransactionResponseRepository transactionResponseRepository;
+ @Autowired
+ private LoginRepository loginRepository;
+
+ @Autowired
+ private LoginHallIdRepository loginHallIdRepository;
+
@GetMapping("/dashboard")
public String viewDashboard(
@RequestParam(required = false, defaultValue = "all zones") String zone,
@@ -120,7 +132,7 @@ public class Admincontroller {
// Validate JWT token
if (token != null && jwtUtil.validateToken(token)) {
- //System.out.println("tokennnnnnnnnnnnnnns"+token);
+ // System.out.println("tokennnnnnnnnnnnnnns"+token);
// Token is valid, proceed with dashboard logic
String adminName = (String) session.getAttribute("usertype");
long mobileno = (long) session.getAttribute("mobileno");
@@ -147,7 +159,6 @@ public class Admincontroller {
}
}
-
@GetMapping("/Reports")
public String viewReports(Model model, HttpSession session) {
String adminname = (String) session.getAttribute("usertype");
@@ -174,7 +185,6 @@ public class Admincontroller {
}
}
-
@GetMapping("/HallDetails")
public String viewHallDetails(Model model, HttpSession session) {
String adminname = (String) session.getAttribute("usertype");
@@ -263,9 +273,9 @@ public class Admincontroller {
List cancelledbookings = bookingDetailsRepository.findAllSettlementCancelledList();
List rejectedbookings = bookingDetailsRepository.findAllSettlementRejectedList();
model.addAttribute("settlementlist", settlement);
- //AKI
+ // AKI
List settlementIntiated = bookingDetailsRepository.findSettlementInitiatedPending();
- model.addAttribute("settlementIntiated", settlementIntiated);
+ model.addAttribute("settlementIntiated", settlementIntiated);
model.addAttribute("cancelledbookings", cancelledbookings);
model.addAttribute("rejectedbookings", rejectedbookings);
System.out.println("Settlement List: " + settlement);
@@ -287,8 +297,10 @@ public class Admincontroller {
String zone = (String) session.getAttribute("zone");
model.addAttribute("zone", zone);
List settlementrefundfailed = bookingDetailsRepository.findAllSettlementRefundFailed();
- List refundfailedcancelledbookings = bookingDetailsRepository.findAllRefundFaileCancelledList();
- List refundfailedrejectedbookings = bookingDetailsRepository.findAllRefundFaileRejectedList();
+ List refundfailedcancelledbookings = bookingDetailsRepository
+ .findAllRefundFaileCancelledList();
+ List refundfailedrejectedbookings = bookingDetailsRepository
+ .findAllRefundFaileRejectedList();
model.addAttribute("settlementrefundfailed", settlementrefundfailed);
model.addAttribute("refundfailedcancelledbookings", refundfailedcancelledbookings);
model.addAttribute("refundfailedrejectedbookings", refundfailedrejectedbookings);
@@ -392,6 +404,20 @@ public class Admincontroller {
}
}
+ // ── New enhanced GCC Blocking page (does NOT affect the existing page) ──
+ @GetMapping("/GccblockingNew")
+ public String viewGccBlockingNew(Model model, HttpSession session) {
+ String adminname = (String) session.getAttribute("usertype");
+ if (adminname != null) {
+ long mobileno = (long) session.getAttribute("mobileno");
+ model.addAttribute("mobileno", mobileno);
+ model.addAttribute("adminname", adminname);
+ return "admin/gccblocking-new";
+ } else {
+ session.invalidate();
+ return "redirect:/communityhall/login";
+ }
+ }
// Utility method to ensure distinct by a key
private static Predicate distinctByKey(Function keyExtractor) {
@@ -410,7 +436,7 @@ public class Admincontroller {
@RequestParam float hallArea,
@RequestParam String ebNumber,
@RequestParam float ebCostPerUnit,
- @RequestParam int parkingCapacity,
+ @RequestParam String parkingCapacity,
@RequestParam int seatingCapacity,
@RequestParam String doorNo,
@RequestParam String street,
@@ -426,8 +452,10 @@ public class Admincontroller {
@RequestParam long hallInchargeNo,
@RequestParam("hallImages") MultipartFile[] hallImages, HttpSession session) {
String updatedId = (String) session.getAttribute("employeeId");
- hallDetailService.saveHall(hallName, depositAmount, halfDayAmt, fullDayAmt, gst, hallArea, ebNumber, ebCostPerUnit, parkingCapacity, seatingCapacity, doorNo,
- street, area, zone, division, landMark, city, pinCode, latitude, longitude, hallInchargeName, hallInchargeNo, updatedId, hallImages, halfdepositAmt);
+ hallDetailService.saveHallByAdmin(hallName, depositAmount, halfDayAmt, fullDayAmt, gst, hallArea, ebNumber,
+ ebCostPerUnit, parkingCapacity, seatingCapacity, doorNo,
+ street, area, zone, division, landMark, city, pinCode, latitude, longitude, hallInchargeName,
+ hallInchargeNo, updatedId, hallImages, halfdepositAmt);
String adminname = (String) session.getAttribute("usertype");
Integer loginid = (Integer) session.getAttribute("id");
ApplicationLogs logs = new ApplicationLogs();
@@ -444,7 +472,8 @@ public class Admincontroller {
e.printStackTrace();
}
applicationLogsRepository.save(logs);
- // Redirect to a success page or return a ModelAndView as per your application flow
+ // Redirect to a success page or return a ModelAndView as per your application
+ // flow
return "redirect:/communityhall/admin/halldetailslist";
}
@@ -558,48 +587,60 @@ public class Admincontroller {
@PostMapping("/getReport")
public String generateReport(Model model,
- @RequestParam(name = "FromDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) String fromDate,
- @RequestParam(name = "ToDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) String toDate,
- @RequestParam(name = "request") String request,
- @RequestParam(name = "userstatus", required = false) String userstatus,
- @RequestParam(name = "usertype", required = false) String usertype,
- @RequestParam(name = "bookingStatus", required = false) String bookingStatus,
- @RequestParam(name = "refundStatus", required = false) String refundStatus,
- @RequestParam(name = "paymentStatus", required = false) String paymentStatus,
- @RequestParam(name = "filterby", required = false) String filterby,
- @RequestParam(name = "zone1", required = false, defaultValue = "ALL") String zone,
- @RequestParam(name = "division1", required = false, defaultValue = "ALL") String division,
- @RequestParam(name = "hall1", required = false) Integer hallid,
- @RequestParam(name = "basedon", required = false) String basedon,
- @RequestParam(name = "bookingId", required = false) Long bookingId,
- @RequestParam(name = "reporttype", required = false) String reporttype,
- @RequestParam(name = "counterId", required = false) String counterId, HttpSession session) throws JsonProcessingException {
+ @RequestParam(name = "FromDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) String fromDate,
+ @RequestParam(name = "ToDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) String toDate,
+ @RequestParam(name = "request") String request,
+ @RequestParam(name = "userstatus", required = false) String userstatus,
+ @RequestParam(name = "usertype", required = false) String usertype,
+ @RequestParam(name = "bookingStatus", required = false) String bookingStatus,
+ @RequestParam(name = "refundStatus", required = false) String refundStatus,
+ @RequestParam(name = "paymentStatus", required = false) String paymentStatus,
+ @RequestParam(name = "filterby", required = false) String filterby,
+ @RequestParam(name = "zone1", required = false, defaultValue = "ALL") String zone,
+ @RequestParam(name = "division1", required = false, defaultValue = "ALL") String division,
+ @RequestParam(name = "hall1", required = false) Integer hallid,
+ @RequestParam(name = "basedon", required = false) String basedon,
+ @RequestParam(name = "bookingId", required = false) Long bookingId,
+ @RequestParam(name = "reporttype", required = false) String reporttype,
+ @RequestParam(name = "counterId", required = false) String counterId, HttpSession session)
+ throws JsonProcessingException {
String adminname = (String) session.getAttribute("usertype");
if (adminname != null) {
long mobileno = (long) session.getAttribute("mobileno");
model.addAttribute("mobileno", mobileno);
List userList = handleUserRequest(request, fromDate, toDate, userstatus, usertype);
- List bookingList = handleBookingRequest(request, fromDate, toDate, bookingStatus, filterby, bookingId, zone, division, hallid);
- List bookingSettlementList = handleBookingSettlementRequest(request, fromDate, toDate, refundStatus, filterby);
- //List paymentList = request.equals("3") ? bookingService.getAllPaymentsDetails(fromDate, toDate,zone,division,hallid) : new ArrayList<>();
+ List bookingList = handleBookingRequest(request, fromDate, toDate, bookingStatus, filterby,
+ bookingId, zone, division, hallid);
+ List bookingSettlementList = handleBookingSettlementRequest(request, fromDate, toDate,
+ refundStatus, filterby);
+ // List paymentList = request.equals("3") ?
+ // bookingService.getAllPaymentsDetails(fromDate, toDate,zone,division,hallid) :
+ // new ArrayList<>();
List paymentList = new ArrayList<>();
List extrapaymentList = new ArrayList<>();
if (request.equals("3")) {
if (paymentStatus == null || paymentStatus.isEmpty()) {
paymentList = bookingService.getAllPaymentsDetails(fromDate, toDate, null, zone, division, hallid);
} else {
- paymentList = bookingService.getAllPaymentsDetails(fromDate, toDate, paymentStatus, zone, division, hallid);
+ paymentList = bookingService.getAllPaymentsDetails(fromDate, toDate, paymentStatus, zone, division,
+ hallid);
}
}
if (request.equals("8")) {
if (paymentStatus == null || paymentStatus.isEmpty()) {
- extrapaymentList = bookingService.getAllExtraPaymentsDetails(fromDate, toDate, null, zone, division, hallid);
+ extrapaymentList = bookingService.getAllExtraPaymentsDetails(fromDate, toDate, null, zone, division,
+ hallid);
} else {
- extrapaymentList = bookingService.getAllExtraPaymentsDetails(fromDate, toDate, paymentStatus, zone, division, hallid);
+ extrapaymentList = bookingService.getAllExtraPaymentsDetails(fromDate, toDate, paymentStatus, zone,
+ division, hallid);
}
}
- List userbookingList = request.equals("4") ? bookingService.getBookingUserDetailsReport(fromDate, toDate) : new ArrayList<>();
- //List hallbookingList = request.equals("5") ? bookingService.getBookingHallDetailsReport(fromDate, toDate) : new ArrayList<>();
+ List userbookingList = request.equals("4")
+ ? bookingService.getBookingUserDetailsReport(fromDate, toDate)
+ : new ArrayList<>();
+ // List hallbookingList = request.equals("5") ?
+ // bookingService.getBookingHallDetailsReport(fromDate, toDate) : new
+ // ArrayList<>();
// In your controller method
// Fetch booking count by zone
List totalcount = new ArrayList<>();
@@ -609,13 +650,13 @@ public class Admincontroller {
totalcount = bookingDetailsRepository.countBookingsByZone();
// Format zone data
totalcount = totalcount.stream()
- .map(data -> new Object[]{"Zone-" + data[0], data[1]})
+ .map(data -> new Object[] { "Zone-" + data[0], data[1] })
.collect(Collectors.toList());
} else if ("division".equals(basedon)) {
totalcount = bookingDetailsRepository.countBookingsByDivisions();
// Format division data
totalcount = totalcount.stream()
- .map(data -> new Object[]{"Division-" + data[0], data[1]})
+ .map(data -> new Object[] { "Division-" + data[0], data[1] })
.collect(Collectors.toList());
}
@@ -626,22 +667,24 @@ public class Admincontroller {
model.addAttribute("basedon", basedon);
model.addAttribute("totalcount", totalcount);
model.addAttribute("totalBookings", totalBookings);
- List hallbookingList = handleBookingHallDetailsReportRequest(request, fromDate, toDate, filterby, zone, division, hallid);
+ List hallbookingList = handleBookingHallDetailsReportRequest(request, fromDate, toDate, filterby,
+ zone, division, hallid);
if ("9".equals(request)) {
- if("abstract".equals(reporttype)){
+ if ("abstract".equals(reporttype)) {
List counterBookingList = new ArrayList<>();
counterBookingList = bookingService.getCounterWiseBookingCount(fromDate, toDate);
model.addAttribute("counterBookingList", counterBookingList);
System.out.println("counterBookingList.." + counterBookingList);
- List hallBookingByCounter = bookingService.getHallWiseBookingDetails(fromDate, toDate, counterId);
+ List hallBookingByCounter = bookingService.getHallWiseBookingDetails(fromDate, toDate,
+ counterId);
// Convert to JSON for JS usage
String hallBookingJson = new ObjectMapper().writeValueAsString(hallBookingByCounter);
model.addAttribute("hallBookingJson", hallBookingJson);
-
- List hallBookingDetails = bookingService.getBookingDetailsForAllHalls(fromDate, toDate, counterId, hallid);
+ List hallBookingDetails = bookingService.getBookingDetailsForAllHalls(fromDate, toDate,
+ counterId, hallid);
String hallBookingDetailsJson = new ObjectMapper().writeValueAsString(hallBookingDetails);
model.addAttribute("hallBookingDetailsJson", hallBookingDetailsJson);
@@ -669,15 +712,15 @@ public class Admincontroller {
String counterWiseBookingJson = new ObjectMapper().writeValueAsString(counterWiseBookingList);
model.addAttribute("counterWiseBookingList", counterWiseBookingJson);
}
- //ak
+ // ak
if ("11".equals(request)) {
- // Fetch Settlement Initiated Report details
- List settlementInitiatedList = bookingService.getSettlementInitiatedReport(fromDate, toDate);
- System.out.println("settlementInitatedList"+ settlementInitiatedList);
+ // Fetch Settlement Initiated Report details
+ List settlementInitiatedList = bookingService.getSettlementInitiatedReport(fromDate, toDate);
+ System.out.println("settlementInitatedList" + settlementInitiatedList);
- // Add the list to the model
- model.addAttribute("settlementInitiatedList", settlementInitiatedList);
-}
+ // Add the list to the model
+ model.addAttribute("settlementInitiatedList", settlementInitiatedList);
+ }
model.addAttribute("filterby", filterby);
model.addAttribute("users", userList);
@@ -701,7 +744,6 @@ public class Admincontroller {
model.addAttribute("hall1", hallid);
model.addAttribute("adminname", adminname);
System.out.println("request" + request);
-
return "admin/reports";
} else {
@@ -710,7 +752,8 @@ public class Admincontroller {
}
}
- private List handleBookingHallDetailsReportRequest(String request, String fromDate, String toDate, String filterby, String zone, String division, Integer hallid) {
+ private List handleBookingHallDetailsReportRequest(String request, String fromDate, String toDate,
+ String filterby, String zone, String division, Integer hallid) {
if (!request.equals("5")) {
return new ArrayList<>();
}
@@ -731,7 +774,8 @@ public class Admincontroller {
return new ArrayList<>();
}
- private List handleUserRequest(String request, String fromDate, String toDate, String userstatus, String usertype) {
+ private List handleUserRequest(String request, String fromDate, String toDate, String userstatus,
+ String usertype) {
if (!request.equals("1")) {
return new ArrayList<>();
}
@@ -747,8 +791,8 @@ public class Admincontroller {
return userService.getAllUsers(fromDate, toDate);
}
-
- private List handleBookingRequest(String request, String fromDate, String toDate, String bookingStatus, String filterby, Long bookingId, String zone, String division, Integer hallid) {
+ private List handleBookingRequest(String request, String fromDate, String toDate, String bookingStatus,
+ String filterby, Long bookingId, String zone, String division, Integer hallid) {
if (!request.equals("2")) {
return new ArrayList<>();
}
@@ -759,10 +803,12 @@ public class Admincontroller {
return bookingDetailsRepo.getAllBookingDetailsWithBookingId(fromDate, toDate, bookingId);
}
if (bookingId != null && !bookingStatus.isEmpty()) {
- return bookingDetailsRepo.getAllBookingDetailsWithBookingIdwithbookingStatus(fromDate, toDate, bookingId, bookingStatus);
+ return bookingDetailsRepo.getAllBookingDetailsWithBookingIdwithbookingStatus(fromDate, toDate, bookingId,
+ bookingStatus);
}
if (bookingId == null && filterby.isEmpty() && !bookingStatus.isEmpty()) {
- return bookingService.getBookingDetailsByBookingDateWithStatus(fromDate, toDate, bookingStatus, zone, division, hallid);
+ return bookingService.getBookingDetailsByBookingDateWithStatus(fromDate, toDate, bookingStatus, zone,
+ division, hallid);
}
if (!filterby.isEmpty()) {
@@ -770,7 +816,8 @@ public class Admincontroller {
if (bookingStatus.isEmpty()) {
return bookingService.getBookingDetailsByBookingDate(fromDate, toDate, zone, division, hallid);
} else {
- return bookingService.getBookingDetailsByBookingDateWithStatus(fromDate, toDate, bookingStatus, zone, division, hallid);
+ return bookingService.getBookingDetailsByBookingDateWithStatus(fromDate, toDate, bookingStatus,
+ zone, division, hallid);
}
}
@@ -778,7 +825,8 @@ public class Admincontroller {
if (bookingStatus.isEmpty()) {
return bookingService.getBookingDetailsByEventDate(fromDate, toDate, zone, division, hallid);
} else {
- return bookingService.getBookingDetailsByEventDateWithStatus(fromDate, toDate, bookingStatus, zone, division, hallid);
+ return bookingService.getBookingDetailsByEventDateWithStatus(fromDate, toDate, bookingStatus, zone,
+ division, hallid);
}
}
@@ -787,8 +835,8 @@ public class Admincontroller {
return new ArrayList<>();
}
-
- private List handleBookingSettlementRequest(String request, String fromDate, String toDate, String refundStatus, String filterby) {
+ private List handleBookingSettlementRequest(String request, String fromDate, String toDate,
+ String refundStatus, String filterby) {
if (!request.equals("6")) {
return new ArrayList<>();
}
@@ -804,7 +852,8 @@ public class Admincontroller {
if (refundStatus.isEmpty()) {
return bookingService.getAllBookingsettlementDetailsByBookingDate(fromDate, toDate);
} else {
- return bookingService.getAllBookingsettlementDetailsByBookingDateWithStatus(fromDate, toDate, refundStatus);
+ return bookingService.getAllBookingsettlementDetailsByBookingDateWithStatus(fromDate, toDate,
+ refundStatus);
}
}
@@ -812,7 +861,8 @@ public class Admincontroller {
if (refundStatus.isEmpty()) {
return bookingService.getAllBookingsettlementDetailsByEventDate(fromDate, toDate);
} else {
- return bookingService.getAllBookingsettlementDetailsByEventDateWithStatus(fromDate, toDate, refundStatus);
+ return bookingService.getAllBookingsettlementDetailsByEventDateWithStatus(fromDate, toDate,
+ refundStatus);
}
}
@@ -888,28 +938,28 @@ public class Admincontroller {
}
}
- // @GetMapping("/getDeveloperdetails")
-// public String getDetails(Model model,HttpSession session)
-// {
-// String adminname = (String) session.getAttribute("usertype");
-// if(adminname != null) {
-// long mobileno = (long) session.getAttribute("mobileno");
-// model.addAttribute("mobileno", mobileno);
-// return "admin/developer";
-// }else {
-// session.invalidate(); // Invalidate the session to clear all session attributes
-// return "redirect:/communityhall/login";
-// }
-// }
+ // @GetMapping("/getDeveloperdetails")
+ // public String getDetails(Model model,HttpSession session)
+ // {
+ // String adminname = (String) session.getAttribute("usertype");
+ // if(adminname != null) {
+ // long mobileno = (long) session.getAttribute("mobileno");
+ // model.addAttribute("mobileno", mobileno);
+ // return "admin/developer";
+ // }else {
+ // session.invalidate(); // Invalidate the session to clear all session
+ // attributes
+ // return "redirect:/communityhall/login";
+ // }
+ // }
@PostMapping("/getDeveloperdetails")
public String generatedetails(Model model,
- @RequestParam(name = "FromDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) String fromDate,
- @RequestParam(name = "ToDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) String toDate,
- @RequestParam(name = "request") String request,
- @RequestParam(name = "bookingId", required = false) Long bookingId,
- @RequestParam(name = "hallId", required = false) Long hallId,
- @RequestParam(name = "hallName", required = false) String hallName, HttpSession session) {
-
+ @RequestParam(name = "FromDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) String fromDate,
+ @RequestParam(name = "ToDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) String toDate,
+ @RequestParam(name = "request") String request,
+ @RequestParam(name = "bookingId", required = false) Long bookingId,
+ @RequestParam(name = "hallId", required = false) Long hallId,
+ @RequestParam(name = "hallName", required = false) String hallName, HttpSession session) {
String adminname = (String) session.getAttribute("usertype");
if (adminname != null) {
@@ -938,15 +988,17 @@ public class Admincontroller {
List BookingCalendar = new ArrayList<>();
if (request.equals("3")) {
System.out.println("outside");
-// if (hallName.isEmpty()) {
-// System.out.println("check1");
-// // Fetch all details for the given date range
-// BookingCalendar = bookingService.getBookingCalendarDetails(fromDate, toDate,hallName);
-// } else {
-// System.out.println("check2");
-// // Fetch filtered details based on hallName
-// BookingCalendar = bookingService.getBookingCalendarDetails(fromDate, toDate, hallName);
-// }
+ // if (hallName.isEmpty()) {
+ // System.out.println("check1");
+ // // Fetch all details for the given date range
+ // BookingCalendar = bookingService.getBookingCalendarDetails(fromDate,
+ // toDate,hallName);
+ // } else {
+ // System.out.println("check2");
+ // // Fetch filtered details based on hallName
+ // BookingCalendar = bookingService.getBookingCalendarDetails(fromDate, toDate,
+ // hallName);
+ // }
BookingCalendar = bookingService.getBookingCalendarDetails(fromDate, toDate, bookingId, hallName);
}
@@ -1045,7 +1097,6 @@ public class Admincontroller {
}
}
-
@GetMapping("/logout")
public String viewLogout(Model model, HttpSession session) {
session.invalidate();
@@ -1072,5 +1123,255 @@ public class Admincontroller {
}
}
-}
+ // care taker, counter and officer login creation added by kanimozhi 15062026
+ @GetMapping("/login-creation")
+ public String viewLoginCreation(Model model, HttpSession session) {
+ String adminname = (String) session.getAttribute("usertype");
+ if (adminname != null && "admin".equals(adminname)) {
+ long mobileno = (long) session.getAttribute("mobileno");
+ model.addAttribute("mobileno", mobileno);
+ model.addAttribute("adminname", adminname);
+
+ // Fetch existing active non-admin logins (returns projection, not full entity)
+ List> loginList = loginRepository.findActiveLogins();
+ model.addAttribute("loginList", loginList);
+
+ // Fetch hall details for the modal dropdown
+ List> hallList = hallDetailsRepo.getAllHalls();
+ model.addAttribute("hallList", hallList);
+
+ return "admin/login-creation";
+ } else {
+ session.invalidate();
+ return "redirect:/communityhall/login";
+ }
+ }
+
+ @PostMapping("/login-creation/save")
+ @ResponseBody
+ @Transactional
+ public Map saveLoginCreation(
+ @RequestParam("mobileNumber") long mobileNumber,
+ @RequestParam("name") String name,
+ @RequestParam("password") String password,
+ @RequestParam("userType") String userType,
+ @RequestParam("zone") String zone,
+ @RequestParam(value = "hallIds", required = false) List hallIds,
+ HttpSession session) {
+
+ Map response = new HashMap<>();
+ String adminname = (String) session.getAttribute("usertype");
+ if (adminname == null && "admin".equals(adminname)) {
+ response.put("status", "error");
+ response.put("message", "Session expired. Please log in again.");
+ return response;
+ }
+ try {
+ /* -------- Duplicate hall check for counter / caretaker -------- */
+ boolean isSingleMode = "counter".equals(userType) || "caretaker".equals(userType);
+ boolean isMulitpleMode = "officer".equals(userType);
+ if (isSingleMode && hallIds != null && !hallIds.isEmpty()) {
+ int hallId = hallIds.get(0);
+ int existingCount = loginRepository.countActiveLoginsByHallId(hallId, userType);
+ if (existingCount > 0) {
+ // Fetch hall name for a clear message
+ String hallName = hallId + "";
+ try {
+ String fetched = hallDetailsRepo.findHallNameById(hallId);
+ if (fetched != null && !fetched.isBlank())
+ hallName = fetched;
+ } catch (Exception ignored) {
+ }
+ response.put("status", "error");
+ response.put("message", "A login already exists for hall \"" + hallName
+ + "\". Only one counter/caretaker login is allowed per hall.");
+ return response;
+ }
+ }
+
+ /* -------- Duplicate hall check for officer -------- */
+ if (isMulitpleMode && hallIds != null && !hallIds.isEmpty()) {
+ int existingCount = loginRepository.getActiveLoginsByHallIds(hallIds, userType);
+ if (existingCount > 0) {
+ response.put("status", "error");
+ response.put("message",
+ "A login already exists for the selected hall(s). Only one officer login is allowed per hall.");
+ return response;
+ }
+ }
+
+ Login login = new Login();
+ login.setMobileNumber(mobileNumber);
+ login.setName(name);
+ login.setPassword(password);
+ login.setUserType(userType);
+ login.setZone(zone);
+ login.setActive(true);
+ login.setDelete(false);
+
+ if (hallIds == null || hallIds.isEmpty()) {
+ // HQ may have no hall assigned
+ loginRepository.save(login);
+ } else if (hallIds.size() == 1) {
+ // Single hall: store directly in login.hallId
+ login.setHallId(hallIds.get(0));
+ loginRepository.save(login);
+ } else {
+ // Multiple halls: store first in hallId, rest in login_hall_ids
+ login.setHallId(hallIds.get(0));
+ Login savedLogin = loginRepository.save(login);
+ for (int hallId : hallIds) {
+ LoginHallId loginHallId = new LoginHallId(savedLogin, hallId);
+ loginHallIdRepository.save(loginHallId);
+ }
+ }
+
+ response.put("status", "success");
+ response.put("message", "Login created successfully.");
+ } catch (Exception e) {
+ response.put("status", "error");
+ response.put("message", "Error creating login: " + e.getMessage());
+ }
+ return response;
+ }
+
+ @PostMapping("/login-creation/delete/{id}")
+ @ResponseBody
+ @Transactional
+ public Map deleteLogin(@PathVariable("id") int id, HttpSession session) {
+ Map response = new HashMap<>();
+ String adminname = (String) session.getAttribute("usertype");
+ if (adminname == null && "admin".equals(adminname)) {
+ response.put("status", "error");
+ response.put("message", "Session expired. Please log in again.");
+ return response;
+ }
+ try {
+ Login login = loginRepository.findLoginById(id);
+ if (login == null) {
+ response.put("status", "error");
+ response.put("message", "Login not found.");
+ return response;
+ }
+ // Soft delete: set is_active = 0, is_delete = 1
+ login.setActive(false);
+ login.setDelete(true);
+ loginRepository.save(login);
+
+ // Also soft-delete any related login_hall_ids
+ loginHallIdRepository.softDeleteByLoginId(id);
+
+ response.put("status", "success");
+ response.put("message", "Login deleted successfully.");
+ } catch (Exception e) {
+ response.put("status", "error");
+ response.put("message", "Error deleting login: " + e.getMessage());
+ }
+ return response;
+ }
+
+ @GetMapping("/login-creation/check-mobile")
+ @ResponseBody
+ public Map checkMobileExists(@RequestParam("mobileNumber") long mobileNumber, HttpSession session) {
+ Map response = new HashMap<>();
+ try {
+ int count = loginRepository.countByMobileNumber(mobileNumber);
+ response.put("exists", count > 0);
+ } catch (Exception e) {
+ response.put("exists", false);
+ response.put("error", e.getMessage());
+ }
+ return response;
+ }
+
+ @GetMapping("/login-creation/halls-by-zone")
+ @ResponseBody
+ public List> getHallsByZone(@RequestParam("zone") String zone, HttpSession session) {
+ try {
+ return hallDetailsRepo.getHallsByZone(zone);
+ } catch (Exception e) {
+ return new java.util.ArrayList<>();
+ }
+ }
+
+ @GetMapping("/login-creation/get-login-halls")
+ @ResponseBody
+ public Map getLoginHalls(@RequestParam("loginId") int loginId, HttpSession session) {
+ Map response = new HashMap<>();
+ try {
+ Login login = loginRepository.findLoginById(loginId);
+ if (login == null) {
+ response.put("status", "error");
+ response.put("message", "Login not found.");
+ return response;
+ }
+ // Collect all assigned hall IDs
+ java.util.List assignedHallIds = new java.util.ArrayList<>();
+ if (login.getHallId() != 0) {
+ assignedHallIds.add(login.getHallId());
+ }
+ loginHallIdRepository.findActiveByLoginId(loginId).forEach(lh -> assignedHallIds.add(lh.getHallId()));
+
+ response.put("status", "success");
+ response.put("loginId", loginId);
+ response.put("name", login.getName());
+ response.put("zone", login.getZone());
+ response.put("userType", login.getUserType());
+ response.put("assignedHallIds", assignedHallIds);
+ // Also return all halls for the zone
+ response.put("hallsForZone", hallDetailsRepo.getHallsByZone(login.getZone()));
+ } catch (Exception e) {
+ response.put("status", "error");
+ response.put("message", "Error fetching login halls: " + e.getMessage());
+ }
+ return response;
+ }
+
+ @PostMapping("/login-creation/update-halls")
+ @ResponseBody
+ @Transactional
+ public Map updateLoginHalls(
+ @RequestParam("loginId") int loginId,
+ @RequestParam("hallIds") java.util.List hallIds,
+ HttpSession session) {
+ Map response = new HashMap<>();
+ try {
+ Login login = loginRepository.findLoginById(loginId);
+ if (login == null) {
+ response.put("status", "error");
+ response.put("message", "Login not found.");
+ return response;
+ }
+ if (hallIds == null || hallIds.isEmpty()) {
+ response.put("status", "error");
+ response.put("message", "At least one hall must be selected.");
+ return response;
+ }
+
+ // Clear all existing login_hall_ids rows for this login
+ loginHallIdRepository.softDeleteByLoginId(loginId);
+
+ if (hallIds.size() == 1) {
+ // Single hall: store in login.hall_id only
+ login.setHallId(hallIds.get(0));
+ loginRepository.save(login);
+ } else {
+ // Multiple halls: first goes to login.hall_id, rest to login_hall_ids
+ login.setHallId(hallIds.get(0));
+ loginRepository.save(login);
+ for (int i = 1; i < hallIds.size(); i++) {
+ LoginHallId lh = new LoginHallId(login, hallIds.get(i));
+ loginHallIdRepository.save(lh);
+ }
+ }
+ response.put("status", "success");
+ response.put("message", "Hall assignment updated successfully.");
+ } catch (Exception e) {
+ response.put("status", "error");
+ response.put("message", "Error updating halls: " + e.getMessage());
+ }
+ return response;
+ }
+
+}
diff --git a/src/main/java/com/gcc/communityHall/controller/HQAPIController.java b/src/main/java/com/gcc/communityHall/controller/HQAPIController.java
new file mode 100644
index 00000000..c780e854
--- /dev/null
+++ b/src/main/java/com/gcc/communityHall/controller/HQAPIController.java
@@ -0,0 +1,1502 @@
+package com.gcc.communityHall.controller;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.ui.Model;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.gcc.communityHall.component.JwtUtil;
+import com.gcc.communityHall.dto.BookingResponseDTO;
+import com.gcc.communityHall.dto.ErrorResponseDto;
+import com.gcc.communityHall.entity.ApplicationLogs;
+import com.gcc.communityHall.entity.BookingCalendar;
+import com.gcc.communityHall.entity.BookingDetails;
+import com.gcc.communityHall.entity.BookingDetails.BookingStatus;
+import com.gcc.communityHall.entity.BookingDetails.RefundStatus;
+import com.gcc.communityHall.entity.DiscountRange;
+import com.gcc.communityHall.entity.FloorDetails;
+import com.gcc.communityHall.entity.GccBlockingDate;
+import com.gcc.communityHall.entity.GccBlockingHistory;
+import com.gcc.communityHall.entity.HallDetails;
+import com.gcc.communityHall.entity.HallImages;
+import com.gcc.communityHall.entity.Notification;
+import com.gcc.communityHall.entity.ReasonDocumentMaster;
+import com.gcc.communityHall.entity.ReasonMaster;
+import com.gcc.communityHall.entity.Settlement;
+import com.gcc.communityHall.entity.Users;
+import com.gcc.communityHall.others.AppConfig;
+import com.gcc.communityHall.others.UserSession;
+import com.gcc.communityHall.paymentService.service.PaymentGatewayServiceImpl;
+import com.gcc.communityHall.repository.ApplicationLogsRepository;
+import com.gcc.communityHall.repository.BookingCalendarRepository;
+import com.gcc.communityHall.repository.BookingDetailsRepository;
+import com.gcc.communityHall.repository.DiscountRangeRepository;
+import com.gcc.communityHall.repository.GccBlockingDateRepository;
+import com.gcc.communityHall.repository.GccBlockingHistoryRepository;
+import com.gcc.communityHall.repository.HallDetailsRepository;
+import com.gcc.communityHall.repository.HallReasonRestrictionRepository;
+import com.gcc.communityHall.repository.HallImagesRepository;
+import com.gcc.communityHall.repository.NotificationRepository;
+import com.gcc.communityHall.repository.ReasonMasterRepository;
+import com.gcc.communityHall.repository.SettlementRepository;
+import com.gcc.communityHall.repository.UsersRepository;
+import com.gcc.communityHall.service.BookingService;
+import com.gcc.communityHall.service.HallDetailService;
+import com.gcc.communityHall.service.ReasonMasterService;
+import com.gcc.communityHall.service.SettlementService;
+import com.gcc.communityHall.service.UserService;
+import com.gcc.communityHall.service.Impl.BookingServiceImpl;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.ExampleObject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import lombok.AllArgsConstructor;
+
+//@RestController
+//@RequestMapping("/admin/api")
+@Tag(name = "CRUD REST APIs for HQ's in CommunityHall", description = "CRUD REST APIs in CommunityHall to CREATE, UPDATE, FETCH AND DELETE Booking details")
+@RestController
+@RequestMapping("/communityhall/headquarters/api")
+@AllArgsConstructor
+@Validated
+public class HQAPIController {
+
+ @Autowired
+ private HallDetailsRepository hallDetailsRepository;
+
+ @Autowired
+ private HallDetailService hallDetailService;
+ @Autowired
+ private BookingDetailsRepository bookingDetailsRepository;
+
+ @Autowired
+ private SettlementService settlementService;
+
+ @Autowired
+ private SettlementRepository settlementRepository;
+
+ @Autowired
+ private BookingServiceImpl bookingService;
+
+ @Autowired
+ private BookingDetailsRepository bookingDetailsRepo;
+
+ @Autowired
+ private DiscountRangeRepository discountRangeRepo;
+
+ @Autowired
+ private GccBlockingDateRepository blockingDateRepository;
+
+ @Autowired
+ private ReasonMasterService reasonMasterService;
+
+ @Autowired
+ private HallDetailService hallService;
+ @Autowired
+ private UserService userService;
+
+ @Autowired
+ private BookingCalendarRepository bookingCalendarRepository;
+
+ @Autowired
+ private UsersRepository userRepository;
+
+ @Autowired
+ private HallImagesRepository hallImagesRepository;
+
+ @Autowired
+ private JwtUtil jwtUtil;
+
+ @Autowired
+ private AppConfig appConfig;
+
+ @Autowired
+ private PaymentGatewayServiceImpl paymentGatewayServiceImpl;
+
+ @Autowired
+ private NotificationRepository notificationRepo;
+
+ @Autowired
+ private HttpSession session;
+
+ @Autowired
+ private ApplicationLogsRepository applicationLogsRepository;
+
+ @Autowired
+ private HallReasonRestrictionRepository hallReasonRestrictionRepository;
+
+ @Operation(summary = "Update HallDetails REST API", description = "REST API to update the Hall Details")
+ @ApiResponses({
+ @ApiResponse(responseCode = "200", description = "HTTP Status UPDATED", content = @Content(mediaType = "text/plain", schema = @Schema(implementation = HallDetails.class), examples = @ExampleObject(value = "Hall details updated successfully"))),
+ @ApiResponse(responseCode = "500", description = "HTTP Status Internal Server Error", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponseDto.class), examples = @ExampleObject(name = "Internal Server Error Example", value = "{ \"path\": \"/updateHallDetails\", \"status\": 500, \"error\": \"Internal Server Error\", \"timestamp\": \"2024-06-22T05:47:04.347+00:00\" }")))
+ })
+ @PostMapping("/updateHallDetails")
+ public ResponseEntity updateHallInfo(
+ @RequestParam("hallId") String hallId,
+ @RequestParam("zone") String zone,
+ @RequestParam("division") String division,
+ @RequestParam("hallName") String hallName,
+ @RequestParam("doorNo") String doorNo,
+ @RequestParam("street") String street,
+ @RequestParam("area") String area,
+ @RequestParam("pinCode") int pinCode,
+ @RequestParam("landMark") String landMark,
+ @RequestParam("latitude") String latitude,
+ @RequestParam("longitude") String longitude,
+ @RequestParam("hallInchargeMobno") long hallInchargeMobno,
+ @RequestParam("hallInchargeName") String hallInchargeName,
+ @RequestParam("depositAmount") float depositAmount,
+ @RequestParam("halfDepositAmount") float halfDepositAmount,
+ @RequestParam("fullDayRent") float fullDayRent,
+ @RequestParam("halfDayRent") float halfDayRent,
+ @RequestParam("parkingCapacity") String parkingCapacity,
+ @RequestParam("seatingCapacity") int seatingCapacity,
+ @RequestParam(value = "images", required = false) List images,
+ @RequestParam("ebNumber") String ebNumber,
+ @RequestParam("ebCostPerUnit") float ebCostPerUnit,
+ @RequestParam("gst") float gst,
+ @RequestParam("city") String city,
+ @RequestParam("isActive") boolean isActive,
+ @RequestParam(value = "floorName", required = false) List floorNames,
+ @RequestParam(value = "floorCapacity", required = false) List floorCapacities) {
+
+ HallDetails hallDetails = new HallDetails();
+ hallDetails.setHallId(Integer.parseInt(hallId));
+ hallDetails.setZone(zone);
+ hallDetails.setDivision(division);
+ hallDetails.setHallName(hallName);
+ hallDetails.setDoorNo(doorNo);
+ hallDetails.setStreet(street);
+ hallDetails.setArea(area);
+ hallDetails.setPinCode(pinCode);
+ hallDetails.setLandMark(landMark);
+ hallDetails.setLatitude(latitude);
+ hallDetails.setLongitude(longitude);
+ hallDetails.setHallInchargeMobno(hallInchargeMobno);
+ hallDetails.setHallInchargeName(hallInchargeName);
+ hallDetails.setDepositAmount(depositAmount);
+ hallDetails.setHalfDepositAmount(halfDepositAmount);
+ hallDetails.setFullDayRent(fullDayRent);
+ hallDetails.setHalfDayRent(halfDayRent);
+ hallDetails.setParkingCapacity(parkingCapacity);
+ hallDetails.setSeatingCapacity(seatingCapacity);
+ hallDetails.setEbNumber(ebNumber);
+ hallDetails.setEbCostPerUnit(ebCostPerUnit);
+ hallDetails.setGst(gst);
+ hallDetails.setCity(city);
+ hallDetails.setActive(isActive);
+
+ hallDetailService.updateHallDetail(hallDetails, images);
+
+ // Update floor details for this hall (HQ only addition)
+ hallDetailService.updateFloorDetails(Integer.parseInt(hallId), floorNames, floorCapacities);
+
+ String adminname = (String) session.getAttribute("usertype");
+ Integer loginid = (Integer) session.getAttribute("id");
+ ApplicationLogs logs = new ApplicationLogs();
+ logs.setComments("Action by " + adminname);
+ logs.setLoginId(loginid);
+ logs.setLogType("Hall Details edit:-" + hallName);
+ InetAddress inetAddress;
+ try {
+ inetAddress = InetAddress.getLocalHost();
+ String hostname = InetAddress.getLocalHost().getHostName();
+ logs.setIpaddress(inetAddress.getHostAddress());
+ logs.setSystemName(hostname);
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ applicationLogsRepository.save(logs);
+
+ return ResponseEntity.ok("Success");
+ }
+
+ @Operation(summary = "Update Settlement Status REST API", description = "REST API to update the Settlement Status to INITIATED")
+ @ApiResponses({
+ @ApiResponse(responseCode = "200", description = "HTTP Status UPDATED", content = @Content(mediaType = "application/json", schema = @Schema(implementation = Settlement.class), examples = @ExampleObject(name = "Settlement Example", value = "{\"settlementId\": Id, \"Refundstatus\": \"INITIATED\", \"comments\": \"Settlement initiated successfully\"}"))),
+ @ApiResponse(responseCode = "500", description = "HTTP Status Internal Server Error", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponseDto.class), examples = @ExampleObject(name = "Internal Server Error Example", value = "{ \"path\": \"/updateInitiatedSettlementStatus/{settlementId}\", \"status\": 500, \"error\": \"Internal Server Error\", \"timestamp\": \"2024-06-22T05:47:04.347+00:00\" }")))
+ })
+ @PostMapping("/updateInitiatedSettlementStatus/{settlementId}")
+ public ResponseEntity updateInitiatedSettlementStatus(
+ @PathVariable("settlementId") int settlementId,
+ @RequestParam("status") BookingDetails.RefundStatus status,
+ @RequestParam("comments") String comments) {
+ Settlement updateInitialiseSettlement = settlementService.updateSettlementStatus(settlementId, status,
+ comments);
+ String adminname = (String) session.getAttribute("usertype");
+ Integer loginid = (Integer) session.getAttribute("id");
+ ApplicationLogs logs = new ApplicationLogs();
+ logs.setComments("Action by " + adminname);
+ logs.setLoginId(loginid);
+ logs.setLogType("Settlement Initiation:-" + status);
+ InetAddress inetAddress;
+ try {
+ inetAddress = InetAddress.getLocalHost();
+ String hostname = InetAddress.getLocalHost().getHostName();
+ logs.setIpaddress(inetAddress.getHostAddress());
+ logs.setSystemName(hostname);
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ applicationLogsRepository.save(logs);
+ if (updateInitialiseSettlement != null) {
+ return new ResponseEntity<>(updateInitialiseSettlement, HttpStatus.OK);
+ } else {
+ return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+ }
+ }
+
+ @Operation(summary = "HallDetails by HallId REST API", description = "REST API to Retrieving the Hall Details by hallId")
+ @ApiResponses({
+ @ApiResponse(responseCode = "200", description = "HTTP Status OK", content = @Content(mediaType = "application/json", schema = @Schema(implementation = HallDetails.class))),
+ @ApiResponse(responseCode = "400", description = "Bad Request"),
+ @ApiResponse(responseCode = "404", description = "Not Found")
+ })
+ @GetMapping("/getHallDetails/{hallId}")
+ public ResponseEntity getHallDetails(@PathVariable String hallId) {
+ int id;
+ try {
+ id = Integer.parseInt(hallId);
+ } catch (NumberFormatException e) {
+ return ResponseEntity.badRequest().build();
+ }
+
+ HallDetails hallDetails = hallDetailsRepository.findHallDetailsById(id);
+ // System.out.println(hallDetails.isActive());
+ if (hallDetails != null) {
+ return ResponseEntity.ok(hallDetails);
+ } else {
+ return ResponseEntity.notFound().build();
+ }
+ }
+
+ @Operation(summary = "Saving the DiscountRange REST API", description = "REST API to Saving the Discount Range for usertypes")
+ @PostMapping("/savediscountrange")
+ public String saveDiscountrange(
+ @RequestParam String userType,
+ @RequestParam float discountRange, HttpSession session) {
+
+ Optional existingDiscountRanges = discountRangeRepo.findByUsertype(userType);
+ if (!existingDiscountRanges.isEmpty()) {
+ return "waiting";
+ }
+
+ String adminname = (String) session.getAttribute("usertype");
+ DiscountRange discount = new DiscountRange();
+ discount.setUsertype(userType);
+ discount.setDiscountRange(discountRange);
+ discount.setcDate(LocalDate.now());
+ discount.setUpdtedBy(adminname);
+ discount.setIs_active(true);
+ discount.setIs_delete(false);
+
+ discountRangeRepo.save(discount);
+ return "success";
+ }
+
+ @PostMapping("/savenotification")
+ public String saveNotification(
+ @RequestParam String notification, HttpSession session) {
+
+ String adminname = (String) session.getAttribute("usertype");
+ Notification newnotification = new Notification();
+ newnotification.setNotification_description(notification);
+ newnotification.setCdate(LocalDate.now());
+ newnotification.setCreatedBY(adminname);
+ newnotification.setActive(true);
+ newnotification.setDelete(false);
+ notificationRepo.save(newnotification);
+ Integer loginid = (Integer) session.getAttribute("id");
+ ApplicationLogs logs = new ApplicationLogs();
+ logs.setComments("Action by " + adminname);
+ logs.setLoginId(loginid);
+ logs.setLogType("Added New Notification:-" + newnotification.getNotification_description());
+ InetAddress inetAddress;
+ try {
+ inetAddress = InetAddress.getLocalHost();
+ String hostname = InetAddress.getLocalHost().getHostName();
+ logs.setIpaddress(inetAddress.getHostAddress());
+ logs.setSystemName(hostname);
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ applicationLogsRepository.save(logs);
+ return "success";
+ }
+
+ @Operation(summary = " Update the DiscountRange REST API", description = "REST API to Updating the Discount Range for usertypes")
+ @PutMapping("/updateById/{id}")
+ public String updateDiscountRangeById(@PathVariable int id, @RequestParam float discountRange,
+ HttpSession session) {
+ String adminname = (String) session.getAttribute("usertype");
+ Optional existingDiscount = discountRangeRepo.findById(id);
+ if (existingDiscount.isPresent()) {
+ DiscountRange updatediscount = existingDiscount.get();
+ updatediscount.setDiscountRange(discountRange);
+ updatediscount.setUpdtedBy(adminname);
+ updatediscount.setcDate(LocalDate.now());
+ discountRangeRepo.save(updatediscount);
+ Integer loginid = (Integer) session.getAttribute("id");
+ ApplicationLogs logs = new ApplicationLogs();
+ logs.setComments("Action by " + adminname);
+ logs.setLoginId(loginid);
+ logs.setLogType("Discount Details Update:-" + updatediscount.getUsertype());
+ InetAddress inetAddress;
+ try {
+ inetAddress = InetAddress.getLocalHost();
+ String hostname = InetAddress.getLocalHost().getHostName();
+ logs.setIpaddress(inetAddress.getHostAddress());
+ logs.setSystemName(hostname);
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ applicationLogsRepository.save(logs);
+ return "success";
+ } else {
+ return "error: Entry with ID " + id + " not found";
+ }
+ }
+
+ @Operation(summary = " Delete the DiscountRange REST API", description = "REST API to Deleting the Discount for usertypes")
+ @DeleteMapping("/deleteById/{id}")
+ public ResponseEntity deleteDiscountRangeById(@PathVariable int id) {
+ if (discountRangeRepo.existsById(id)) {
+ discountRangeRepo.deleteById(id);
+ String adminname = (String) session.getAttribute("usertype");
+ Integer loginid = (Integer) session.getAttribute("id");
+ ApplicationLogs logs = new ApplicationLogs();
+ logs.setComments("Action by " + adminname);
+ logs.setLoginId(loginid);
+ logs.setLogType("Discount Details Delete:-" + id);
+ InetAddress inetAddress;
+ try {
+ inetAddress = InetAddress.getLocalHost();
+ String hostname = InetAddress.getLocalHost().getHostName();
+ logs.setIpaddress(inetAddress.getHostAddress());
+ logs.setSystemName(hostname);
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ applicationLogsRepository.save(logs);
+ return ResponseEntity.ok("DiscountRange with ID " + id + " deleted successfully.");
+ } else {
+ return ResponseEntity.notFound().build(); // Return 404 if the entry does not exist
+ }
+ }
+
+ @PostMapping("/deletenotificationById/{id}")
+ public ResponseEntity deleteNotificationById(@PathVariable int id, HttpSession session) {
+ Optional notification = notificationRepo.findById(id);
+ Notification newnotification = notification.get();
+ newnotification.setActive(false);
+ newnotification.setDelete(true);
+ String adminname = (String) session.getAttribute("usertype");
+ newnotification.setUpdatedBy(adminname);
+ String date = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ newnotification.setUpdatedDate(date);
+ notificationRepo.save(newnotification);
+ Integer loginid = (Integer) session.getAttribute("id");
+ ApplicationLogs logs = new ApplicationLogs();
+ logs.setComments("Action by " + adminname);
+ logs.setLoginId(loginid);
+ logs.setLogType("Detele Notification:-" + newnotification.getNotification_description());
+ InetAddress inetAddress;
+ try {
+ inetAddress = InetAddress.getLocalHost();
+ String hostname = InetAddress.getLocalHost().getHostName();
+ logs.setIpaddress(inetAddress.getHostAddress());
+ logs.setSystemName(hostname);
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ applicationLogsRepository.save(logs);
+ return ResponseEntity.ok("Notification with ID " + id + " deleted successfully.");
+
+ }
+
+ @Operation(summary = "Retrieving the Discount Details REST API", description = "REST API to Retrieve the Discount Details for usertypes")
+ // Retrieving the Discount Details
+ @GetMapping("/getDiscountDetails")
+ public Optional getDIscountDetails(@RequestParam("id") int id) {
+ Optional discountdetails = discountRangeRepo.findById(id);
+ return discountdetails;
+ }
+
+ @Operation(summary = "Save Reasons REST API", description = "REST API to save the reasons")
+ // saving the Reason
+ @PostMapping("/saveReason")
+ public ResponseEntity saveReason(@RequestBody ReasonMaster reasaon) {
+ return ResponseEntity.ok(reasonMasterService.saveTheReason(reasaon));
+ }
+
+ @Operation(summary = "All Reasons REST API", description = "REST API to retrie the allreasons")
+ // retrieving the allreasons
+ @GetMapping("/getReasons")
+ @ResponseBody
+ public List getAllReasons() {
+ return reasonMasterService.getAllReasons();
+ }
+
+ // retrieving allowed reasons for a specific hall (filtered by restriction)
+ @GetMapping("/getAllowedReasons")
+ @ResponseBody
+ public List getAllowedReasons(@RequestParam int hallId) {
+ HallDetails hallDetails = hallDetailsRepository.findHallDetailsById(hallId);
+ if (hallDetails != null && hallDetails.isReasonRestricted()) {
+ List allowedReasonIds = hallReasonRestrictionRepository.findReasonIdsByHallId(hallId);
+ if (!allowedReasonIds.isEmpty()) {
+ List allReasons = reasonMasterService.getAllReasons();
+ return allReasons.stream()
+ .filter(r -> allowedReasonIds.contains(r.getReasonId()))
+ .collect(java.util.stream.Collectors.toList());
+ }
+ }
+ return reasonMasterService.getAllReasons();
+ }
+
+ @Operation(summary = "Reason Documents by reasonId REST API", description = "REST API to Get the ReasonDocuments By reasonId")
+ // Getting ReasonDocuments By reasonId
+ @GetMapping("/getReasonDocumentDetails")
+ public List getReasonDocumentDetails(@RequestParam int reasonId) {
+ return reasonMasterService.getReasonDocumentDetailsByReasonId(reasonId);
+ }
+
+ @Operation(summary = "Booking Details by Fromdate,toDate and HallId REST API", description = "REST API to get the Booking Details by Fromdate,toDate and HallId for GccBlokcing")
+ // @GetMapping("/filter")
+ // public ResponseEntity> getFilteredBookings(
+ // @RequestParam("fromDate") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate
+ // fromDate,
+ // @RequestParam("toDate") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate
+ // toDate,
+ // @RequestParam("hallIds") List hallIds) {
+ //
+ // List bookings = bookingService.getFilteredBookings(fromDate,
+ // toDate, hallIds);
+ //
+ // List responses = new ArrayList<>();
+ // for (BookingDetails bookingDetails : bookings) {
+ // // Fetch GccBlockingDate records for each bookingId
+ // List gccBlockedList =
+ // blockingDateRepository.getByBookingId(bookingDetails.getBookingId());
+ // Integer blockingId = gccBlockedList.isEmpty() ? null :
+ // gccBlockedList.get(0).getBlockingId();
+ // responses.add(new BookingResponseDTO(bookingDetails, blockingId));
+ // }
+ //
+ // return ResponseEntity.ok(responses);
+ // }
+ @GetMapping("/filter")
+ public ResponseEntity> getFilteredBookings(
+ @RequestParam("fromDate") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate fromDate,
+ @RequestParam("toDate") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate toDate,
+ @RequestParam("hallIds") List hallIds) {
+
+ List bookings = bookingService.getFilteredBookings(fromDate, toDate, hallIds);
+ List gccBlockedList = blockingDateRepository
+ .findByFromDateAndToDateBetweenAndHallIdIn(fromDate, toDate, hallIds);
+
+ Map response = new HashMap<>();
+ response.put("bookings", bookings);
+ response.put("blockedEvents", gccBlockedList);
+
+ return ResponseEntity.ok(response);
+ }
+
+ @Operation(summary = " GCC Blocked Booking Details REST API", description = "REST API to get the GCC Blocked BookingDetails")
+ // retrieving the GCC Blocked BookingDetails
+ @GetMapping("/blockedevents")
+ public ResponseEntity> getBlockedEvents() {
+ List blockedBookings = bookingService.getBlockedEvents();
+ if (blockedBookings.isEmpty()) {
+ return ResponseEntity.ok(blockedBookings);
+ }
+
+ for (GccBlockingDate blockedBooking : blockedBookings) {
+ // System.out.println("Blocked Event: " + blockedBooking);
+ }
+
+ return ResponseEntity.ok(blockedBookings);
+ }
+
+ @Operation(summary = "UNBLOCK the gcc Blocked Event REST API", description = "REST API to unblocking the Gcc blocked Events for blocking")
+ @GetMapping("/cancelByid")
+ public ResponseEntity cancellationById(@RequestParam int blockingId,
+ @RequestParam("fromDate") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate fromDate,
+ @RequestParam("endDate") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate endDate) {
+
+ // Fetch the blocking date entity
+ GccBlockingDate blockingDate = blockingDateRepository.findById(blockingId).orElse(null);
+
+ if (blockingDate == null) {
+ return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Blocking ID not found.");
+ }
+
+ // Get the booking IDs from the blocking date entity
+ String bookingIds = blockingDate.getBookingIds();
+ String hallIds = blockingDate.getHallId();
+
+ // Convert the booking IDs to a list of integers
+ List bookingIdList = Arrays.stream(bookingIds.split(","))
+ .map(Integer::parseInt)
+ .collect(Collectors.toList());
+
+ // Convert the hall IDs to a list of longs if provided
+ List hallIdList = hallIds != null ? Arrays.stream(hallIds.split(","))
+ .map(Long::parseLong)
+ .collect(Collectors.toList())
+ : Collections.emptyList();
+
+ // Fetch the booking calendar entries within the date range
+ List bookingCalendars = bookingService.getBookedslots(fromDate, endDate, hallIdList);
+
+ // ── Smart unblock: per-slot decision ──────────────────────────────────
+ // If morning+evening+is_blocked are all true AND an APPROVED user booking
+ // exists for that hall/date → only clear is_blocked (leave slots intact).
+ // Otherwise (GCC-owned slot) → clear everything.
+ for (BookingCalendar bookingslots : bookingCalendars) {
+ if (bookingslots.isMorningSlot() && bookingslots.isEveningSlot() && bookingslots.getIs_blocked()) {
+ List approvedBookings = bookingDetailsRepository.findByHallIdAndDate(
+ bookingslots.getBdate(), bookingslots.getHallId());
+ if (!approvedBookings.isEmpty()) {
+ // Approved user booking owns the slots — only remove gcc flag
+ bookingslots.setIs_blocked(false);
+ } else {
+ // GCC owned this slot fully — release everything
+ bookingslots.setBookingId_1(null);
+ bookingslots.setBookingId_2(null);
+ bookingslots.setMorningSlot(false);
+ bookingslots.setEveningSlot(false);
+ bookingslots.setIs_blocked(false);
+ }
+ } else {
+ // Partial slot scenario — only clear the gcc overlay flag
+ bookingslots.setIs_blocked(false);
+ }
+ bookingCalendarRepository.save(bookingslots);
+ }
+
+ blockingDate.setBlockedStatus(GccBlockingDate.BlockedStatus.UNBLOCKED);
+ blockingDateRepository.save(blockingDate);
+
+ // Update GCC_BLOCKED booking_details entries back to GCC_UNBLOCKED
+ for (int bookingId : bookingIdList) {
+ Optional bookingDetails = bookingDetailsRepo.findById(bookingId);
+ if (bookingDetails.isPresent()) {
+ BookingDetails bookings = bookingDetails.get();
+ if (bookings.getBookingStatus() == BookingDetails.BookingStatus.GCC_BLOCKED) {
+ bookings.setBookingStatus(BookingDetails.BookingStatus.GCC_UNBLOCKED);
+ bookings.setRefundStatus(BookingDetails.RefundStatus.NA);
+ bookingDetailsRepo.save(bookings);
+ }
+ }
+ }
+ String adminname = (String) session.getAttribute("usertype");
+ Integer loginid = (Integer) session.getAttribute("id");
+ ApplicationLogs logs = new ApplicationLogs();
+ logs.setComments("Action by " + adminname);
+ logs.setLoginId(loginid);
+ logs.setLogType("Gcc UnBlocking for the Id:-" + blockingDate.getBlockingId());
+ InetAddress inetAddress;
+ try {
+ inetAddress = InetAddress.getLocalHost();
+ String hostname = InetAddress.getLocalHost().getHostName();
+ logs.setIpaddress(inetAddress.getHostAddress());
+ logs.setSystemName(hostname);
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ applicationLogsRepository.save(logs);
+ return ResponseEntity.ok("Success");
+ }
+ // @GetMapping("/cancelByid")
+ // public ResponseEntity cancellationById(@RequestParam int blockingId,
+ // @RequestParam("fromDate") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate
+ // fromDate,
+ // @RequestParam("endDate") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate
+ // endDate) {
+
+ // // Fetch the blocking date entity
+ // GccBlockingDate blockingDate =
+ // blockingDateRepository.findById(blockingId).orElse(null);
+
+ // if (blockingDate == null) {
+ // return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Blocking ID not
+ // found.");
+ // }
+
+ // // Get the booking IDs from the blocking date entity (may be null/empty for
+ // // block-only entries)
+ // String bookingIds = blockingDate.getBookingIds();
+ // String hallIds = blockingDate.getHallId();
+
+ // // Parse booking IDs only if present
+ // List bookingIdList = (bookingIds != null &&
+ // !bookingIds.trim().isEmpty())
+ // ? Arrays.stream(bookingIds.split(","))
+ // .map(String::trim)
+ // .filter(s -> !s.isEmpty())
+ // .map(Integer::parseInt)
+ // .collect(Collectors.toList())
+ // : Collections.emptyList();
+
+ // // Convert the hall IDs to a list of longs if provided
+ // List hallIdList = (hallIds != null && !hallIds.trim().isEmpty())
+ // ? Arrays.stream(hallIds.split(","))
+ // .map(Long::parseLong)
+ // .collect(Collectors.toList())
+ // : Collections.emptyList();
+
+ // // Fetch the booking calendar entries within the date range
+ // List bookingCalendars =
+ // bookingService.getBookedslots(fromDate, endDate, hallIdList);
+
+ // // Release the GCC block flag ONLY.
+ // // Do NOT touch bookingId_1, bookingId_2, morningSlot, or eveningSlot –
+ // // those belong to real user bookings that must remain intact.
+ // for (BookingCalendar bookingslots : bookingCalendars) {
+ // bookingslots.setIs_blocked(false);
+ // bookingCalendarRepository.save(bookingslots);
+ // }
+
+ // blockingDate.setBlockedStatus(GccBlockingDate.BlockedStatus.UNBLOCKED);
+ // blockingDateRepository.save(blockingDate);
+
+ // // Restore status of any bookings that were cancelled as part of this GCC
+ // block
+ // for (int bookingId : bookingIdList) {
+ // Optional bookingDetails =
+ // bookingDetailsRepo.findById(bookingId);
+ // if (bookingDetails.isPresent()) {
+ // BookingDetails bookings = bookingDetails.get();
+ // bookings.setBookingStatus(BookingDetails.BookingStatus.GCC_UNBLOCKED);
+ // bookings.setRefundStatus(BookingDetails.RefundStatus.NA);
+ // bookingDetailsRepo.save(bookings);
+ // }
+ // }
+ // String adminname = (String) session.getAttribute("usertype");
+ // Integer loginid = (Integer) session.getAttribute("id");
+ // ApplicationLogs logs = new ApplicationLogs();
+ // logs.setComments("Action by " + adminname);
+ // logs.setLoginId(loginid);
+ // logs.setLogType("Gcc UnBlocking for the Id:-" +
+ // blockingDate.getBlockingId());
+ // InetAddress inetAddress;
+ // try {
+ // inetAddress = InetAddress.getLocalHost();
+ // String hostname = InetAddress.getLocalHost().getHostName();
+ // logs.setIpaddress(inetAddress.getHostAddress());
+ // logs.setSystemName(hostname);
+ // } catch (UnknownHostException e) {
+ // e.printStackTrace();
+ // }
+ // applicationLogsRepository.save(logs);
+ // return ResponseEntity.ok("Success");
+ // }
+
+ @Operation(summary = "HAll IMAGES by HallId REST API", description = "REST API to get the hall Images by Hall Id")
+ // retrieving Hall Images by Hallid
+ @GetMapping("/getImageById")
+ public List getImageDetails(@RequestParam int hallId) {
+ return hallService.getHallImages(hallId);
+ }
+
+ @Operation(summary = "GCC Block Without Cancelling REST API", description = "REST API to Block halls without cancelling existing bookings (smart slot logic)")
+ @PostMapping("/blockWithoutCancel")
+ public ResponseEntity blockWithoutCancel(
+ @RequestParam("fromDate") String fromDate,
+ @RequestParam("toDate") String toDate,
+ @RequestParam("hallID") String hallID,
+ @RequestParam("reasonforblocking") String reasonforblocking,
+ @RequestParam(value = "description", required = false) String[] descriptions,
+ @RequestParam(value = "document", required = false) MultipartFile[] documents,
+ HttpSession session) {
+
+ String updatedBy = (String) session.getAttribute("employeeId");
+ List hallIdsList = Arrays.stream(hallID.split(","))
+ .map(Long::parseLong)
+ .collect(Collectors.toList());
+
+ bookingService.blockWithoutCancellingBookings(fromDate, toDate, hallIdsList, reasonforblocking,
+ updatedBy, descriptions, documents);
+
+ String adminname = (String) session.getAttribute("usertype");
+ Integer loginid = (Integer) session.getAttribute("id");
+ ApplicationLogs logs = new ApplicationLogs();
+ logs.setComments("Action by " + adminname);
+ logs.setLoginId(loginid);
+ logs.setLogType("Gcc Block Without Cancel for the Reason:-" + reasonforblocking);
+ InetAddress inetAddress;
+ try {
+ inetAddress = InetAddress.getLocalHost();
+ String hostname = InetAddress.getLocalHost().getHostName();
+ logs.setIpaddress(inetAddress.getHostAddress());
+ logs.setSystemName(hostname);
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ applicationLogsRepository.save(logs);
+ return ResponseEntity.ok("Success");
+ }
+
+ @Operation(summary = "GCC Blocking REST API", description = "REST API to Block the Halls by Admin")
+ // GccBlocking Api
+ @PostMapping("/cancelAll")
+ public ResponseEntity cancelAllBookings(
+ @RequestParam("fromDate") String fromDate,
+ @RequestParam("toDate") String toDate,
+ @RequestParam("hallID") String hallID,
+ @RequestParam("reasonforblocking") String reasonforblocking,
+ @RequestParam(value = "selectedBookings", required = false) List selectedBookings,
+ @RequestParam(value = "description", required = false) String[] descriptions, // Handle descriptions
+ @RequestParam(value = "document", required = false) MultipartFile[] documents, // Handle documents
+ HttpSession session) {
+
+ // Your existing logic
+ String updatedBy = (String) session.getAttribute("employeeId");
+
+ // Split and convert hall IDs
+ List hallIdsList = Arrays.stream(hallID.split(","))
+ .map(Long::parseLong)
+ .collect(Collectors.toList());
+
+ System.out.println("fromDate " + fromDate + "\n toDate " + toDate + "\n hallID " + hallID
+ + "\n reasonforblocking " + reasonforblocking + "\n selectedBookings " + selectedBookings
+ + "\n descriptions " + descriptions + "\n documents " + documents + "\n updatedBy " + updatedBy);
+
+ // Call the service with descriptions and documents
+ bookingService.cancelAllBookings(fromDate, toDate, hallIdsList, reasonforblocking, selectedBookings, updatedBy,
+ descriptions, documents);
+ String adminname = (String) session.getAttribute("usertype");
+ Integer loginid = (Integer) session.getAttribute("id");
+ ApplicationLogs logs = new ApplicationLogs();
+ logs.setComments("Action by " + adminname);
+ logs.setLoginId(loginid);
+ logs.setLogType("Gcc Blocking for the Reason:-" + reasonforblocking);
+ InetAddress inetAddress;
+ try {
+ inetAddress = InetAddress.getLocalHost();
+ String hostname = InetAddress.getLocalHost().getHostName();
+ logs.setIpaddress(inetAddress.getHostAddress());
+ logs.setSystemName(hostname);
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ applicationLogsRepository.save(logs);
+ return ResponseEntity.ok("Success");
+ }
+
+ // @PostMapping("/blockhall")
+ // public ResponseEntity blockHall(
+ // @RequestParam("blockingId") Integer blockingId,
+ // @RequestParam("hallID") String hallID, // Ensure this matches the parameter
+ // name used in AJAX
+ // @RequestParam(value = "selectedBookings", required = false) List
+ // selectedBookings,
+ // HttpSession session) {
+ //
+ // String updatedBy = (String) session.getAttribute("employeeId");
+ // Optional gccblocking =
+ // blockingDateRepository.findById(blockingId);
+ // GccBlockingDate gccblockingdata = gccblocking.get();
+ //
+ // // Convert startDate and endDate to String
+ // SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ // String startDateString = sdf.format(gccblockingdata.getStartDate());
+ // String endDateString = sdf.format(gccblockingdata.getEndDate());
+ //
+ // // Split and convert hall IDs
+ // List hallIdsList = Arrays.stream(hallID.split(","))
+ // .map(Long::parseLong)
+ // .collect(Collectors.toList());
+ //
+ // System.out.println("selected BookingIds: " + selectedBookings);
+ //
+ // // Pass the formatted date strings
+ // bookingService.cancelAllBookings(startDateString, endDateString, hallIdsList,
+ // gccblockingdata.getDepartment(), gccblockingdata.getBlockingReason(),
+ // selectedBookings, updatedBy);
+ //
+ // return ResponseEntity.ok("Success");
+ // }
+
+ @GetMapping("/bookingdetailsByuserId")
+ public List getuserDetails(@RequestParam Integer userId) {
+ return bookingService.getAllBookingsByUserId(userId);
+ }
+
+ @GetMapping("/settlement-approved")
+ public ResponseEntity> getApprovedSettlements(HttpSession session) {
+ List approvedSettlements = settlementRepository
+ .findByBookingDetailsRefundStatus(RefundStatus.APPROVED);
+ return ResponseEntity.ok(approvedSettlements);
+ }
+ // @PostMapping("/complete-refund")
+ // public ResponseEntity completeRefund(@RequestBody List
+ // bookingIds, HttpSession session, HttpServletResponse response) throws
+ // IOException {
+ // String token = (String) session.getAttribute("jwtToken");
+ // //System.out.println("tokensssssssss" + token);
+ //
+ // // Validate JWT token
+ // if (token != null && jwtUtil.validateToken(token)) {
+ // // System.out.println("tokennnnnnnnnnnnnnns" + token);
+ // try {
+ // // System.out.println("Received booking IDs for refund: " + bookingIds);
+ //
+ // List bookids = bookingService.processRefundRequests(bookingIds);
+ //
+ // if (!bookids.isEmpty()) {
+ // // Prepare and return error response if there are errors
+ // StringBuilder errorResponse = new StringBuilder("Errors processing refund for
+ // IDs: ");
+ // for (String bookId : bookids) {
+ // errorResponse.append(bookId).append(", ");
+ // }
+ // return
+ // ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse.toString());
+ // }
+ //
+ // return ResponseEntity.ok("Refund completed successfully");
+ // } catch (Exception e) {
+ // e.printStackTrace();
+ // return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Error
+ // processing refund: " + e.getMessage());
+ // }
+ // } else {
+ // // Token is invalid or not present, redirect to login
+ // session.invalidate(); // Invalidate the session to clear all session
+ // attributes
+ // response.sendRedirect("/login"); // Redirect to the login page
+ // return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build(); // Return HTTP
+ // 401 Unauthorized
+ // }
+ // }
+
+ // @GetMapping("/Gccblocking")
+ // public ResponseEntity>
+ // getGccBlockingEvents(@RequestParam("hallId") int hallId) {
+ // System.out.println("Received hallId: " + hallId);
+ //
+ // List