From 94c7ef56a98b77e04df96d55d3f4c432d915ef8f Mon Sep 17 00:00:00 2001 From: rdodiya Date: Mon, 25 May 2026 15:02:46 +0530 Subject: [PATCH 1/2] remove duplicate name check in category while creating new one --- .../category/dto/CategoryRequestDTO.java | 4 ---- .../repository/CategoryRepository.java | 2 -- .../category/service/CategoryServiceImpl.java | 22 +------------------ 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/category/dto/CategoryRequestDTO.java b/RestroHub/src/main/java/com/restroly/qrmenu/category/dto/CategoryRequestDTO.java index 771c132a..65faa9b6 100644 --- a/RestroHub/src/main/java/com/restroly/qrmenu/category/dto/CategoryRequestDTO.java +++ b/RestroHub/src/main/java/com/restroly/qrmenu/category/dto/CategoryRequestDTO.java @@ -29,10 +29,6 @@ public class CategoryRequestDTO { @Schema(description = "Whether the category is marked for deletion (soft delete)") private Boolean isDelete; // Mirrors the field from the Category entity - @NotNull(message = "Branch ID is required") - private Long branchId; // Added branchId to link category to a branch - - public static CategoryRequestDTO fromEntity(Category category) { if (category == null) return null; diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/category/repository/CategoryRepository.java b/RestroHub/src/main/java/com/restroly/qrmenu/category/repository/CategoryRepository.java index c6aacd3c..5a85328d 100644 --- a/RestroHub/src/main/java/com/restroly/qrmenu/category/repository/CategoryRepository.java +++ b/RestroHub/src/main/java/com/restroly/qrmenu/category/repository/CategoryRepository.java @@ -16,6 +16,4 @@ public interface CategoryRepository extends JpaRepository { Page findByIsDeleteFalse(Pageable pageable); - boolean existsByNameIgnoreCaseAndBranch_BranchId(String name, Long branchId); - } diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/category/service/CategoryServiceImpl.java b/RestroHub/src/main/java/com/restroly/qrmenu/category/service/CategoryServiceImpl.java index 5eae630a..e6427467 100644 --- a/RestroHub/src/main/java/com/restroly/qrmenu/category/service/CategoryServiceImpl.java +++ b/RestroHub/src/main/java/com/restroly/qrmenu/category/service/CategoryServiceImpl.java @@ -3,13 +3,10 @@ import com.restroly.qrmenu.category.dto.CategoryRequestDTO; import com.restroly.qrmenu.category.dto.CategoryResponseDTO; import com.restroly.qrmenu.common.exception.ResourceNotFoundException; -import com.restroly.qrmenu.user.exception.DuplicateResourceException; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import com.restroly.qrmenu.branch.entity.Branch; -import com.restroly.qrmenu.branch.repository.BranchRepository; import com.restroly.qrmenu.category.dto.CategoryDTO; import com.restroly.qrmenu.category.entity.Category; import com.restroly.qrmenu.category.repository.CategoryRepository; @@ -26,7 +23,6 @@ public class CategoryServiceImpl implements CategoryService { private final CategoryRepository categoryRepository; - private final BranchRepository branchRepository; /* ======================= CREATE CATEGORY @@ -35,20 +31,7 @@ public class CategoryServiceImpl implements CategoryService { public CategoryResponseDTO createCategory(CategoryRequestDTO requestDTO) { log.debug("Creating category with name: {}", requestDTO.getName()); - // Check for duplicate category name within the same branch - if(categoryRepository.existsByNameIgnoreCaseAndBranch_BranchId( - requestDTO.getName(), requestDTO.getBranchId())) { - log.warn("Category with name '{}' already exists in branch '{}'", requestDTO.getName(), requestDTO.getBranchId()); - throw new DuplicateResourceException("Category with name '" + requestDTO.getName() + "' already exists"); - } - - // Validate branch existence - Branch branch = branchRepository.findById(requestDTO.getBranchId()) - .orElseThrow(() ->{ - log.warn("Branch with ID '{}' not found for category creation", requestDTO.getBranchId()); - return new ResourceNotFoundException("Branch with ID '" + requestDTO.getBranchId() + "' not found"); - }); - + // Check for duplicate category name within the same branch //add mapping before logic Category category = CategoryDTO.toEntity( CategoryDTO.builder() .name(requestDTO.getName()) @@ -58,9 +41,6 @@ public CategoryResponseDTO createCategory(CategoryRequestDTO requestDTO) { .build() ); - // Attach branch - category.setBranch(branch); - Category savedCategory = categoryRepository.save(category); log.info("Category created with ID: {}", savedCategory.getCategoryId()); return CategoryResponseDTO.fromEntity(savedCategory); From 98f1ed0c9201ba423d88c45a387da58621f29a97 Mon Sep 17 00:00:00 2001 From: rdodiya Date: Mon, 25 May 2026 16:07:03 +0530 Subject: [PATCH 2/2] Remove mappig of BranchId done in PR #146 --- .../java/com/restroly/qrmenu/category/entity/Category.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/RestroHub/src/main/java/com/restroly/qrmenu/category/entity/Category.java b/RestroHub/src/main/java/com/restroly/qrmenu/category/entity/Category.java index 1ef24b3e..4d1dc466 100644 --- a/RestroHub/src/main/java/com/restroly/qrmenu/category/entity/Category.java +++ b/RestroHub/src/main/java/com/restroly/qrmenu/category/entity/Category.java @@ -48,11 +48,6 @@ public class Category { @ManyToMany(mappedBy = "categories", fetch = FetchType.LAZY) private Set menu = new HashSet<>(); - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "branch_id", nullable = false) - private Branch branch; - - @PreUpdate protected void onUpdate() { updatedDate = LocalDateTime.now();