Merge pull request #14 from verissimor/feature/reactive

fix(reactive): force to use operator IN when there are comma

build.gradle.kts

@@ -19,7 +19,7 @@ plugins {
 }
 
 group = "io.github.verissimor.lib"
-version = System.getenv("RELEASE_VERSION") ?: "1.0.1-SNAPSHOT"
+version = System.getenv("RELEASE_VERSION") ?: "1.0.2-SNAPSHOT"
 
 java {
   sourceCompatibility = JavaVersion.VERSION_1_8

examples/java-gradle-reactive/src/main/java/io/github/verissimor/examples/reactive/javagradlereactive/configuration/PageableWebFluxConfiguration.java

@@ -2,6 +2,7 @@
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.web.ReactivePageableHandlerMethodArgumentResolver;
+import org.springframework.web.reactive.config.CorsRegistry;
 import org.springframework.web.reactive.config.WebFluxConfigurer;
 import org.springframework.web.reactive.result.method.annotation.ArgumentResolverConfigurer;
 
@@ -12,4 +13,12 @@ public class PageableWebFluxConfiguration implements WebFluxConfigurer {
     public void configureArgumentResolvers(ArgumentResolverConfigurer configurer) {
         configurer.addCustomResolver(new ReactivePageableHandlerMethodArgumentResolver());
     }
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("http://localhost:4400/") // only for tests
+                .allowedMethods("GET", "POST")
+                .allowedHeaders("*");
+    }
 }

src/main/kotlin/io/github/verissimor/lib/r2dbcmagicfilter/R2dbcFieldParser.kt

@@ -1,32 +1,47 @@
 package io.github.verissimor.lib.r2dbcmagicfilter
 
+import io.github.verissimor.lib.jpamagicfilter.domain.FieldType
 import io.github.verissimor.lib.jpamagicfilter.domain.FilterOperator
+import io.github.verissimor.lib.jpamagicfilter.domain.ParsedField
+import io.github.verissimor.lib.jpamagicfilter.toSingleString
 import io.github.verissimor.lib.r2dbcmagicfilter.domain.R2dbcParsedField
 import java.lang.reflect.Field
 
 object R2dbcFieldParser {
 
   fun parseField(field: String, value: Array<String>?, clazz: Class<*>): R2dbcParsedField {
     val normalized = normalize(field)
-    val filterType = fieldToType(normalized, value)
-    val resolvedFieldName = resolveFieldName(normalized, filterType)
+    val filterOperator = fieldToFilterOperator(normalized)
+    val resolvedFieldName = resolveFieldName(normalized, filterOperator)
     val fieldClass: Field? = fieldToClass(resolvedFieldName, clazz)
 
-    return R2dbcParsedField(filterType, resolvedFieldName, fieldClass)
+    val resolvedOperator = overloadFilterOperator(filterOperator, value, fieldClass)
+
+    return R2dbcParsedField(resolvedOperator, resolvedFieldName, fieldClass)
   }
 
   private fun normalize(field: String) = field.trim().replace("[]", "")
 
-  private fun fieldToType(field: String, value: Array<String>?): FilterOperator {
+  private fun fieldToFilterOperator(field: String): FilterOperator {
     val type = FilterOperator.values()
       .sortedByDescending { it.suffix.length }
       .firstOrNull { field.contains(it.suffix) } ?: FilterOperator.EQUAL
 
-    if (value != null && type == FilterOperator.EQUAL && value.size > 1) {
+    return type
+  }
+
+  private fun overloadFilterOperator(filterOperator: FilterOperator, value: Array<String>?, fieldClass: Field?): FilterOperator {
+    val shouldTryOverload = value != null && filterOperator == FilterOperator.EQUAL
+    if (shouldTryOverload && value!!.size > 1) {
       return FilterOperator.IN
     }
 
-    return type
+    val fieldType: FieldType? = ParsedField.getFieldType(fieldClass)
+    if (shouldTryOverload && fieldType == FieldType.NUMBER && value!!.toSingleString()!!.contains(",")) {
+      return FilterOperator.IN
+    }
+
+    return filterOperator
   }
 
   private fun resolveFieldName(field: String, type: FilterOperator?) =