fix(specs): types and parameters

shortcuts · shortcuts · commit f25e02f6d955 · 2022-06-17T17:04:09.000+02:00
diff --git a/generators/src/main/java/com/algolia/codegen/cts/tests/ParametersWithDataType.java b/generators/src/main/java/com/algolia/codegen/cts/tests/ParametersWithDataType.java
@@ -546,7 +546,10 @@ private IJsonSchemaValidationProperties findMatchingOneOf(Object param, CodegenM
       }
     }
     for (CodegenModel oneOf : model.interfaceModels) {
-      if (oneOf.dataType.equals(paramType)) return oneOf;
+      // Somehow the dataType can be in lower case?
+      if (oneOf.dataType.toLowerCase().equals(paramType.toLowerCase())) {
+        return oneOf;
+      }
     }
     return null;
   }
diff --git a/specs/common/schemas/IndexSettings.yml b/specs/common/schemas/IndexSettings.yml
@@ -45,10 +45,6 @@ baseIndexSettings:
         type: string
       description: Sets the languages at the index level for language-specific processing such as tokenization and normalization.
       default: []
-    filterPromotes:
-      type: boolean
-      description: Whether promoted results should match the filters of the current search, except for geographic filters.
-      default: false
     disablePrefixOnAttributes:
       type: array
       items:
@@ -65,19 +61,23 @@ baseIndexSettings:
         type: string
       description: List of numeric attributes that can be used as numerical filters.
       default: []
+    separatorsToIndex:
+      type: string
+      description: Control which separators are indexed.
+      default: ''
+    searchableAttributes:
+      type: array
+      items:
+        type: string
+      description: The complete list of attributes used for searching.
+      default: []
     userData:
       $ref: '#/userData'
 
 indexSettingsAsSearchParams:
   type: object
   additionalProperties: false
   properties:
-    searchableAttributes:
-      type: array
-      items:
-        type: string
-      description: The complete list of attributes used for searching.
-      default: []
     attributesForFaceting:
       type: array
       items:
@@ -175,18 +175,10 @@ indexSettingsAsSearchParams:
         type: string
       description: List of attributes on which you want to disable typo tolerance.
       default: []
-    separatorsToIndex:
-      type: string
-      description: Control which separators are indexed.
-      default: ''
     ignorePlurals:
-      type: string
-      description: Treats singular, plurals, and other forms of declensions as matching terms.
-      default: false
+      $ref: '#/ignorePlurals'
     removeStopWords:
-      type: string
-      description: Removes stop (common) words from the query before executing it.
-      default: false
+      $ref: '#/removeStopWords'
     keepDiacriticsOnCharacters:
       type: string
       description: List of characters that the engine shouldn't automatically normalize.
@@ -327,3 +319,35 @@ alternativesAsExact:
 advancedSyntaxFeatures:
   type: string
   enum: [exactPhrase, excludeWords]
+
+ignorePlurals:
+  description: >
+    Treats singular, plurals, and other forms of declensions as matching terms.
+
+    ignorePlurals is used in conjunction with the queryLanguages setting.
+
+    list: language ISO codes for which ignoring plurals should be enabled. This list will override any values that you may have set in queryLanguages.
+    true: enables the ignore plurals functionality, where singulars and plurals are considered equivalent (foot = feet). The languages supported here are either every language (this is the default, see list of languages below), or those set by queryLanguages.
+    false: disables ignore plurals, where singulars and plurals are not considered the same for matching purposes (foot will not find feet).
+  oneOf:
+    - type: array
+      items:
+        type: string
+    - type: boolean
+      default: false
+
+removeStopWords:
+  description: >
+    Removes stop (common) words from the query before executing it.
+
+    removeStopWords is used in conjunction with the queryLanguages setting.
+
+    list: language ISO codes for which ignoring plurals should be enabled. This list will override any values that you may have set in queryLanguages.
+    true: enables the stop word functionality, ensuring that stop words are removed from consideration in a search. The languages supported here are either every language, or those set by queryLanguages.
+    false: disables stop word functionality, allowing stop words to be taken into account in a search.
+  oneOf:
+    - type: array
+      items:
+        type: string
+    - type: boolean
+      default: false
diff --git a/specs/common/schemas/SearchParams.yml b/specs/common/schemas/SearchParams.yml
@@ -84,11 +84,13 @@ baseSearchParams:
       type: array
       items:
         type: number
+        format: double
       description: Search inside a rectangular area (in geo coordinates).
     insidePolygon:
       type: array
       items:
         type: number
+        format: double
       description: Search inside a polygon (in geo coordinates).
     naturalLanguages:
       type: array
diff --git a/specs/predict/paths/fetchUserProfile.yml b/specs/predict/paths/fetchUserProfile.yml
@@ -43,6 +43,7 @@ post:
                               type: string
                             probability:
                               type: number
