From 061364cbdf7271c5b71bc3bb822a986c64aecec9 Mon Sep 17 00:00:00 2001
From: Marc Becker <marc.becker@sap.com>
Date: Mon, 15 Dec 2025 10:26:15 +0100
Subject: [PATCH 1/4] @assert

---
 app/travels/webapp/index.html              |  2 +-
 db/constraints.cds                         | 23 ----------
 pom.xml                                    |  4 +-
 srv/src/main/resources/messages.properties |  6 +++
 srv/travel-constraints.cds                 | 50 ++++++++++++++++++++++
 5 files changed, 59 insertions(+), 26 deletions(-)
 delete mode 100644 db/constraints.cds
 create mode 100644 srv/src/main/resources/messages.properties
 create mode 100644 srv/travel-constraints.cds

diff --git a/app/travels/webapp/index.html b/app/travels/webapp/index.html
index 98f26b6..c37cb0b 100644
--- a/app/travels/webapp/index.html
+++ b/app/travels/webapp/index.html
@@ -16,7 +16,7 @@
     </style>
     <script
       id="sap-ui-bootstrap"
-      src="https://ui5.sap.com/1.136.8/resources/sap-ui-core.js"
+      src="https://ui5.sap.com/1.136.12/resources/sap-ui-core.js"
       data-sap-ui-theme="sap_horizon"
       data-sap-ui-oninit="module:sap/ui/core/ComponentSupport"
       data-sap-ui-resourceroots='{ "sap.capire.travels": "." }'
diff --git a/db/constraints.cds b/db/constraints.cds
deleted file mode 100644
index 2d3175c..0000000
--- a/db/constraints.cds
+++ /dev/null
@@ -1,23 +0,0 @@
-using { sap.capire.travels as my } from './schema';
-
-@assert.constraint.beginAfterEnd: {
-  condition: (BeginDate <= EndDate),
-  message: 'End Date must be after Begin Date.',
-  targets: [(EndDate)]
-}
-annotate my.Travels with {
-  @mandatory BeginDate;
-  @mandatory EndDate;
-  @mandatory Agency;
-  @mandatory Customer;
-}
-
-annotate my.Bookings with {
-  @mandatory Flight;
-  @mandatory Travel;
-}
-
-annotate my.Travels with @Capabilities.FilterRestrictions.FilterExpressionRestrictions: [
-  { Property: 'BeginDate', AllowedExpressions : 'SingleRange' },
-  { Property: 'EndDate', AllowedExpressions : 'SingleRange' }
-];
diff --git a/pom.xml b/pom.xml
index 8d824ed..fbaa3cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 
 		<!-- DEPENDENCIES VERSION -->
 		<jdk.version>21</jdk.version>
-		<cds.services.version>4.5.1</cds.services.version>
+		<cds.services.version>4.6.0-SNAPSHOT</cds.services.version>
 		<spring.boot.version>3.5.8</spring.boot.version>
 		<sap.cloud.sdk.version>5.24.0</sap.cloud.sdk.version>
 
@@ -169,4 +169,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/srv/src/main/resources/messages.properties b/srv/src/main/resources/messages.properties
new file mode 100644
index 0000000..0ceaeb4
--- /dev/null
+++ b/srv/src/main/resources/messages.properties
@@ -0,0 +1,6 @@
+ASSERT_ENDDATE_AFTER_BEGINDATE=End date must be after begin date
+ASSERT_BOOKINGS_IN_TRAVEL_PERIOD=All bookings must be within the travel period
+ASSERT_BOOKING_CURRENCY_MATCHES_TRAVEL=All bookings must use the same currency as the travel
+ASSERT_FLIGHT_PRICE_POSITIVE=Flight price must be a positive value
+ASSERT_NO_BOOKINGS_AFTER_TRAVEL=No bookings are allowed after the travel end date
+ASSERT_BOOKING_FEE_NON_NEGATIVE=Booking fee cannot be negative
diff --git a/srv/travel-constraints.cds b/srv/travel-constraints.cds
new file mode 100644
index 0000000..14ded56
--- /dev/null
+++ b/srv/travel-constraints.cds
@@ -0,0 +1,50 @@
+using { TravelService } from './travel-service';
+
+
+annotate TravelService.Travels with {
+
+  Description @assert: (case
+    when length(Description) < 3 then 'Description too short'
+  end);
+
+  Customer @assert: (case
+    when Customer is null then 'Customer must be specified'
+    when not exists Customer then 'Customer does not exist'
+  end);
+
+  EndDate @assert: (case
+    when EndDate < BeginDate then error('ASSERT_ENDDATE_AFTER_BEGINDATE', null, (BeginDate, EndDate))
+  end);
+
+  BookingFee @assert: (case
+    when BookingFee < 0 then 'Booking fee cannot be negative'
+  end);
+
+};
+
+
+annotate TravelService.Bookings with {
+
+  FlightPrice @assert: (case
+    when FlightPrice < 0 then 'ASSERT_FLIGHT_PRICE_POSITIVE'
+  end);
+
+  Currency {
+    code @assert: (case
+      when $self.Currency.code != $self.Travel.Currency.code then 'ASSERT_BOOKING_CURRENCY_MATCHES_TRAVEL'
+    end);
+  }
+
+  Flight {
+    date @assert: (case
+      when date not between $self.Travel.BeginDate and $self.Travel.EndDate then 'ASSERT_BOOKINGS_IN_TRAVEL_PERIOD'
+    end);
+  }
+
+};
+
+
+annotate TravelService.Travels with @Capabilities.FilterRestrictions.FilterExpressionRestrictions: [
+  { Property: 'BeginDate', AllowedExpressions : 'SingleRange' },
+  { Property: 'EndDate', AllowedExpressions : 'SingleRange' }
+];

