diff --git a/RestroHub-FrontEnd/src/components/admin/store/tables/TableCard.jsx b/RestroHub-FrontEnd/src/components/admin/store/tables/TableCard.jsx index b997ed5e..db8343ff 100644 --- a/RestroHub-FrontEnd/src/components/admin/store/tables/TableCard.jsx +++ b/RestroHub-FrontEnd/src/components/admin/store/tables/TableCard.jsx @@ -1,8 +1,9 @@ import { useState } from 'react'; import { QrCode, Edit2, Trash2, Users, Loader2 } from 'lucide-react'; +import api from '@services/common/api'; const TableCard = ({ table, onShowQR, onEdit, onDelete }) => { - const [deleting, setDeleting] = useState(false); + const [saving, setSaving] = useState(false); const statusStyles = { available: { @@ -23,38 +24,43 @@ const TableCard = ({ table, onShowQR, onEdit, onDelete }) => { dot: 'bg-yellow-500', numberBg: 'bg-yellow-50', }, + inactive: { + border: 'border-gray-200 hover:border-gray-300', + badge: 'bg-gray-100 text-gray-600', + dot: 'bg-gray-400', + numberBg: 'bg-gray-50', + }, }; - const styles = statusStyles[table.status] || statusStyles.available; + const displayStatus = table.isActive ? table.status : 'inactive'; + const styles = statusStyles[displayStatus] || statusStyles.available; const handleDelete = async (e) => { e.stopPropagation(); if (!window.confirm(`Delete Table ${table.number}?`)) return; + try { - setDeleting(true); - // 🔌 await api.delete(`/api/tables/${table.id}`); - await new Promise((r) => setTimeout(r, 300)); + setSaving(true); + await api.delete(`/secure/api/v1/tables/${table.id}`); onDelete(table.id); } catch (err) { console.error('Delete failed:', err); + alert(err.response?.data?.message || 'Failed to delete table'); } finally { - setDeleting(false); + setSaving(false); } }; return (
onShowQR(table)} + onClick={() => table.isActive && onShowQR(table)} className={` - cursor-pointer overflow-hidden rounded-2xl border-2 - bg-white transition-all duration-200 - hover:shadow-lg + overflow-hidden rounded-2xl border-2 bg-white transition-all duration-200 + ${table.isActive ? 'cursor-pointer hover:shadow-lg' : 'opacity-75'} ${styles.border} `} > - {/* Body */}
- {/* Number Circle */}
{
- {/* Label */}

Table {table.number}

- {/* Capacity */}
{table.capacity} seats
- {/* Status Badge */}
{ `} > - {table.status} + {displayStatus}
- {/* Actions Footer */}
- + {table.isActive && ( + + )}
- {/* Form */}
+ {error && ( +
+ {error} +
+ )} +
setFormData({ ...formData, number: e.target.value })} + onChange={(e) => updateField('number', e.target.value)} className={inputClass} placeholder="9" required @@ -81,16 +125,45 @@ const TableFormModal = ({ isOpen, onClose, branchId }) => { setFormData({ ...formData, capacity: e.target.value })} + onChange={(e) => updateField('capacity', e.target.value)} className={inputClass} placeholder="4" required />
+
+ + +
+ {editingTable && ( + + )}
- {/* Footer */}
@@ -126,4 +199,4 @@ const TableFormModal = ({ isOpen, onClose, branchId }) => { ); }; -export default TableFormModal; \ No newline at end of file +export default TableFormModal; diff --git a/RestroHub-FrontEnd/src/components/admin/store/tables/TableQRModal.jsx b/RestroHub-FrontEnd/src/components/admin/store/tables/TableQRModal.jsx index 4a62fd11..6516a54d 100644 --- a/RestroHub-FrontEnd/src/components/admin/store/tables/TableQRModal.jsx +++ b/RestroHub-FrontEnd/src/components/admin/store/tables/TableQRModal.jsx @@ -8,7 +8,7 @@ const TableQRModal = ({ isOpen, onClose, table, branchId }) => { if (!table) return null; - const qrUrl = `${window.location.origin}/Restrohub/RajkotDhaba/${branchId}?table=${table.number}`; + const qrUrl = `${window.location.origin}/Restrohub/RajkotDhaba/${branchId}?tableId=${table.id}&table=${table.number}`; const handleDownload = async () => { try { @@ -35,7 +35,7 @@ const TableQRModal = ({ isOpen, onClose, table, branchId }) => { {/* Header */}
- Table {table.number} — QR Code + Table {table.number} - QR Code
); }; -export default TablesGrid; \ No newline at end of file +export default TablesGrid; diff --git a/RestroHub-FrontEnd/src/components/admin/store/tables/TablesStatusLegend.jsx b/RestroHub-FrontEnd/src/components/admin/store/tables/TablesStatusLegend.jsx index ebe22f63..c161469a 100644 --- a/RestroHub-FrontEnd/src/components/admin/store/tables/TablesStatusLegend.jsx +++ b/RestroHub-FrontEnd/src/components/admin/store/tables/TablesStatusLegend.jsx @@ -1,8 +1,9 @@ const TablesStatusLegend = ({ tables = [] }) => { + const activeTables = tables.filter((table) => table.isActive !== false); const counts = { - available: tables.filter((t) => t.status === 'available').length, - occupied: tables.filter((t) => t.status === 'occupied').length, - reserved: tables.filter((t) => t.status === 'reserved').length, + available: activeTables.filter((t) => t.status === 'available').length, + occupied: activeTables.filter((t) => t.status === 'occupied').length, + reserved: activeTables.filter((t) => t.status === 'reserved').length, }; const statuses = [ @@ -33,4 +34,4 @@ const TablesStatusLegend = ({ tables = [] }) => { ); }; -export default TablesStatusLegend; \ No newline at end of file +export default TablesStatusLegend; diff --git a/RestroHub-FrontEnd/src/components/admin/store/tables/tableMapper.js b/RestroHub-FrontEnd/src/components/admin/store/tables/tableMapper.js new file mode 100644 index 00000000..734fad81 --- /dev/null +++ b/RestroHub-FrontEnd/src/components/admin/store/tables/tableMapper.js @@ -0,0 +1,11 @@ +export const normalizeTable = (table) => ({ + id: table.tableId, + tableId: table.tableId, + branchId: table.branchId, + number: table.tableNumber, + tableNumber: table.tableNumber, + capacity: table.capacity || 4, + status: table.status || 'available', + qrCodeUrl: table.qrCodeUrl, + isActive: table.isActive !== false, +}); diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/branch/dto/BranchResponseDTO.java b/RestroHub/src/main/java/com/restroly/qrmenu/branch/dto/BranchResponseDTO.java index a65b1911..2f34166c 100644 --- a/RestroHub/src/main/java/com/restroly/qrmenu/branch/dto/BranchResponseDTO.java +++ b/RestroHub/src/main/java/com/restroly/qrmenu/branch/dto/BranchResponseDTO.java @@ -106,8 +106,12 @@ public static class TableDTO { private Integer tableNumber; + private Integer capacity; + + private String status; + private String qrCodeUrl; private Boolean isActive; } -} \ No newline at end of file +} diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/branch/mapper/BranchMapper.java b/RestroHub/src/main/java/com/restroly/qrmenu/branch/mapper/BranchMapper.java index f0b12305..8c0c8497 100644 --- a/RestroHub/src/main/java/com/restroly/qrmenu/branch/mapper/BranchMapper.java +++ b/RestroHub/src/main/java/com/restroly/qrmenu/branch/mapper/BranchMapper.java @@ -46,7 +46,7 @@ public BranchResponseDTO toResponseDTO(Branch branch) { .address(toAddressDTO(branch.getAddress())) .menu(toMenuDTO(branch.getMenu())) .tables(toTableDTOList(branch.getTables())) - .tableCount(branch.getTables() != null ? branch.getTables().size() : 0) + .tableCount(countActiveTables(branch.getTables())) .build(); } @@ -61,7 +61,7 @@ public BranchResponseDTO toSummaryDTO(Branch branch) { .isDelete(branch.getIsDelete()) .createdDate(branch.getCreatedDate()) .address(toAddressDTO(branch.getAddress())) - .tableCount(branch.getTables() != null ? branch.getTables().size() : 0) + .tableCount(countActiveTables(branch.getTables())) .build(); } @@ -170,6 +170,8 @@ private BranchResponseDTO.TableDTO toTableDTO(Tables table) { return BranchResponseDTO.TableDTO.builder() .tableId(table.getTableId()) .tableNumber(table.getTableNumber()) + .capacity(table.getCapacity()) + .status(table.getStatus()) .qrCodeUrl(table.getQrCodeUrl()) .isActive(table.getIsActive()) .build(); @@ -182,6 +184,13 @@ private List toTableDTOList(List tables) { .collect(Collectors.toList()); } + private int countActiveTables(List tables) { + if (tables == null) return 0; + return (int) tables.stream() + .filter(table -> Boolean.TRUE.equals(table.getIsActive())) + .count(); + } + private String buildFullAddress(Address address) { StringBuilder sb = new StringBuilder(); @@ -211,4 +220,4 @@ private String buildFullAddress(Address address) { return sb.toString(); } -} \ No newline at end of file +} diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/config/SecurityConfig.java b/RestroHub/src/main/java/com/restroly/qrmenu/config/SecurityConfig.java index c5770f40..b92a1971 100644 --- a/RestroHub/src/main/java/com/restroly/qrmenu/config/SecurityConfig.java +++ b/RestroHub/src/main/java/com/restroly/qrmenu/config/SecurityConfig.java @@ -65,6 +65,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti .requestMatchers(HttpMethod.GET, PUBLIC_GET_URLS).permitAll() .requestMatchers(HttpMethod.POST, "/secure/api/**").hasAnyAuthority("ADMIN", "RESTAURANT_OWNER") .requestMatchers(HttpMethod.PUT, "/secure/api/**").hasAnyAuthority("ADMIN", "RESTAURANT_OWNER") + .requestMatchers(HttpMethod.PATCH, "/secure/api/**").hasAnyAuthority("ADMIN", "RESTAURANT_OWNER") .requestMatchers(HttpMethod.DELETE, "/secure/api/**").hasAnyAuthority("ADMIN", "RESTAURANT_OWNER") // All other requests require authentication .anyRequest().authenticated() diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/table/controller/TableController.java b/RestroHub/src/main/java/com/restroly/qrmenu/table/controller/TableController.java new file mode 100644 index 00000000..3da5634b --- /dev/null +++ b/RestroHub/src/main/java/com/restroly/qrmenu/table/controller/TableController.java @@ -0,0 +1,122 @@ +package com.restroly.qrmenu.table.controller; + +import com.restroly.qrmenu.common.util.ApiConstants; +import com.restroly.qrmenu.exception.ApiErrorResponse; +import com.restroly.qrmenu.table.dto.TableRequestDTO; +import com.restroly.qrmenu.table.dto.TableResponseDTO; +import com.restroly.qrmenu.table.service.TableService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +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.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.net.URI; +import java.util.List; + +import static com.restroly.qrmenu.common.util.ApiConstants.SECURE_API_VERSION; + +@RestController +@RequestMapping(SECURE_API_VERSION) +@RequiredArgsConstructor +@Slf4j +@Validated +@Tag(name = "Table Management", description = "APIs for managing branch tables") +public class TableController { + + private final TableService tableService; + + @GetMapping(value = "/branches/{branchId}/tables", produces = MediaType.APPLICATION_JSON_VALUE) + @Operation(summary = "Get tables by branch", description = "Retrieves all tables for a branch") + @ApiResponses({ + @ApiResponse(responseCode = "200", description = "Successfully retrieved tables"), + @ApiResponse(responseCode = "404", description = "Branch not found", + content = @Content(schema = @Schema(implementation = ApiErrorResponse.class))) + }) + public ResponseEntity> getTablesByBranch( + @Parameter(description = "ID of the branch", required = true) + @PathVariable Long branchId) { + + log.debug("REST request to get tables for branch id: {}", branchId); + return ResponseEntity.ok(tableService.getTablesByBranch(branchId)); + } + + @PostMapping(value = "/branches/{branchId}/tables", + consumes = MediaType.APPLICATION_JSON_VALUE, + produces = MediaType.APPLICATION_JSON_VALUE) + @PreAuthorize("hasAnyAuthority('ADMIN', 'RESTAURANT_OWNER')") + @Operation( + summary = "Create a table", + description = "Creates a new table for a branch. Requires ADMIN or RESTAURANT_OWNER authority.", + security = @SecurityRequirement(name = "bearerAuth") + ) + @ApiResponses({ + @ApiResponse(responseCode = "201", description = "Table created successfully", + content = @Content(schema = @Schema(implementation = TableResponseDTO.class))), + @ApiResponse(responseCode = "400", description = "Invalid input data", + content = @Content(schema = @Schema(implementation = ApiErrorResponse.class))), + @ApiResponse(responseCode = "404", description = "Branch not found", + content = @Content(schema = @Schema(implementation = ApiErrorResponse.class))), + @ApiResponse(responseCode = "409", description = "Duplicate table number", + content = @Content(schema = @Schema(implementation = ApiErrorResponse.class))) + }) + public ResponseEntity createTable( + @Parameter(description = "ID of the branch", required = true) + @PathVariable Long branchId, + @Valid @RequestBody TableRequestDTO requestDTO) { + + log.info("REST request to create table {} for branch {}", requestDTO.getTableNumber(), branchId); + TableResponseDTO response = tableService.createTable(branchId, requestDTO); + + URI location = URI.create("/" + ApiConstants.APP_NAME + SECURE_API_VERSION + "/tables/" + response.getTableId()); + return ResponseEntity.created(location).body(response); + } + + @PutMapping(value = "/tables/{tableId}", + consumes = MediaType.APPLICATION_JSON_VALUE, + produces = MediaType.APPLICATION_JSON_VALUE) + @PreAuthorize("hasAnyAuthority('ADMIN', 'RESTAURANT_OWNER')") + @Operation( + summary = "Update a table", + description = "Updates table details, status, and active state. Requires ADMIN or RESTAURANT_OWNER authority.", + security = @SecurityRequirement(name = "bearerAuth") + ) + public ResponseEntity updateTable( + @Parameter(description = "ID of the table", required = true) + @PathVariable Long tableId, + @Valid @RequestBody TableRequestDTO requestDTO) { + + log.info("REST request to update table {}", tableId); + return ResponseEntity.ok(tableService.updateTable(tableId, requestDTO)); + } + + @DeleteMapping("/tables/{tableId}") + @PreAuthorize("hasAnyAuthority('ADMIN', 'RESTAURANT_OWNER')") + @ResponseStatus(HttpStatus.NO_CONTENT) + @Operation( + summary = "Delete a table", + description = "Permanently deletes a table. Requires ADMIN or RESTAURANT_OWNER authority.", + security = @SecurityRequirement(name = "bearerAuth") + ) + public ResponseEntity deleteTable( + @Parameter(description = "ID of the table", required = true) + @PathVariable Long tableId) { + + log.info("REST request to delete table {}", tableId); + tableService.deleteTable(tableId); + return ResponseEntity.noContent().build(); + } + +} diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/table/dto/TableRequestDTO.java b/RestroHub/src/main/java/com/restroly/qrmenu/table/dto/TableRequestDTO.java new file mode 100644 index 00000000..66681845 --- /dev/null +++ b/RestroHub/src/main/java/com/restroly/qrmenu/table/dto/TableRequestDTO.java @@ -0,0 +1,33 @@ +package com.restroly.qrmenu.table.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@Schema(description = "Table creation and update request payload") +public class TableRequestDTO { + + @NotNull(message = "Table number is required") + @Min(value = 1, message = "Table number must be greater than 0") + private Integer tableNumber; + + @Min(value = 1, message = "Capacity must be greater than 0") + private Integer capacity; + + @Pattern(regexp = "(?i)available|occupied|reserved", + message = "Status must be available, occupied, or reserved") + private String status; + + private String qrCodeUrl; + + private Boolean isActive; +} diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/table/dto/TableResponseDTO.java b/RestroHub/src/main/java/com/restroly/qrmenu/table/dto/TableResponseDTO.java new file mode 100644 index 00000000..1a98f45c --- /dev/null +++ b/RestroHub/src/main/java/com/restroly/qrmenu/table/dto/TableResponseDTO.java @@ -0,0 +1,32 @@ +package com.restroly.qrmenu.table.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@Schema(description = "Table response payload") +public class TableResponseDTO { + + private Long tableId; + private Long branchId; + private Integer tableNumber; + private Integer capacity; + private String status; + private String qrCodeUrl; + private Boolean isActive; + + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + private LocalDateTime createdDate; + + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + private LocalDateTime updatedDate; +} diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/table/entity/Tables.java b/RestroHub/src/main/java/com/restroly/qrmenu/table/entity/Tables.java index f0813945..74eaca02 100644 --- a/RestroHub/src/main/java/com/restroly/qrmenu/table/entity/Tables.java +++ b/RestroHub/src/main/java/com/restroly/qrmenu/table/entity/Tables.java @@ -5,6 +5,8 @@ import jakarta.persistence.*; import lombok.*; +import java.time.LocalDateTime; + @Entity @Table(name = "T_table_master") @Getter @@ -26,6 +28,14 @@ public class Tables { @Column(name = "table_number", nullable = false) private Integer tableNumber; + @Column(name = "capacity", nullable = false) + @Builder.Default + private Integer capacity = 4; + + @Column(name = "status", nullable = false, length = 20) + @Builder.Default + private String status = "available"; + @Column(name = "qr_code_url") private String qrCodeUrl; @@ -33,4 +43,29 @@ public class Tables { @Builder.Default private Boolean isActive = true; -} \ No newline at end of file + @Column(name = "created_date") + private LocalDateTime createdDate; + + @Column(name = "updated_date") + private LocalDateTime updatedDate; + + @PrePersist + protected void onCreate() { + createdDate = LocalDateTime.now(); + updatedDate = LocalDateTime.now(); + if (isActive == null) { + isActive = true; + } + if (capacity == null) { + capacity = 4; + } + if (status == null || status.isBlank()) { + status = "available"; + } + } + + @PreUpdate + protected void onUpdate() { + updatedDate = LocalDateTime.now(); + } +} diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/table/repository/TablesRepository.java b/RestroHub/src/main/java/com/restroly/qrmenu/table/repository/TablesRepository.java index 04709859..4ea36908 100644 --- a/RestroHub/src/main/java/com/restroly/qrmenu/table/repository/TablesRepository.java +++ b/RestroHub/src/main/java/com/restroly/qrmenu/table/repository/TablesRepository.java @@ -17,5 +17,9 @@ public interface TablesRepository extends JpaRepository { List findByBranch_BranchId(Long branchId); - Tables findByTableNumber(Long tableNumber); -} \ No newline at end of file + boolean existsByBranch_BranchIdAndTableNumber(Long branchId, Integer tableNumber); + + boolean existsByBranch_BranchIdAndTableNumberAndTableIdNot(Long branchId, Integer tableNumber, Long tableId); + + Tables findByTableNumber(Integer tableNumber); +} diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/table/service/TableService.java b/RestroHub/src/main/java/com/restroly/qrmenu/table/service/TableService.java new file mode 100644 index 00000000..12bbbf1f --- /dev/null +++ b/RestroHub/src/main/java/com/restroly/qrmenu/table/service/TableService.java @@ -0,0 +1,17 @@ +package com.restroly.qrmenu.table.service; + +import com.restroly.qrmenu.table.dto.TableRequestDTO; +import com.restroly.qrmenu.table.dto.TableResponseDTO; + +import java.util.List; + +public interface TableService { + + List getTablesByBranch(Long branchId); + + TableResponseDTO createTable(Long branchId, TableRequestDTO requestDTO); + + TableResponseDTO updateTable(Long tableId, TableRequestDTO requestDTO); + + void deleteTable(Long tableId); +} diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/table/service/TableServiceImpl.java b/RestroHub/src/main/java/com/restroly/qrmenu/table/service/TableServiceImpl.java new file mode 100644 index 00000000..8b409f58 --- /dev/null +++ b/RestroHub/src/main/java/com/restroly/qrmenu/table/service/TableServiceImpl.java @@ -0,0 +1,130 @@ +package com.restroly.qrmenu.table.service; + +import com.restroly.qrmenu.branch.entity.Branch; +import com.restroly.qrmenu.branch.repository.BranchRepository; +import com.restroly.qrmenu.exception.ResourceAlreadyExistsException; +import com.restroly.qrmenu.exception.ResourceNotFoundException; +import com.restroly.qrmenu.table.dto.TableRequestDTO; +import com.restroly.qrmenu.table.dto.TableResponseDTO; +import com.restroly.qrmenu.table.entity.Tables; +import com.restroly.qrmenu.table.repository.TablesRepository; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@RequiredArgsConstructor +@Slf4j +@Transactional +public class TableServiceImpl implements TableService { + + private static final String TABLE_NOT_FOUND = "Table not found with id: %s"; + + private final TablesRepository tablesRepository; + private final BranchRepository branchRepository; + + @Override + @Transactional(readOnly = true) + public List getTablesByBranch(Long branchId) { + validateBranchExists(branchId); + return tablesRepository.findByBranch_BranchId(branchId) + .stream() + .map(this::toResponseDTO) + .toList(); + } + + @Override + public TableResponseDTO createTable(Long branchId, TableRequestDTO requestDTO) { + log.info("Creating table {} for branch {}", requestDTO.getTableNumber(), branchId); + + Branch branch = branchRepository.findByBranchIdAndIsDeleteFalse(branchId) + .orElseThrow(() -> new ResourceNotFoundException("Branch not found with id: " + branchId)); + + if (tablesRepository.existsByBranch_BranchIdAndTableNumber(branchId, requestDTO.getTableNumber())) { + throw duplicateTableNumber(branchId, requestDTO.getTableNumber()); + } + + Tables table = Tables.builder() + .branch(branch) + .tableNumber(requestDTO.getTableNumber()) + .capacity(requestDTO.getCapacity() != null ? requestDTO.getCapacity() : 4) + .status(normalizeStatus(requestDTO.getStatus())) + .qrCodeUrl(requestDTO.getQrCodeUrl()) + .isActive(true) + .build(); + + return toResponseDTO(tablesRepository.save(table)); + } + + @Override + public TableResponseDTO updateTable(Long tableId, TableRequestDTO requestDTO) { + log.info("Updating table {}", tableId); + + Tables table = findTableOrThrow(tableId); + Long branchId = table.getBranch().getBranchId(); + + if (tablesRepository.existsByBranch_BranchIdAndTableNumberAndTableIdNot( + branchId, requestDTO.getTableNumber(), tableId)) { + throw duplicateTableNumber(branchId, requestDTO.getTableNumber()); + } + + table.setTableNumber(requestDTO.getTableNumber()); + table.setCapacity(requestDTO.getCapacity() != null ? requestDTO.getCapacity() : table.getCapacity()); + table.setStatus(hasText(requestDTO.getStatus()) ? normalizeStatus(requestDTO.getStatus()) : table.getStatus()); + table.setQrCodeUrl(requestDTO.getQrCodeUrl()); + if (requestDTO.getIsActive() != null) { + table.setIsActive(requestDTO.getIsActive()); + } + + return toResponseDTO(tablesRepository.save(table)); + } + + @Override + public void deleteTable(Long tableId) { + log.info("Deleting table {}", tableId); + + Tables table = findTableOrThrow(tableId); + tablesRepository.delete(table); + } + + private void validateBranchExists(Long branchId) { + if (branchRepository.findByBranchIdAndIsDeleteFalse(branchId).isEmpty()) { + throw new ResourceNotFoundException("Branch not found with id: " + branchId); + } + } + + private Tables findTableOrThrow(Long tableId) { + return tablesRepository.findById(tableId) + .orElseThrow(() -> new ResourceNotFoundException(String.format(TABLE_NOT_FOUND, tableId))); + } + + private ResourceAlreadyExistsException duplicateTableNumber(Long branchId, Integer tableNumber) { + return new ResourceAlreadyExistsException( + "Table number " + tableNumber + " already exists for branch id: " + branchId); + } + + private String normalizeStatus(String status) { + return status == null || status.isBlank() ? "available" : status.toLowerCase(); + } + + private boolean hasText(String value) { + return value != null && !value.isBlank(); + } + + private TableResponseDTO toResponseDTO(Tables table) { + return TableResponseDTO.builder() + .tableId(table.getTableId()) + .branchId(table.getBranch() != null ? table.getBranch().getBranchId() : null) + .tableNumber(table.getTableNumber()) + .capacity(table.getCapacity()) + .status(table.getStatus()) + .qrCodeUrl(table.getQrCodeUrl()) + .isActive(table.getIsActive()) + .createdDate(table.getCreatedDate()) + .updatedDate(table.getUpdatedDate()) + .build(); + } +} diff --git a/RestroHub/src/test/java/com/restroly/qrmenu/table/service/TableServiceImplTest.java b/RestroHub/src/test/java/com/restroly/qrmenu/table/service/TableServiceImplTest.java new file mode 100644 index 00000000..d02cc716 --- /dev/null +++ b/RestroHub/src/test/java/com/restroly/qrmenu/table/service/TableServiceImplTest.java @@ -0,0 +1,271 @@ +package com.restroly.qrmenu.table.service; + +import com.restroly.qrmenu.branch.entity.Branch; +import com.restroly.qrmenu.branch.repository.BranchRepository; +import com.restroly.qrmenu.exception.ResourceAlreadyExistsException; +import com.restroly.qrmenu.exception.ResourceNotFoundException; +import com.restroly.qrmenu.table.dto.TableRequestDTO; +import com.restroly.qrmenu.table.dto.TableResponseDTO; +import com.restroly.qrmenu.table.entity.Tables; +import com.restroly.qrmenu.table.repository.TablesRepository; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +@ExtendWith(MockitoExtension.class) +class TableServiceImplTest { + + @Mock + private TablesRepository tablesRepository; + + @Mock + private BranchRepository branchRepository; + + @InjectMocks + private TableServiceImpl tableService; + + @Test + void createTableShouldPersistBranchScopedTable() { + Branch branch = Branch.builder().branchId(1L).build(); + TableRequestDTO request = TableRequestDTO.builder() + .tableNumber(5) + .capacity(4) + .status("available") + .build(); + + when(branchRepository.findByBranchIdAndIsDeleteFalse(1L)).thenReturn(Optional.of(branch)); + when(tablesRepository.existsByBranch_BranchIdAndTableNumber(1L, 5)).thenReturn(false); + when(tablesRepository.save(any(Tables.class))).thenAnswer(invocation -> { + Tables table = invocation.getArgument(0); + table.setTableId(10L); + return table; + }); + + TableResponseDTO response = tableService.createTable(1L, request); + + assertEquals(10L, response.getTableId()); + assertEquals(1L, response.getBranchId()); + assertEquals(5, response.getTableNumber()); + assertTrue(response.getIsActive()); + verify(tablesRepository).save(any(Tables.class)); + } + + @Test + void createTableShouldApplyDefaultsWhenOptionalFieldsAreMissing() { + Branch branch = Branch.builder().branchId(1L).build(); + TableRequestDTO request = TableRequestDTO.builder() + .tableNumber(7) + .build(); + + when(branchRepository.findByBranchIdAndIsDeleteFalse(1L)).thenReturn(Optional.of(branch)); + when(tablesRepository.existsByBranch_BranchIdAndTableNumber(1L, 7)).thenReturn(false); + when(tablesRepository.save(any(Tables.class))).thenAnswer(invocation -> { + Tables table = invocation.getArgument(0); + table.setTableId(11L); + return table; + }); + + TableResponseDTO response = tableService.createTable(1L, request); + + assertEquals(4, response.getCapacity()); + assertEquals("available", response.getStatus()); + assertTrue(response.getIsActive()); + } + + @Test + void createTableShouldRejectMissingBranch() { + TableRequestDTO request = TableRequestDTO.builder().tableNumber(5).build(); + + when(branchRepository.findByBranchIdAndIsDeleteFalse(99L)).thenReturn(Optional.empty()); + + assertThrows(ResourceNotFoundException.class, () -> tableService.createTable(99L, request)); + verify(tablesRepository, never()).save(any(Tables.class)); + } + + @Test + void createTableShouldRejectDuplicateTableNumberInBranch() { + TableRequestDTO request = TableRequestDTO.builder().tableNumber(5).build(); + + when(branchRepository.findByBranchIdAndIsDeleteFalse(1L)) + .thenReturn(Optional.of(Branch.builder().branchId(1L).build())); + when(tablesRepository.existsByBranch_BranchIdAndTableNumber(1L, 5)).thenReturn(true); + + assertThrows(ResourceAlreadyExistsException.class, () -> tableService.createTable(1L, request)); + verify(tablesRepository, never()).save(any(Tables.class)); + } + + @Test + void getTablesByBranchShouldRejectMissingBranch() { + when(branchRepository.findByBranchIdAndIsDeleteFalse(99L)).thenReturn(Optional.empty()); + + assertThrows(ResourceNotFoundException.class, () -> tableService.getTablesByBranch(99L)); + verify(tablesRepository, never()).findByBranch_BranchId(99L); + } + + @Test + void deleteTableShouldHardDeleteTable() { + Tables table = Tables.builder() + .tableId(10L) + .branch(Branch.builder().branchId(1L).build()) + .tableNumber(5) + .isActive(true) + .build(); + + when(tablesRepository.findById(10L)).thenReturn(Optional.of(table)); + + tableService.deleteTable(10L); + + verify(tablesRepository).delete(table); + } + + @Test + void deleteTableShouldRejectMissingTable() { + when(tablesRepository.findById(99L)).thenReturn(Optional.empty()); + + assertThrows(ResourceNotFoundException.class, () -> tableService.deleteTable(99L)); + verify(tablesRepository, never()).delete(any(Tables.class)); + } + + @Test + void updateTableShouldChangeDetailsAndKeepExistingCapacityWhenMissing() { + Branch branch = Branch.builder().branchId(1L).build(); + Tables table = Tables.builder() + .tableId(10L) + .branch(branch) + .tableNumber(5) + .capacity(6) + .status("reserved") + .isActive(true) + .build(); + TableRequestDTO request = TableRequestDTO.builder() + .tableNumber(8) + .status("occupied") + .qrCodeUrl("https://example.com/qr/table-8") + .build(); + + when(tablesRepository.findById(10L)).thenReturn(Optional.of(table)); + when(tablesRepository.existsByBranch_BranchIdAndTableNumberAndTableIdNot(1L, 8, 10L)).thenReturn(false); + when(tablesRepository.save(table)).thenReturn(table); + + TableResponseDTO response = tableService.updateTable(10L, request); + + assertEquals(8, response.getTableNumber()); + assertEquals(6, response.getCapacity()); + assertEquals("occupied", response.getStatus()); + assertEquals("https://example.com/qr/table-8", response.getQrCodeUrl()); + } + + @Test + void updateTableShouldKeepExistingStatusWhenMissing() { + Branch branch = Branch.builder().branchId(1L).build(); + Tables table = Tables.builder() + .tableId(10L) + .branch(branch) + .tableNumber(5) + .capacity(6) + .status("reserved") + .isActive(true) + .build(); + TableRequestDTO request = TableRequestDTO.builder() + .tableNumber(5) + .capacity(8) + .build(); + + when(tablesRepository.findById(10L)).thenReturn(Optional.of(table)); + when(tablesRepository.existsByBranch_BranchIdAndTableNumberAndTableIdNot(1L, 5, 10L)).thenReturn(false); + when(tablesRepository.save(table)).thenReturn(table); + + TableResponseDTO response = tableService.updateTable(10L, request); + + assertEquals(8, response.getCapacity()); + assertEquals("reserved", response.getStatus()); + } + + @Test + void updateTableShouldPersistActiveStateToggle() { + Branch branch = Branch.builder().branchId(1L).build(); + Tables table = Tables.builder() + .tableId(10L) + .branch(branch) + .tableNumber(5) + .capacity(6) + .status("available") + .isActive(true) + .build(); + TableRequestDTO request = TableRequestDTO.builder() + .tableNumber(5) + .capacity(6) + .status("available") + .isActive(false) + .build(); + + when(tablesRepository.findById(10L)).thenReturn(Optional.of(table)); + when(tablesRepository.existsByBranch_BranchIdAndTableNumberAndTableIdNot(1L, 5, 10L)).thenReturn(false); + when(tablesRepository.save(table)).thenReturn(table); + + TableResponseDTO response = tableService.updateTable(10L, request); + + assertFalse(response.getIsActive()); + } + + @Test + void updateTableShouldRejectDuplicateTableNumberInBranch() { + Branch branch = Branch.builder().branchId(1L).build(); + Tables table = Tables.builder() + .tableId(10L) + .branch(branch) + .tableNumber(5) + .isActive(true) + .build(); + TableRequestDTO request = TableRequestDTO.builder().tableNumber(8).build(); + + when(tablesRepository.findById(10L)).thenReturn(Optional.of(table)); + when(tablesRepository.existsByBranch_BranchIdAndTableNumberAndTableIdNot(1L, 8, 10L)).thenReturn(true); + + assertThrows(ResourceAlreadyExistsException.class, () -> tableService.updateTable(10L, request)); + verify(tablesRepository, never()).save(any(Tables.class)); + } + + @Test + void updateTableShouldRejectMissingTable() { + TableRequestDTO request = TableRequestDTO.builder().tableNumber(8).build(); + + when(tablesRepository.findById(99L)).thenReturn(Optional.empty()); + + assertThrows(ResourceNotFoundException.class, () -> tableService.updateTable(99L, request)); + } + + @Test + void getTablesByBranchShouldReturnAllBranchTables() { + Branch branch = Branch.builder().branchId(1L).build(); + Tables activeTable = Tables.builder() + .tableId(10L) + .branch(branch) + .tableNumber(1) + .isActive(true) + .build(); + Tables inactiveTable = Tables.builder() + .tableId(11L) + .branch(branch) + .tableNumber(2) + .isActive(false) + .build(); + + when(branchRepository.findByBranchIdAndIsDeleteFalse(1L)).thenReturn(Optional.of(branch)); + when(tablesRepository.findByBranch_BranchId(1L)).thenReturn(List.of(activeTable, inactiveTable)); + + List response = tableService.getTablesByBranch(1L); + + assertEquals(2, response.size()); + assertFalse(response.get(1).getIsActive()); + } +}