+                              format: double
                               minimum: 0
                               maximum: 1
                       lastUpdatedAt:
@@ -53,6 +54,7 @@ post:
                     properties:
                       value:
                         type: number
+                        format: double
                         minimum: 0
                       lastUpdatedAt:
                         type: string
@@ -72,6 +74,7 @@ post:
                               type: string
                             probability:
                               type: number
+                              format: double
                               minimum: 0
                               maximum: 1
                       lastUpdatedAt:
diff --git a/specs/search/common/schemas/SearchQuery.yml b/specs/search/common/schemas/SearchQuery.yml
@@ -22,9 +22,7 @@ searchForFacetsOptions:
     indexName:
       $ref: '../../../common/parameters.yml#/indexName'
     facetQuery:
-      type: string
-      description: Text to search inside the facet's values.
-      default: ''
+      $ref: '#/facetQuery'
     maxFacetHits:
       $ref: '../../../common/schemas/IndexSettings.yml#/maxFacetHits'
     type:
@@ -34,6 +32,11 @@ searchForFacetsOptions:
     - type
     - facet
 
+facetQuery:
+  type: string
+  description: Text to search inside the facet's values.
+  default: ''
+
 searchForHitsOptions:
   # We provide this option because TypeScript can't distinguish union with optional keys
   # if they are not completely the same, see usage in `templates/javascript/model.mustache`
diff --git a/specs/search/paths/search/searchForFacetValues.yml b/specs/search/paths/search/searchForFacetValues.yml
@@ -25,9 +25,7 @@ post:
             params:
               $ref: '../../../common/schemas/SearchParams.yml#/paramsAsString'
             facetQuery:
-              type: string
-              description: Text to search inside the facet's values.
-              default: ''
+              $ref: '../../common/schemas/SearchQuery.yml#/facetQuery'
             maxFacetHits:
               $ref: '../../../common/schemas/IndexSettings.yml#/maxFacetHits'
   responses:
diff --git a/templates/java/oneof_interface.mustache b/templates/java/oneof_interface.mustache
@@ -7,6 +7,7 @@ import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
+import java.util.List;
 
 @JsonAdapter({{classname}}.Adapter.class)
 {{>additionalModelTypeAnnotations}}
diff --git a/tests/CTS/methods/requests/search/search.json b/tests/CTS/methods/requests/search/search.json
@@ -192,5 +192,182 @@
         "strategy": "stopIfEnoughMatches"
       }
     }
