Skip to content

Commit

Permalink
Spaces and Strict Comparison Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@karakhanyans
karakhanyans committed Dec 18, 2022
1 parent 706d024 commit 7a9edba
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 72 deletions.
140 changes: 70 additions & 70 deletions src/Engines/TypesenseEngine.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ public function update($models): void
$models->each->pushSoftDeleteMetadata();
}

$this->typesense->importDocuments($collection, $models->map(fn ($m) => $m->toSearchableArray())
->toArray());
$this->typesense->importDocuments($collection, $models->map(fn($m) => $m->toSearchableArray())
->toArray());
}

/**
Expand All @@ -111,10 +111,10 @@ public function delete($models): void
/**
* @param \Laravel\Scout\Builder $builder
*
* @throws \Typesense\Exceptions\TypesenseClientError
* @return mixed
* @throws \Http\Client\Exception
*
* @return mixed
* @throws \Typesense\Exceptions\TypesenseClientError
*/
public function search(Builder $builder): mixed
{
Expand All @@ -123,13 +123,13 @@ public function search(Builder $builder): mixed

/**
* @param \Laravel\Scout\Builder $builder
* @param int $perPage
* @param int $page
* @param int $perPage
* @param int $page
*
* @throws \Typesense\Exceptions\TypesenseClientError
* @return mixed
* @throws \Http\Client\Exception
*
* @return mixed
* @throws \Typesense\Exceptions\TypesenseClientError
*/
public function paginate(Builder $builder, $perPage, $page): mixed
{
Expand All @@ -143,17 +143,17 @@ public function paginate(Builder $builder, $perPage, $page): mixed
*
* @return array
*/
private function buildSearchParams(Builder $builder, int $page, int | null $perPage): array
private function buildSearchParams(Builder $builder, int $page, int|null $perPage): array
{
$params = [
'q' => $builder->query,
'query_by' => implode(',', $builder->model->typesenseQueryBy()),
'filter_by' => $this->filters($builder),
'per_page' => $perPage,
'page' => $page,
'q' => $builder->query,
'query_by' => implode(',', $builder->model->typesenseQueryBy()),
'filter_by' => $this->filters($builder),
'per_page' => $perPage,
'page' => $page,
'highlight_start_tag' => $this->startTag,
'highlight_end_tag' => $this->endTag,
'exhaustive_search' => $this->exhaustiveSearch,
'highlight_end_tag' => $this->endTag,
'exhaustive_search' => $this->exhaustiveSearch,
];

if ($this->limitHits > 0) {
Expand Down Expand Up @@ -185,8 +185,8 @@ private function buildSearchParams(Builder $builder, int $page, int | null $perP
* Parse location order by for sort_by.
*
* @param string $column
* @param float $lat
* @param float $lng
* @param float $lat
* @param float $lng
* @param string $direction
*
* @return string
Expand All @@ -195,9 +195,9 @@ private function buildSearchParams(Builder $builder, int $page, int | null $perP
private function parseOrderByLocation(string $column, float $lat, float $lng, string $direction = 'asc'): string
{
$direction = Str::lower($direction) === 'asc' ? 'asc' : 'desc';
$str = $column.'('.$lat.', '.$lng.')';
$str = $column . '(' . $lat . ', ' . $lng . ')';

return $str.':'.$direction;
return $str . ':' . $direction;
}

/**
Expand All @@ -211,25 +211,25 @@ private function parseOrderBy(array $orders): string
{
$sortByArr = [];
foreach ($orders as $order) {
$sortByArr[] = $order['column'].':'.$order['direction'];
$sortByArr[] = $order['column'] . ':' . $order['direction'];
}

return implode(',', $sortByArr);
}

/**
* @param \Laravel\Scout\Builder $builder
* @param array $options
* @param array $options
*
* @throws \Typesense\Exceptions\TypesenseClientError
* @return mixed
* @throws \Http\Client\Exception
*
* @return mixed
* @throws \Typesense\Exceptions\TypesenseClientError
*/
protected function performSearch(Builder $builder, array $options = []): mixed
{
$documents = $this->typesense->getCollectionIndex($builder->model)
->getDocuments();
->getDocuments();
if ($builder->callback) {
return call_user_func($builder->callback, $documents, $builder->query, $options);
}
Expand Down Expand Up @@ -261,17 +261,17 @@ protected function filters(Builder $builder): string
])
->values()
->implode(' && ');
return $whereFilter . (
(strlen($whereFilter) > 0 && strlen($whereInFilter) > 0) ? ' && ' : ''
) . $whereInFilter;

return $whereFilter . (
($whereFilter !== '' && $whereInFilter !== '') ? ' && ' : ''
) . $whereInFilter;
}

/**
* Parse typesense where filter.
*
* @param array|string $value
* @param string $key
* @param string $key
*
* @return string
*/
Expand All @@ -287,14 +287,14 @@ public function parseWhereFilter(array|string $value, string $key): string
/**
* Parse typesense whereIn filter.
*
* @param array $value
* @param array $value
* @param string $key
*
* @return string
*/
public function parseWhereInFilter(array $value, string $key): string
{
return sprintf('%s:=%s', $key, '['. implode(', ', $value).']');
return sprintf('%s:=%s', $key, '[' . implode(', ', $value) . ']');
}

/**
Expand All @@ -305,13 +305,13 @@ public function parseWhereInFilter(array $value, string $key): string
public function mapIds($results): Collection
{
return collect($results['hits'])
->pluck('document.id')
->values();
->pluck('document.id')
->values();
}

/**
* @param \Laravel\Scout\Builder $builder
* @param mixed $results
* @param \Laravel\Scout\Builder $builder
* @param mixed $results
* @param \Illuminate\Database\Eloquent\Model $model
*
* @return \Illuminate\Database\Eloquent\Collection
Expand All @@ -323,28 +323,28 @@ public function map(Builder $builder, $results, $model): \Illuminate\Database\El
}

$objectIds = collect($results['hits'])
->pluck('document.id')
->values()
->all();
->pluck('document.id')
->values()
->all();

$objectIdPositions = array_flip($objectIds);

return $model->getScoutModelsByIds($builder, $objectIds)
->filter(static function ($model) use ($objectIds) {
return in_array($model->getScoutKey(), $objectIds, false);
})
->sortBy(static function ($model) use ($objectIdPositions) {
return $objectIdPositions[$model->getScoutKey()];
})
->values();
->filter(static function ($model) use ($objectIds) {
return in_array($model->getScoutKey(), $objectIds, false);
})
->sortBy(static function ($model) use ($objectIdPositions) {
return $objectIdPositions[$model->getScoutKey()];
})
->values();
}

/**
* @inheritDoc
*/
public function getTotalCount($results): int
{
return (int) ($results['found'] ?? 0);
return (int)($results['found'] ?? 0);
}

/**
Expand All @@ -370,43 +370,43 @@ protected function usesSoftDelete($model): bool
}

/**
* @param \Laravel\Scout\Builder $builder
* @param mixed $results
* @param \Laravel\Scout\Builder $builder
* @param mixed $results
* @param \Illuminate\Database\Eloquent\Model $model
*
* @return \Illuminate\Support\LazyCollection
*/
public function lazyMap(Builder $builder, $results, $model): LazyCollection
{
if ((int) ($results['found'] ?? 0) === 0) {
if ((int)($results['found'] ?? 0) === 0) {
return LazyCollection::make($model->newCollection());
}

$objectIds = collect($results['hits'])
->pluck('document.id')
->values()
->all();
->pluck('document.id')
->values()
->all();

$objectIdPositions = array_flip($objectIds);

return $model->queryScoutModelsByIds($builder, $objectIds)
->cursor()
->filter(static function ($model) use ($objectIds) {
return in_array($model->getScoutKey(), $objectIds, false);
})
->sortBy(static function ($model) use ($objectIdPositions) {
return $objectIdPositions[$model->getScoutKey()];
})
->values();
->cursor()
->filter(static function ($model) use ($objectIds) {
return in_array($model->getScoutKey(), $objectIds, false);
})
->sortBy(static function ($model) use ($objectIdPositions) {
return $objectIdPositions[$model->getScoutKey()];
})
->values();
}

/**
* @param string $name
* @param array $options
* @param array $options
*
* @return void
* @throws \Exception
*
* @return void
*/
public function createIndex($name, array $options = []): void
{
Expand Down Expand Up @@ -489,18 +489,18 @@ public function limitHits(int $limitHits): static
* Add location to order by clause.
*
* @param string $column
* @param float $lat
* @param float $lng
* @param float $lat
* @param float $lng
* @param string $direction
*
* @return $this
*/
public function orderByLocation(string $column, float $lat, float $lng, string $direction): static
{
$this->locationOrderBy = [
'column' => $column,
'lat' => $lat,
'lng' => $lng,
'column' => $column,
'lat' => $lat,
'lng' => $lng,
'direction' => $direction,
];

Expand All @@ -524,11 +524,11 @@ public function exhaustiveSearch(bool $exhaustiveSearch): static
/**
* @param string $name
*
* @throws \Typesense\Exceptions\ObjectNotFound
* @return array
* @throws \Typesense\Exceptions\TypesenseClientError
* @throws \Http\Client\Exception
*
* @return array
* @throws \Typesense\Exceptions\ObjectNotFound
*/
public function deleteIndex($name): array
{
Expand Down
3 changes: 1 addition & 2 deletions src/Typesense.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ public function importDocuments(Collection $collectionIndex, $documents, string
*/
public function deleteCollection(string $collectionName): array
{
$index = $this->client->getCollections()->{$collectionName};
return $index->delete();
return $this->client->getCollections()->{$collectionName}->delete();
}
}

0 comments on commit 7a9edba

Please sign in to comment.