Skip to content

Commit

Permalink
NOD-642 Format code
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrea-barchi
andrea-barchi committed Jan 23, 2024
1 parent b28ffb2 commit d0cf80f
Show file tree
Hide file tree
Showing 9 changed files with 273 additions and 228 deletions.
1 change: 1 addition & 0 deletions src/main/java/it/gov/pagopa/fdr/AppStartup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public class AppStartup {

@ConfigProperty(name = "history.enabled")
boolean historyEnabled;

@Inject Logger log;

@Inject Config config;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/it/gov/pagopa/fdr/repository/fdr/FdrPublishEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
import it.gov.pagopa.fdr.repository.fdr.model.FdrStatusEnumEntity;
import it.gov.pagopa.fdr.repository.fdr.model.ReceiverEntity;
import it.gov.pagopa.fdr.repository.fdr.model.SenderEntity;
import java.time.Instant;

import it.gov.pagopa.fdr.service.re.model.BlobHttpBody;
import java.time.Instant;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.bson.codecs.pojo.annotations.BsonProperty;
Expand Down
348 changes: 204 additions & 144 deletions src/main/java/it/gov/pagopa/fdr/service/history/HistoryService.java
View file

Large diffs are not rendered by default.

89 changes: 45 additions & 44 deletions src/main/java/it/gov/pagopa/fdr/service/history/constants/HistoryConstants.java
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,50 @@
package it.gov.pagopa.fdr.service.history.constants;

public class HistoryConstants {
public static final String FDR_PUBLISH_ID = "id";
public static final String FDR_PUBLISH_REVISION = "revision";
public static final String FDR_PUBLISH_CREATED = "created";
public static final String FDR_PUBLISH_UPDATED = "updated";
public static final String FDR_PUBLISH_PUBLISHED = "published";
public static final String FDR_PUBLISH_FDR = "fdr";
public static final String FDR_PUBLISH_FDR_DATE = "fdr_date";
public static final String FDR_PUBLISH_FDR_REF_JSON_CONTAINER_NAME = "ref_json.container_name";
public static final String FDR_PUBLISH_FDR_REF_JSON_FILE_LENGTH = "ref_json.file_length";
public static final String FDR_PUBLISH_FDR_REF_JSON_FILE_NAME = "ref_json.file_name";
public static final String FDR_PUBLISH_FDR_REF_JSON_STORAGE_ACCOUNT = "ref_json.storage_account";
public static final String FDR_PUBLISH_SENDER_TYPE = "sender.type";
public static final String FDR_PUBLISH_SENDER_ID = "sender.id";
public static final String FDR_PUBLISH_SENDER_PSP_ID = "sender.psp_id";
public static final String FDR_PUBLISH_SENDER_PSP_NAME = "sender.psp_name";
public static final String FDR_PUBLISH_SENDER_PSP_BROKER_ID = "sender.psp_broker_id";
public static final String FDR_PUBLISH_SENDER_CHANNEL_ID = "sender.channel_id";
public static final String FDR_PUBLISH_SENDER_PASSWORD = "sender.password";
public static final String FDR_PUBLISH_RECEIVER_ID = "receiver.id";
public static final String FDR_PUBLISH_RECEIVER_ORGANIZATION_ID = "receiver.organization_id";
public static final String FDR_PUBLISH_RECEIVER_ORGANIZATION_NAME = "receiver.organization_name";
public static final String FDR_PUBLISH_REGULATION = "regulation";
public static final String FDR_PUBLISH_REGULATION_DATE = "regulation_date";
public static final String FDR_PUBLISH_BIC_CODE_POURING_BANK = "bic_code_pouring_bank";
public static final String FDR_PUBLISH_STATUS = "status";
public static final String FDR_PUBLISH_COMPUTED_TOT_PAYMENTS = "computed_tot_payments";
public static final String FDR_PUBLISH_COMPUTED_SUM_PAYMENTS = "computed_sum_payments";
public static final String FDR_PUBLISH_TOT_PAYMENTS = "tot_payments";
public static final String FDR_PUBLISH_SUM_PAYMENTS = "sum_payments";
public static final String FDR_PUBLISH_ID = "id";
public static final String FDR_PUBLISH_REVISION = "revision";
public static final String FDR_PUBLISH_CREATED = "created";
public static final String FDR_PUBLISH_UPDATED = "updated";
public static final String FDR_PUBLISH_PUBLISHED = "published";
public static final String FDR_PUBLISH_FDR = "fdr";
public static final String FDR_PUBLISH_FDR_DATE = "fdr_date";
public static final String FDR_PUBLISH_FDR_REF_JSON_CONTAINER_NAME = "ref_json.container_name";
public static final String FDR_PUBLISH_FDR_REF_JSON_FILE_LENGTH = "ref_json.file_length";
public static final String FDR_PUBLISH_FDR_REF_JSON_FILE_NAME = "ref_json.file_name";
public static final String FDR_PUBLISH_FDR_REF_JSON_STORAGE_ACCOUNT = "ref_json.storage_account";
public static final String FDR_PUBLISH_SENDER_TYPE = "sender.type";
public static final String FDR_PUBLISH_SENDER_ID = "sender.id";
public static final String FDR_PUBLISH_SENDER_PSP_ID = "sender.psp_id";
public static final String FDR_PUBLISH_SENDER_PSP_NAME = "sender.psp_name";
public static final String FDR_PUBLISH_SENDER_PSP_BROKER_ID = "sender.psp_broker_id";
public static final String FDR_PUBLISH_SENDER_CHANNEL_ID = "sender.channel_id";
public static final String FDR_PUBLISH_SENDER_PASSWORD = "sender.password";
public static final String FDR_PUBLISH_RECEIVER_ID = "receiver.id";
public static final String FDR_PUBLISH_RECEIVER_ORGANIZATION_ID = "receiver.organization_id";
public static final String FDR_PUBLISH_RECEIVER_ORGANIZATION_NAME = "receiver.organization_name";
public static final String FDR_PUBLISH_REGULATION = "regulation";
public static final String FDR_PUBLISH_REGULATION_DATE = "regulation_date";
public static final String FDR_PUBLISH_BIC_CODE_POURING_BANK = "bic_code_pouring_bank";
public static final String FDR_PUBLISH_STATUS = "status";
public static final String FDR_PUBLISH_COMPUTED_TOT_PAYMENTS = "computed_tot_payments";
public static final String FDR_PUBLISH_COMPUTED_SUM_PAYMENTS = "computed_sum_payments";
public static final String FDR_PUBLISH_TOT_PAYMENTS = "tot_payments";
public static final String FDR_PUBLISH_SUM_PAYMENTS = "sum_payments";

public static final String FDR_PAYMENT_PUBLISH_ID = "id";
public static final String FDR_PAYMENT_PUBLISH_REVISION = "revision";
public static final String FDR_PAYMENT_PUBLISH_CREATED = "created";
public static final String FDR_PAYMENT_PUBLISH_UPDATED = "updated";
public static final String FDR_PAYMENT_PUBLISH_IUV = "iuv";
public static final String FDR_PAYMENT_PUBLISH_IUR = "iur";
public static final String FDR_PAYMENT_PUBLISH_INDEX = "index";
public static final String FDR_PAYMENT_PUBLISH_PAY = "pay";
public static final String FDR_PAYMENT_PUBLISH_PAY_STATUS = "pay_status";
public static final String FDR_PAYMENT_PUBLISH_PAY_DATE = "pay_date";
public static final String FDR_PAYMENT_PUBLISH_REF_FDR_ID = "ref_fdr_id";
public static final String FDR_PAYMENT_PUBLISH_REF_FDR = "ref_fdr";
public static final String FDR_PAYMENT_PUBLISH_REF_FDR_SENDER_PSP_ID = "ref_fdr_sender_psp_id";
public static final String FDR_PAYMENT_PUBLISH_REF_FDR_REVISION = "ref_fdr_revision";
public static final String FDR_PAYMENT_PUBLISH_REF_FDR_RECEIVER_ORGANIZATION_ID = "ref_fdr_receiver_organization_id";
public static final String FDR_PAYMENT_PUBLISH_ID = "id";
public static final String FDR_PAYMENT_PUBLISH_REVISION = "revision";
public static final String FDR_PAYMENT_PUBLISH_CREATED = "created";
public static final String FDR_PAYMENT_PUBLISH_UPDATED = "updated";
public static final String FDR_PAYMENT_PUBLISH_IUV = "iuv";
public static final String FDR_PAYMENT_PUBLISH_IUR = "iur";
public static final String FDR_PAYMENT_PUBLISH_INDEX = "index";
public static final String FDR_PAYMENT_PUBLISH_PAY = "pay";
public static final String FDR_PAYMENT_PUBLISH_PAY_STATUS = "pay_status";
public static final String FDR_PAYMENT_PUBLISH_PAY_DATE = "pay_date";
public static final String FDR_PAYMENT_PUBLISH_REF_FDR_ID = "ref_fdr_id";
public static final String FDR_PAYMENT_PUBLISH_REF_FDR = "ref_fdr";
public static final String FDR_PAYMENT_PUBLISH_REF_FDR_SENDER_PSP_ID = "ref_fdr_sender_psp_id";
public static final String FDR_PAYMENT_PUBLISH_REF_FDR_REVISION = "ref_fdr_revision";
public static final String FDR_PAYMENT_PUBLISH_REF_FDR_RECEIVER_ORGANIZATION_ID =
"ref_fdr_receiver_organization_id";
}
23 changes: 12 additions & 11 deletions src/main/java/it/gov/pagopa/fdr/service/history/mapper/HistoryServiceMapper.java
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
package it.gov.pagopa.fdr.service.history.mapper;

import it.gov.pagopa.fdr.repository.fdr.FdrInsertEntity;
import it.gov.pagopa.fdr.repository.fdr.FdrPaymentInsertEntity;
import it.gov.pagopa.fdr.repository.fdr.FdrPaymentPublishEntity;
import it.gov.pagopa.fdr.repository.fdr.FdrPublishEntity;
import it.gov.pagopa.fdr.service.history.model.FdrHistoryEntity;
import it.gov.pagopa.fdr.service.history.model.FdrHistoryMongoEntity;
import it.gov.pagopa.fdr.service.history.model.FdrHistoryPaymentEntity;
import java.util.List;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.MappingConstants.ComponentModel;
import org.mapstruct.factory.Mappers;

import java.util.List;

@Mapper(componentModel = ComponentModel.JAKARTA)
public interface HistoryServiceMapper {

HistoryServiceMapper INSTANCE = Mappers.getMapper(HistoryServiceMapper.class);
@Mapping(target = "paymentList", ignore = true)
FdrHistoryEntity toFdrHistoryEntity(FdrPublishEntity fdrEntity);
HistoryServiceMapper INSTANCE = Mappers.getMapper(HistoryServiceMapper.class);

@Mapping(target = "paymentList", ignore = true)
FdrHistoryEntity toFdrHistoryEntity(FdrPublishEntity fdrEntity);

FdrHistoryPaymentEntity toFdrHistoryPaymentEntity(
FdrPaymentPublishEntity fdrPaymentPublishEntity);

FdrHistoryPaymentEntity toFdrHistoryPaymentEntity(FdrPaymentPublishEntity fdrPaymentPublishEntity);
List<FdrHistoryPaymentEntity> toFdrHistoryPaymentEntityList(List<FdrPaymentPublishEntity> fdrPaymentPublishEntities);
List<FdrHistoryPaymentEntity> toFdrHistoryPaymentEntityList(
List<FdrPaymentPublishEntity> fdrPaymentPublishEntities);

FdrHistoryMongoEntity toFdrHistoryMongoEntity(FdrHistoryEntity fdrHistoryEntity);
}
FdrHistoryMongoEntity toFdrHistoryMongoEntity(FdrHistoryEntity fdrHistoryEntity);
}
11 changes: 4 additions & 7 deletions src/main/java/it/gov/pagopa/fdr/service/history/model/FdrHistoryEntity.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package it.gov.pagopa.fdr.service.history.model;