+  },
+  {
+    "testName": "search with all search parameters",
+    "parameters": {
+      "requests": [
+        {
+          "indexName": "theIndexName",
+          "query": "",
+          "similarQuery": "",
+          "filters": "",
+          "facetFilters": [""],
+          "optionalFilters": [""],
+          "numericFilters": [""],
+          "tagFilters": [""],
+          "sumOrFiltersScores": true,
+          "facets": [""],
+          "maxValuesPerFacet": 0,
+          "facetingAfterDistinct": true,
+          "sortFacetValuesBy": "",
+          "page": 0,
+          "offset": 0,
+          "length": 0,
+          "aroundLatLng": "",
+          "aroundLatLngViaIP": true,
+          "aroundRadius": "all",
+          "aroundPrecision": 0,
+          "minimumAroundRadius": 0,
+          "insideBoundingBox": [47.3165, 4.9665],
+          "insidePolygon": [47.3165, 4.9665],
+          "naturalLanguages": [""],
+          "ruleContexts": [""],
+          "personalizationImpact": 0,
+          "userToken": "",
+          "getRankingInfo": true,
+          "clickAnalytics": true,
+          "analytics": true,
+          "analyticsTags": [""],
+          "percentileComputation": true,
+          "enableABTest": true,
+          "enableReRanking": true,
+          "reRankingApplyFilter": [""],
+          "attributesForFaceting": [""],
+          "unretrievableAttributes": [""],
+          "attributesToRetrieve": [""],
+          "restrictSearchableAttributes": [""],
+          "ranking": [""],
+          "customRanking": [""],
+          "relevancyStrictness": 0,
+          "attributesToHighlight": [""],
+          "attributesToSnippet": [""],
+          "highlightPreTag": "",
+          "highlightPostTag": "",
+          "snippetEllipsisText": "",
+          "restrictHighlightAndSnippetArrays": true,
+          "hitsPerPage": 0,
+          "minWordSizefor1Typo": 0,
+          "minWordSizefor2Typos": 0,
+          "typoTolerance": "min",
+          "allowTyposOnNumericTokens": true,
+          "disableTypoToleranceOnAttributes": [""],
+          "ignorePlurals": false,
+          "removeStopWords": true,
+          "keepDiacriticsOnCharacters": "",
+          "queryLanguages": [""],
+          "decompoundQuery": true,
+          "enableRules": true,
+          "enablePersonalization": true,
+          "queryType": "prefixAll",
+          "removeWordsIfNoResults": "allOptional",
+          "advancedSyntax": true,
+          "optionalWords": [""],
+          "disableExactOnAttributes": [""],
+          "exactOnSingleWordQuery": "attribute",
+          "alternativesAsExact": ["multiWordsSynonym"],
+          "advancedSyntaxFeatures": ["exactPhrase"],
+          "distinct": 0,
+          "synonyms": true,
+          "replaceSynonymsInHighlight": true,
+          "minProximity": 0,
+          "responseFields": [""],
+          "attributeCriteriaComputedByMinProximity": true,
+          "renderingContent": {
+            "string": "any"
+          },
+          "type": "default"
+        }
+      ]
+    },
+    "request": {
+      "path": "/1/indexes/*/queries",
+      "method": "POST",
+      "body": {
+        "requests": [
+          {
+            "indexName": "theIndexName",
+            "query": "",
+            "similarQuery": "",
+            "filters": "",
+            "facetFilters": [""],
+            "optionalFilters": [""],
+            "numericFilters": [""],
+            "tagFilters": [""],
+            "sumOrFiltersScores": true,
+            "facets": [""],
+            "maxValuesPerFacet": 0,
+            "facetingAfterDistinct": true,
+            "sortFacetValuesBy": "",
+            "page": 0,
+            "offset": 0,
+            "length": 0,
+            "aroundLatLng": "",
+            "aroundLatLngViaIP": true,
+            "aroundRadius": "all",
+            "aroundPrecision": 0,
+            "minimumAroundRadius": 0,
+            "insideBoundingBox": [47.3165, 4.9665],
+            "insidePolygon": [47.3165, 4.9665],
+            "naturalLanguages": [""],
+            "ruleContexts": [""],
+            "personalizationImpact": 0,
+            "userToken": "",
+            "getRankingInfo": true,
+            "clickAnalytics": true,
+            "analytics": true,
+            "analyticsTags": [""],
+            "percentileComputation": true,
+            "enableABTest": true,
+            "enableReRanking": true,
+            "reRankingApplyFilter": [""],
+            "attributesForFaceting": [""],
+            "unretrievableAttributes": [""],
+            "attributesToRetrieve": [""],
+            "restrictSearchableAttributes": [""],
+            "ranking": [""],
+            "customRanking": [""],
+            "relevancyStrictness": 0,
+            "attributesToHighlight": [""],
+            "attributesToSnippet": [""],
+            "highlightPreTag": "",
+            "highlightPostTag": "",
+            "snippetEllipsisText": "",
+            "restrictHighlightAndSnippetArrays": true,
+            "hitsPerPage": 0,
+            "minWordSizefor1Typo": 0,
+            "minWordSizefor2Typos": 0,
+            "typoTolerance": "min",
+            "allowTyposOnNumericTokens": true,
+            "disableTypoToleranceOnAttributes": [""],
+            "ignorePlurals": false,
+            "removeStopWords": true,
+            "keepDiacriticsOnCharacters": "",
+            "queryLanguages": [""],
+            "decompoundQuery": true,
+            "enableRules": true,
+            "enablePersonalization": true,
+            "queryType": "prefixAll",
+            "removeWordsIfNoResults": "allOptional",
+            "advancedSyntax": true,
+            "optionalWords": [""],
+            "disableExactOnAttributes": [""],
+            "exactOnSingleWordQuery": "attribute",
+            "alternativesAsExact": ["multiWordsSynonym"],
+            "advancedSyntaxFeatures": ["exactPhrase"],
+            "distinct": 0,
+            "synonyms": true,
+            "replaceSynonymsInHighlight": true,
+            "minProximity": 0,
+            "responseFields": [""],
+            "attributeCriteriaComputedByMinProximity": true,
+            "renderingContent": {
+              "string": "any"
+            },
+            "type": "default"
+          }
+        ]
+      }
+    }
   }
 ]

Original file line number	Diff line number	Diff line change
`@@ -546,7 +546,10 @@ private IJsonSchemaValidationProperties findMatchingOneOf(Object param, CodegenM`
`546`	`546`	`}`
`547`	`547`	`}`
`548`	`548`	`for (CodegenModel oneOf : model.interfaceModels) {`
`549`		`- if (oneOf.dataType.equals(paramType)) return oneOf;`
	`549`	`+ // Somehow the dataType can be in lower case?`
	`550`	`+ if (oneOf.dataType.toLowerCase().equals(paramType.toLowerCase())) {`
	`551`	`+ return oneOf;`
	`552`	`+ }`
`550`	`553`	`}`
`551`	`554`	`return null;`
`552`	`555`	`}`