Skip to content
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

chore(routing-policy): [CHK-3671] improve ecommerce routing policies performance #2763

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
+29 −13
Open

chore(routing-policy): [CHK-3671] improve ecommerce routing policies performance #2763

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
929527a
refactor(routing-policy): [CHK-3671] change conditions from contains …
dylantangredi-bvt Feb 4, 2025
77568f5
Merge branch 'main' into CHK-3671-infra-refactor-policy-routing-ecomm…
dylantangredi-bvt Feb 4, 2025
b78f4a1
Merge branch 'main' into CHK-3671-infra-refactor-policy-routing-ecomm…
dylantangredi-bvt Feb 4, 2025
cde8cc1
refactor(routing-policy): [CHK-3671] update ecommerce routing policies
dylantangredi-bvt Feb 4, 2025
26022ef
Merge branch 'main' into CHK-3671-infra-refactor-policy-routing-ecomm…
dylantangredi-bvt Feb 5, 2025
17b6977
chore(routing-policy): change condition
CianoDanilo Feb 5, 2025
369a293
chore(routing-policy): change condition
CianoDanilo Feb 5, 2025
a68d8e5
chore(routing-policy): change condition
CianoDanilo Feb 6, 2025
f675ae1
Merge branch 'main' into CHK-3671-infra-refactor-policy-routing-ecomm…
scaminati-bv Feb 7, 2025
84ab180
Merge branch 'main' into CHK-3671-infra-refactor-policy-routing-ecomm…
pietro-tota Feb 11, 2025
8139c93
remove contains checking
Feb 11, 2025
f220ec5
Merge branch 'main' into CHK-3671-infra-refactor-policy-routing-ecomm…
CianoDanilo Feb 11, 2025
910504d
Merge branch 'main' into CHK-3671-infra-refactor-policy-routing-ecomm…
ciuffagianluca Feb 11, 2025
122f1db
fix: docs
infantesimone Feb 11, 2025
9fad17b
Merge branch 'main' into CHK-3671-infra-refactor-policy-routing-ecomm…
dylantangredi-bvt Feb 12, 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
21 changes: 18 additions & 3 deletions src/domains/ecommerce-app/api/ecommerce-checkout/v1/_base_policy.xml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,29 @@
<set-header name="X-Client-Id" exists-action="override" >
<value>CHECKOUT</value>
</set-header>
<set-variable name="transactionsOperationId" value="newTransaction,getTransactionInfo,requestTransactionUserCancellation,requestTransactionAuthorization" />
<set-variable name="paymentMethodsOperationId" value="getAllPaymentMethods,getPaymentMethod,calculateFees,createSession,getSessionPaymentMethod" />
<set-variable name="paymentRequestsOperationId" value="getPaymentRequestInfo" />
<set-variable name="cartsOperationId" value="GetCarts,GetCartsRedirect" />
<choose>
<when condition="@( context.Request.Url.Path.Contains("transactions") )">
<when condition="@(
context.Request.Url.Path.Contains("transactions")
CianoDanilo marked this conversation as resolved.
Show resolved Hide resolved
&& Array.Exists(context.Variables.GetValueOrDefault("transactionsOperationId","").Split(','), operations => operations == context.Operation.Id)
)">
<set-backend-service base-url="@("https://${ecommerce_ingress_hostname}"+context.Variables["blueDeploymentPrefix"]+"/pagopa-ecommerce-transactions-service")"/>
</when>
<when condition="@( context.Request.Url.Path.Contains("payment-methods") )">
<when condition="@(
context.Request.Url.Path.Contains("payment-methods")
&& Array.Exists(context.Variables.GetValueOrDefault("paymentMethodsOperationId","").Split(','), operations => operations == context.Operation.Id)
)">
<set-backend-service base-url="@("https://${ecommerce_ingress_hostname}"+context.Variables["blueDeploymentPrefix"]+"/pagopa-ecommerce-payment-methods-service")"/>
</when>
<when condition="@( context.Request.Url.Path.Contains("payment-requests") || context.Request.Url.Path.Contains("carts") )"> <!-- TODO use startWith -->
<when condition="@(
(context.Request.Url.Path.Contains("payment-requests")
&& Array.Exists(context.Variables.GetValueOrDefault("paymentRequestsOperationId","").Split(','), operations => operations == context.Operation.Id))
|| (context.Request.Url.Path.Contains("carts")
&& Array.Exists(context.Variables.GetValueOrDefault("cartsOperationId","").Split(','), operations => operations == context.Operation.Id))
)">
<set-backend-service base-url="@("https://${ecommerce_ingress_hostname}"+context.Variables["blueDeploymentPrefix"]+"/pagopa-ecommerce-payment-requests-service")"/>
</when>
</choose>
Expand Down
18 changes: 15 additions & 3 deletions src/domains/ecommerce-app/api/ecommerce-checkout/v2/_base_policy.xml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,26 @@
<set-header name="X-Client-Id" exists-action="override" >
<value>CHECKOUT</value>
</set-header>
<set-variable name="transactionsV2OperationId" value="getTransactionInfo" />
<set-variable name="transactionsV21OperationId" value="newTransaction" />
<set-variable name="paymentMethodsOperationId" value="calculateFees" />
<choose>
<when condition="@( context.Request.Url.Path.Contains("transactions") && context.Operation.Id.Equals("newTransaction") )">
<when condition="@(
context.Request.Url.Path.Contains("transactions")
&& Array.Exists(context.Variables.GetValueOrDefault("transactionsV21OperationId","").Split(','), operations => operations == context.Operation.Id)
)">
<set-backend-service base-url="@("https://${ecommerce_ingress_hostname}"+context.Variables["blueDeploymentPrefix"]+"/pagopa-ecommerce-transactions-service/v2.1")"/>
</when>
<when condition="@( context.Request.Url.Path.Contains("transactions") && context.Operation.Id.Equals("getTransactionInfo") )">
<when condition="@(
context.Request.Url.Path.Contains("transactions")
&& Array.Exists(context.Variables.GetValueOrDefault("transactionsV2OperationId","").Split(','), operations => operations == context.Operation.Id)
)">
<set-backend-service base-url="@("https://${ecommerce_ingress_hostname}"+context.Variables["blueDeploymentPrefix"]+"/pagopa-ecommerce-transactions-service/v2")"/>
</when>
<when condition="@( context.Request.Url.Path.Contains("payment-methods") )">
<when condition="@(
context.Request.Url.Path.Contains("payment-methods")
&& Array.Exists(context.Variables.GetValueOrDefault("paymentMethodsOperationId","").Split(','), operations => operations == context.Operation.Id)
)">
<set-backend-service base-url="@("https://${ecommerce_ingress_hostname}"+context.Variables["blueDeploymentPrefix"]+"/pagopa-ecommerce-payment-methods-service/v2")"/>
</when>
</choose>
Expand Down
34 changes: 27 additions & 7 deletions src/domains/ecommerce-app/api/ecommerce-io/v2/_base_policy.xml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<rate-limit-by-key calls="150" renewal-period="10" counter-key="@(context.Request.Headers.GetValueOrDefault("X-Forwarded-For"))" />
<!-- fragment to read user id from session token jwt claims. it return userId as sessionTokenUserId variable taken from jwt claims. if the session token
is an opaque token a "session-token-not-found" string is returned-->
is an opaque token a "session-token-not-found" string is returned-->
<include-fragment fragment-id="pay-wallet-user-id-from-session-token" />
<!-- Session eCommerce START-->
<choose>
Expand All @@ -30,7 +30,7 @@
</set-header>
<!-- Headers settings required for backend service END -->
</when>
<when condition="@("PM".Equals("{{ecommerce-for-io-pm-npg-ff}}") || ("NPGFF".Equals("{{ecommerce-for-io-pm-npg-ff}}") && !"{{pay-wallet-family-friends-user-ids}}".Contains(((string)context.Variables["sessionTokenUserId"]))))">
<when condition="@("PM".Equals("{{ecommerce-for-io-pm-npg-ff}}") || ("NPGFF".Equals("{{ecommerce-for-io-pm-npg-ff}}") && !"{{pay-wallet-family-friends-user-ids}}".Contains(((string)context.Variables["sessionTokenUserId"]))))">

