From cc8771bff0bc98beb6e010612b0b0d1cc79615ce Mon Sep 17 00:00:00 2001 From: FedericoRuzzier <49512050+FedericoRuzzier@users.noreply.github.com> Date: Tue, 28 May 2024 11:21:55 +0200 Subject: [PATCH 1/3] PAGOPA-1770 removing order by in station and channel --- pom.xml | 2 +- .../it/gov/pagopa/apiconfig/core/service/ChannelsService.java | 3 +-- .../it/gov/pagopa/apiconfig/core/service/StationsService.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 0529b9be6..8c9d3d2ad 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 42.5.5 8.6.6 1.17.6 - 1.19.0 + 1.20.1 diff --git a/src/main/java/it/gov/pagopa/apiconfig/core/service/ChannelsService.java b/src/main/java/it/gov/pagopa/apiconfig/core/service/ChannelsService.java index 08768c643..788733d55 100644 --- a/src/main/java/it/gov/pagopa/apiconfig/core/service/ChannelsService.java +++ b/src/main/java/it/gov/pagopa/apiconfig/core/service/ChannelsService.java @@ -33,7 +33,6 @@ import java.util.stream.Collectors; import static it.gov.pagopa.apiconfig.core.util.CommonUtil.deNull; -import static it.gov.pagopa.apiconfig.core.util.CommonUtil.getSort; @Service @Validated @@ -65,7 +64,7 @@ public Channels getChannels( String brokerCode, String brokerDescription, @Valid FilterAndOrder filterAndOrder) { - Pageable pageable = PageRequest.of(pageNumber, limit, getSort(filterAndOrder)); + Pageable pageable = PageRequest.of(pageNumber, limit); Page page = canaliRepository.findAll( CanaliSpecification.filterChannelsByCodeAndBrokerDescriptionFilters( diff --git a/src/main/java/it/gov/pagopa/apiconfig/core/service/StationsService.java b/src/main/java/it/gov/pagopa/apiconfig/core/service/StationsService.java index 08e98c129..fc0a7486a 100644 --- a/src/main/java/it/gov/pagopa/apiconfig/core/service/StationsService.java +++ b/src/main/java/it/gov/pagopa/apiconfig/core/service/StationsService.java @@ -58,7 +58,7 @@ public Stations getStations( @Nullable String brokerDescription, @Nullable String creditorInstitutionCode, @Valid FilterAndOrder filterAndOrder) { - Pageable pageable = PageRequest.of(pageNumber, limit, CommonUtil.getSort(filterAndOrder)); + Pageable pageable = PageRequest.of(pageNumber, limit); // convert code to FK Long fkIntermediario = Optional.ofNullable(brokerCode) From 80a9a6a805270ea85b4ceacfc346dc0a15effc89 Mon Sep 17 00:00:00 2001 From: pagopa-github-bot Date: Wed, 29 May 2024 09:49:08 +0000 Subject: [PATCH 2/3] Bump to version 0.58.23-1-PAGOPA-1770-api-cfg-pag-canali-e-stazioni [skip ci] --- helm/Chart.yaml | 4 ++-- helm/values-dev.yaml | 2 +- helm/values-prod.yaml | 2 +- helm/values-uat.yaml | 2 +- openapi/openapi.json | 2 +- openapi/swagger.json | 2 +- pom.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 7819f5a74..d5f8e65b1 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: core description: APIs to manage configuration for CI and PSP of pagoPA type: application -version: 0.144.0 -appVersion: 0.58.23 +version: 0.145.0 +appVersion: 0.58.23-1-PAGOPA-1770-api-cfg-pag-canali-e-stazioni dependencies: - name: microservice-chart version: 2.8.0 diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index fa456319a..8d0b6ce23 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -27,7 +27,7 @@ microservice-chart: µservice-chart envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config - tag: "0.58.23" + tag: "0.58.23-1-PAGOPA-1770-api-cfg-pag-canali-e-stazioni" pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index e8026beda..da89963cb 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -27,7 +27,7 @@ microservice-chart: µservice-chart envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config - tag: "0.58.23" + tag: "0.58.23-1-PAGOPA-1770-api-cfg-pag-canali-e-stazioni" pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 9748bf74d..802ac6fb3 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -27,7 +27,7 @@ microservice-chart: µservice-chart envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config - tag: "0.58.23" + tag: "0.58.23-1-PAGOPA-1770-api-cfg-pag-canali-e-stazioni" pullPolicy: Always livenessProbe: httpGet: diff --git a/openapi/openapi.json b/openapi/openapi.json index 6482d5747..d4d8f48fa 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -4,7 +4,7 @@ "title": "core", "description": "Spring application exposes APIs to manage configuration for CI/PSP on the Nodo dei Pagamenti", "termsOfService": "https://www.pagopa.gov.it/", - "version": "0.58.23" + "version": "0.58.23-1-PAGOPA-1770-api-cfg-pag-canali-e-stazioni" }, "servers": [ { diff --git a/openapi/swagger.json b/openapi/swagger.json index c97bdac86..3dbeddb64 100644 --- a/openapi/swagger.json +++ b/openapi/swagger.json @@ -4,7 +4,7 @@ "description": "Spring application exposes APIs to manage configuration for CI/PSP on the Nodo dei Pagamenti", "termsOfService": "https://www.pagopa.gov.it/", "title": "core", - "version": "0.58.23" + "version": "0.58.23-1-PAGOPA-1770-api-cfg-pag-canali-e-stazioni" }, "host": "localhost:8080", "basePath": "/", diff --git a/pom.xml b/pom.xml index 3e08af480..67d3376f1 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ it.gov.pagopa.apiconfig core - 0.58.23 + 0.58.23-1-PAGOPA-1770-api-cfg-pag-canali-e-stazioni Spring application exposes APIs to manage configuration for CI/PSP on the Nodo dei Pagamenti From f03d2b850fa4fab7fd40c41b0014bc00f44a147a Mon Sep 17 00:00:00 2001 From: pagopa-github-bot Date: Wed, 29 May 2024 12:29:36 +0000 Subject: [PATCH 3/3] Bump to version 0.58.24-1-PAGOPA-1770-api-cfg-pag-canali-e-stazioni [skip ci] --- helm/Chart.yaml | 4 ++-- helm/values-dev.yaml | 2 +- helm/values-prod.yaml | 2 +- helm/values-uat.yaml | 2 +- openapi/openapi.json | 2 +- openapi/swagger.json | 2 +- pom.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 7c4461e9f..1cebee6ea 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: core description: APIs to manage configuration for CI and PSP of pagoPA type: application -version: 0.145.0 -appVersion: 0.58.24 +version: 0.146.0 +appVersion: 0.58.24-1-PAGOPA-1770-api-cfg-pag-canali-e-stazioni dependencies: - name: microservice-chart version: 2.8.0 diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index 97d27fc3e..404b32661 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -27,7 +27,7 @@ microservice-chart: µservice-chart envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config - tag: "0.58.24" + tag: "0.58.24-1-PAGOPA-1770-api-cfg-pag-canali-e-stazioni" pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 3458aa93c..92ed8bf62 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -27,7 +27,7 @@ microservice-chart: µservice-chart envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config - tag: "0.58.24" + tag: "0.58.24-1-PAGOPA-1770-api-cfg-pag-canali-e-stazioni" pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 7a2e97384..7a2fc9e8a 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -27,7 +27,7 @@ microservice-chart: µservice-chart envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config - tag: "0.58.24" + tag: "0.58.24-1-PAGOPA-1770-api-cfg-pag-canali-e-stazioni" pullPolicy: Always livenessProbe: httpGet: diff --git a/openapi/openapi.json b/openapi/openapi.json index 641dcc0d5..4700903fa 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -4,7 +4,7 @@ "title": "core", "description": "Spring application exposes APIs to manage configuration for CI/PSP on the Nodo dei Pagamenti", "termsOfService": "https://www.pagopa.gov.it/", - "version": "0.58.24" + "version": "0.58.24-1-PAGOPA-1770-api-cfg-pag-canali-e-stazioni" }, "servers": [ { diff --git a/openapi/swagger.json b/openapi/swagger.json index e90a058a3..5fa6f25df 100644 --- a/openapi/swagger.json +++ b/openapi/swagger.json @@ -4,7 +4,7 @@ "description": "Spring application exposes APIs to manage configuration for CI/PSP on the Nodo dei Pagamenti", "termsOfService": "https://www.pagopa.gov.it/", "title": "core", - "version": "0.58.24" + "version": "0.58.24-1-PAGOPA-1770-api-cfg-pag-canali-e-stazioni" }, "host": "localhost:8080", "basePath": "/", diff --git a/pom.xml b/pom.xml index 07446a581..b81589880 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ it.gov.pagopa.apiconfig core - 0.58.24 + 0.58.24-1-PAGOPA-1770-api-cfg-pag-canali-e-stazioni Spring application exposes APIs to manage configuration for CI/PSP on the Nodo dei Pagamenti