Skip to content

@W-20405182 Transfer Basket #3495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
syadupathi-sf merged 3 commits into from
Dec 9, 2025
Merged

@W-20405182 Transfer Basket #3495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1eeef97
transfer basket initial changes
syadupathi-sf Nov 21, 2025
10300aa
removed some of the checks
syadupathi-sf Dec 5, 2025
a073eb0
fix tests
syadupathi-sf Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions ...emplate-retail-react-app/app/pages/checkout-one-click/partials/one-click-contact-info.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const ContactInfo = ({isSocialEnabled = false, idps = [], onRegisteredUserChoseG

const logout = useAuthHelper(AuthHelpers.Logout)
const updateCustomerForBasket = useShopperBasketsMutation('updateCustomerForBasket')
const mergeBasket = useShopperBasketsMutation('mergeBasket')
const transferBasket = useShopperBasketsMutation('transferBasket')
const updateCustomer = useShopperCustomersMutation('updateCustomer')
const authorizePasswordlessLogin = useAuthHelper(AuthHelpers.AuthorizePasswordless)
const loginPasswordless = useAuthHelper(AuthHelpers.LoginPasswordlessUser)
Expand Down Expand Up @@ -270,14 +270,13 @@ const ContactInfo = ({isSocialEnabled = false, idps = [], onRegisteredUserChoseG
let basketId
if (hasBasketItem) {
// Mirror legacy checkout flow header and await completion
const merged = await mergeBasket.mutateAsync({
const merged = await transferBasket.mutateAsync({
headers: {
'Content-Type': 'application/json'
},
parameters: {
createDestinationBasket: true
},
body: {sourceBasketId: basket.basketId}
merge: true
}
})
basketId = merged?.basketId || basket.basketId
// Ensure we hydrate the latest basket after merge
Expand Down Expand Up @@ -364,12 +363,12 @@ const ContactInfo = ({isSocialEnabled = false, idps = [], onRegisteredUserChoseG
return
}
try {
await mergeBasket.mutateAsync({
await transferBasket.mutateAsync({
headers: {
'Content-Type': 'application/json'
},
parameters: {
createDestinationBasket: true
merge: true
}
})
await currentBasketQuery.refetch()
Expand Down
22 changes: 11 additions & 11 deletions ...ate-retail-react-app/app/pages/checkout-one-click/partials/one-click-contact-info.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const mockAuthHelperFunctions = {
}

const mockUpdateCustomerForBasket = {mutateAsync: jest.fn()}
const mockMergeBasket = {mutate: jest.fn(), mutateAsync: jest.fn()}
const mockTransferBasket = {mutate: jest.fn(), mutateAsync: jest.fn()}

jest.mock('@salesforce/commerce-sdk-react', () => {
const originalModule = jest.requireActual('@salesforce/commerce-sdk-react')
Expand All @@ -33,7 +33,7 @@ jest.mock('@salesforce/commerce-sdk-react', () => {
.mockImplementation((helperType) => mockAuthHelperFunctions[helperType]),
useShopperBasketsMutation: jest.fn().mockImplementation((mutationType) => {
if (mutationType === 'updateCustomerForBasket') return mockUpdateCustomerForBasket
if (mutationType === 'mergeBasket') return mockMergeBasket
if (mutationType === 'transferBasket') return mockTransferBasket
return {mutate: jest.fn()}
}),
useShopperCustomersMutation: jest.fn().mockImplementation((mutationType) => {
Expand Down Expand Up @@ -155,8 +155,9 @@ describe('ContactInfo Component', () => {
test('updates checkout contact phone when user types phone (guest)', async () => {
const {user} = renderWithProviders(<ContactInfo />)
const phoneInput = screen.getByLabelText('Phone')
await user.type(phoneInput, '7275551234')
// Formatting can be applied incrementally; assert value is being updated
await act(async () => {
await user.type(phoneInput, '7275551234')
})
expect(phoneInput.value.length).toBeGreaterThan(0)
})

Expand Down Expand Up @@ -521,13 +522,13 @@ describe('ContactInfo Component', () => {
expect(screen.getByText(/Resend Code/i)).toBeInTheDocument()
})

test('OTP verification merges and updates basket email using merged id', async () => {
test('OTP verification transfers and updates basket email using transferred id', async () => {
// Arrange mocks
mockAuthHelperFunctions[AuthHelpers.LoginPasswordlessUser].mutateAsync.mockResolvedValue({})
mockAuthHelperFunctions[AuthHelpers.AuthorizePasswordless].mutateAsync.mockResolvedValue({})

const mergedId = 'merged-123'
mockMergeBasket.mutateAsync.mockResolvedValue({basketId: mergedId})
mockTransferBasket.mutateAsync.mockResolvedValue({basketId: mergedId})
// Make refetch return merged id to simulate hydration
const refetchSpy = jest.fn().mockResolvedValue({data: {basketId: mergedId}})
mockUseCurrentBasket.mockReturnValue({
Expand Down Expand Up @@ -560,11 +561,10 @@ describe('ContactInfo Component', () => {
useCustomerType.mockReturnValue({isRegistered: true})

await waitFor(() => {
expect(mockMergeBasket.mutateAsync).toHaveBeenCalled()
// Validate merge called with sourceBasketId in body and createDestinationBasket param
const mergeArgs = mockMergeBasket.mutateAsync.mock.calls[0]?.[0]
expect(mergeArgs?.parameters).toMatchObject({createDestinationBasket: true})
expect(mergeArgs?.body).toMatchObject({sourceBasketId: 'guest-1'})
expect(mockTransferBasket.mutateAsync).toHaveBeenCalled()
// Validate transferBasket called with merge=true parameter
const transferArgs = mockTransferBasket.mutateAsync.mock.calls[0]?.[0]
expect(transferArgs?.parameters).toMatchObject({merge: true})
})
// Updating basket email may occur asynchronously or be skipped if unchanged; don't hard-require it here
})
Expand Down
Loading