Skip to content

Commit

Permalink
Merge pull request #247 from vtex-apps/fix/simulation-1p
Browse files Browse the repository at this point in the history
Add simulationBehavior only1P
  • Loading branch information
hiagolcm authored Oct 5, 2021
2 parents 54d9a86 + 558a41d commit 367a9db
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion node/commons/compatibility-layer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ interface OrderFormItemBySeller {
export const convertBiggyProduct = async (
product: BiggySearchProduct,
checkout: Checkout,
simulationBehavior: 'skip' | 'default' | null,
simulationBehavior: 'skip' | 'only1P' | 'default' | null,
segment?: SegmentData,
tradePolicy?: string,
regionId?: string | null,
Expand Down
2 changes: 1 addition & 1 deletion node/commons/products.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { queries } from '../resolvers/search'
interface ConvertProductInput {
searchResult: any
ctx: any
simulationBehavior?: 'skip' | 'default' | null
simulationBehavior?: 'skip' | 'only1P' | 'default' | null
tradePolicy?: string | null
regionId?: string | null
}
Expand Down
2 changes: 1 addition & 1 deletion node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"dependencies": {
"@gocommerce/utils": "^0.6.11",
"@vtex/vtexis-compatibility-layer": "^0.1.0",
"@vtex/vtexis-compatibility-layer": "0.2.2",
"atob": "^2.1.2",
"axios": "^0.19.0",
"camelcase": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion node/typings/Search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ interface SuggestionProductsArgs {
segment?: SegmentData
indexingType?: IndexingType
productOriginVtex: boolean
simulationBehavior: 'skip' | 'default' | null
simulationBehavior: 'skip' | 'default' | 'only1P' | null
sellers?: RegionSeller[]
hideUnavailableItems?: boolean | null
regionId?: string
Expand Down
12 changes: 7 additions & 5 deletions node/utils/compatibility-layer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ import { Store } from '../clients/store'
const fillProductWithSimulation = async (
product: SearchProduct,
store: Store,
simulationBehavior: 'default' | 'only1P',
regionId?: string,
) => {
const payload = {
items: product.items.map(item => ({
itemId: item.itemId,
sellers: item.sellers.map(seller => ({
sellers: simulationBehavior === 'only1P' ? [{sellerId: "1"}] : item.sellers.map(seller => ({
sellerId: seller.sellerId,
})),
})),
Expand All @@ -28,7 +29,8 @@ const fillProductWithSimulation = async (

return mergeProductWithItems(
product,
itemsWithSimulation.data.itemsWithSimulation
itemsWithSimulation.data.itemsWithSimulation,
simulationBehavior
)
} catch(error) {
// TODO: PER-2503 - Improve error observability
Expand All @@ -40,7 +42,7 @@ const fillProductWithSimulation = async (
}
}

export const convertProducts = async (products: BiggySearchProduct[], ctx: Context, simulationBehavior: 'skip' | 'default' | null, channel?: string, regionId?: string) => {
export const convertProducts = async (products: BiggySearchProduct[], ctx: Context, simulationBehavior: 'skip' | 'default' | 'only1P' | null, channel?: string, regionId?: string) => {
const {
vtex: { segment },
clients: { store },
Expand All @@ -50,8 +52,8 @@ export const convertProducts = async (products: BiggySearchProduct[], ctx: Conte
let convertedProducts = products
.map(product => convertISProduct(product, salesChannel))

if (simulationBehavior === 'default') {
const simulationPromises = convertedProducts.map(product => fillProductWithSimulation(product as SearchProduct, store, regionId))
if (simulationBehavior === 'default' || simulationBehavior === 'only1P') {
const simulationPromises = convertedProducts.map(product => fillProductWithSimulation(product as SearchProduct, store, simulationBehavior, regionId))
convertedProducts = (await Promise.all(simulationPromises)) as SearchProduct[]
}

Expand Down
8 changes: 4 additions & 4 deletions node/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -839,10 +839,10 @@
"@types/jest" "^24.0.18"
"@types/node" "^12.7.2"

"@vtex/vtexis-compatibility-layer@^0.1.0":
version "0.1.0"
resolved "https://registry.yarnpkg.com/@vtex/vtexis-compatibility-layer/-/vtexis-compatibility-layer-0.1.0.tgz#ed3156d4b189f9fdadc178136925cd6b1bc6448d"
integrity sha512-YWFtOW/sv/JQTjC+IO/bOYE+QYH9whKUU5QUW26+W1AlG282zFXQtRuPNE79xlJs0BiS/g47bGo3z9i0GQKB4A==
"@vtex/vtexis-compatibility-layer@0.2.2":
version "0.2.2"
resolved "https://registry.yarnpkg.com/@vtex/vtexis-compatibility-layer/-/vtexis-compatibility-layer-0.2.2.tgz#1d96d8dbf0448dc6db51c3eb1eebbc8d518889a1"
integrity sha512-+S+CZFrNJshIsLn1hux1d9mhGbeUbM/hT+mdMJzXYmrGRvljBk/TBzEu+r4iGqBMn/5slE9WFOCJqLOkbL7ETQ==
dependencies:
ramda "^0.27.1"

Expand Down

0 comments on commit 367a9db

Please sign in to comment.