<!-- Check sessiontoken START-->
<set-variable name="sessionToken" value="@(context.Request.Headers.GetValueOrDefault("Authorization", "").Replace("Bearer ",""))" />
Expand Down Expand Up @@ -60,20 +60,40 @@
</choose>

<set-variable name="blueDeploymentPrefix" value="@(context.Request.Headers.GetValueOrDefault("deployment","").Contains("blue")?"/beta":"")" />
<set-variable name="transactionsOperationId" value="newTransactionForIO,getTransactionInfoForIO,requestTransactionUserCancellationForIO,requestTransactionAuthorizationForIO" />
<set-variable name="paymentMethodsOperationId" value="getAllPaymentMethodsForIO,calculateFeesForIO" />
<set-variable name="paymentRequestsOperationId" value="getPaymentRequestInfoForIO" />
<set-variable name="lastPaymentMethodUsedOperationId" value="getUserLastPaymentMethodUsed" />
<set-variable name="walletsOperationId" value="createWalletForTransactionsForIO,getWalletsByIdIOUser" />
<choose>
<when condition="@( context.Request.Url.Path.Contains("transactions") )">
<when condition="@(
context.Request.Url.Path.Contains("transactions")
&& Array.Exists(context.Variables.GetValueOrDefault("transactionsOperationId","").Split(','), operations => operations == context.Operation.Id)
)">
<set-backend-service base-url="@("https://${ecommerce_ingress_hostname}"+context.Variables["blueDeploymentPrefix"]+"/pagopa-ecommerce-transactions-service")"/>
</when>
<when condition="@( context.Request.Url.Path.Contains("payment-methods") )">
<when condition="@(
context.Request.Url.Path.Contains("payment-methods")
&& Array.Exists(context.Variables.GetValueOrDefault("paymentMethodsOperationId","").Split(','), operations => operations == context.Operation.Id)
)">
<set-backend-service base-url="@("https://${ecommerce_ingress_hostname}"+context.Variables["blueDeploymentPrefix"]+"/pagopa-ecommerce-payment-methods-service")"/>
</when>
<when condition="@( context.Request.Url.Path.Contains("payment-requests") )">
<when condition="@(
context.Request.Url.Path.Contains("payment-requests")
&& Array.Exists(context.Variables.GetValueOrDefault("paymentRequestsOperationId","").Split(','), operations => operations == context.Operation.Id)
)">
<set-backend-service base-url="@("https://${ecommerce_ingress_hostname}"+context.Variables["blueDeploymentPrefix"]+"/pagopa-ecommerce-payment-requests-service")"/>
</when>
<when condition="@( context.Request.Url.Path.Contains("user/lastPaymentMethodUsed") )">
<when condition="@(
context.Request.Url.Path.Contains("user/lastPaymentMethodUsed")
&& Array.Exists(context.Variables.GetValueOrDefault("lastPaymentMethodUsedOperationId","").Split(','), operations => operations == context.Operation.Id)
)">
<set-backend-service base-url="@("https://${ecommerce_ingress_hostname}"+context.Variables["blueDeploymentPrefix"]+"/pagopa-ecommerce-user-stats-service")"/>
</when>
<when condition="@( context.Request.Url.Path.Contains("wallets") )">
<when condition="@(
context.Request.Url.Path.Contains("wallets")
&& Array.Exists(context.Variables.GetValueOrDefault("walletsOperationId","").Split(','), operations => operations == context.Operation.Id)
)">
<set-backend-service base-url="@("https://${wallet_ingress_hostname}"+context.Variables["blueDeploymentPrefix"]+"/pagopa-wallet-service")"/>
</when>
</choose>
Expand Down