Skip to content

Allow using state field for countries other than US and CA #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
veelkoov wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

Allow using state field for countries other than US and CA #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
827126b
WIP
veelkoov Apr 12, 2026
e702652
Merge branch 'develop' into feature/allow-ignore-states-outside-north…
veelkoov Apr 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Filtering/RequestsHandling/FiltersValidChoicesFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function getOnlyValidChoices(Choices $choices): Choices
$countries = self::onlyValidValues($choices->countries,
$this->dataService->getCountries(), Consts::FILTER_VALUE_UNKNOWN);
$states = self::onlyValidValues($choices->states,
$this->dataService->getStates(), Consts::FILTER_VALUE_UNKNOWN);
$this->dataService->getStates(), Consts::FILTER_VALUE_UNKNOWN); // FIXME: Allow Other which will match anything outside US/CA
$languages = self::onlyValidValues($choices->languages,
$this->dataService->getLanguages(), Consts::FILTER_VALUE_UNKNOWN);

Expand Down
1 change: 0 additions & 1 deletion src/Form/InclusionUpdate/Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
])
->add('state', TextType::class, [
'label' => 'State',
'help' => 'Only for the US and Canada, otherwise please leave empty.',
'required' => false,
'empty_data' => '',
])
Expand Down
15 changes: 9 additions & 6 deletions src/Repository/CreatorRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,14 +196,17 @@ public function getDistinctCountries(): StringSet
return new StringSet($result); // @phpstan-ignore argument.type (Lack of skill to fix this)
}

public function getDistinctStates(): StringSet
public function getDistinctStates(StringSet $fromCountries = new StringSet()): StringSet
{
$result = $this->createQueryBuilder('d_c')
->select('DISTINCT d_c.state')
->getQuery()
->getSingleColumnResult();
$builder = $this->createQueryBuilder('d_c')->select('DISTINCT d_c.state');

return new StringSet($result); // @phpstan-ignore argument.type (Lack of skill to fix this)
if ($fromCountries->isNotEmpty()) {
$builder->where('d_c.country IN (:countries)')->setParameter('countries', $fromCountries);
}

$result = $builder->getQuery()->getSingleColumnResult();

return new StringSet($result);
}

public function getActiveOffersPaymentPlansStats(): NullBoolToInt
Expand Down
5 changes: 3 additions & 2 deletions src/Service/DataService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,10 @@ public function getCountries(): StringSet
return $this->cache->get(fn () => $this->creatorRepository->getDistinctCountries(), CacheTags::CREATORS, __METHOD__);
}

public function getStates(): StringSet
public function getStates(): StringSet // FIXME: Parametrize (and improve cache keys) or rename
{
return $this->cache->get(fn () => $this->creatorRepository->getDistinctStates(), CacheTags::CREATORS, __METHOD__);
return $this->cache->get(fn () => $this->creatorRepository->getDistinctStates(StringSet::of('CA', 'US')),
CacheTags::CREATORS, __METHOD__);
}

public function getOpenFor(): StringSet
Expand Down