refactor: introduce domain model classes and mapper layer
Replace ad-hoc inline row casting (snake_case → camelCase) spread across services, routes, and the indexing pipeline with explicit model classes (Repository, IndexingJob, RepositoryVersion, Snippet, SearchResult) and dedicated mapper classes that own the DB → domain conversion. - Add src/lib/server/models/ with typed model classes for all domain entities - Add src/lib/server/mappers/ with mapper classes per entity - Remove duplicated RawRow interfaces and inline map functions from job-queue, repository.service, indexing.pipeline, and all API routes - Add dtoJsonResponse helper to standardise JSON responses via SvelteKit json() - Add api-contract.integration.test.ts as a regression baseline Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -13,11 +13,12 @@
|
||||
|
||||
import type Database from 'better-sqlite3';
|
||||
import type { EmbeddingProvider } from '../embeddings/provider.js';
|
||||
import type { SnippetSearchResult } from './search.service.js';
|
||||
import { SnippetSearchResult, SnippetRepositoryRef } from '$lib/server/models/search-result.js';
|
||||
import { SnippetEntity } from '$lib/server/models/snippet.js';
|
||||
import { SearchResultMapper } from '$lib/server/mappers/search-result.mapper.js';
|
||||
import { SearchService } from './search.service.js';
|
||||
import { VectorSearch } from './vector.search.js';
|
||||
import { reciprocalRankFusion } from './rrf.js';
|
||||
import type { Snippet } from '$lib/types';
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Public interfaces
|
||||
@@ -54,18 +55,7 @@ export interface SearchConfig {
|
||||
// Raw DB row used when re-fetching snippets by ID
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
interface RawSnippetById {
|
||||
id: string;
|
||||
document_id: string;
|
||||
repository_id: string;
|
||||
version_id: string | null;
|
||||
type: 'code' | 'info';
|
||||
title: string | null;
|
||||
content: string;
|
||||
language: string | null;
|
||||
breadcrumb: string | null;
|
||||
token_count: number | null;
|
||||
created_at: number;
|
||||
interface RawSnippetById extends SnippetEntity {
|
||||
repo_id: string;
|
||||
repo_title: string;
|
||||
}
|
||||
@@ -200,25 +190,17 @@ export class HybridSearchService {
|
||||
const row = byId.get(id);
|
||||
if (!row) continue;
|
||||
|
||||
const snippet: Snippet = {
|
||||
id: row.id,
|
||||
documentId: row.document_id,
|
||||
repositoryId: row.repository_id,
|
||||
versionId: row.version_id,
|
||||
type: row.type,
|
||||
title: row.title,
|
||||
content: row.content,
|
||||
language: row.language,
|
||||
breadcrumb: row.breadcrumb,
|
||||
tokenCount: row.token_count,
|
||||
createdAt: new Date(row.created_at * 1000)
|
||||
};
|
||||
|
||||
results.push({
|
||||
snippet,
|
||||
score: 0, // RRF score not mapped to BM25 scale; consumers use rank position.
|
||||
repository: { id: row.repo_id, title: row.repo_title }
|
||||
});
|
||||
results.push(
|
||||
new SnippetSearchResult({
|
||||
snippet: SearchResultMapper.snippetFromEntity(
|
||||
new SnippetEntity(row),
|
||||
new SnippetRepositoryRef({ id: row.repo_id, title: row.repo_title }),
|
||||
0
|
||||
).snippet,
|
||||
score: 0,
|
||||
repository: new SnippetRepositoryRef({ id: row.repo_id, title: row.repo_title })
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
return results;
|
||||
|
||||
Reference in New Issue
Block a user