import com.fasterxml.jackson.annotation.JsonIgnore;
import it.gov.pagopa.fdr.repository.fdr.FdrPaymentInsertEntity;
import it.gov.pagopa.fdr.repository.fdr.model.FdrStatusEnumEntity;
import it.gov.pagopa.fdr.repository.fdr.model.ReceiverEntity;
import it.gov.pagopa.fdr.repository.fdr.model.SenderEntity;
import lombok.*;
import org.bson.codecs.pojo.annotations.BsonProperty;
import java.time.Instant;
import java.util.List;
import lombok.*;
import org.bson.codecs.pojo.annotations.BsonProperty;

@Data
@Builder
Expand Down Expand Up @@ -53,6 +51,5 @@ public class FdrHistoryEntity {
@BsonProperty("sum_payments")
private Double sumPayments;

@Setter
private List<FdrHistoryPaymentEntity> paymentList;
}
@Setter private List<FdrHistoryPaymentEntity> paymentList;
}
4 changes: 2 additions & 2 deletions src/main/java/it/gov/pagopa/fdr/service/history/model/FdrHistoryMongoEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import it.gov.pagopa.fdr.repository.fdr.model.FdrStatusEnumEntity;
import it.gov.pagopa.fdr.repository.fdr.model.ReceiverEntity;
import it.gov.pagopa.fdr.repository.fdr.model.SenderEntity;
import java.time.Instant;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.bson.codecs.pojo.annotations.BsonProperty;
import java.time.Instant;

