From 291200ebf0ed671df863816ca86ba5a02ab03cee Mon Sep 17 00:00:00 2001 From: Frazer Joe Dourado Date: Fri, 12 Aug 2022 10:20:24 +0200 Subject: [PATCH 1/3] Updated booking entity. --- .../edocumentation/model/mapper/BookingMapper.java | 4 ++-- .../java/org/dcsa/core/events/model/Booking.java | 13 ++++--------- .../core/events/repository/BookingRepository.java | 8 ++++---- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/dcsa/core/events/edocumentation/model/mapper/BookingMapper.java b/src/main/java/org/dcsa/core/events/edocumentation/model/mapper/BookingMapper.java index 4d9ec553..313d2e9f 100644 --- a/src/main/java/org/dcsa/core/events/edocumentation/model/mapper/BookingMapper.java +++ b/src/main/java/org/dcsa/core/events/edocumentation/model/mapper/BookingMapper.java @@ -8,14 +8,14 @@ @Mapper(componentModel = "spring") public interface BookingMapper { - @Mapping(source = "invoicePayableAt", target = "invoicePayableAt.id") + @Mapping(source = "invoicePayableAtID", target = "invoicePayableAt.id") @Mapping(source = "placeOfIssueID", target = "placeOfIssue.id") @Mapping(source = "communicationChannelCode", target = "communicationChannelCode") @Mapping(source = "updatedDateTime", target = "bookingRequestUpdatedDateTime") @Mapping(source = "bookingRequestDateTime", target = "bookingRequestCreatedDateTime") BookingTO bookingToDTO(Booking booking); - @Mapping(source = "invoicePayableAt", target = "invoicePayableAt", ignore = true) + @Mapping(source = "invoicePayableAt", target = "invoicePayableAtID", ignore = true) @Mapping(source = "communicationChannelCode", target = "communicationChannelCode") @Mapping(source = "bookingRequestUpdatedDateTime", target = "updatedDateTime") @Mapping(source = "bookingRequestCreatedDateTime", target = "bookingRequestDateTime") diff --git a/src/main/java/org/dcsa/core/events/model/Booking.java b/src/main/java/org/dcsa/core/events/model/Booking.java index e0bce52f..9dbf93fc 100644 --- a/src/main/java/org/dcsa/core/events/model/Booking.java +++ b/src/main/java/org/dcsa/core/events/model/Booking.java @@ -16,7 +16,6 @@ import java.time.OffsetDateTime; import java.util.EnumSet; import java.util.UUID; -import java.util.function.UnaryOperator; import static org.dcsa.core.events.model.enums.ShipmentEventTypeCode.BOOKING_DOCUMENT_STATUSES; @@ -92,7 +91,7 @@ public class Booking implements Persistable { @Column("incoterms") private IncoTerms incoTerms; - @Column("invoice_payable_at") + @Column("invoice_payable_at_id") @Size(max = 100) private UUID invoicePayableAt; @@ -124,18 +123,14 @@ public class Booking implements Persistable { @Column("vessel_id") private UUID vesselId; - @Column("export_voyage_number") - @Size(max = 50) - private String exportVoyageNumber; - - @Column("declared_value_currency") + @Column("declared_value_currency_code") @Size(max = 3) - private String declaredValueCurrency; + private String declaredValueCurrencyCode; @Column("declared_value") private Float declaredValue; - @Column("place_of_issue") + @Column("place_of_issue_id") @Size(max = 100) private UUID placeOfIssueID; diff --git a/src/main/java/org/dcsa/core/events/repository/BookingRepository.java b/src/main/java/org/dcsa/core/events/repository/BookingRepository.java index 36034098..3c58782f 100644 --- a/src/main/java/org/dcsa/core/events/repository/BookingRepository.java +++ b/src/main/java/org/dcsa/core/events/repository/BookingRepository.java @@ -35,12 +35,12 @@ Mono findByCarrierBookingRequestReferenceAndValidUntilIsNull( Mono setVesselIDFor(UUID vesselId, UUID id); @Modifying - @Query("UPDATE booking SET invoice_payable_at = :invoicePayableAt where id = :id") - Mono setInvoicePayableAtFor(UUID invoicePayableAt, UUID id); + @Query("UPDATE booking SET invoice_payable_at_id = :invoicePayableAtID where id = :id") + Mono setInvoicePayableAtFor(UUID invoicePayableAtID, UUID id); @Modifying - @Query("UPDATE booking SET place_of_issue = :placeOfIssue where id = :id") - Mono setPlaceOfIssueIDFor(UUID placeOfIssue, UUID id); + @Query("UPDATE booking SET place_of_issue_id = :placeOfIssueID where id = :id") + Mono setPlaceOfIssueIDFor(UUID placeOfIssueID, UUID id); @Modifying @Query( From feb31cafc26a1f806d07609ae2980ff8912ff2ab Mon Sep 17 00:00:00 2001 From: Frazer Joe Dourado Date: Fri, 12 Aug 2022 10:26:18 +0200 Subject: [PATCH 2/3] Fixed typos. --- .../events/edocumentation/model/mapper/BookingMapper.java | 4 ++-- .../edocumentation/service/impl/BookingServiceImpl.java | 4 ++-- src/main/java/org/dcsa/core/events/model/Booking.java | 4 ++-- .../dcsa/core/events/repository/BookingRepository.java | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/dcsa/core/events/edocumentation/model/mapper/BookingMapper.java b/src/main/java/org/dcsa/core/events/edocumentation/model/mapper/BookingMapper.java index 313d2e9f..5fcaf67a 100644 --- a/src/main/java/org/dcsa/core/events/edocumentation/model/mapper/BookingMapper.java +++ b/src/main/java/org/dcsa/core/events/edocumentation/model/mapper/BookingMapper.java @@ -8,14 +8,14 @@ @Mapper(componentModel = "spring") public interface BookingMapper { - @Mapping(source = "invoicePayableAtID", target = "invoicePayableAt.id") + @Mapping(source = "invoicePayableAtId", target = "invoicePayableAt.id") @Mapping(source = "placeOfIssueID", target = "placeOfIssue.id") @Mapping(source = "communicationChannelCode", target = "communicationChannelCode") @Mapping(source = "updatedDateTime", target = "bookingRequestUpdatedDateTime") @Mapping(source = "bookingRequestDateTime", target = "bookingRequestCreatedDateTime") BookingTO bookingToDTO(Booking booking); - @Mapping(source = "invoicePayableAt", target = "invoicePayableAtID", ignore = true) + @Mapping(source = "invoicePayableAt", target = "invoicePayableAtId", ignore = true) @Mapping(source = "communicationChannelCode", target = "communicationChannelCode") @Mapping(source = "bookingRequestUpdatedDateTime", target = "updatedDateTime") @Mapping(source = "bookingRequestCreatedDateTime", target = "bookingRequestDateTime") diff --git a/src/main/java/org/dcsa/core/events/edocumentation/service/impl/BookingServiceImpl.java b/src/main/java/org/dcsa/core/events/edocumentation/service/impl/BookingServiceImpl.java index a97bc046..ae3f03bc 100644 --- a/src/main/java/org/dcsa/core/events/edocumentation/service/impl/BookingServiceImpl.java +++ b/src/main/java/org/dcsa/core/events/edocumentation/service/impl/BookingServiceImpl.java @@ -50,10 +50,10 @@ public Mono fetchByBookingID(UUID bookingID) { BookingTO bookingTO = bookingMapper.bookingToDTO(booking); return Mono.when( locationService - .fetchLocationByID(booking.getInvoicePayableAt()) + .fetchLocationByID(booking.getInvoicePayableAtId()) .doOnNext(bookingTO::setInvoicePayableAt), locationService - .fetchLocationByID(booking.getPlaceOfIssueID()) + .fetchLocationByID(booking.getPlaceOfIssueId()) .doOnNext(bookingTO::setPlaceOfIssue), fetchCommoditiesByBookingID(booking.getId()) .doOnNext(bookingTO::setCommodities), diff --git a/src/main/java/org/dcsa/core/events/model/Booking.java b/src/main/java/org/dcsa/core/events/model/Booking.java index 9dbf93fc..e10ac9d3 100644 --- a/src/main/java/org/dcsa/core/events/model/Booking.java +++ b/src/main/java/org/dcsa/core/events/model/Booking.java @@ -93,7 +93,7 @@ public class Booking implements Persistable { @Column("invoice_payable_at_id") @Size(max = 100) - private UUID invoicePayableAt; + private UUID invoicePayableAtId; @Column("expected_departure_date") private LocalDate expectedDepartureDate; @@ -132,7 +132,7 @@ public class Booking implements Persistable { @Column("place_of_issue_id") @Size(max = 100) - private UUID placeOfIssueID; + private UUID placeOfIssueId; @JsonIgnore @Column("pre_carriage_mode_of_transport_code") diff --git a/src/main/java/org/dcsa/core/events/repository/BookingRepository.java b/src/main/java/org/dcsa/core/events/repository/BookingRepository.java index 3c58782f..db39f5ec 100644 --- a/src/main/java/org/dcsa/core/events/repository/BookingRepository.java +++ b/src/main/java/org/dcsa/core/events/repository/BookingRepository.java @@ -35,12 +35,12 @@ Mono findByCarrierBookingRequestReferenceAndValidUntilIsNull( Mono setVesselIDFor(UUID vesselId, UUID id); @Modifying - @Query("UPDATE booking SET invoice_payable_at_id = :invoicePayableAtID where id = :id") - Mono setInvoicePayableAtFor(UUID invoicePayableAtID, UUID id); + @Query("UPDATE booking SET invoice_payable_at_id = :invoicePayableAtId where id = :id") + Mono setInvoicePayableAtFor(UUID invoicePayableAtId, UUID id); @Modifying - @Query("UPDATE booking SET place_of_issue_id = :placeOfIssueID where id = :id") - Mono setPlaceOfIssueIDFor(UUID placeOfIssueID, UUID id); + @Query("UPDATE booking SET place_of_issue_id = :placeOfIssueId where id = :id") + Mono setPlaceOfIssueIDFor(UUID placeOfIssueId, UUID id); @Modifying @Query( From 686ad1301b91fc5160d91a225eeba18645c25b11 Mon Sep 17 00:00:00 2001 From: Frazer Joe Dourado Date: Fri, 12 Aug 2022 10:35:14 +0200 Subject: [PATCH 3/3] Fixed typo in placeOfIssueId. --- .../core/events/edocumentation/model/mapper/BookingMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/dcsa/core/events/edocumentation/model/mapper/BookingMapper.java b/src/main/java/org/dcsa/core/events/edocumentation/model/mapper/BookingMapper.java index 5fcaf67a..4f879d81 100644 --- a/src/main/java/org/dcsa/core/events/edocumentation/model/mapper/BookingMapper.java +++ b/src/main/java/org/dcsa/core/events/edocumentation/model/mapper/BookingMapper.java @@ -9,7 +9,7 @@ @Mapper(componentModel = "spring") public interface BookingMapper { @Mapping(source = "invoicePayableAtId", target = "invoicePayableAt.id") - @Mapping(source = "placeOfIssueID", target = "placeOfIssue.id") + @Mapping(source = "placeOfIssueId", target = "placeOfIssue.id") @Mapping(source = "communicationChannelCode", target = "communicationChannelCode") @Mapping(source = "updatedDateTime", target = "bookingRequestUpdatedDateTime") @Mapping(source = "bookingRequestDateTime", target = "bookingRequestCreatedDateTime")