setIsOpen(false)}
+ />
+ )}
+
+
+
+ );
+};
+
+// ============================================
+// STYLES
+// ============================================
+
+const styles = {
+ container: {
+ position: 'fixed',
+ bottom: '24px',
+ right: '24px',
+ zIndex: 1000,
+ display: 'flex',
+ flexDirection: 'column',
+ alignItems: 'flex-end',
+ gap: '12px',
+ animation: 'fabSlideIn 0.4s ease-out',
+ },
+ fab: {
+ width: '60px',
+ height: '60px',
+ borderRadius: '50%',
+ border: 'none',
+ background: 'linear-gradient(135deg, #f59e0b, #d97706)',
+ color: '#fff',
+ cursor: 'pointer',
+ display: 'flex',
+ alignItems: 'center',
+ justifyContent: 'center',
+ boxShadow: '0 4px 20px rgba(245, 158, 11, 0.4)',
+ transition: 'all 0.3s ease',
+ animation: 'fabPulse 2s ease-in-out infinite',
+ },
+ fabOpen: {
+ background: 'linear-gradient(135deg, #374151, #1f2937)',
+ animation: 'none',
+ transform: 'rotate(0deg)',
+ },
+ fabCooldown: {
+ background: 'linear-gradient(135deg, #10b981, #059669)',
+ animation: 'none',
+ cursor: 'default',
+ },
+ fabIconText: {
+ fontSize: '24px',
+ lineHeight: 1,
+ },
+ actions: {
+ display: 'flex',
+ flexDirection: 'column',
+ gap: '10px',
+ alignItems: 'flex-end',
+ },
+ actionBtn: {
+ display: 'flex',
+ alignItems: 'center',
+ gap: '10px',
+ padding: '12px 20px',
+ borderRadius: '50px',
+ border: 'none',
+ background: '#1f2937',
+ color: '#fff',
+ cursor: 'pointer',
+ fontSize: '14px',
+ fontWeight: '600',
+ boxShadow: '0 4px 15px rgba(0, 0, 0, 0.3)',
+ transition: 'all 0.2s ease',
+ animation: 'actionPop 0.3s ease-out',
+ whiteSpace: 'nowrap',
+ },
+ actionIcon: {
+ fontSize: '18px',
+ },
+ actionLabel: {
+ letterSpacing: '0.02em',
+ },
+ tableTag: {
+ fontSize: '11px',
+ color: '#9ca3af',
+ background: 'rgba(31, 41, 55, 0.8)',
+ padding: '4px 10px',
+ borderRadius: '12px',
+ textAlign: 'center',
+ backdropFilter: 'blur(8px)',
+ },
+ backdrop: {
+ position: 'fixed',
+ inset: 0,
+ background: 'rgba(0, 0, 0, 0.3)',
+ zIndex: 999,
+ },
+ toast: {
+ position: 'fixed',
+ top: '20px',
+ left: '50%',
+ transform: 'translateX(-50%)',
+ padding: '12px 24px',
+ borderRadius: '12px',
+ color: '#fff',
+ fontSize: '14px',
+ fontWeight: '600',
+ zIndex: 1100,
+ boxShadow: '0 8px 25px rgba(0, 0, 0, 0.3)',
+ animation: 'toastSlide 0.3s ease-out',
+ maxWidth: '90vw',
+ textAlign: 'center',
+ },
+};
+
+export default ServiceFAB;
diff --git a/RestroHub-FrontEnd/src/hooks/useWebSocketNotifications.js b/RestroHub-FrontEnd/src/hooks/useWebSocketNotifications.js
new file mode 100644
index 0000000..ddd52dd
--- /dev/null
+++ b/RestroHub-FrontEnd/src/hooks/useWebSocketNotifications.js
@@ -0,0 +1,156 @@
+import { useState, useEffect, useRef, useCallback } from 'react';
+import { Client } from '@stomp/stompjs';
+import SockJS from 'sockjs-client/dist/sockjs';
+
+// ============================================
+// useWebSocketNotifications Hook
+// Connects to backend WebSocket and provides
+// live service request notifications for admin
+// ============================================
+
+const WS_URL = 'http://localhost:8181/restroly/ws';
+const API_BASE_URL = 'http://localhost:8181/restroly';
+
+/**
+ * Helper to compute relative time (e.g., "2m ago")
+ */
+const getRelativeTime = (dateString) => {
+ const now = new Date();
+ const date = new Date(dateString);
+ const diffMs = now - date;
+ const diffSec = Math.floor(diffMs / 1000);
+ const diffMin = Math.floor(diffSec / 60);
+ const diffHr = Math.floor(diffMin / 60);
+
+ if (diffSec < 60) return 'Just now';
+ if (diffMin < 60) return `${diffMin}m ago`;
+ if (diffHr < 24) return `${diffHr}h ago`;
+ return date.toLocaleDateString();
+};
+
+/**
+ * Map a service request to a notification object
+ */
+const mapToNotification = (request) => {
+ const typeLabel = request.requestType === 'CALL_WAITER' ? '🔔 Call Waiter' : '💳 Request Bill';
+ return {
+ id: request.id,
+ title: `${typeLabel} — Table ${request.tableNumber}`,
+ desc: `Branch #${request.branchId} • ${request.requestType.replace('_', ' ')}`,
+ time: getRelativeTime(request.createdAt),
+ unread: request.status === 'PENDING',
+ raw: request,
+ };
+};
+
+const useWebSocketNotifications = (branchId) => {
+ const [notifications, setNotifications] = useState([]);
+ const clientRef = useRef(null);
+ const timerRef = useRef(null);
+
+ // Fetch existing PENDING requests on mount
+ useEffect(() => {
+ if (!branchId) return;
+
+ const fetchExisting = async () => {
+ try {
+ const token = localStorage.getItem('accessToken');
+ const res = await fetch(
+ `${API_BASE_URL}/secure/api/v1/service-requests/branch/${branchId}`,
+ { headers: { Authorization: `Bearer ${token}` } }
+ );
+ if (res.ok) {
+ const data = await res.json();
+ setNotifications(data.map(mapToNotification));
+ }
+ } catch (err) {
+ console.warn('Failed to fetch existing service requests:', err);
+ }
+ };
+
+ fetchExisting();
+ }, [branchId]);
+
+ // Connect to WebSocket
+ useEffect(() => {
+ if (!branchId) return;
+
+ const client = new Client({
+ webSocketFactory: () => new SockJS(WS_URL),
+ reconnectDelay: 5000,
+ debug: (str) => {
+ // Uncomment for debugging: console.log('STOMP:', str);
+ },
+ onConnect: () => {
+ console.log('WebSocket connected for service requests');
+ client.subscribe(
+ `/topic/service-requests/branch/${branchId}`,
+ (message) => {
+ const request = JSON.parse(message.body);
+ const notif = mapToNotification(request);
+ setNotifications((prev) => [notif, ...prev]);
+ }
+ );
+ },
+ onStompError: (frame) => {
+ console.error('STOMP error:', frame.headers['message']);
+ },
+ });
+
+ client.activate();
+ clientRef.current = client;
+
+ // Refresh relative times every 60 seconds
+ timerRef.current = setInterval(() => {
+ setNotifications((prev) =>
+ prev.map((n) => ({
+ ...n,
+ time: getRelativeTime(n.raw.createdAt),
+ }))
+ );
+ }, 60000);
+
+ return () => {
+ if (clientRef.current) clientRef.current.deactivate();
+ if (timerRef.current) clearInterval(timerRef.current);
+ };
+ }, [branchId]);
+
+ // Acknowledge a request
+ const acknowledgeRequest = useCallback(async (requestId) => {
+ try {
+ const token = localStorage.getItem('accessToken');
+ await fetch(
+ `${API_BASE_URL}/secure/api/v1/service-requests/${requestId}/acknowledge`,
+ { method: 'PATCH', headers: { Authorization: `Bearer ${token}` } }
+ );
+ setNotifications((prev) =>
+ prev.map((n) =>
+ n.id === requestId ? { ...n, unread: false } : n
+ )
+ );
+ } catch (err) {
+ console.error('Failed to acknowledge request:', err);
+ }
+ }, []);
+
+ // Complete/dismiss a request
+ const completeRequest = useCallback(async (requestId) => {
+ try {
+ const token = localStorage.getItem('accessToken');
+ await fetch(
+ `${API_BASE_URL}/secure/api/v1/service-requests/${requestId}/complete`,
+ { method: 'PATCH', headers: { Authorization: `Bearer ${token}` } }
+ );
+ setNotifications((prev) => prev.filter((n) => n.id !== requestId));
+ } catch (err) {
+ console.error('Failed to complete request:', err);
+ }
+ }, []);
+
+ const unreadCount = notifications.filter((n) => n.unread).length;
+
+ return { notifications, unreadCount, acknowledgeRequest, completeRequest };
+};
+
+export default useWebSocketNotifications;
diff --git a/RestroHub-FrontEnd/src/main.jsx b/RestroHub-FrontEnd/src/main.jsx
index 35ce286..898b5ee 100644
--- a/RestroHub-FrontEnd/src/main.jsx
+++ b/RestroHub-FrontEnd/src/main.jsx
@@ -3,12 +3,12 @@ import React from 'react';
import ReactDOM from 'react-dom/client';
import App from './App';
import './index.css';
-import { GoogleOAuthProvider } from '@react-oauth/google';
+import { GoogleOAuthProvider } from "@react-oauth/google";
ReactDOM.createRoot(document.getElementById('root')).render(
-
-
-
+
+
+
);
diff --git a/RestroHub-FrontEnd/src/pages/customer/RestaurantMenu.jsx b/RestroHub-FrontEnd/src/pages/customer/RestaurantMenu.jsx
index 7aca824..18f1924 100644
--- a/RestroHub-FrontEnd/src/pages/customer/RestaurantMenu.jsx
+++ b/RestroHub-FrontEnd/src/pages/customer/RestaurantMenu.jsx
@@ -11,6 +11,7 @@ import GallerySection from '@components/customer/GallerySection.jsx';
import ReservationsSection from '@components/customer/ReservationsSection.jsx';
import ContactSection from '@components/customer/ContactSection.jsx';
import Footer from '@components/customer/Footer.jsx';
+import ServiceFAB from '@components/customer/ServiceFAB.jsx';
// ============================================
// MAIN APP COMPONENT
@@ -41,6 +42,7 @@ const AppContent = () => {
+
Don't have an account?{" "}
diff --git a/RestroHub-FrontEnd/vite.config.js b/RestroHub-FrontEnd/vite.config.js
index 01ddfd4..a9ae012 100644
--- a/RestroHub-FrontEnd/vite.config.js
+++ b/RestroHub-FrontEnd/vite.config.js
@@ -18,6 +18,7 @@ export default defineConfig({
'@': path.resolve(__dirname, './src'),
'@components': path.resolve(__dirname, './src/components'),
'@context': path.resolve(__dirname, './src/context'),
+ '@hooks': path.resolve(__dirname, './src/hooks'),
'@services': path.resolve(__dirname, './src/services'),
'@data': path.resolve(__dirname, './src/data'),
'@styles': path.resolve(__dirname, './src/styles')
diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/notification/controller/ServiceRequestController.java b/RestroHub/src/main/java/com/restroly/qrmenu/notification/controller/ServiceRequestController.java
new file mode 100644
index 0000000..346336d
--- /dev/null
+++ b/RestroHub/src/main/java/com/restroly/qrmenu/notification/controller/ServiceRequestController.java
@@ -0,0 +1,118 @@
+package com.restroly.qrmenu.notification.controller;
+
+import com.restroly.qrmenu.notification.dto.ServiceRequestDTO;
+import com.restroly.qrmenu.notification.dto.ServiceRequestResponseDTO;
+import com.restroly.qrmenu.notification.service.ServiceRequestService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static com.restroly.qrmenu.common.util.ApiConstants.PUBLIC_API_VERSION;
+import static com.restroly.qrmenu.common.util.ApiConstants.SECURE_API_VERSION;
+
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+@Tag(name = "Service Requests", description = "APIs for real-time service requests (Call Waiter / Request Bill)")
+public class ServiceRequestController {
+
+ private final ServiceRequestService serviceRequestService;
+
+ // ========== PUBLIC ENDPOINT (Customer / Guest) ==========
+
+ @PostMapping(value = PUBLIC_API_VERSION + "/service-requests",
+ produces = MediaType.APPLICATION_JSON_VALUE,
+ consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Operation(
+ summary = "Create a service request",
+ description = "Allows a customer to call a waiter or request a bill. "
+ + "This is a public endpoint — no authentication required. "
+ + "Table 0 (counter) is not allowed to make service requests."
+ )
+ @ApiResponses({
+ @ApiResponse(responseCode = "201", description = "Service request created and broadcast to admin"),
+ @ApiResponse(responseCode = "400", description = "Invalid input (e.g., table 0)"),
+ @ApiResponse(responseCode = "404", description = "Restaurant not found"),
+ @ApiResponse(responseCode = "409", description = "Service requests not enabled for this restaurant")
+ })
+ public ResponseEntity createServiceRequest(
+ @Valid @RequestBody ServiceRequestDTO requestDTO) {
+
+ log.info("REST request to create service request: {}", requestDTO);
+ ServiceRequestResponseDTO response = serviceRequestService.createServiceRequest(requestDTO);
+ return ResponseEntity.status(HttpStatus.CREATED).body(response);
+ }
+
+ // ========== SECURE ENDPOINTS (Admin / Restaurant Owner) ==========
+
+ @GetMapping(value = SECURE_API_VERSION + "/service-requests/branch/{branchId}",
+ produces = MediaType.APPLICATION_JSON_VALUE)
+ @Operation(
+ summary = "Get active service requests for a branch",
+ description = "Returns all PENDING and ACKNOWLEDGED service requests for the given branch.",
+ security = @SecurityRequirement(name = "bearerAuth")
+ )
+ @ApiResponses({
+ @ApiResponse(responseCode = "200", description = "Active service requests retrieved")
+ })
+ public ResponseEntity> getActiveRequests(
+ @Parameter(description = "Branch ID", required = true)
+ @PathVariable Long branchId) {
+
+ log.debug("REST request to get active service requests for branch: {}", branchId);
+ List requests = serviceRequestService.getActiveRequests(branchId);
+ return ResponseEntity.ok(requests);
+ }
+
+ @PatchMapping(value = SECURE_API_VERSION + "/service-requests/{id}/acknowledge",
+ produces = MediaType.APPLICATION_JSON_VALUE)
+ @Operation(
+ summary = "Acknowledge a service request",
+ description = "Marks a service request as acknowledged by the admin.",
+ security = @SecurityRequirement(name = "bearerAuth")
+ )
+ @ApiResponses({
+ @ApiResponse(responseCode = "200", description = "Service request acknowledged"),
+ @ApiResponse(responseCode = "404", description = "Service request not found")
+ })
+ public ResponseEntity acknowledgeRequest(
+ @Parameter(description = "Service request ID", required = true)
+ @PathVariable Long id) {
+
+ log.info("REST request to acknowledge service request: {}", id);
+ ServiceRequestResponseDTO response = serviceRequestService.acknowledgeRequest(id);
+ return ResponseEntity.ok(response);
+ }
+
+ @PatchMapping(value = SECURE_API_VERSION + "/service-requests/{id}/complete",
+ produces = MediaType.APPLICATION_JSON_VALUE)
+ @Operation(
+ summary = "Complete a service request",
+ description = "Marks a service request as completed (table has been served).",
+ security = @SecurityRequirement(name = "bearerAuth")
+ )
+ @ApiResponses({
+ @ApiResponse(responseCode = "200", description = "Service request completed"),
+ @ApiResponse(responseCode = "404", description = "Service request not found")
+ })
+ public ResponseEntity completeRequest(
+ @Parameter(description = "Service request ID", required = true)
+ @PathVariable Long id) {
+
+ log.info("REST request to complete service request: {}", id);
+ ServiceRequestResponseDTO response = serviceRequestService.completeRequest(id);
+ return ResponseEntity.ok(response);
+ }
+}
diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/notification/dto/ServiceRequestDTO.java b/RestroHub/src/main/java/com/restroly/qrmenu/notification/dto/ServiceRequestDTO.java
new file mode 100644
index 0000000..0070af5
--- /dev/null
+++ b/RestroHub/src/main/java/com/restroly/qrmenu/notification/dto/ServiceRequestDTO.java
@@ -0,0 +1,32 @@
+package com.restroly.qrmenu.notification.dto;
+
+import com.restroly.qrmenu.notification.entity.ServiceRequestType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Schema(description = "Service request payload from customer")
+public class ServiceRequestDTO {
+
+ @NotNull(message = "Restaurant ID is required")
+ @Schema(description = "Restaurant ID", example = "1", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Long restaurantId;
+
+ @NotNull(message = "Branch ID is required")
+ @Schema(description = "Branch ID", example = "1", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Long branchId;
+
+ @NotNull(message = "Table number is required")
+ @Min(value = 1, message = "Table number must be greater than 0")
+ @Schema(description = "Table number (must be > 0, table 0 is counter)", example = "5", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Integer tableNumber;
+
+ @NotNull(message = "Request type is required")
+ @Schema(description = "Type of service request", example = "CALL_WAITER", requiredMode = Schema.RequiredMode.REQUIRED)
+ private ServiceRequestType requestType;
+}
diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/notification/dto/ServiceRequestResponseDTO.java b/RestroHub/src/main/java/com/restroly/qrmenu/notification/dto/ServiceRequestResponseDTO.java
new file mode 100644
index 0000000..60968b3
--- /dev/null
+++ b/RestroHub/src/main/java/com/restroly/qrmenu/notification/dto/ServiceRequestResponseDTO.java
@@ -0,0 +1,37 @@
+package com.restroly.qrmenu.notification.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Schema(description = "Service request response payload")
+public class ServiceRequestResponseDTO {
+
+ @Schema(description = "Unique request ID", example = "1")
+ private Long id;
+
+ @Schema(description = "Restaurant ID", example = "1")
+ private Long restaurantId;
+
+ @Schema(description = "Branch ID", example = "1")
+ private Long branchId;
+
+ @Schema(description = "Table number that made the request", example = "5")
+ private Integer tableNumber;
+
+ @Schema(description = "Type of service request", example = "CALL_WAITER")
+ private String requestType;
+
+ @Schema(description = "Current status of the request", example = "PENDING")
+ private String status;
+
+ @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
+ @Schema(description = "When the request was created")
+ private LocalDateTime createdAt;
+}
diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/notification/entity/ServiceRequest.java b/RestroHub/src/main/java/com/restroly/qrmenu/notification/entity/ServiceRequest.java
new file mode 100644
index 0000000..0ba6606
--- /dev/null
+++ b/RestroHub/src/main/java/com/restroly/qrmenu/notification/entity/ServiceRequest.java
@@ -0,0 +1,50 @@
+package com.restroly.qrmenu.notification.entity;
+
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "t_service_request")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ServiceRequest {
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "request_id")
+ private Long id;
+
+ @Column(name = "restaurant_id", nullable = false)
+ private Long restaurantId;
+
+ @Column(name = "branch_id", nullable = false)
+ private Long branchId;
+
+ @Column(name = "table_number", nullable = false)
+ private Integer tableNumber;
+
+ @Enumerated(EnumType.STRING)
+ @Column(name = "request_type", nullable = false)
+ private ServiceRequestType requestType;
+
+ @Enumerated(EnumType.STRING)
+ @Column(name = "status")
+ @Builder.Default
+ private ServiceRequestStatus status = ServiceRequestStatus.PENDING;
+
+ @Column(name = "created_at", updatable = false)
+ private LocalDateTime createdAt;
+
+ @Column(name = "resolved_at")
+ private LocalDateTime resolvedAt;
+
+ @PrePersist
+ protected void onCreate() {
+ this.createdAt = LocalDateTime.now();
+ }
+}
diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/notification/entity/ServiceRequestStatus.java b/RestroHub/src/main/java/com/restroly/qrmenu/notification/entity/ServiceRequestStatus.java
new file mode 100644
index 0000000..100f619
--- /dev/null
+++ b/RestroHub/src/main/java/com/restroly/qrmenu/notification/entity/ServiceRequestStatus.java
@@ -0,0 +1,7 @@
+package com.restroly.qrmenu.notification.entity;
+
+public enum ServiceRequestStatus {
+ PENDING,
+ ACKNOWLEDGED,
+ COMPLETED
+}
diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/notification/entity/ServiceRequestType.java b/RestroHub/src/main/java/com/restroly/qrmenu/notification/entity/ServiceRequestType.java
new file mode 100644
index 0000000..6b84af5
--- /dev/null
+++ b/RestroHub/src/main/java/com/restroly/qrmenu/notification/entity/ServiceRequestType.java
@@ -0,0 +1,6 @@
+package com.restroly.qrmenu.notification.entity;
+
+public enum ServiceRequestType {
+ CALL_WAITER,
+ REQUEST_BILL
+}
diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/notification/mapper/ServiceRequestMapper.java b/RestroHub/src/main/java/com/restroly/qrmenu/notification/mapper/ServiceRequestMapper.java
new file mode 100644
index 0000000..b920295
--- /dev/null
+++ b/RestroHub/src/main/java/com/restroly/qrmenu/notification/mapper/ServiceRequestMapper.java
@@ -0,0 +1,17 @@
+package com.restroly.qrmenu.notification.mapper;
+
+import com.restroly.qrmenu.notification.dto.ServiceRequestResponseDTO;
+import com.restroly.qrmenu.notification.entity.ServiceRequest;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+
+import java.util.List;
+
+@Mapper(componentModel = "spring",
+ unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface ServiceRequestMapper {
+
+ ServiceRequestResponseDTO toResponseDTO(ServiceRequest entity);
+
+ List toResponseDTOList(List entities);
+}
diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/notification/repository/ServiceRequestRepository.java b/RestroHub/src/main/java/com/restroly/qrmenu/notification/repository/ServiceRequestRepository.java
new file mode 100644
index 0000000..e8e0c06
--- /dev/null
+++ b/RestroHub/src/main/java/com/restroly/qrmenu/notification/repository/ServiceRequestRepository.java
@@ -0,0 +1,18 @@
+package com.restroly.qrmenu.notification.repository;
+
+import com.restroly.qrmenu.notification.entity.ServiceRequest;
+import com.restroly.qrmenu.notification.entity.ServiceRequestStatus;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ServiceRequestRepository extends JpaRepository {
+
+ List findByBranchIdAndStatusOrderByCreatedAtDesc(
+ Long branchId, ServiceRequestStatus status);
+
+ List findByBranchIdAndStatusInOrderByCreatedAtDesc(
+ Long branchId, List statuses);
+}
diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/notification/service/LiveNotificationService.java b/RestroHub/src/main/java/com/restroly/qrmenu/notification/service/LiveNotificationService.java
new file mode 100644
index 0000000..01ac16b
--- /dev/null
+++ b/RestroHub/src/main/java/com/restroly/qrmenu/notification/service/LiveNotificationService.java
@@ -0,0 +1,35 @@
+package com.restroly.qrmenu.notification.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.stereotype.Service;
+
+/**
+ * Generic, reusable live notification broadcaster.
+ * Wraps SimpMessagingTemplate to provide a clean API for broadcasting
+ * real-time events via WebSocket to any destination.
+ *
+ * Usage:
+ * liveNotificationService.broadcast("/topic/orders/branch/1", orderResponse);
+ * liveNotificationService.broadcast("/topic/service-requests/branch/1", serviceRequestResponse);
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class LiveNotificationService {
+
+ private final SimpMessagingTemplate messagingTemplate;
+
+ /**
+ * Broadcast a payload to a specific WebSocket destination.
+ *
+ * @param destination the STOMP topic destination (e.g., "/topic/service-requests/branch/1")
+ * @param payload the object to send (will be serialized to JSON)
+ * @param type of the payload
+ */
+ public void broadcast(String destination, T payload) {
+ log.info("Broadcasting to {}: {}", destination, payload);
+ messagingTemplate.convertAndSend(destination, payload);
+ }
+}
diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/notification/service/ServiceRequestService.java b/RestroHub/src/main/java/com/restroly/qrmenu/notification/service/ServiceRequestService.java
new file mode 100644
index 0000000..29dbbec
--- /dev/null
+++ b/RestroHub/src/main/java/com/restroly/qrmenu/notification/service/ServiceRequestService.java
@@ -0,0 +1,124 @@
+package com.restroly.qrmenu.notification.service;
+
+import com.restroly.qrmenu.notification.dto.ServiceRequestDTO;
+import com.restroly.qrmenu.notification.dto.ServiceRequestResponseDTO;
+import com.restroly.qrmenu.notification.entity.ServiceRequest;
+import com.restroly.qrmenu.notification.entity.ServiceRequestStatus;
+import com.restroly.qrmenu.notification.mapper.ServiceRequestMapper;
+import com.restroly.qrmenu.notification.repository.ServiceRequestRepository;
+import com.restroly.qrmenu.restaurant.entity.Restaurant;
+import com.restroly.qrmenu.restaurant.repository.RestaurantRepository;
+import jakarta.persistence.EntityNotFoundException;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class ServiceRequestService {
+
+ private final ServiceRequestRepository serviceRequestRepository;
+ private final ServiceRequestMapper serviceRequestMapper;
+ private final LiveNotificationService liveNotificationService;
+ private final RestaurantRepository restaurantRepository;
+
+ /**
+ * Create a new service request from a customer.
+ * Validates feature flag and table number before saving.
+ */
+ @Transactional
+ public ServiceRequestResponseDTO createServiceRequest(ServiceRequestDTO dto) {
+ log.info("Creating service request: type={}, restaurant={}, branch={}, table={}",
+ dto.getRequestType(), dto.getRestaurantId(), dto.getBranchId(), dto.getTableNumber());
+
+ // Validate: Table 0 is the counter — no service requests allowed
+ if (dto.getTableNumber() == null || dto.getTableNumber() <= 0) {
+ throw new IllegalArgumentException("Service requests are not available for counter/walk-in (Table 0)");
+ }
+
+ // Validate: Check if the restaurant has service requests enabled (feature flag)
+ try {
+ Restaurant restaurant = restaurantRepository.findById(dto.getRestaurantId())
+ .orElseThrow(() -> new EntityNotFoundException("Restaurant not found with ID: " + dto.getRestaurantId()));
+
+ if (!Boolean.TRUE.equals(restaurant.getServiceRequestEnabled())) {
+ throw new IllegalStateException("Service requests are not enabled for this restaurant");
+ }
+ } catch (EntityNotFoundException e) {
+ log.warn("Database is unseeded. Bypassing restaurant validation check for ID {} (acting as demo mode fallback).", dto.getRestaurantId());
+ }
+
+ // Build and save the entity
+ ServiceRequest serviceRequest = ServiceRequest.builder()
+ .restaurantId(dto.getRestaurantId())
+ .branchId(dto.getBranchId())
+ .tableNumber(dto.getTableNumber())
+ .requestType(dto.getRequestType())
+ .status(ServiceRequestStatus.PENDING)
+ .build();
+
+ ServiceRequest saved = serviceRequestRepository.save(serviceRequest);
+ ServiceRequestResponseDTO response = serviceRequestMapper.toResponseDTO(saved);
+
+ // Broadcast via WebSocket to admin subscribers
+ String destination = "/topic/service-requests/branch/" + dto.getBranchId();
+ liveNotificationService.broadcast(destination, response);
+
+ log.info("Service request created and broadcast: id={}", saved.getId());
+ return response;
+ }
+
+ /**
+ * Get all active (PENDING + ACKNOWLEDGED) service requests for a branch.
+ * Used by the admin dashboard.
+ */
+ @Transactional(readOnly = true)
+ public List getActiveRequests(Long branchId) {
+ log.debug("Fetching active service requests for branch: {}", branchId);
+
+ List requests = serviceRequestRepository
+ .findByBranchIdAndStatusInOrderByCreatedAtDesc(
+ branchId,
+ List.of(ServiceRequestStatus.PENDING, ServiceRequestStatus.ACKNOWLEDGED));
+
+ return serviceRequestMapper.toResponseDTOList(requests);
+ }
+
+ /**
+ * Acknowledge a service request (admin saw it).
+ */
+ @Transactional
+ public ServiceRequestResponseDTO acknowledgeRequest(Long requestId) {
+ log.info("Acknowledging service request: {}", requestId);
+
+ ServiceRequest request = serviceRequestRepository.findById(requestId)
+ .orElseThrow(() -> new EntityNotFoundException("Service request not found: " + requestId));
+
+ request.setStatus(ServiceRequestStatus.ACKNOWLEDGED);
+ ServiceRequest updated = serviceRequestRepository.save(request);
+
+ return serviceRequestMapper.toResponseDTO(updated);
+ }
+
+ /**
+ * Complete/dismiss a service request (admin served the table).
+ */
+ @Transactional
+ public ServiceRequestResponseDTO completeRequest(Long requestId) {
+ log.info("Completing service request: {}", requestId);
+
+ ServiceRequest request = serviceRequestRepository.findById(requestId)
+ .orElseThrow(() -> new EntityNotFoundException("Service request not found: " + requestId));
+
+ request.setStatus(ServiceRequestStatus.COMPLETED);
+ request.setResolvedAt(LocalDateTime.now());
+ ServiceRequest updated = serviceRequestRepository.save(request);
+
+ return serviceRequestMapper.toResponseDTO(updated);
+ }
+}
diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/restaurant/dto/RestaurantResponseDTO.java b/RestroHub/src/main/java/com/restroly/qrmenu/restaurant/dto/RestaurantResponseDTO.java
index f48d2f6..1d22a7c 100644
--- a/RestroHub/src/main/java/com/restroly/qrmenu/restaurant/dto/RestaurantResponseDTO.java
+++ b/RestroHub/src/main/java/com/restroly/qrmenu/restaurant/dto/RestaurantResponseDTO.java
@@ -31,6 +31,9 @@ public class RestaurantResponseDTO {
@Schema(description = "Whether the restaurant is active", example = "true")
private Boolean isActive;
+ @Schema(description = "Whether service requests (Call Waiter / Request Bill) are enabled", example = "false")
+ private Boolean serviceRequestEnabled;
+
@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
@Schema(description = "Timestamp when the restaurant was created")
private LocalDateTime createdAt;
diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/restaurant/dto/RestaurantUpdateDTO.java b/RestroHub/src/main/java/com/restroly/qrmenu/restaurant/dto/RestaurantUpdateDTO.java
index a7961e6..515f240 100644
--- a/RestroHub/src/main/java/com/restroly/qrmenu/restaurant/dto/RestaurantUpdateDTO.java
+++ b/RestroHub/src/main/java/com/restroly/qrmenu/restaurant/dto/RestaurantUpdateDTO.java
@@ -23,4 +23,7 @@ public class RestaurantUpdateDTO {
@Schema(description = "Whether the restaurant is active", example = "true")
private Boolean isActive;
+
+ @Schema(description = "Enable or disable service requests (Call Waiter / Request Bill)", example = "true")
+ private Boolean serviceRequestEnabled;
}
diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/restaurant/entity/Restaurant.java b/RestroHub/src/main/java/com/restroly/qrmenu/restaurant/entity/Restaurant.java
index 31aec89..361f111 100644
--- a/RestroHub/src/main/java/com/restroly/qrmenu/restaurant/entity/Restaurant.java
+++ b/RestroHub/src/main/java/com/restroly/qrmenu/restaurant/entity/Restaurant.java
@@ -38,6 +38,10 @@ public class Restaurant {
@Builder.Default
private Boolean isActive = true;
+ @Column(name = "service_request_enabled")
+ @Builder.Default
+ private Boolean serviceRequestEnabled = false;
+
@Column(name = "created_at", updatable = false)
private LocalDateTime createdAt;