@Data
@EqualsAndHashCode(callSuper = true)
Expand Down Expand Up @@ -37,4 +37,4 @@ public class FdrHistoryMongoEntity extends PanacheMongoEntity {
private FdrStatusEnumEntity status;

private FdrHistoryEntity jsonFile;
}
}
20 changes: 4 additions & 16 deletions src/main/java/it/gov/pagopa/fdr/service/history/model/FdrHistoryPaymentEntity.java
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,12 @@
package it.gov.pagopa.fdr.service.history.model;

import com.fasterxml.jackson.annotation.JsonIgnore;
import io.quarkus.mongodb.panache.PanacheMongoEntity;
import io.quarkus.mongodb.panache.PanacheMongoEntityBase;
import io.quarkus.mongodb.panache.PanacheQuery;
import io.quarkus.mongodb.panache.common.MongoEntity;
import io.quarkus.panache.common.Parameters;
import io.quarkus.panache.common.Sort;
import it.gov.pagopa.fdr.repository.fdr.model.PaymentStatusEnumEntity;
import java.time.Instant;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.bson.codecs.pojo.annotations.BsonProperty;
import org.bson.types.ObjectId;

import java.time.Instant;
import java.util.List;

@Data
public class FdrHistoryPaymentEntity {

Expand All @@ -27,14 +18,11 @@ public class FdrHistoryPaymentEntity {

private Double pay;

@JsonIgnore
private Long revision;
@JsonIgnore private Long revision;

@JsonIgnore
private Instant created;
@JsonIgnore private Instant created;

@JsonIgnore
private Instant updated;
@JsonIgnore private Instant updated;

@BsonProperty("pay_status")
private PaymentStatusEnumEntity payStatus;
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/it/gov/pagopa/fdr/service/psps/PspsService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import java.math.BigDecimal;
import java.sql.Blob;
import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -300,7 +299,6 @@ public void publishByFdr(String action, String pspId, String fdr, boolean intern
.project(FdrPaymentInsertEntity.class)
.list();


FdrPublishEntity fdrPublishEntity = mapper.toFdrPublishEntity(fdrEntity);
Instant now = Instant.now();
fdrPublishEntity.setUpdated(now);
Expand Down

0 comments on commit d0cf80f

Please sign in to comment.