Adaptations for 4.7.0 (#45)

- Improve handling of https://github.com/Assert on associations
- Use $now as default for Date again

Author: beckermarc

pom.xml

@@ -19,7 +19,7 @@
 
     <!-- DEPENDENCIES VERSION -->
     <jdk.version>21</jdk.version>
-    <cds.services.version>4.6.2</cds.services.version>
+    <cds.services.version>4.7.0</cds.services.version>
     <spring.boot.version>3.5.10</spring.boot.version>
     <sap.cloud.sdk.version>5.26.0</sap.cloud.sdk.version>
 

srv/src/main/java/sap/capire/xtravels/handler/CreationHandler.java

@@ -13,7 +13,6 @@
 import com.sap.cds.services.handler.EventHandler;
 import com.sap.cds.services.handler.annotations.Before;
 import com.sap.cds.services.handler.annotations.ServiceName;
-import java.time.LocalDate;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -41,10 +40,8 @@ void calculateTravelId(final Travels travel) {
 
     if (travel.getBookings() != null) {
       int nextPos = 1;
-      LocalDate now = LocalDate.now(); // $now uses timestamp unexpectedly
       for (Bookings booking : travel.getBookings()) {
         booking.setPos(nextPos++);
-        booking.setBookingDate(now);
       }
     }
   }
@@ -60,6 +57,5 @@ void calculateBookingPos(Bookings_ ref, final Bookings booking) {
       int pos = (int) maxPos;
       booking.setPos(++pos);
     }
-    booking.setBookingDate(LocalDate.now());
   }
 }

srv/src/test/java/sap/capire/xtravels/handler/TravelServiceTest.java

@@ -13,7 +13,6 @@
 import com.sap.cds.Result;
 import com.sap.cds.ql.Insert;
 import com.sap.cds.ql.cqn.CqnInsert;
-import com.sap.cds.services.utils.CdsErrorStatuses;
 import java.math.BigDecimal;
 import java.util.List;
 import org.junit.jupiter.api.Test;
@@ -62,8 +61,8 @@ public void testCreateTravel_CustomerIsNull() {
     assertThatServiceException()
         .isThrownBy(() -> srv.run(insert))
         .isBadRequest()
-        .withMessageOrKey(CdsErrorStatuses.VALUE_REQUIRED.getCodeString())
-        .thatTargets("Customer");
+        .withMessageOrKey("409003") // @mandatory
+        .thatTargets("Customer_ID", "Customer.ID");
   }
 
   @Test
@@ -76,7 +75,7 @@ public void testCreateTravel_CustomerDoesNotExist() {
         .isThrownBy(() -> srv.run(insert))
         .isBadRequest()
         .withMessageOrKey("Customer does not exist")
-        .thatTargets("Customer_ID");
+        .thatTargets("Customer", "Customer_ID");
   }
 
   @Test
@@ -89,7 +88,7 @@ public void testCreateTravel_AgencyDoesNotExist() {
         .isThrownBy(() -> srv.run(insert))
         .isBadRequest()
         .withMessageOrKey("Agency does not exist")
-        .thatTargets("Agency");
+        .thatTargets("Agency", "Agency_ID");
   }
 
   @Test

srv/travel-constraints.cds

@@ -8,11 +8,12 @@ annotate TravelService.Travels with {
   end);
 
   Agency @assert: (case
+    when Agency is null then null // handled by @mandatory
     when not exists Agency then 'Agency does not exist'
   end);
 
   Customer @assert: (case
-    when Customer is null then 'Customer must be specified'
+    when Customer is null then null // handled by @mandatory
     when not exists Customer then 'Customer does not exist'
   end);
 
@@ -26,6 +27,9 @@ annotate TravelService.Travels with {
 
 };
 
+// avoid propagation of @assert to FKs
+annotate TravelService.Travels:Agency.ID with @assert: null;
+annotate TravelService.Travels:Customer.ID with @assert: null;
 
 annotate TravelService.Bookings with {