Merge pull request #53 from pagopa/upd-mem-uat

Upd uat and prod cfg + fix typo
pagopa · Jan 10, 2024 · 09c1d25 · 09c1d25
2 parents 81f4fce + 86f65ee
commit 09c1d25
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 41 deletions.
diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml
@@ -57,7 +57,7 @@ microservice-chart:
  memory: "768Mi"
  cpu: "300m"
  limits:
- memory: "768Mi"
+ memory: "1.5Gi"
  cpu: "500m"
  autoscaling:
  enable: true
@@ -112,15 +112,15 @@ microservice-chart:
  MAX_DATE_DIFF_MILLIS: "1800000" # 30min
  MAX_DATE_DIFF_NOTIFY_MILLIS: "1800000" # 30nin
  MAX_DATE_DIFF_CART_MILLIS: "1800000" # 30nin
- TRIGGER_NOTIFY_REC_SCHEDULE: "0 0 */1 * * *"
- RECOVER_FAILED_CRON: "0 0 */1 * * *"
+ TRIGGER_NOTIFY_REC_SCHEDULE: "0 */15 * * * *"
+ RECOVER_FAILED_CRON: "0 */15 * * * *"
  RECOVER_FAILED_CART_CRON: "0 0 */1 * * *"
  AZURE_FUNCTIONS_MESH_JAVA_OPTS: "-javaagent:/home/site/wwwroot/jmx_prometheus_javaagent-0.19.0.jar=12345:/home/site/wwwroot/config.yaml -javaagent:/home/site/wwwroot/opentelemetry-javaagent.jar -Xmx768m -XX:+UseG1GC"
  FAILED_AUTORECOVER_ENABLED: "true"
  NOT_NOTIFIED_AUTORECOVER_ENABLED: "true"
  FAILED_CART_AUTORECOVER_ENABLED: "false"
- RECOVER_FAILED_MASSIVE_MAX_DAYS: "0"
- RECOVER_NOT_NOTIFIED_MASSIVE_MAX_DAYS: "0"
+ RECOVER_FAILED_MASSIVE_MAX_DAYS: "1"
+ RECOVER_NOT_NOTIFIED_MASSIVE_MAX_DAYS: "1"
  RECOVER_NOT_NOTIFIED_MASSIVE_MAX_RECORDS: "200"
  envConfigMapExternals:
  template-maps:

diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml
@@ -57,7 +57,7 @@ microservice-chart:
  memory: "768Mi"
  cpu: "300m"
  limits:
- memory: "768Mi"
+ memory: "1.5Gi"
  cpu: "500m"
  autoscaling:
  enable: true
@@ -119,8 +119,8 @@ microservice-chart:
  FAILED_AUTORECOVER_ENABLED: "true"
  NOT_NOTIFIED_AUTORECOVER_ENABLED: "true"
  FAILED_CART_AUTORECOVER_ENABLED: "false"
- RECOVER_FAILED_MASSIVE_MAX_DAYS: "0"
- RECOVER_NOT_NOTIFIED_MASSIVE_MAX_DAYS: "0"
+ RECOVER_FAILED_MASSIVE_MAX_DAYS: "1"
+ RECOVER_NOT_NOTIFIED_MASSIVE_MAX_DAYS: "1"
  RECOVER_NOT_NOTIFIED_MASSIVE_MAX_RECORDS: "200"
  envConfigMapExternals:
  template-maps:

