fix(specs): correct type for taskID APIC-478 (#504)

Author: millotp

generators/src/main/java/com/algolia/codegen/cts/ParametersWithDataType.java

@@ -401,11 +401,15 @@ private void handlePrimitive(
     Map<String, Object> testOutput,
     IJsonSchemaValidationProperties spec
   ) throws CTSException {
-    inferDataType(param, null, testOutput);
-    if (
-      spec instanceof CodegenParameter && ((CodegenParameter) spec).isAnyType
-    ) {
-      testOutput.put("isAnyType", true);
+    if (isPrimitiveType(spec)) {
+      transferPrimitiveData(spec, testOutput);
+    } else {
+      inferDataType(param, null, testOutput);
+      if (
+        spec instanceof CodegenParameter && ((CodegenParameter) spec).isAnyType
+      ) {
+        testOutput.put("isAnyType", true);
+      }
     }
     testOutput.put("value", param);
   }
@@ -439,6 +443,16 @@ private boolean isEnum(IJsonSchemaValidationProperties param) {
     return false;
   }
 
+  private boolean isPrimitiveType(IJsonSchemaValidationProperties param) {
+    if (param instanceof CodegenParameter) {
+      return ((CodegenParameter) param).isPrimitiveType;
+    }
+    if (param instanceof CodegenProperty) {
+      return ((CodegenProperty) param).isPrimitiveType;
+    }
+    return false;
+  }
+
   private String inferDataType(
     Object param,
     CodegenParameter spec,
@@ -472,6 +486,31 @@ private String inferDataType(
     }
   }
 
+  private void transferPrimitiveData(
+    IJsonSchemaValidationProperties spec,
+    Map<String, Object> output
+  ) throws CTSException {
+    switch (getTypeName(spec)) {
+      case "String":
+        output.put("isString", true);
+        break;
+      case "Integer":
+        output.put("isInteger", true);
+        break;
+      case "Long":
+        output.put("isLong", true);
+        break;
+      case "Double":
+        output.put("isDouble", true);
+        break;
+      case "Boolean":
+        output.put("isBoolean", true);
+        break;
+      default:
+        throw new CTSException("Unknown primitive: " + getTypeName(spec));
+    }
+  }
+
   private IJsonSchemaValidationProperties findMatchingOneOf(
     Object param,
     CodegenModel model

specs/abtesting/common/schemas/ABTestResponse.yml

@@ -7,7 +7,7 @@ ABTestResponse:
     abTestID:
       $ref: '../parameters.yml#/abTestID'
     taskID:
-      $ref: '../../../common/parameters.yml#/taskID'
+      $ref: '../../../common/responses/common.yml#/taskID'
   required:
     - abTestID
     - index

specs/analytics/paths/status/getStatus.yml

@@ -19,7 +19,7 @@ get:
               - updatedAt
             properties:
               updatedAt:
-                $ref: '../../../common/parameters.yml#/updatedAt'
+                $ref: '../../../common/responses/common.yml#/updatedAt'
     '400':
       $ref: '../../../common/responses/BadRequest.yml'
     '402':

specs/common/parameters.yml

@@ -94,10 +94,6 @@ Limit:
     default: 10
 
 # misc
-taskID:
-  type: integer
-  description: taskID of the task to wait for.
-
 objectID:
   type: string
   description: Unique identifier of the object.
@@ -106,37 +102,6 @@ id:
   type: string
   description: objectID of the inserted object.
 
-objectIDs:
-  type: array
-  items:
-    type: string
-  description: List of objectID.
-
-queryID:
-  type: string
-  pattern: '^[a-f0-9]{32}$'
-  example: 43b15df305339e827f0ac0bdc5ebcaa7
-
-abTestID:
-  type: integer
-  description: If a search encounters an index that is being A/B tested, abTestID reports the ongoing A/B test ID.
-
-abTestVariantID:
-  type: integer
-  description: If a search encounters an index that is being A/B tested, abTestVariantID reports the variant ID of the index used.
-
-createdAt:
-  type: string
-  description: Date of creation (ISO-8601 format).
-
-updatedAt:
-  type: string
-  description: Date of last update (ISO-8601 format).
-
-deletedAt:
-  type: string
-  description: Date of deletion (ISO-8601 format).
-
 indexName:
   type: string
   example: products

specs/common/responses/CreatedAt.yml

@@ -10,4 +10,4 @@ content:
         - createdAt
       properties:
         createdAt:
-          $ref: '../parameters.yml#/createdAt'
+          $ref: '../responses/common.yml#/createdAt'

specs/common/responses/DeletedAt.yml

@@ -11,6 +11,6 @@ content:
         - deletedAt
       properties:
         taskID:
-          $ref: '../parameters.yml#/taskID'
+          $ref: '../responses/common.yml#/taskID'
         deletedAt:
-          $ref: '../parameters.yml#/deletedAt'
+          $ref: '../responses/common.yml#/deletedAt'

specs/common/responses/UpdatedAt.yml

@@ -11,6 +11,6 @@ content:
         - updatedAt
       properties:
         taskID:
-          $ref: '../parameters.yml#/taskID'
+          $ref: '../responses/common.yml#/taskID'
         updatedAt:
-          $ref: '../parameters.yml#/updatedAt'
+          $ref: '../responses/common.yml#/updatedAt'

specs/common/responses/UpdatedAtWithObjectId.yml

@@ -8,8 +8,8 @@ content:
       type: object
       properties:
         taskID:
-          $ref: '../parameters.yml#/taskID'
+          $ref: '../responses/common.yml#/taskID'
         updatedAt:
-          $ref: '../parameters.yml#/updatedAt'
+          $ref: '../responses/common.yml#/updatedAt'
         objectID:
           $ref: '../parameters.yml#/objectID'

specs/common/responses/common.yml

@@ -0,0 +1,22 @@
+taskID:
+  type: integer
+  format: int64
+  description: taskID of the task to wait for.
+
+objectIDs:
+  type: array
+  items:
+    type: string
+  description: List of objectID.
+
+createdAt:
+  type: string
+  description: Date of creation (ISO-8601 format).
+
+updatedAt:
+  type: string
+  description: Date of last update (ISO-8601 format).
+
+deletedAt:
+  type: string
+  description: Date of deletion (ISO-8601 format).

specs/search/common/schemas/SearchResponse.yml

@@ -43,9 +43,11 @@ baseSearchResponse:
     - params
   properties:
     abTestID:
-      $ref: '../../../common/parameters.yml#/abTestID'
+      type: integer
+      description: If a search encounters an index that is being A/B tested, abTestID reports the ongoing A/B test ID.
     abTestVariantID:
-      $ref: '../../../common/parameters.yml#/abTestVariantID'
+      type: integer
+      description: If a search encounters an index that is being A/B tested, abTestVariantID reports the variant ID of the index used.
     aroundLatLng:
       type: string
       description: The computed geo location.