wip: test: add test that aggregations like NONE_NULL also work on two 1-to-1 relations in a row in a path

WIP: see if this failed on main. If yes, fix it before the refactor. If not, integrate this in the regular add-tests commit.

Author: Yogu

spec/regression/collect/model/model.graphqls

@@ -18,8 +18,12 @@ type Shipment @rootEntity {
     itemCount: Int @collect(path: "allItems", aggregate: COUNT)
     deliveryCount: Int @collect(path: "deliveries", aggregate: COUNT)
     allDeliveriesHaveOrders: Boolean @collect(path: "deliveries.order", aggregate: NONE_NULL)
+    allDeliveriesHaveOriginalOrders: Boolean
+        @collect(path: "deliveries.order.originalOrder", aggregate: NONE_NULL)
     allDeliveriesArePayed: Boolean @collect(path: "deliveries.order.payedAt", aggregate: NONE_NULL)
     numberOfDeliveriesWithoutOrder: Int @collect(path: "deliveries.order", aggregate: COUNT_NULL)
+    numberOfDeliveriesWithoutOriginalOrder: Int
+        @collect(path: "deliveries.order.originalOrder", aggregate: COUNT_NULL)
     numberOfDeliveriesWithoutPayedOrder: Int
         @collect(path: "deliveries.order.payedAt", aggregate: COUNT_NULL)
     #numberOfUnpayedOrders: Int @collect(path: "allOrders.payedAt", aggregate: COUNT_NULL) # waiting for DISTINCT aggregations to be supported in collect paths
@@ -104,7 +108,7 @@ type Order @rootEntity {
     accessGroup: String
     location: Location @accessField
     payedAt: DateTime
-
+    originalOrder: Order @relation # so we can have two 1-to-1 relations in a row
     delivery: Delivery @relation(inverseOf: "order")
 
     allOuterHandlingUnits: [HandlingUnit] @collect(path: "delivery.handlingUnits")

spec/regression/collect/tests/relation-and-field-aggregation/aql/createEdges.aql

@@ -170,9 +170,52 @@ RETURN (IS_NULL(v_delivery1) ? null : {
 
 // --------------------------------
 
+WITH @@deliveries, @@shipments, @@orders
+RETURN (
+  FOR v_currentEntity1
+  IN (
+    FOR v_order1
+    IN @@orders
+    FILTER (v_order1._key == @var1)
+    LIMIT @var2
+    RETURN v_order1
+  )
+  UPDATE v_currentEntity1
+  WITH {}
+  IN @@orders
+  OPTIONS { mergeObjects: false }
+  RETURN NEW._key
+)
+
+// --------------------------------
+
+WITH @@deliveries, @@shipments, @@orders
+RETURN DOCUMENT(@@orders, @var1)
+
+// --------------------------------
+
+WITH @@deliveries, @@shipments, @@orders
+RETURN (
+  UPSERT {_from: CONCAT(@var1, FIRST(@v_updatedIds1))}
+  INSERT {_from: CONCAT(@var2, FIRST(@v_updatedIds1)), _to: @var3}
+  UPDATE {_from: CONCAT(@var4, FIRST(@v_updatedIds1)), _to: @var5}
+  IN @@orders_originalOrder
+)
+
+// --------------------------------
+
+WITH @@deliveries, @@shipments, @@orders
+LET v_order1 = DOCUMENT(@@orders, @var1)
+RETURN (IS_NULL(v_order1) ? null : {
+  "orderNumber": v_order1.`orderNumber`
+})
+
+// --------------------------------
+
 WITH @@deliveries, @@shipments, @@orders
 RETURN {
   "updateShipment": @v_updateShipment1,
   "d1": @v_updateDelivery1,
-  "d2": @v_updateDelivery2
+  "d2": @v_updateDelivery2,
+  "o1": @v_updateOrder1
 }

spec/regression/collect/tests/relation-and-field-aggregation/aql/fields.aql

@@ -50,79 +50,102 @@ RETURN {
       COLLECT AGGREGATE v_none_null1 = MAX(v_item4 == null)
       RETURN v_none_null1 < true
     ),
-    "allDeliveriesArePayed": FIRST(
+    "allDeliveriesHaveOriginalOrders": FIRST(
       FOR v_item5
       IN (
         FOR v_node6, v_edge6, v_path6 IN @var13..@var14 OUTBOUND v_shipment1 @@shipments_deliveries
         LET v_nullableNode2 = FIRST(FOR v_node7, v_edge7, v_path7 IN @var15..@var16 OUTBOUND v_node6 @@deliveries_order FILTER v_node7 != null RETURN v_node7)
-        RETURN v_nullableNode2.`payedAt`
+        LET v_nullableNode3 = FIRST(FOR v_node8, v_edge8, v_path8 IN @var17..@var18 OUTBOUND v_nullableNode2 @@orders_originalOrder FILTER v_node8 != null RETURN v_node8)
+        RETURN v_nullableNode3
       )
       COLLECT AGGREGATE v_none_null2 = MAX(v_item5 == null)
       RETURN v_none_null2 < true
     ),
-    "numberOfDeliveriesWithoutOrder": FIRST(
+    "allDeliveriesArePayed": FIRST(
       FOR v_item6
       IN (
-        FOR v_node8, v_edge8, v_path8 IN @var17..@var18 OUTBOUND v_shipment1 @@shipments_deliveries
-        LET v_nullableNode3 = FIRST(FOR v_node9, v_edge9, v_path9 IN @var19..@var20 OUTBOUND v_node8 @@deliveries_order FILTER v_node9 != null RETURN v_node9)
-        RETURN v_nullableNode3
+        FOR v_node9, v_edge9, v_path9 IN @var19..@var20 OUTBOUND v_shipment1 @@shipments_deliveries
+        LET v_nullableNode4 = FIRST(FOR v_node10, v_edge10, v_path10 IN @var21..@var22 OUTBOUND v_node9 @@deliveries_order FILTER v_node10 != null RETURN v_node10)
+        RETURN v_nullableNode4.`payedAt`
       )
-      FILTER v_item6 == null
-      COLLECT AGGREGATE v_count_null1 = COUNT(v_item6)
-      RETURN v_count_null1
+      COLLECT AGGREGATE v_none_null3 = MAX(v_item6 == null)
+      RETURN v_none_null3 < true
     ),
-    "numberOfDeliveriesWithoutPayedOrder": FIRST(
+    "numberOfDeliveriesWithoutOrder": FIRST(
       FOR v_item7
       IN (
-        FOR v_node10, v_edge10, v_path10 IN @var21..@var22 OUTBOUND v_shipment1 @@shipments_deliveries
-        LET v_nullableNode4 = FIRST(FOR v_node11, v_edge11, v_path11 IN @var23..@var24 OUTBOUND v_node10 @@deliveries_order FILTER v_node11 != null RETURN v_node11)
-        RETURN v_nullableNode4.`payedAt`
+        FOR v_node11, v_edge11, v_path11 IN @var23..@var24 OUTBOUND v_shipment1 @@shipments_deliveries
+        LET v_nullableNode5 = FIRST(FOR v_node12, v_edge12, v_path12 IN @var25..@var26 OUTBOUND v_node11 @@deliveries_order FILTER v_node12 != null RETURN v_node12)
+        RETURN v_nullableNode5
       )
       FILTER v_item7 == null
-      COLLECT AGGREGATE v_count_null2 = COUNT(v_item7)
+      COLLECT AGGREGATE v_count_null1 = COUNT(v_item7)
+      RETURN v_count_null1
+    ),
+    "numberOfDeliveriesWithoutOriginalOrder": FIRST(
+      FOR v_item8
+      IN (
+        FOR v_node13, v_edge13, v_path13 IN @var27..@var28 OUTBOUND v_shipment1 @@shipments_deliveries
+        LET v_nullableNode6 = FIRST(FOR v_node14, v_edge14, v_path14 IN @var29..@var30 OUTBOUND v_node13 @@deliveries_order FILTER v_node14 != null RETURN v_node14)
+        LET v_nullableNode7 = FIRST(FOR v_node15, v_edge15, v_path15 IN @var31..@var32 OUTBOUND v_nullableNode6 @@orders_originalOrder FILTER v_node15 != null RETURN v_node15)
+        RETURN v_nullableNode7
+      )
+      FILTER v_item8 == null
+      COLLECT AGGREGATE v_count_null2 = COUNT(v_item8)
       RETURN v_count_null2
     ),
+    "numberOfDeliveriesWithoutPayedOrder": FIRST(
+      FOR v_item9
+      IN (
+        FOR v_node16, v_edge16, v_path16 IN @var33..@var34 OUTBOUND v_shipment1 @@shipments_deliveries
+        LET v_nullableNode8 = FIRST(FOR v_node17, v_edge17, v_path17 IN @var35..@var36 OUTBOUND v_node16 @@deliveries_order FILTER v_node17 != null RETURN v_node17)
+        RETURN v_nullableNode8.`payedAt`
+      )
+      FILTER v_item9 == null
+      COLLECT AGGREGATE v_count_null3 = COUNT(v_item9)
+      RETURN v_count_null3
+    ),
     "startedDispatchingAt": FIRST(
-      FOR v_item8
+      FOR v_item10
       IN (
         FOR v_offsetDateTime1
         IN (
-          FOR v_node12, v_edge12, v_path12 IN @var25..@var26 OUTBOUND v_shipment1 @@shipments_deliveries
-          FILTER v_node12._key != null
-          RETURN v_node12.`dispatchedAt`
+          FOR v_node18, v_edge18, v_path18 IN @var37..@var38 OUTBOUND v_shipment1 @@shipments_deliveries
+          FILTER v_node18._key != null
+          RETURN v_node18.`dispatchedAt`
         )
         RETURN v_offsetDateTime1.`timestamp`
       )
-      FILTER v_item8 != null
-      COLLECT AGGREGATE v_min1 = MIN(v_item8)
+      FILTER v_item10 != null
+      COLLECT AGGREGATE v_min1 = MIN(v_item10)
       RETURN v_min1
     ),
     "fullyDispatchedAt": FIRST(
-      FOR v_item9
+      FOR v_item11
       IN (
         FOR v_offsetDateTime2
         IN (
-          FOR v_node13, v_edge13, v_path13 IN @var27..@var28 OUTBOUND v_shipment1 @@shipments_deliveries
-          FILTER v_node13._key != null
-          RETURN v_node13.`dispatchedAt`
+          FOR v_node19, v_edge19, v_path19 IN @var39..@var40 OUTBOUND v_shipment1 @@shipments_deliveries
+          FILTER v_node19._key != null
+          RETURN v_node19.`dispatchedAt`
         )
         RETURN v_offsetDateTime2.`timestamp`
       )
-      FILTER v_item9 != null
-      COLLECT AGGREGATE v_max2 = MAX(v_item9)
+      FILTER v_item11 != null
+      COLLECT AGGREGATE v_max2 = MAX(v_item11)
       RETURN v_max2
     ),
     "allOrders": (
       FOR v_order1
       IN (
-        FOR v_item10
+        FOR v_item12
         IN (
-          FOR v_node14, v_edge14, v_path14 IN @var29..@var30 OUTBOUND v_shipment1 @@shipments_deliveries
-          LET v_nullableNode5 = FIRST(FOR v_node15, v_edge15, v_path15 IN @var31..@var32 OUTBOUND v_node14 @@deliveries_order FILTER v_node15 != null RETURN v_node15)
-          RETURN v_nullableNode5
+          FOR v_node20, v_edge20, v_path20 IN @var41..@var42 OUTBOUND v_shipment1 @@shipments_deliveries
+          LET v_nullableNode9 = FIRST(FOR v_node21, v_edge21, v_path21 IN @var43..@var44 OUTBOUND v_node20 @@deliveries_order FILTER v_node21 != null RETURN v_node21)
+          RETURN v_nullableNode9
         )
-        FILTER v_item10 != null
-        COLLECT v_distinct1 = v_item10
+        FILTER v_item12 != null
+        COLLECT v_distinct1 = v_item12
         RETURN v_distinct1
       )
       SORT (v_order1.`orderNumber`)

spec/regression/collect/tests/relation-and-field-aggregation/result.json

@@ -9,6 +9,9 @@
       },
       "d2": {
         "deliveryNumber": "D2"
+      },
+      "o1": {
+        "orderNumber": "O1"
       }
     }
   },
@@ -19,8 +22,10 @@
         "maxPriority": 3,
         "itemCount": 8,
         "allDeliveriesHaveOrders": false,
+        "allDeliveriesHaveOriginalOrders": false,
         "allDeliveriesArePayed": false,
         "numberOfDeliveriesWithoutOrder": 2,
+        "numberOfDeliveriesWithoutOriginalOrder": 3,
         "numberOfDeliveriesWithoutPayedOrder": 3,
         "startedDispatchingAt": "2020-01-30T08:00:00Z",
         "fullyDispatchedAt": "2020-01-30T09:00:00Z",

spec/regression/collect/tests/relation-and-field-aggregation/test.graphql

@@ -18,15 +18,21 @@ mutation createEdges {
     d2: updateDelivery(input: { id: "@{ids/Delivery/2}", order: "@{ids/Order/2}" }) {
         deliveryNumber
     }
+    o1: updateOrder(input: { id: "@{ids/Order/1}", originalOrder: "@{ids/Order/2}" }) {
+        orderNumber
+    }
 }
 query fields {
     Shipment(shipmentNumber: "S1") {
         totalWeightInKg
         maxPriority
         itemCount
         allDeliveriesHaveOrders
+        allDeliveriesHaveOriginalOrders
         allDeliveriesArePayed
         numberOfDeliveriesWithoutOrder
+        # TODO NXT-7991 make sure this fails on main because we did not account for two to-1 relations in a row
+        numberOfDeliveriesWithoutOriginalOrder
         numberOfDeliveriesWithoutPayedOrder
         startedDispatchingAt
         fullyDispatchedAt