diff --git a/.changes/unreleased/Fixed-20260223-144735.yaml b/.changes/unreleased/Fixed-20260223-144735.yaml new file mode 100644 index 000000000..d20a8b4de --- /dev/null +++ b/.changes/unreleased/Fixed-20260223-144735.yaml @@ -0,0 +1,8 @@ +kind: Fixed +body: | + Fix: some postal code appears in the UI, although they are marked as deleted +time: 2026-02-23T14:47:35.925109983+01:00 +custom: + Issue: "499" + MR: "963" + SchemaChange: No schema change diff --git a/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php index cd13ad455..4ca82053d 100644 --- a/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php +++ b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php @@ -79,5 +79,7 @@ final class PostalCodeAPIController extends ApiController $qb->andWhere('e.origin = :zero') ->setParameter('zero', 0); + + $qb->andWhere('e.deletedAt IS NULL'); } } diff --git a/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php b/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php index 0779ea90a..b26b5bed2 100644 --- a/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php +++ b/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php @@ -100,7 +100,9 @@ final readonly class PostalCodeRepository implements PostalCodeRepositoryInterfa $query ->setFromClause('chill_main_postal_code cmpc') - ->andWhereClause('cmpc.origin = 0'); + ->andWhereClause('cmpc.origin = 0') + ->andWhereClause('cmpc.deletedAt IS NULL') + ; if (null !== $country) { $query->andWhereClause('cmpc.country_id = ?', [$country->getId()]); diff --git a/src/Bundle/ChillMainBundle/migrations/Version20260223134919.php b/src/Bundle/ChillMainBundle/migrations/Version20260223134919.php new file mode 100644 index 000000000..170519940 --- /dev/null +++ b/src/Bundle/ChillMainBundle/migrations/Version20260223134919.php @@ -0,0 +1,41 @@ +addSql('DROP INDEX public.search_name_code'); + $this->addSql('CREATE INDEX search_name_code ON public.chill_main_postal_code USING GIN (LOWER(code) gin_trgm_ops, LOWER(label) gin_trgm_ops) WHERE deletedAt IS NULL'); + $this->addSql('DROP INDEX public.chill_internal_postal_code_canonicalized'); + $this->addSql('CREATE INDEX chill_internal_postal_code_canonicalized ON chill_main_postal_code USING GIST (canonical gist_trgm_ops) WHERE origin = 0 AND deletedAt IS NULL'); + + } + + public function down(Schema $schema): void + { + $this->addSql('DROP INDEX public.search_name_code'); + $this->addSql('CREATE INDEX search_name_code ON chill_main_postal_code USING GIN (LOWER(code) gin_trgm_ops, LOWER(label) gin_trgm_ops)'); + + $this->addSql('DROP INDEX public.chill_internal_postal_code_canonicalized'); + $this->addSql('CREATE INDEX chill_internal_postal_code_canonicalized ON chill_main_postal_code USING GIST (canonical gist_trgm_ops) WHERE origin = 0'); + } +}