Merge pull request #928 from solita/feature/ae-1814-fixes

Feature/ae 1814 fixes

etp-backend/src/main/clj/solita/etp/service/energiatodistus_search.clj

@@ -51,7 +51,8 @@
  {:energiatodistus energiatodistus-schema/Energiatodistus2018}
  {:energiatodistus
  {:perustiedot
- {:postinumero schema/Int}}}
+ {:nimi schema/Str
+ :postinumero schema/Int}}}
  {:laatija
  {:patevyystaso common-schema/Key
  :toteamispaivamaara common-schema/Date
@@ -60,7 +61,8 @@
  (deep/map-values second search-fields/computed-fields)
  geo-schema/Search))
 
-(def bilingual-fields #{"postinumero.label"})
+(def bilingual-fields #{"energiatodistus.perustiedot.nimi"
+ "postinumero.label"})
 
 (def public-search-schema
  (schemas->search-schema
@@ -192,9 +194,10 @@
  :message (str "Unknown predicate: " predicate-name)})))
 
 (defn- expand-bilingual-expression [formatter search-schema predicate field & values]
- (let [[fi-sql & fi-values] (apply formatter search-schema predicate (str field "-fi") values)
+ (let [logical-op (if (= predicate "not ilike") "and" "or")
+ [fi-sql & fi-values] (apply formatter search-schema predicate (str field "-fi") values)
  [sv-sql & sv-values] (apply formatter search-schema predicate (str field "-sv") values)]
- (concat [(str "((" fi-sql ")or(" sv-sql "))")]
+ (concat [(str "((" fi-sql ")" logical-op "(" sv-sql "))")]
  fi-values sv-values)))
 
 (defn predicate-expression->sql [search-schema expression]

etp-backend/src/main/clj/solita/etp/service/energiatodistus_search_fields.clj

@@ -96,9 +96,7 @@
 (def computed-fields
  "Computed field consists of sql expression and value schema [sql, schema]"
  {:energiatodistus
- {:perustiedot
- {:nimi ["energiatodistus.pt$nimi_fi || '__' || energiatodistus.pt$nimi_fi" schema/Str]}
- :lahtotiedot
+ {:lahtotiedot
  {:rakennusvaippa (deep/deep-merge ua-fields osuus-lampohaviosta-fields)}
  :tulokset
  {:kaytettavat-energiamuodot

etp-backend/src/test/clj/solita/etp/service/energiatodistus_search_test.clj

@@ -666,8 +666,7 @@
  energiatodistus-adds
  laatija-id)]
  (sign-energiatodistukset! (map #(vec [laatija-id %]) energiatodistus-ids))
- {:laatija (assoc laatija :id laatija-id)
- :energiatodistukset (zipmap energiatodistus-ids energiatodistus-adds)}
+
  (t/testing "Simple search in Finnish"
  (let [results (search kayttaja-test-data/paakayttaja
  [[["ilike" "postinumero.label" "purola"]]]
@@ -689,3 +688,44 @@
  (t/is (= (count results) 2))
  (doseq [et results]
  (t/is (= (get-in et [:perustiedot :postinumero]) "49270")))))))
+
+(t/deftest search-by-nimi-both-languages-test
+ (let [[laatija-id _] (-> (laatija-test-data/generate-and-insert! 1) first)
+ energiatodistus-adds (concat
+ (map (fn [et]
+ (-> et
+ (assoc-in [:perustiedot :nimi-fi] "Talo 12499")
+ (assoc-in [:perustiedot :nimi-sv] "Hus 12499")))
+ (energiatodistus-test-data/generate-adds 1 2018 true))
+ (energiatodistus-test-data/generate-adds 3 2018 true))
+ energiatodistus-ids (energiatodistus-test-data/insert!
+ energiatodistus-adds
+ laatija-id)]
+ (sign-energiatodistukset! (map #(vec [laatija-id %]) energiatodistus-ids))
+
+ (t/testing "Simple search in Finnish"
+ (let [results (search kayttaja-test-data/paakayttaja
+ [[["ilike" "energiatodistus.perustiedot.nimi" "%Talo 12499%"]]]
+ nil nil nil)]
+ (t/is (= (count results) 1))
+ (doseq [et results]
+ (t/is (= (get-in et [:perustiedot :nimi-fi]) "Talo 12499"))
+ (t/is (= (get-in et [:perustiedot :nimi-sv]) "Hus 12499")))))
+ (t/testing "Search in Swedish, using caps"
+ (let [results (search kayttaja-test-data/paakayttaja
+ [[["ilike" "energiatodistus.perustiedot.nimi" "%Hus 12499%"]]]
+ nil nil nil)]
+ (t/is (= (count results) 1))
+ (doseq [et results]
+ (t/is (= (get-in et [:perustiedot :nimi-fi]) "Talo 12499"))
+ (t/is (= (get-in et [:perustiedot :nimi-sv]) "Hus 12499")))))
+ (t/testing "Negation"
+ (let [results (search kayttaja-test-data/paakayttaja
+ [[["not ilike" "energiatodistus.perustiedot.nimi" "%12499%"]]]
+ nil nil nil)]
+ (t/is (= (count results) 3))))
+ (t/testing "Negation so that it is hitting only one language"
+ (let [results (search kayttaja-test-data/paakayttaja
+ [[["not ilike" "energiatodistus.perustiedot.nimi" "Hus 12499"]]]
+ nil nil nil)]
+ (t/is (= (count results) 3))))))