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.

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

fix: Some minor refactoring after first tests in DEV #37

Merged
merged 5 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: pagopa-wisp-converter
description: A service that permits to handle nodoInviaRPT and nodoInviaCarrelloRPT request from WISP, interfacing them with GPD system
type: application
version: 0.66.0
appVersion: 0.0.30
version: 0.68.0
appVersion: 0.0.30-2-fix-after-tests
dependencies:
- name: microservice-chart
version: 3.0.0
Expand Down
4 changes: 2 additions & 2 deletions helm/values-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ microservice-chart:
fullnameOverride: ""
image:
repository: ghcr.io/pagopa/pagopa-wisp-converter
tag: "0.0.30"
tag: "0.0.30-2-fix-after-tests"
pullPolicy: Always
livenessProbe:
httpGet:
Expand Down Expand Up @@ -108,7 +108,7 @@ microservice-chart:
create: true
envSecrets:
# required
APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-d-connection-string'
APPLICATIONINSIGHTS_CONNECTION_STRING: 'azure-insight-connection-string'
SERVICE_BUS_PAYMENT_TIMEOUT_QUEUE_CONNECTION_STRING: 'wisp-payment-timeout-queue-connection-string'
SERVICE_BUS_PAAINVIART_QUEUE_CONNECTION_STRING: 'wisp-paainviart-queue-connection-string'
OTEL_EXPORTER_OTLP_HEADERS: elastic-apm-secret-token
Expand Down
4 changes: 2 additions & 2 deletions helm/values-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ microservice-chart:
fullnameOverride: ""
image:
repository: ghcr.io/pagopa/pagopa-wisp-converter
tag: "0.0.30"
tag: "0.0.30-2-fix-after-tests"
pullPolicy: Always
livenessProbe:
httpGet:
Expand Down Expand Up @@ -108,7 +108,7 @@ microservice-chart:
create: true
envSecrets:
# required
APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-p-connection-string'
APPLICATIONINSIGHTS_CONNECTION_STRING: 'azure-insight-connection-string'
SERVICE_BUS_PAYMENT_TIMEOUT_QUEUE_CONNECTION_STRING: 'wisp-payment-timeout-queue-connection-string'
SERVICE_BUS_PAAINVIART_QUEUE_CONNECTION_STRING: 'wisp-paainviart-queue-connection-string'
OTEL_EXPORTER_OTLP_HEADERS: elastic-apm-secret-token
Expand Down
4 changes: 2 additions & 2 deletions helm/values-uat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ microservice-chart:
fullnameOverride: ""
image:
repository: ghcr.io/pagopa/pagopa-wisp-converter
tag: "0.0.30"
tag: "0.0.30-2-fix-after-tests"
pullPolicy: Always
livenessProbe:
httpGet:
Expand Down Expand Up @@ -108,7 +108,7 @@ microservice-chart:
create: true
envSecrets:
# required
APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-u-connection-string'
APPLICATIONINSIGHTS_CONNECTION_STRING: 'azure-insight-connection-string'
SERVICE_BUS_PAYMENT_TIMEOUT_QUEUE_CONNECTION_STRING: 'wisp-payment-timeout-queue-connection-string'
SERVICE_BUS_PAAINVIART_QUEUE_CONNECTION_STRING: 'wisp-paainviart-queue-connection-string'
OTEL_EXPORTER_OTLP_HEADERS: elastic-apm-secret-token
Expand Down
2 changes: 1 addition & 1 deletion openapi/openapi.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>it.gov.pagopa</groupId>
<artifactId>wisp-converter</artifactId>
<version>0.0.30</version>
<version>0.0.30-2-fix-after-tests</version>
<name>pagoPA WISP Converter</name>
<description>A service that permits to handle nodoInviaRPT and nodoInviaCarrelloRPT request from WISP, converting them in NMU payments.</description>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -466,9 +466,6 @@ private void handleNewPaymentPosition(SessionDataDTO sessionData, PaymentPositio
MDC.put(Constants.MDC_NOTICE_NUMBER, nav);
}

// validate the station, checking if exists one with the required segregation code and, if is onboarded on GPD, has the correct primitive version
CommonUtility.checkStationValidity(configCacheService, sessionData, nav);

// update the payment option to be used in bulk insert with the newly generated NAV code
List<PaymentOptionModelDto> paymentOptions = extractedPaymentPosition.getPaymentOption();
if (paymentOptions == null || paymentOptions.isEmpty()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
public interface CartMapper {

@Mapping(source = "commonFields.sessionId", target = "idCart")
@Mapping(source = "commonFields.payerEmail", target = "emailNotice")
@Mapping(target = "emailNotice", expression = "java(null)")
@Mapping(target = "allCCP", constant = "false")
@Mapping(target = "paymentNotices", ignore = true)
it.gov.pagopa.gen.wispconverter.client.checkout.model.CartRequestDto toCart(SessionDataDTO sessionData);
Expand Down
Loading