Skip to content

Commit 0703c47

Browse files
authored
Merge pull request #287 from keboola/jv-PST-324-fix-source-tags-validation
[input-mapping] Fix source tags validation
2 parents 55c414e + 863e2c6 commit 0703c47

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

src/Helper/BuildQueryFromConfigurationHelper.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@ class BuildQueryFromConfigurationHelper
1010
{
1111
public static function buildQuery(array $configuration): string
1212
{
13-
if (isset($configuration['query']) && isset($configuration['source']['tags'])) {
13+
$tagsPresent = count($configuration['source']['tags'] ?? []) > 0;
14+
15+
if (isset($configuration['query']) && $tagsPresent) {
1416
return sprintf(
1517
'%s AND (%s)',
1618
$configuration['query'],
1719
self::buildQueryForSourceTags($configuration['source']['tags']),
1820
);
1921
}
20-
if (isset($configuration['source']['tags'])) {
22+
if ($tagsPresent) {
2123
return self::buildQueryForSourceTags(
2224
$configuration['source']['tags'],
2325
$configuration['changed_since'] ?? null,

tests/Helper/BuildQueryFromConfigurationHelperTest.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,19 @@ public function testBuildQuerySourceTagsAndQuery(): void
117117
);
118118
}
119119

120+
public function testBuildQuerySourceTagsAndQueryWhenSourceTagsEmpty(): void
121+
{
122+
self::assertEquals(
123+
'tag:123',
124+
BuildQueryFromConfigurationHelper::buildQuery([
125+
'query' => 'tag:123',
126+
'source' => [
127+
'tags' => [],
128+
],
129+
]),
130+
);
131+
}
132+
120133
public function testChangedSinceQueryPortion(): void
121134
{
122135
self::assertEquals(

0 commit comments

Comments
 (0)