NOD-719 add fdrAction to query

pagopa · Feb 22, 2024 · 25b4444 · 25b4444
1 parent c614845
commit 25b4444
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/fdr-techical-support.iml b/fdr-techical-support.iml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+ <component name="Quarkus Tools">
+ <option name="hash" value="2134669772" />
+ <option name="version" value="1" />
+ </component>
+</module>
diff --git a/pom.xml b/pom.xml
@@ -161,6 +161,14 @@
  <version>1.6</version>
  <scope>test</scope>
  </dependency>
+
+ <!-- solo per i mac M1 https://medium.com/@boysbee/unable-to-load-io-netty-resolver-dns-macos-macosdnsserveraddressstreamprovider-46d89bf74d42 -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver-dns-native-macos</artifactId>
+ <version>4.1.76.Final</version>
+ <classifier>osx-aarch_64</classifier>
+ </dependency>
  </dependencies>
  <build>
  <plugins>

diff --git a/src/main/java/it/gov/pagopa/fdrtechsupport/repository/FdrTableRepository.java b/src/main/java/it/gov/pagopa/fdrtechsupport/repository/FdrTableRepository.java
@@ -116,6 +116,16 @@ public List<FdrEventEntity> findWithParams(
  organizationFiscalCode.map(
  orgId -> filterBuilder.append(String.format(" and %s eq '%s'", ORGANIZATION, orgId)));
 
+ actions.ifPresent(
+ act -> {
+ filterBuilder.append(" and ( ");
+ filterBuilder.append(
+ String.join(
+ " or ",
+ act.stream().map(a -> String.format(" %s eq '%s' ", ACTION, a)).toList()));
+ filterBuilder.append(" )");
+ });
+
  flowName.ifPresentOrElse(
  fn -> filterBuilder.append(String.format(" and %s eq '%s'", NAME, fn)),
  () -> filterBuilder.append(String.format(" and %s ne ''", NAME)));

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -56,7 +56,7 @@ quarkus.smallrye-openapi.servers=\\$\{host\}/technical-support/api/v1 - APIM
 
 fdr-re-table-storage.table-name=events
 fdr-re-table-storage.connection-string=${FDR_RE_TABLE_STORAGE_CONN_STRING:${mockserver.azurite.connection-string}}
-
+%dev.fdr-re-table-storage.connection-string=DefaultEndpointsProtocol=https;AccountName=pagopadweufdrresa;AccountKey=QoJu9A07x2XGfKLssVuPuVjKoOHuGiUwAQisOyr+guH9dUICBNmpC1QlcSlN9uuRJUrLT8dLh70r+AStIqOLAA==;EndpointSuffix=core.windows.net
 %openapi.fdr-re-table-storage.connection-string=nn
 
 ###################
@@ -113,8 +113,10 @@ quarkus.log.category."it.gov.pagopa.fdrtechsupport".level=DEBUG
 # HISTORY
 ##############
 fdr-history-table-storage.connection-string=${TABLE_HISTORY_CONNECTION_STRING:${mockserver.azurite.connection-string}}
+%dev.fdr-history-table-storage.connection-string=DefaultEndpointsProtocol=https;AccountName=pagopadweufdrhistorysa;AccountKey=ZiEE6ecpjppctGZt25osMVM2x1d2fMJT1HIBzLY/vLQ4ZyuxAYZSvaT3CC4Mzktwd6bhmqHinDJz+AStShURzg==;EndpointSuffix=core.windows.net
 fdr-history-publish-table-storage.table-name=${FDR_HISTORY_PUBLISH_TABLE_STORAGE_TABLE_NAME:fdrpublish}
 fdr-history-payment-publish-table-storage.table-name=${FDR_HISTORY_PAYMENT_PUBLISH_TABLE_STORAGE_TABLE_NAME:fdrpaymentpublish}
 fdr-history-blob-storage.connection-string=${BLOB_HISTORY_CONNECTION_STRING:${mockserver.azurite.connection-string}}
+%dev.fdr-history-blob-storage.connection-string=DefaultEndpointsProtocol=https;AccountName=pagopadweufdrhistorysa;AccountKey=ZiEE6ecpjppctGZt25osMVM2x1d2fMJT1HIBzLY/vLQ4ZyuxAYZSvaT3CC4Mzktwd6bhmqHinDJz+AStShURzg==;EndpointSuffix=core.windows.net
 %openapi.fdr-history-blob-storage.connection-string=nn
 %openapi.fdr-history-table-storage.connection-string=nn