commit

src/main/java/com/example/afrishop_v3/controllers/CartController.java

@@ -79,9 +79,9 @@ public class CartController extends Controller {
         String itemId = itemDetail.getItemId();
         boolean hasItemId = itemId != null && !itemId.isEmpty();
         if (hasItemId) {
-            optionalItem = repository.findFirstByItemImgAndItemSku(itemDetail.getItemImg(), itemDetail.getItemSku());
+            optionalItem = repository.findFirstByUserIdAndItemImgAndItemSku(userId,itemDetail.getItemImg(), itemDetail.getItemSku());
         } else {
-            optionalItem = repository.findFirstBySourceItemIdAndItemSku(itemDetail.getSourceItemId(), itemDetail.getItemSku());
+            optionalItem = repository.findFirstByUserIdAndSourceItemIdAndItemSku(userId,itemDetail.getSourceItemId(), itemDetail.getItemSku());
         }
 
         TbCfCartRecordR detail;
@@ -94,9 +94,8 @@ public class CartController extends Controller {
 
         } else {
             itemId = itemId != null && !itemId.isEmpty() ? itemId : uid();
-
-        }
             updateItemCategory(itemDetail);
+        }
 
         // Check if the item exist in cart
         Optional<TbCfCartRecordR> cartOptional = repository.findFirstByUserIdAndItemIdAndItemSku(userId, itemId, itemDetail.getItemSku());

src/main/java/com/example/afrishop_v3/repository/TbCfCartRecordRRepository.java

@@ -12,9 +12,9 @@ public interface TbCfCartRecordRRepository extends PagingAndSortingRepository<Tb
 
     Optional<TbCfCartRecordR> findFirstByUserIdAndItemIdAndItemSku(String userId, String itemId, String itemSku);
 
-    Optional<TbCfCartRecordR> findFirstByItemImgAndItemSku(String itemImg, String itemSku);
+    Optional<TbCfCartRecordR> findFirstByUserIdAndItemImgAndItemSku(String userId, String itemImg, String itemSku);
 
-    Optional<TbCfCartRecordR> findFirstBySourceItemIdAndItemSku(String itemImg, String itemSku);
+    Optional<TbCfCartRecordR> findFirstByUserIdAndSourceItemIdAndItemSku(String userId, String sourceItemId, String itemSku);
 
     List<TbCfCartRecordR> findAllByUserIdOrderByCreateTimeDesc(String userId);
     List<TbCfCartRecordR> findAllByCartRecordIdIn(String[] ids);