Skip to content

Dev into Main #34

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

Merged
merged 4 commits into from
Oct 14, 2025
Merged

Dev into Main #34

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68c4202
add relevance scoring for single-field prefix searches
ginkelsoft-development Oct 14, 2025
875c515
add encryption validation and batch search methods
ginkelsoft-development Oct 14, 2025
3692c62
add relevance scoring for single-field prefix searches
ginkelsoft-development Oct 14, 2025
ad54caa
Merge pull request #33 from ginkelsoft-development/feature/encryption…
ginkelsoft-development Oct 14, 2025
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
7 changes: 5 additions & 2 deletions src/Traits/HasEncryptedSearchIndex.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,15 +349,16 @@ public function scopeEncryptedPrefix(Builder $query, string $field, string $term
return $query->whereIn($this->getQualifiedKeyName(), $modelIds);
}

// Fallback to database
// Fallback to database with relevance sorting
// Sort by field length (shorter matches = more relevant)
return $query->whereIn($this->getQualifiedKeyName(), function ($sub) use ($field, $tokens) {
$sub->select('model_id')
->from('encrypted_search_index')
->where('model_type', static::class)
->where('field', $field)
->where('type', 'prefix')
->whereIn('token', $tokens);
});
})->orderByRaw("LENGTH({$field}) ASC");
}

/**
Expand Down Expand Up @@ -408,6 +409,8 @@ public function scopeEncryptedPrefixMulti(Builder $query, array $fields, string
}

// Fallback to database - use OR logic for multiple fields
// Note: Multi-field searches don't have relevance sorting due to database compatibility
// Use single-field searches for relevance-sorted results
return $query->whereIn($this->getQualifiedKeyName(), function ($sub) use ($fields, $tokens) {
$sub->select('model_id')
->from('encrypted_search_index')
Expand Down