feat: update composition according to upcoming API changes

Author: e-krebs

specs/common/schemas/SearchResponse.yml

@@ -1,4 +1,21 @@
 baseSearchResponse:
+  additionalProperties: true
+  allOf:
+    - $ref: '#/rootSearchResponse'
+    - $ref: '#/appliedRulesResponse'
+
+appliedRulesResponse:
+  type: object
+  additionalProperties: true
+  properties:
+    appliedRules:
+      description: Rules applied to the query.
+      title: appliedRules
+      type: array
+      items:
+        type: object
+
+rootSearchResponse:
   type: object
   additionalProperties: true
   required:
@@ -44,12 +61,6 @@ baseSearchResponse:
           type: boolean
           title: typo
           description: Whether the typo search was exhaustive (`true`) or approximate (`false`). An approximation is done when the typo search query part takes more than 10% of the query budget (ie. 5ms by default) to be processed (this can happen when a lot of typo alternatives exist for the query). This field will not be included when typo-tolerance is entirely disabled.
-    appliedRules:
-      description: Rules applied to the query.
-      title: appliedRules
-      type: array
-      items:
-        type: object
     exhaustiveFacetsCount:
       type: boolean
       description: See the `facetsCount` field of the `exhaustive` object in the response.

specs/composition/common/schemas/Hit.yml

@@ -32,12 +32,14 @@ compositionRankingInfo:
     composed:
       title: composedRankingInfo
       type: object
-      additionalProperties: false
-      properties:
-        index:
-          type: string
-        inset:
-          type: string
-      required:
-        - index
-        - inset
+      additionalProperties:
+        title: compositionIdRankingInfo
+        type: object
+        properties:
+          index:
+            type: string
+          injectedItemKey:
+            type: string
+        required:
+          - index
+          - injectedItemKey

specs/composition/common/schemas/SearchParams.yml

@@ -657,8 +657,8 @@ mainInjectionQueryParameters:
       x-categories:
         - Filtering
 
-InsetsQueryParameters:
-  title: Composition Insets Query parameters as object
+injectedItemsQueryParameters:
+  title: Composition injectedItems Query parameters as object
   type: object
   additionalProperties: false
   properties:

specs/composition/common/schemas/SearchResponse.yml

@@ -1,7 +1,8 @@
 searchResponse:
   additionalProperties: true
   allOf:
-    - $ref: '../../../common/schemas/SearchResponse.yml#/baseSearchResponse'
+    - $ref: '#/compositionRootSearchResponse'
+    - $ref: '../../../common/schemas/SearchResponse.yml#/rootSearchResponse'
     - $ref: '#/searchResults'
 
 searchResults:
@@ -16,6 +17,7 @@ searchResults:
 
 searchResultsItem:
   allOf:
+    - $ref: '#/resultsCompositionsResponse'
     - $ref: '#/searchHits'
     - $ref: '../../../common/schemas/SearchResponse.yml#/SearchPagination'
 
@@ -33,3 +35,80 @@ searchHits:
         $ref: 'Hit.yml#/hit'
   required:
     - hits
+
+resultsCompositionsResponse:
+  type: object
+  additionalProperties: true
+  properties:
+    compositions:
+      title: resultsCompositionsInfoResponse
+      type: object
+      additionalProperties:
+        title: resultsCompositionInfoResponse
+        type: object
+        properties:
+          injectedItems:
+            type: array
+            items:
+              $ref: '#/resultsInjectedItemInfoResponse'
+        required:
+          - injectedItems
+  required:
+    - compositions
+
+resultsInjectedItemInfoResponse:
+  type: object
+  additionalProperties: true
+  properties:
+    key:
+      type: string
+    appliedRules:
+      type: array
+      items:
+        title: resultsInjectedItemAppliedRulesInfoResponse
+        type: object
+        properties:
+          objectID:
+            $ref: '../../../common/parameters.yml#/objectID'
+        required:
+          - objectID
+  required:
+    - key
+
+compositionRootSearchResponse:
+  type: object
+  additionalProperties: true
+  properties:
+    compositions:
+      $ref: '#/compositionBaseSearchResponse'
+
+compositionBaseSearchResponse:
+  type: object
+  additionalProperties: true
+  properties:
+    run:
+      type: array
+      items:
+        $ref: '#/compositionRunSearchResponse'
+  required:
+    - run
+
+compositionRunSearchResponse:
+  type: object
+  additionalProperties: true
+  properties:
+    objectID:
+      $ref: '../../../common/parameters.yml#/objectID'
+    appliedRules:
+      type: array
+      items:
+        title: compositionRunAppliedRules
+        type: object
+        properties:
+          objectID:
+            $ref: '../../../common/parameters.yml#/objectID'
+        required:
+          - objectID
+  required:
+    - objectID
+    - appliedRules

specs/composition/common/schemas/compositionBehavior.yml

@@ -34,32 +34,32 @@ compositionBehavior:
                 - search
           required:
             - source
-        insets:
+        injectedItems:
           type: array
-          description: list of insets of the current Composition.
+          description: list of injected items of the current Composition.
           minItems: 0
           maxItems: 2
           items:
-            $ref: '#/compositionInset'
+            $ref: '#/injectedItem'
       required:
         - main
   required:
     - injection
 
-compositionInset:
+injectedItem:
   type: object
   additionalProperties: false
   properties:
-    name:
+    key:
       type: string
-      description: Inset name.
+      description: injected Item unique identifier.
     source:
-      title: compositionInsetSource
+      title: injectedItemSource
       type: object
       additionalProperties: false
       properties:
         search:
-          title: compositionInsetSourceSearch
+          title: injectedItemSourceSearch
           type: object
           additionalProperties: false
           properties:
@@ -68,7 +68,7 @@ compositionInset:
               description: Composition Main Index name.
               example: Products
             params:
-              $ref: './SearchParams.yml#/InsetsQueryParameters'
+              $ref: './SearchParams.yml#/injectedItemsQueryParameters'
           required:
             - index
       required:
@@ -82,7 +82,7 @@ compositionInset:
       minimum: 0
       maximum: 20
   required:
-    - name
+    - key
     - source
     - position
     - length

specs/composition/common/schemas/listCompositionsResponse.yml

@@ -21,12 +21,17 @@ composition:
   properties:
     objectID:
       $ref: '../../../common/parameters.yml#/objectID'
-    description:
+    name:
       type: string
       description: Composition name.
       example: 'my lovely crafted composition'
+    description:
+      type: string
+      description: Composition description.
+      example: 'my lovely crafted composition that is used for X purpose'
     behavior:
       $ref: './compositionBehavior.yml#/compositionBehavior'
   required:
     - objectID
     - behavior
+    - name

tests/CTS/requests/composition/listCompositions.json

@@ -18,6 +18,7 @@
         "items": [
           {
             "objectID": "id1",
+            "name": "my first composition",
             "description": "the first ever composition from the client",
             "behavior": {
               "injection": {

tests/CTS/requests/composition/multipleBatch.json

@@ -15,7 +15,7 @@
                     }
                   }
                 },
-                "insets": []
+                "injectedItems": []
               }
             }
           }
@@ -38,7 +38,7 @@
             "body": {
               "behavior": {
                 "injection": {
-                  "insets": [],
+                  "injectedItems": [],
                   "main": {
                     "source": {
                       "search": {