diff --git a/...in/java/it/gov/pagopa/receipt/pdf/helpdesk/service/impl/BizEventToReceiptServiceImpl.java b/...in/java/it/gov/pagopa/receipt/pdf/helpdesk/service/impl/BizEventToReceiptServiceImpl.java
@@ -161,7 +161,7 @@ public void handleSaveReceipt(Receipt receipt) {
 
  try {
  receipt.setStatus(ReceiptStatusType.INSERTED);
- receipt.setInsertedAt(System.currentTimeMillis());
+ receipt.setInserted_at(System.currentTimeMillis());
  CosmosItemResponse<Receipt> response = receiptCosmosClient.saveReceipts(receipt);
 
  statusCode = response.getStatusCode();

diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/helpdesk/utils/BizEventToReceiptUtils.java b/src/main/java/it/gov/pagopa/receipt/pdf/helpdesk/utils/BizEventToReceiptUtils.java
@@ -116,7 +116,7 @@ public static Receipt getEvent(
  bizEventToReceiptService.handleSendMessageToQueue(isCart ? listCart :
  Collections.singletonList(bizEvent), receipt);
  if (receipt.getStatus() != ReceiptStatusType.NOT_QUEUE_SENT) {
- receipt.setInsertedAt(System.currentTimeMillis());
+ receipt.setInserted_at(System.currentTimeMillis());
  receipt.setReasonErr(null);
  receipt.setReasonErrPayer(null);
  }

diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/helpdesk/utils/RecoverNotNotifiedReceiptUtils.java b/src/main/java/it/gov/pagopa/receipt/pdf/helpdesk/utils/RecoverNotNotifiedReceiptUtils.java
@@ -13,7 +13,7 @@ public class RecoverNotNotifiedReceiptUtils {
  public static Receipt restoreReceipt(Receipt receipt) {
  receipt.setStatus(ReceiptStatusType.GENERATED);
  receipt.setNotificationNumRetry(0);
- receipt.setNotifiedAt(0);
+ receipt.setNotified_at(0);
 
  if (receipt.getReasonErr() != null) {
  receipt.setReasonErr(null);

diff --git a/...java/it/gov/pagopa/receipt/pdf/helpdesk/GetReceiptByOrganizationFiscalCodeAndIUVTest.java b/...java/it/gov/pagopa/receipt/pdf/helpdesk/GetReceiptByOrganizationFiscalCodeAndIUVTest.java
@@ -182,9 +182,9 @@ private Receipt buildReceipt() {
  .build())
  .numRetry(0)
  .notificationNumRetry(6)
- .insertedAt(0)
- .generatedAt(0)
- .notifiedAt(0)
+ .inserted_at(0)
+ .generated_at(0)
+ .notified_at(0)
  .build();
  }
 

diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/GetReceiptTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/GetReceiptTest.java
@@ -128,9 +128,9 @@ private Receipt buildReceipt() {
  .build())
  .numRetry(0)
  .notificationNumRetry(6)
- .insertedAt(0)
- .generatedAt(0)
- .notifiedAt(0)
+ .inserted_at(0)
+ .generated_at(0)
+ .notified_at(0)
  .build();
  }
 }
diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/RecoverFailedCartMassiveScheduledTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/RecoverFailedCartMassiveScheduledTest.java
@@ -205,9 +205,9 @@ private Receipt buildReceipt() {
  .build())
  .numRetry(0)
  .notificationNumRetry(6)
- .insertedAt(0)
- .generatedAt(0)
- .notifiedAt(0)
+ .inserted_at(0)
+ .generated_at(0)
+ .notified_at(0)
  .build();
  }
 

diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/RecoverFailedCartMassiveTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/RecoverFailedCartMassiveTest.java
@@ -295,9 +295,9 @@ private Receipt buildReceipt() {
  .build())
  .numRetry(0)
  .notificationNumRetry(6)
- .insertedAt(0)
- .generatedAt(0)
- .notifiedAt(0)
+ .inserted_at(0)
+ .generated_at(0)
+ .notified_at(0)
  .build();
  }
 

diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/RecoverNotNotifiedReceiptMassiveTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/RecoverNotNotifiedReceiptMassiveTest.java
@@ -275,9 +275,9 @@ private Receipt buildReceipt(ReceiptStatusType statusType) {
  .build())
  .numRetry(0)
  .notificationNumRetry(6)
- .insertedAt(0)
- .generatedAt(0)
- .notifiedAt(0)
+ .inserted_at(0)
+ .generated_at(0)
+ .notified_at(0)
  .build();
  }
 

diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/RecoverNotNotifiedReceiptScheduledTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/RecoverNotNotifiedReceiptScheduledTest.java
@@ -104,9 +104,9 @@ private Receipt buildReceipt(ReceiptStatusType statusType) {
  .build())
  .numRetry(0)
  .notificationNumRetry(6)
- .insertedAt(0)
- .generatedAt(0)
- .notifiedAt(0)
+ .inserted_at(0)
+ .generated_at(0)
+ .notified_at(0)
  .build();
  }
 

diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/RecoverNotNotifiedReceiptTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/RecoverNotNotifiedReceiptTest.java
@@ -243,9 +243,9 @@ private Receipt buildReceipt() {
  .build())
  .numRetry(0)
  .notificationNumRetry(6)
- .insertedAt(0)
- .generatedAt(0)
- .notifiedAt(0)
+ .inserted_at(0)
+ .generated_at(0)
+ .notified_at(0)
  .build();
  }
 

diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/RegenerateReceiptPdfTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/helpdesk/RegenerateReceiptPdfTest.java
@@ -234,9 +234,9 @@ private Receipt buildReceiptWithStatus(ReceiptStatusType receiptStatusType, int
  .eventId("biz-event-id")
  .status(receiptStatusType)
  .numRetry(numRetry)
- .generatedAt(ORIGINAL_GENERATED_AT)
- .insertedAt(0L)
- .notifiedAt(0L)
+ .generated_at(ORIGINAL_GENERATED_AT)
+ .inserted_at(0L)
+ .notified_at(0L)
  .build();
  }
 }
diff --git a/...va/it/gov/pagopa/receipt/pdf/helpdesk/service/impl/GenerateReceiptPdfServiceImplTest.java b/...va/it/gov/pagopa/receipt/pdf/helpdesk/service/impl/GenerateReceiptPdfServiceImplTest.java
@@ -586,9 +586,9 @@ private Receipt buildReceiptForVerify(boolean debtorAlreadyCreated, boolean paye
  .mdAttach(buildMetadata(debtorAlreadyCreated))
  .mdAttachPayer(buildMetadata(payerAlreadyCreated))
  .numRetry(0)
- .generatedAt(1L)
- .insertedAt(1L)
- .notifiedAt(1L)
+ .generated_at(1L)
+ .inserted_at(1L)
+ .notified_at(1L)
  .build();
  }
 
@@ -686,9 +686,9 @@ private Receipt getReceipt(EventData eventData, ReceiptMetadata metadataD, Recei
  .mdAttachPayer(metadataP)
  .status(ReceiptStatusType.INSERTED)
  .numRetry(0)
- .generatedAt(1L)
- .insertedAt(1L)
- .notifiedAt(1L)
+ .generated_at(1L)
+ .inserted_at(1L)
+ .notified_at(1L)
  .build();
  }