Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

fixed: error with parent joins in thirdparty api search query

Browse Source
This commit is contained in:
Mathieu Jaumotte 2023-07-12 10:38:11 +02:00
parent 197d69ef4a
commit a2e705bd92
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Bundle/ChillMainBundle/Controller/resquery.bad.sql Normal file
View File

@ -0,0 +1,21 @@
SELECT
'tparty' AS key, jsonb_build_object('id', tparty.id) AS metadata, GREATEST(
STRICT_WORD_SIMILARITY(LOWER(UNACCENT('areams')), tparty.canonicalized),
STRICT_WORD_SIMILARITY(LOWER(UNACCENT('areams')), parent.canonicalized)
) + GREATEST(
(tparty.canonicalized LIKE '%s' || LOWER(UNACCENT('areams')) || '%')::int,
(parent.canonicalized LIKE '%s' || LOWER(UNACCENT('areams')) || '%')::int
) + COALESCE((LOWER(UNACCENT(cmpc.label)) LIKE '%' || LOWER(UNACCENT('areams')) || '%')::int * 0.3, 0) + COALESCE((LOWER(UNACCENT(cmpc_p.label)) LIKE '%' || LOWER(UNACCENT('areams')) || '%')::int * 0.3, 0) + 1 AS pertinence
FROM chill_3party.third_party AS tparty
LEFT JOIN chill_main_address cma ON cma.id = tparty.address_id
LEFT JOIN chill_main_postal_code cmpc ON cma.postcode_id = cmpc.id
LEFT JOIN chill_3party.third_party AS parent ON tparty.parent_id = parent.id
LEFT JOIN chill_main_address cma_p ON parent.address_id = cma_p.id
LEFT JOIN chill_main_postal_code cmpc_p ON cma_p.postcode_id = cmpc.id
WHERE (tparty.active IS TRUE) AND (((LOWER(UNACCENT('areams')) <<% tparty.canonicalized OR
tparty.canonicalized LIKE '%' || LOWER(UNACCENT('areams')) || '%')
OR
(LOWER(UNACCENT('areams')) <<% parent.canonicalized OR
parent.canonicalized LIKE '%' || LOWER(UNACCENT('areams')) || '%'))
AND tparty.active IS TRUE and (parent.active IS TRUE OR parent IS NULL))
ORDER BY pertinence DESC LIMIT 50 OFFSET 0;

21
src/Bundle/ChillMainBundle/Controller/resquery.fixed.sql Normal file
View File

@ -0,0 +1,21 @@
SELECT
'tparty' AS key, jsonb_build_object('id', tparty.id) AS metadata, GREATEST(
STRICT_WORD_SIMILARITY(LOWER(UNACCENT('areams')), tparty.canonicalized),
STRICT_WORD_SIMILARITY(LOWER(UNACCENT('areams')), parent.canonicalized)
) + GREATEST(
(tparty.canonicalized LIKE '%s' || LOWER(UNACCENT('areams')) || '%')::int,
(parent.canonicalized LIKE '%s' || LOWER(UNACCENT('areams')) || '%')::int
) + COALESCE((LOWER(UNACCENT(cmpc.label)) LIKE '%' || LOWER(UNACCENT('areams')) || '%')::int * 0.3, 0) + COALESCE((LOWER(UNACCENT(cmpc_p.label)) LIKE '%' || LOWER(UNACCENT('areams')) || '%')::int * 0.3, 0) + 1 AS pertinence
FROM chill_3party.third_party AS tparty
LEFT JOIN chill_main_address cma ON cma.id = tparty.address_id
LEFT JOIN chill_main_postal_code cmpc ON cma.postcode_id = cmpc.id
LEFT JOIN chill_3party.third_party AS parent ON tparty.parent_id = parent.id
LEFT JOIN chill_main_address cma_p ON parent.address_id = cma_p.id
LEFT JOIN chill_main_postal_code cmpc_p ON cma_p.postcode_id = cmpc_p.id
WHERE (tparty.active IS TRUE) AND (((LOWER(UNACCENT('areams')) <<% tparty.canonicalized OR
tparty.canonicalized LIKE '%' || LOWER(UNACCENT('areams')) || '%')
OR
(LOWER(UNACCENT('areams')) <<% parent.canonicalized OR
parent.canonicalized LIKE '%' || LOWER(UNACCENT('areams')) || '%'))
AND tparty.active IS TRUE and (parent.active IS TRUE OR parent IS NULL))
ORDER BY pertinence DESC LIMIT 50 OFFSET 0;

2
src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
View File

@ -75,7 +75,7 @@ class ThirdPartyApiSearch implements SearchApiInterface
LEFT JOIN chill_main_postal_code cmpc ON cma.postcode_id = cmpc.id
LEFT JOIN chill_3party.third_party AS parent ON tparty.parent_id = parent.id
LEFT JOIN chill_main_address cma_p ON parent.address_id = cma_p.id
LEFT JOIN chill_main_postal_code cmpc_p ON cma_p.postcode_id = cmpc.id')
LEFT JOIN chill_main_postal_code cmpc_p ON cma_p.postcode_id = cmpc_p.id')
->andWhereClause('tparty.active IS TRUE');
$strs = explode(' ', $pattern);