Merge pull request #301 from pagopa/PAGOPA-1770-api-cfg-pag-canali-e-…

…stazioni Pagopa 1770 api cfg pag canali e stazioni
pagopa · May 31, 2024 · b78c779 · b78c779
2 parents b2d4c5b + f03d2b8
commit b78c779
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 11 deletions.
diff --git 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
@@ -27,7 +27,7 @@ microservice-chart: &microservice-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
@@ -27,7 +27,7 @@ microservice-chart: &microservice-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
@@ -27,7 +27,7 @@ microservice-chart: &microservice-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
@@ -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
@@ -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
@@ -12,7 +12,7 @@
 
   <groupId>it.gov.pagopa.apiconfig</groupId>
   <artifactId>core</artifactId>
-  <version>0.58.24</version>
+  <version>0.58.24-1-PAGOPA-1770-api-cfg-pag-canali-e-stazioni</version>
   <description>Spring application exposes APIs to manage configuration for CI/PSP on the Nodo dei Pagamenti</description>
 
   <properties>

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
@@ -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<Canali> 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
@@ -79,7 +79,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)