From edad7a7b5fa93e512fc7a219b8a1420b2ba19ca7 Mon Sep 17 00:00:00 2001
From: Marc Becker <marc.becker@sap.com>
Date: Mon, 15 Dec 2025 13:12:26 +0100
Subject: [PATCH 2/4] Remove @readonly from ID

---
 db/schema.cds | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/schema.cds b/db/schema.cds
index cc10533..a3aa417 100644
--- a/db/schema.cds
+++ b/db/schema.cds
@@ -8,7 +8,7 @@ using {
 
 
 entity Travels : managed {
-  key ID       : Integer default 0 @readonly;
+  key ID       : Integer default 0;
   Description  : String(1024);
   BeginDate    : Date default $now;
   EndDate      : Date default $now;

From b996b13d8f9a0aa904a13e028035e4ed2d6ab3b5 Mon Sep 17 00:00:00 2001
From: Marc Becker <marc.becker@sap.com>
Date: Tue, 16 Dec 2025 09:28:28 +0100
Subject: [PATCH 3/4] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fbaa3cf..5dea50d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 
 		<!-- DEPENDENCIES VERSION -->
 		<jdk.version>21</jdk.version>
-		<cds.services.version>4.6.0-SNAPSHOT</cds.services.version>
+		<cds.services.version>4.6.0</cds.services.version>
 		<spring.boot.version>3.5.8</spring.boot.version>
 		<sap.cloud.sdk.version>5.24.0</sap.cloud.sdk.version>
 

From 66240851f9b4fb6976c72ca1d137b1f97ea47f58 Mon Sep 17 00:00:00 2001
From: Marc Becker <marc.becker@sap.com>
Date: Wed, 7 Jan 2026 15:11:41 +0100
Subject: [PATCH 4/4] Better align with Node.js sample

---
 srv/src/main/resources/messages.properties    |  1 -
 srv/src/main/resources/messages_de.properties |  5 +++++
 srv/src/main/resources/messages_fr.properties |  5 +++++
 .../TravelServiceIntegrationTest.java         |  2 ++
 srv/travel-constraints.cds                    | 20 +++++++++++--------
 5 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 srv/src/main/resources/messages_de.properties
 create mode 100644 srv/src/main/resources/messages_fr.properties

diff --git a/srv/src/main/resources/messages.properties b/srv/src/main/resources/messages.properties
index 0ceaeb4..f43ae27 100644
--- a/srv/src/main/resources/messages.properties
+++ b/srv/src/main/resources/messages.properties
@@ -2,5 +2,4 @@ ASSERT_ENDDATE_AFTER_BEGINDATE=End date must be after begin date
 ASSERT_BOOKINGS_IN_TRAVEL_PERIOD=All bookings must be within the travel period
 ASSERT_BOOKING_CURRENCY_MATCHES_TRAVEL=All bookings must use the same currency as the travel
 ASSERT_FLIGHT_PRICE_POSITIVE=Flight price must be a positive value
-ASSERT_NO_BOOKINGS_AFTER_TRAVEL=No bookings are allowed after the travel end date
 ASSERT_BOOKING_FEE_NON_NEGATIVE=Booking fee cannot be negative
diff --git a/srv/src/main/resources/messages_de.properties b/srv/src/main/resources/messages_de.properties
new file mode 100644
index 0000000..0071bfa
--- /dev/null
+++ b/srv/src/main/resources/messages_de.properties
@@ -0,0 +1,5 @@
+ASSERT_ENDDATE_AFTER_BEGINDATE=Enddatum muss nach dem Anfangsdatum liegen
+ASSERT_BOOKINGS_IN_TRAVEL_PERIOD=Alle Buchungen müssen innerhalb des Reisezeitraums liegen
+ASSERT_BOOKING_CURRENCY_MATCHES_TRAVEL=Alle Buchungen müssen dieselbe Währung wie die Reise verwenden
+ASSERT_FLIGHT_PRICE_POSITIVE=Der Flugpreis muss ein positiver Wert sein
+ASSERT_BOOKING_FEE_NON_NEGATIVE=Buchungsgebühr kann nicht negativ sein
diff --git a/srv/src/main/resources/messages_fr.properties b/srv/src/main/resources/messages_fr.properties
new file mode 100644
index 0000000..dd71aff
--- /dev/null
+++ b/srv/src/main/resources/messages_fr.properties
@@ -0,0 +1,5 @@
+ASSERT_ENDDATE_AFTER_BEGINDATE=La date de fin doit être postérieure à la date de début
+ASSERT_BOOKINGS_IN_TRAVEL_PERIOD=Toutes les réservations doivent être dans la période de voyage
+ASSERT_BOOKING_CURRENCY_MATCHES_TRAVEL=Toutes les réservations doivent utiliser la même devise que le voyage
+ASSERT_FLIGHT_PRICE_POSITIVE=Le prix du vol doit être une valeur positive
+ASSERT_BOOKING_FEE_NON_NEGATIVE=Les frais de réservation ne peuvent pas être négatifs
diff --git a/srv/src/test/java/sap/capire/xtravels/TravelServiceIntegrationTest.java b/srv/src/test/java/sap/capire/xtravels/TravelServiceIntegrationTest.java
index aca2429..6d9181f 100644
--- a/srv/src/test/java/sap/capire/xtravels/TravelServiceIntegrationTest.java
+++ b/srv/src/test/java/sap/capire/xtravels/TravelServiceIntegrationTest.java
@@ -120,9 +120,11 @@ void shouldCreateAndRetrieveTravelWithBookingsSuccessfully() throws Exception {
     booking.setFlightId("GA0322");
     booking.setFlightDate(LocalDate.of(2024, 6, 2));
     booking.setFlightPrice(BigDecimal.valueOf(1103));
+    booking.setCurrencyCode("EUR");
     Bookings.Supplements supplement = Bookings.Supplements.create();
     supplement.setBookedId("bv-0001");
     supplement.setPrice(new BigDecimal("2.30"));
+    supplement.setCurrencyCode("EUR");
     booking.setSupplements(List.of(supplement));
     travel.setBookings(List.of(booking));
 
diff --git a/srv/travel-constraints.cds b/srv/travel-constraints.cds
index 14ded56..a0f97c8 100644
--- a/srv/travel-constraints.cds
+++ b/srv/travel-constraints.cds
@@ -7,6 +7,10 @@ annotate TravelService.Travels with {
     when length(Description) < 3 then 'Description too short'
   end);
 
+  Agency @assert: (case
+    when not exists Agency then 'Agency does not exist'
+  end);
+
   Customer @assert: (case
     when Customer is null then 'Customer must be specified'
     when not exists Customer then 'Customer does not exist'
@@ -17,7 +21,7 @@ annotate TravelService.Travels with {
   end);
 
   BookingFee @assert: (case
-    when BookingFee < 0 then 'Booking fee cannot be negative'
+    when BookingFee < 0 then 'ASSERT_BOOKING_FEE_NON_NEGATIVE'
   end);
 
 };
@@ -25,19 +29,19 @@ annotate TravelService.Travels with {
 
 annotate TravelService.Bookings with {
 
+  Flight {
+    date @assert: (case
+      when date not between $self.Travel.BeginDate and $self.Travel.EndDate then 'ASSERT_BOOKINGS_IN_TRAVEL_PERIOD'
+    end);
+  }
+
   FlightPrice @assert: (case
     when FlightPrice < 0 then 'ASSERT_FLIGHT_PRICE_POSITIVE'
   end);
 
   Currency {
     code @assert: (case
-      when $self.Currency.code != $self.Travel.Currency.code then 'ASSERT_BOOKING_CURRENCY_MATCHES_TRAVEL'
-    end);
-  }
-
-  Flight {
-    date @assert: (case
-      when date not between $self.Travel.BeginDate and $self.Travel.EndDate then 'ASSERT_BOOKINGS_IN_TRAVEL_PERIOD'
+      when code != $self.Travel.Currency.code then 'ASSERT_BOOKING_CURRENCY_MATCHES_TRAVEL'
     end);
   }