for (FulfillmentGroupItem fgi : request.getFgisToDelete()) {

                for (FulfillmentGroup fg : order.getFulfillmentGroups()) {

                    ListIterator<FulfillmentGroupItem> fgItemIter = fg.getFulfillmentGroupItems().listIterator();

                    while (fgItemIter.hasNext()) {

                        if (fgi2 == fgi) {

                            fgItemIter.remove();

                            fgItemDao.delete(fgi2);

                        }

                    }

        // 1) Find the item's existing fulfillment group, if any

        for (FulfillmentGroup fg : order.getFulfillmentGroups()) {

            Iterator<FulfillmentGroupItem> itr = fg.getFulfillmentGroupItems().iterator();

            while (itr.hasNext()) {

                    // 2) remove item from it's existing fulfillment group

                    itr.remove();

                    fulfillmentGroupItemDao.delete(fgItem);

                }

            }

        }

        if (fulfillmentGroup.getId() == null) {

            // API user is trying to add an item to a fulfillment group not created

            fulfillmentGroup = addFulfillmentGroupToOrder(order, fulfillmentGroup, priceOrder);

        }

        fgi = fulfillmentGroupItemDao.save(fgi);

        // 3) add the item to the new fulfillment group

        fulfillmentGroup.addFulfillmentGroupItem(fgi);

        order = updateOrder(order, priceOrder);

        return orderDao.save(order);

    }

    protected FulfillmentGroupItem createFulfillmentGroupItemFromOrderItem(OrderItem orderItem, FulfillmentGroup fulfillmentGroup, int quantity) {

        return fgi;

    }

        List<FulfillmentGroup> fulfillmentGroups = order.getFulfillmentGroups();

        for (FulfillmentGroup fulfillmentGroup : fulfillmentGroups) {

            Iterator<FulfillmentGroupItem> itr = fulfillmentGroup.getFulfillmentGroupItems().iterator();

            while (itr.hasNext()) {

                    itr.remove();

                    fulfillmentGroupItemDao.delete(fulfillmentGroupItem);

                } else if (orderItem instanceof BundleOrderItem) {

                    BundleOrderItem bundleOrderItem = (BundleOrderItem) orderItem;

                    for (DiscreteOrderItem discreteOrderItem : bundleOrderItem.getDiscreteOrderItems()) {

                            itr.remove();

                            fulfillmentGroupItemDao.delete(fulfillmentGroupItem);

                            break;

                        }

                    }

                newOrderItem.setOrder(order);

                newOrderItem.updateSaleAndRetailPrices();

                // Re-associate fulfillment group item to newOrderItem

                if (fulfillmentGroupItem != null) {

                    newFulfillmentGroupItem = fulfillmentGroupItemDao.save(newFulfillmentGroupItem);

                    //In case this activity is run inside a transaction, we need to set the relationships on the order directly

                    //these associations may have not been committed yet. This order is used in other activities and will not be reloaded if in a transaction.

                    for (FulfillmentGroup fg : order.getFulfillmentGroups()) {

                            fg.addFulfillmentGroupItem(newFulfillmentGroupItem);

                        }

                    }

                }

                order.getOrderItems().add(newOrderItem);

            }

        }

        bundleOrderItem.updateSaleAndRetailPrices();

        order.getOrderItems().add(bundleOrderItem);

        order =  orderService.save(order, false);

        for (OrderItem orderItem : order.getOrderItems()) {

            if (orderItem instanceof BundleOrderItem) {

                BundleOrderItem bundleItem = (BundleOrderItem) orderItem;

                for (DiscreteOrderItem discreteOrderItem : bundleItem.getDiscreteOrderItems()) {

                    // Re-associate fulfillment group item to newly created skuBundles

                    if (fulfillmentGroupItem != null) {

                        //In case this activity is run inside a transaction, we need to set the relationships on the order directly

                        //these associations may have not been committed yet. This order is used in other activities and will not be reloaded if in a transaction.

                        for (FulfillmentGroup fg : order.getFulfillmentGroups()) {

                                fg.addFulfillmentGroupItem(newFulfillmentGroupItem);

                            }

                        }

                    }

                }

       

        FulfillmentGroup fg = order.getFulfillmentGroups().get(0);

        assert fg.getFulfillmentGroupItems().size() == 1;

       

    }

       

        FulfillmentGroup fg = order.getFulfillmentGroups().get(0);

        assert fg.getFulfillmentGroupItems().size() == 1;

       

        /*

        This test is not supported currently, as the order service may only do like item merging

        // re-price the order without automatically merging.

        // Assert that the appropriate fulfillment group item has changed

        assert order.getFulfillmentGroups().size() == 1;

        FulfillmentGroup fg = order.getFulfillmentGroups().get(0);

        assert fg.getFulfillmentGroupItems().size() == 1;

        for (FulfillmentGroupItem fgi : fg.getFulfillmentGroupItems()) {

            if (fgi.getOrderItem().equals(updatedItem)) {

                fgItem = fgi;

            }

        }

        List<OrderItem> items = new ArrayList<OrderItem>();

        items.add(item);

        order.setOrderItems(items);

        //fgItem.setPrice(new Money(0D));

        group.addFulfillmentGroupItem(fgItem);

    }

       

        item = (DiscreteOrderItem) orderItemService.saveOrderItem(item);

       

        order.addOrderItem(item);

        //fgItem.setPrice(new Money(0D));

        group.addFulfillmentGroupItem(fgItem);

        }

       

        {

        DiscreteOrderItem item = new DiscreteOrderItemImpl();

        Sku sku = new SkuImpl();

        sku.setName("Test Product 2");

        sku.setRetailPrice(new Money(20D));

        sku.setDiscountable(true);

       

        sku = catalogService.saveSku(sku);

       

        item.setSku(sku);

        item.setQuantity(1);

        item.setOrder(order);

       

        item = (DiscreteOrderItem) orderItemService.saveOrderItem(item);

       

        order.addOrderItem(item);

       

        //fgItem.setPrice(new Money(0D));

        group.addFulfillmentGroupItem(fgItem);

        }

       

        order.addOfferCode(createOfferCode("20 Percent Off Item Offer", OfferType.ORDER_ITEM, OfferDiscountType.PERCENT_OFF, 20, null, "discreteOrderItem.sku.name==\"Test Sku\""));