Backend/fix : toClickHouseVal support for Boolean Values

Author: dhruv-1010

lib/mobility-core/src/Kernel/Storage/ClickhouseV2/ClickhouseValue.hs

@@ -48,10 +48,12 @@ instance FromJSON (Value a) where
 class (Show a, Read a) => ClickhouseValue a where
   toClickhouseValue :: a -> Value a
   fromClickhouseValue :: Value a -> Except a
+  toClickhouseFilterValues :: a -> NonEmpty (Value a)
   toClickhouseValue = String . show
   fromClickhouseValue (String str) = parseAsString @a str
   fromClickhouseValue (Number _) = fail "Unexpected Number"
   fromClickhouseValue Null = fail "Unexpected Null"
+  toClickhouseFilterValues a = toClickhouseValue a :| []
 
 -- For ATLAS_KAFKA env we store numbers as String, for APP_SERVICE_CLICKHOUSE env we store as Number. So we should be able to parse both
 instance ClickhouseValue HighPrecMoney where
@@ -101,6 +103,8 @@ parseAsNumber = Except . eitherResult . A.fromJSON @a . A.Number
 instance ClickhouseValue Bool where
   toClickhouseValue True = Number 1
   toClickhouseValue False = Number 0
+  toClickhouseFilterValues True = Number 1 :| [String "True", String "TRUE", String "true"] -- we are not sure about the current clickhouse Bool format
+  toClickhouseFilterValues False = Number 0 :| [String "False", String "FALSE", String "false"]
   fromClickhouseValue (String "1") = pure True
   fromClickhouseValue (String "0") = pure False
   fromClickhouseValue (String "True") = pure True

lib/mobility-core/src/Kernel/Storage/ClickhouseV2/Internal/ClickhouseQuery.hs

@@ -73,17 +73,30 @@ instance (ClickhouseTable t) => ClickhouseQuery (Clause t) where
   toClickhouseQuery (Val b) = RawQuery $ C.toLower <$> show @String @Bool b
 
 instance ClickhouseValue value => ClickhouseQuery (Term value) where
-  toClickhouseQuery (In valList) = " IN " <> (addBrackets . intercalate "," . (valToClickhouseQuery @value <$>) $ toList valList)
-  toClickhouseQuery (Eq term) = "=" <> valToClickhouseQuery @value term
+  toClickhouseQuery (In valList) = " IN " <> renderInList (toList valList >>= (toList . toClickhouseFilterValues @value))
+  toClickhouseQuery (Eq term) = eqOrInClickhouseQuery @value term
   toClickhouseQuery NullTerm = " IS NULL"
   toClickhouseQuery NotNullTerm = " IS NOT NULL"
-  toClickhouseQuery (NotEq term) = "!=" <> valToClickhouseQuery @value term
+  toClickhouseQuery (NotEq term) = notEqOrNotInClickhouseQuery @value term
   toClickhouseQuery (GreaterThan term) = ">" <> valToClickhouseQuery @value term
   toClickhouseQuery (GreaterOrEqualThan term) = ">=" <> valToClickhouseQuery @value term
   toClickhouseQuery (LessThan term) = "<" <> valToClickhouseQuery @value term
   toClickhouseQuery (LessOrEqualThan term) = "<=" <> valToClickhouseQuery @value term
   toClickhouseQuery (Like term) = " LIKE " <> valToClickhouseQuery @value term
 
+eqOrInClickhouseQuery :: forall value. ClickhouseValue value => value -> RawQuery
+eqOrInClickhouseQuery term = case toClickhouseFilterValues @value term of
+  v :| [] -> "=" <> toClickhouseQuery @(Value value) v
+  vs -> " IN " <> renderInList (toList vs)
+
+notEqOrNotInClickhouseQuery :: forall value. ClickhouseValue value => value -> RawQuery
+notEqOrNotInClickhouseQuery term = case toClickhouseFilterValues @value term of
+  v :| [] -> "!=" <> toClickhouseQuery @(Value value) v
+  vs -> " NOT IN " <> renderInList (toList vs)
+
+renderInList :: forall value. ClickhouseValue value => [Value value] -> RawQuery
+renderInList = addBrackets . intercalate "," . (toClickhouseQuery @(Value value) <$>)
+
 -- do we need quotes for each datatype?
 valToClickhouseQuery :: forall value. ClickhouseValue value => value -> RawQuery
 valToClickhouseQuery = toClickhouseQuery @(Value value) . toClickhouseValue @value