Remove isToOrder attribute from transaction

It is a document wide attribute.

Signed-off-by: Niels Thykier <[email protected]>

ec-persistence/src/main/java/org/dcsa/endorsementchain/persistence/entity/Transaction.java

@@ -39,8 +39,6 @@ public class Transaction {
  @Column(name = "timestamp", nullable = false)
  private Long timestamp;
 
- private Boolean isToOrder;
-
  private String platformHost;
 
  @ToString.Exclude

ec-service/src/main/java/org/dcsa/endorsementchain/unofficial/service/TransportDocumentService.java

@@ -116,13 +116,6 @@ private Transaction createExportTransaction(String transferee, Set<Transaction>
  return Transaction.builder()
  .party(partyService.getPartyByTransferee(transferee))
  .comments("The B/L exported to: " + transferee)
- .isToOrder(
- transactions.stream()
- .map(Transaction::getIsToOrder)
- .findAny()
- .orElse(
- true)) // When no local transactions exist only the export transaction will be
- // created and isToOrder will be set to true
  .platformHost(hostname+":"+port)
  .timestamp(System.currentTimeMillis())
  .action(TransactionAction.TRNS)

ec-service/src/test/java/org/dcsa/endorsementchain/datafactories/EndorsementChainTransactionTODataFactory.java

@@ -13,7 +13,6 @@ public EndorsementChainTransactionTO endorsementChainTransactionTO() {
  return EndorsementChainTransactionTO.builder()
  .comments("This is a freetext comment")
  .action(BlAction.SURR)
- .isToOrder(false)
  .platformHost("localhost:8443")
  .timestamp(System.currentTimeMillis())
  .transferee("Transferee@localhost:8443")
@@ -25,7 +24,6 @@ public List<EndorsementChainTransactionTO> endorsementChainTransactionTOList() {
  EndorsementChainTransactionTO initialTransaction = EndorsementChainTransactionTO.builder()
  .comments("The B/L is issued")
  .action(BlAction.ISSU)
- .isToOrder(false)
  .platformHost("localhost:8443")
  .timestamp(System.currentTimeMillis())
  .transferee("initialTransferee@localhost:8443")

ec-service/src/test/java/org/dcsa/endorsementchain/datafactories/SignedEndorsementChainEntryTODataFactory.java

@@ -10,15 +10,15 @@ public class SignedEndorsementChainEntryTODataFactory {
 
  public SignedEndorsementChainEntryTO signedEndorsementChainEntryTO() {
  return SignedEndorsementChainEntryTO.builder()
- .signature("eyJhbGciOiJSUzI1NiIsImtpZCI6IlVhRVdLNmt2ZkRITzNZT2NwUGl2M1RCT2JQTzk2SFZhR2U0czFhUUxBZU0ifQ.eyJkb2N1bWVudEhhc2giOiJmZDg2OGM4MmU5OTc3N2I0NzJhMTY3NzM5MGQ5NTRkYmIwMTMxY2IzYjBmNTVjOGVmNTE5Njk4NTY0MTBkMzhlIiwicHJldmlvdXNFbnZlbG9wZUhhc2giOm51bGwsInRyYW5zYWN0aW9ucyI6W3siYWN0aW9uIjoiSVNTVSIsImNvbW1lbnRzIjoiVGhlIEIvTCBoYXMgYmVlbiBpc3N1ZWQuIiwidGltZXN0YW1wIjoxNjU4Mzg1MTY2MzAyNDQyMjAwLCJpc1RvT3JkZXIiOnRydWUsInBsYXRmb3JtSG9zdCI6ImxvY2FsaG9zdDo4NDQzIiwidHJhbnNmZXJlZSI6IjQzNTQ5ODUwMjQ4QGxvY2FsaG9zdDo4NDQzIn1dfQ.UTICZFOGEuz-Vx1FwP5UQBrHRh3M6LSd9OqicROBNgDnHLVW1jegBksl_6JSWNEyPfGPQ9GeVO4XMO4d2MIz1NATaS14qVz2no67ixC3p4EgvjSMoc1JFK7Se3-sVanlKxIGxo9vn_qV30xa2LrbGXdpm4cM1noWzRvsolTvbju-T9_Z_jC_Pch9zqBL-seMPZOpUUxjgP_ZB25IY9GJ_Ge_T2jEGGx87ud5JD8IwOc4zRISRIs21vfw6q0QGtmnPtatSXqR1kFlJILY-SZn_eGjIdPn9OzQfBnXUJ38HbqwASW5uO3o7zPIazl7VYQA2YWq92LRIyn13ZTlc-ePQw")
- .envelopeHash("92939058e050dcdfaa836ab7d8d2da57420c6320f25b49e087af5af16f49cb1b")
+ .signature("eyJhbGciOiJSUzI1NiIsImtpZCI6IlVhRVdLNmt2ZkRITzNZT2NwUGl2M1RCT2JQTzk2SFZhR2U0czFhUUxBZU0ifQ.eyJkb2N1bWVudEhhc2giOiJmZDg2OGM4MmU5OTc3N2I0NzJhMTY3NzM5MGQ5NTRkYmIwMTMxY2IzYjBmNTVjOGVmNTE5Njk4NTY0MTBkMzhlIiwicHJldmlvdXNFbnZlbG9wZUhhc2giOm51bGwsInRyYW5zYWN0aW9ucyI6W3siYWN0aW9uIjoiSVNTVSIsImNvbW1lbnRzIjoiVGhlIEIvTCBoYXMgYmVlbiBpc3N1ZWQuIiwidGltZXN0YW1wIjoxNjU4Mzg1MTY2MzAyNDQyMjAwLCJwbGF0Zm9ybUhvc3QiOiJsb2NhbGhvc3Q6ODQ0MyIsInRyYW5zZmVyZWUiOiI0MzU0OTg1MDI0OEBsb2NhbGhvc3Q6ODQ0MyJ9XX0.nTGlzapgHj_UUJAWG_Z0pvPJ3OqsA4BrWW7FTPAeypupg2EcBpC-EagAeAfgR9dm4g4O2Dv-sm1Q-U8lRj4cSn1YMEGntVn7HEeQ0-Yft7iCVdYtl7GUGKqvbiZ1DMr3MY98Ec0xcDXnBWnzagE3C2_VuUUOg0Yr1-GHJyIrs1Ehcl4YsFscuEPgjGzgOgjU3hMhZ2ItNF62qE1P3HMf-6O98TDFgmC8Br9-RgfeOuU_0t3My7Qk_hKfSKu0aCTjVS4TczQv3B8ag5KtDmu02qrXnYrsOJx8wDaYDSYLQOlR4tVud9DKDMRCzcadAFlMTvwtqWfRyaYISuy126ME6Q")
+ .envelopeHash("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")
  .build();
  }
 
  public SignedEndorsementChainEntryTO signedEndorsementChainEntryTOWithInvalidSignature() {
  return SignedEndorsementChainEntryTO.builder()
- .signature("eyJhbGciOiJSUzI1NiIsImtpZCI6IlVhRVdLNmt2ZkRITzNZT2NwUGl2M1RCT2JQTzk2SFZhR2U0czFhUUxBZU0ifQ.eyJkb2N1bWVudEhhc2giOiJmZDg2OGM4MmU5OTc3N2I0NzJhMTY3NzM5MGQ5NTRkYmIwMTMxY2IzYjBmNTVjOGVmNTE5Njk4NTY0MTBkMzhlIiwicHJldmlvdXNFbnZlbG9wZUhhc2giOm51bGwsInRyYW5zYWN0aW9ucyI6W3siYWN0aW9uIjoiSVNTVSIsImNvbW1lbnRzIjoiVGhlIEIvTCBoYXMgYmVlbiBpc3N1ZWQuIiwidGltZXN0YW1wIjoxNjU4Mzg1MTY2MzAyNDQyMjAwLCJpc1RvT3JkZXIiOnRydWUsInBsYXRmb3JtSG9zdCI6ImxvY2FsaG9zdDo4NDQzIiwidHJhbnNmZXJlZSI6IjQzNTQ5ODUwMjQ4QGxvY2FsaG9zdDo4NDQzIn1dfQ.UTICZFOGEuz-Vx1FwP5UQBrHRh3M6LSd9OqicROBNgDnHLVW1jegBksl_6JSWNEyPfGPQ9GeVO4XMO4d2MIz1NATaS14qVz2no67ixC3p4EgvjSMoc1JFK7Se3-sVanlKxIGxo9vn_qV30xa2LrbGXdpm4cM1noWzRvsolTvbju-T9_Z_jC_Pch9zqBL-seMPZOpUUxjgP_ZB25IY9GJ_Ge_T2jEGGx87ud5JD8IwOc4zRISRIs21vfw6q0QGtmnPtatSXqR1kFlJILY-SZn_eGjIdPn9OzQfBnXUJ38HbqwASW5uO3o7zPIazl7VYQA2YWq92LRIyn13ZTlc-ePQw")
- .envelopeHash("92939058e050dcdfaa836ab7d8d2da57420c6320f25b49e087af5af16f49cb1b")
+ .signature("eyJhbGciOiJSUzI1NiIsImtpZCI6IlVhRVdLNmt2ZkRITzNZT2NwUGl2M1RCT2JQTzk2SFZhR2U0czFhUUxBZU0ifQ.eyJkb2N1bWVudEhhc2giOiJmZDg2OGM4MmU5OTc3N2I0NzJhMTY3NzM5MGQ5NTRkYmIwMTMxY2IzYjBmNTVjOGVmNTE5Njk4NTY0MTBkMzhlIiwicHJldmlvdXNFbnZlbG9wZUhhc2giOm51bGwsInRyYW5zYWN0aW9ucyI6W3siYWN0aW9uIjoiSVNTVSIsImNvbW1lbnRzIjoiVGhlIEIvTCBoYXMgYmVlbiBpc3N1ZWQuIiwidGltZXN0YW1wIjoxNjU4Mzg1MTY2MzAyNDQyMjAwLCJwbGF0Zm9ybUhvc3QiOiJsb2NhbGhvc3Q6ODQ0MyIsInRyYW5zZmVyZWUiOiI0MzU0OTg1MDI0OEBsb2NhbGhvc3Q6ODQ0MyJ9XX0K.UTICZFOGEuz-Vx1FwP5UQBrHRh3M6LSd9OqicROBNgDnHLVW1jegBksl_6JSWNEyPfGPQ9GeVO4XMO4d2MIz1NATaS14qVz2no67ixC3p4EgvjSMoc1JFK7Se3-sVanlKxIGxo9vn_qV30xa2LrbGXdpm4cM1noWzRvsolTvbju-T9_Z_jC_Pch9zqBL-seMPZOpUUxjgP_ZB25IY9GJ_Ge_T2jEGGx87ud5JD8IwOc4zRISRIs21vfw6q0QGtmnPtatSXqR1kFlJILY-SZn_eGjIdPn9OzQfBnXUJ38HbqwASW5uO3o7zPIazl7VYQA2YWq92LRIyn13ZTlc-ePQw")
+ .envelopeHash("969f15560aa8f1cb87ab5519627fc6f94a4aded3416b3e8fb57946d299113a0a")
  .build();
  }
 

ec-service/src/test/java/org/dcsa/endorsementchain/mapping/EndorsementChainEntryMapperTest.java

@@ -45,7 +45,6 @@ void testEndorsementChainEntryMapper() {
  Set.of(
  Transaction.builder()
  .comments("this is a comment")
- .isToOrder(true)
  .action(TransactionAction.ISSU)
  .platformHost("localhost:443")
  .party(PartyDataFactory.party())

ec-service/src/test/java/org/dcsa/endorsementchain/unofficial/datafactories/TransactionDataFactory.java

@@ -18,7 +18,6 @@ public Transaction transactionEntity() {
  return Transaction.builder()
  .comments("this is a free text comment")
  .action(TransactionAction.ISSU)
- .isToOrder(true)
  .platformHost("localhost:8443")
  .id(UUID.fromString("326137d8-bd60-4dea-88cc-52687fcb303a"))
  .timestamp(System.currentTimeMillis())
@@ -31,7 +30,6 @@ public List<Transaction> transactionEntityList() {
  Transaction transaction = Transaction.builder()
  .comments("this is a free text comment")
  .action(TransactionAction.TRNS)
- .isToOrder(true)
  .platformHost("localhost:8443")
  .id(UUID.fromString("cb4c7721-f87c-485e-a6ec-3d0682faa24c"))
  .timestamp(System.currentTimeMillis())
@@ -46,7 +44,6 @@ public EndorsementChainTransactionTO endorsementChainTransaction() {
  return EndorsementChainTransactionTO.builder()
  .action(BlAction.ISSU)
  .comments("this is a free text comment")
- .isToOrder(true)
  .transferee("Receiving party")
  .build();
  }
@@ -57,7 +54,6 @@ public String endorsementChainTransactionJson() throws JsonProcessingException {
  {
  "action": "ISSU",
  "comments": "The B/L has been issued.",
- "isToOrder": true,
  "transferee": "dummy transferee"
  }
  """;

ec-transfer-obj/src/main/java/org/dcsa/endorsementchain/transferobjects/EndorsementChainTransactionTO.java

@@ -16,9 +16,6 @@ public record EndorsementChainTransactionTO(
  @NotNull
  Long timestamp,
 
- @NotNull
- Boolean isToOrder,
-
  @NotNull
  String platformHost,