1 Commits
Author SHA1 Message Date
kasun 5f4f417edc docs: add git and ticket conventions
SonarQube Analysis / Build and Analyze (push) Successful in 2m44s
2026-07-21 01:36:24 +02:00
41 changed files with 342 additions and 1026 deletions
+8 -39
View File
@@ -49,15 +49,13 @@ Package-by-feature layout. Server context path is `/api`. Main endpoints:
- `GET /api/connections/status` — lists connected services for the current session - `GET /api/connections/status` — lists connected services for the current session
- `DELETE /api/connections/{serviceType}` — removes a service from the session; invalidates the session if no connections remain - `DELETE /api/connections/{serviceType}` — removes a service from the session; invalidates the session if no connections remain
- `POST /api/search` — paged search against the requested service; returns 401 if no active session - `POST /api/search` — paged search against the requested service; returns 401 if no active session
- `POST /api/sync` — triggers a vector-store sync for the requested service; returns 401 if no active session. Not yet triggered on login or called from the frontend — manual/internal trigger only for now.
Eight packages: Five packages:
**`shared/`** — cross-cutting types used by more than one feature package **`shared/`** — cross-cutting types used by more than one feature package
- `ServiceType` (enum): identifies each integrated app (e.g. `HOMEBOX`); used across `connection/`, `search/`, `sync/` - `ServiceType` (enum): identifies each integrated app (e.g. `HOMEBOX`); used in both `connection/` and `search/`
- `ServiceProvider` (interface): base for `ConnectionProvider`, `SearchProvider`, `SyncProvider`; declares `getServiceType()` - `ServiceProvider` (interface): base for `ConnectionProvider` and `SearchProvider`; declares `getServiceType()`
- `ServiceItem`: normalized item shape (`id`, `title`, `description`, `extraData`) returned by both search and sync fetches
- `Endpoint` (enum): API path constants for all external service calls - `Endpoint` (enum): API path constants for all external service calls
- `SessionKeys`: builds session attribute names of the form `{SERVICE_TYPE}_CONNECTION_ID` - `SessionKeys`: builds session attribute names of the form `{SERVICE_TYPE}_CONNECTION_ID`
@@ -69,40 +67,17 @@ Eight packages:
**`connection/`** — connecting to and persisting service credentials **`connection/`** — connecting to and persisting service credentials
- `ConnectionProvider` interface: extends `ServiceProvider`; each integrated app implements `login()` and credential checking - `ConnectionProvider` interface: extends `ServiceProvider`; each integrated app implements `login()` and credential checking
- `ConnectionIdentifiable` interface: `appUrl()`/`username()`/`serviceType()`; implemented by `SearchRequest` and `SyncRequest` so `HomeboxItemClient` can resolve the underlying connection regardless of which feature is calling it
- `ConnectionService`: auto-discovers providers via Spring injection, dispatches login by `ServiceType` - `ConnectionService`: auto-discovers providers via Spring injection, dispatches login by `ServiceType`
- `ConnectionController`: stores `{serviceType}_CONNECTION_ID` in `HttpSession` after login; reads session attributes to build status responses - `ConnectionController`: stores `{serviceType}_CONNECTION_ID` in `HttpSession` after login; reads session attributes to build status responses
- Entity (`ConnectionEntity`) uses **Single Table Inheritance** — one `connections` table with app-specific nullable columns - Entity (`ConnectionEntity`) uses **Single Table Inheritance** — one `connections` table with app-specific nullable columns
- `HomeboxConnectionProvider` / `HomeboxConnectionEntity`: Homebox-specific implementation - `HomeboxConnectionProvider` / `HomeboxEntity`: Homebox-specific implementation
**`homebox/`** — shared Homebox API access **`search/`** — querying connected services
- `HomeboxItemClient`: fetches a page of items from the Homebox entities API and maps them to `ServiceItem`; used by both `HomeboxSearchProvider` (keyword search) and `HomeboxSyncProvider` (vector-store sync) so the fetch/mapping logic isn't duplicated
**`vector/`** — vectorization
- `EmbeddingService`: embeds `ServiceItem`s into pgvector's `VectorStore` and prunes entries that no longer exist upstream. Document ID is `{connectionId}:{itemId}`, so re-syncing upserts existing items instead of duplicating them. Deliberately stateless (only field is the injected `VectorStore`) since it's a singleton bean — the per-sync ID accumulator used for pruning is owned by the caller (`HomeboxSyncProvider`), not held as instance state
- `PgVectorStore` itself is auto-configured by `spring-ai-starter-vector-store-pgvector` from `application.yaml` (`spring.ai.vectorstore.pgvector.dimensions`) — no manual config class in this codebase
**`search/`** — querying connected services (keyword and AI)
- `SearchProvider` interface: extends `ServiceProvider`; each integrated app implements `getSearchResults()` - `SearchProvider` interface: extends `ServiceProvider`; each integrated app implements `getSearchResults()`
- `SearchService`: dispatches by `ServiceType` via a single provider map — **does not yet route on `SearchRequest.aiSearch`**; `HomeboxSearchProvider` and `HomeboxAiSearchProvider` both currently register for `ServiceType.HOMEBOX`, so only one wins the registration (known gap, pending AI search work) - `SearchService`: auto-discovers providers via Spring injection, dispatches by `ServiceType`
- `SearchController`: guards with session check before delegating to `SearchService` - `SearchController`: guards with session check before delegating to `SearchService`
- `SearchRequest`: includes `aiSearch: boolean` (not yet consumed, see above) and implements `ConnectionIdentifiable` - `HomeboxSearchProvider`: Homebox-specific search implementation using bearer token from session
- `PagedSearchResponse`: includes nullable `summary` field — populated only for AI search results; null for keyword search
- `HomeboxSearchProvider`: keyword search; delegates the remote fetch to `HomeboxItemClient`
- `HomeboxAiSearchProvider`: **stub only**`getSearchResults` throws `UnsupportedOperationException`; the actual similarity search + summary generation is pending
**`sync/`** — indexing connected services into the vector store
- `SyncProvider` interface: extends `ServiceProvider`; each integrated app implements `syncVectorStore()`
- `SyncService`: dispatches by `ServiceType` via a provider map, same pattern as `SearchService`
- `SyncController`: session-gated `POST /sync`; not currently called by the frontend or triggered on login
- `SyncRequest`: implements `ConnectionIdentifiable`
- `HomeboxSyncProvider`: pages through the full Homebox catalog via `HomeboxItemClient`, embedding each page through `EmbeddingService.vectorizeData` and collecting every item ID seen along the way. Once the full page loop finishes, calls `EmbeddingService.deleteStaleVectorEntries` **once** with the complete ID set, removing any previously indexed item no longer present upstream. Order matters — pruning per page instead of once at the end would treat items on other pages as stale and delete them too.
**Pending work (not yet implemented):** `HomeboxAiSearchProvider`'s actual similarity search + summary generation; `SearchService` routing two provider maps by `aiSearch`; triggering `/sync` on login or from the frontend; a frontend sync button and AI search UI.
**`exception/`** — `GlobalExceptionHandler` via `@ControllerAdvice` **`exception/`** — `GlobalExceptionHandler` via `@ControllerAdvice`
@@ -122,15 +97,9 @@ React 19 + TypeScript + SCSS, Vite 6 build. Package-by-feature under `components
### Data & AI ### Data & AI
- PostgreSQL + pgvector (semantic search via embeddings); also used as the Spring Session store (JDBC) - PostgreSQL + pgvector (semantic search via embeddings); also used as the Spring Session store (JDBC)
- LiteLLM as a unified AI proxy; Spring AI OpenAI starter wired to it`OPENAI_BASE_URL` points to LiteLLM, not OpenAI directly, keeping the underlying model provider configurable - LiteLLM as a unified AI proxy; Spring AI OpenAI starter wired to it
- `spring-ai-starter-vector-store-pgvector` provides `PgVectorStore`, auto-configured from `application.yaml` (no manual config class)
- Embedding dimensions must stay consistent with the configured LiteLLM embedding model — changing models requires re-syncing all indexed items
- Processing pipeline (Phase 2): stage in DB → LLM inference → refine via UI → export to target app - Processing pipeline (Phase 2): stage in DB → LLM inference → refine via UI → export to target app
### Testing Strategy ### Testing Strategy
Integration tests spin up a **mirrored PostgreSQL container** on port 5434 (same schema as production). WireMock mocks external HTTP APIs (Homebox, WikiJS). Do not mock the database in integration tests — the mirrored container strategy exists specifically to catch schema/migration divergence. Integration tests spin up a **mirrored PostgreSQL container** on port 5434 (same schema as production). WireMock mocks external HTTP APIs (Homebox, WikiJS). Do not mock the database in integration tests — the mirrored container strategy exists specifically to catch schema/migration divergence.
## Chat Operations
Don't make code suggestions and changes unless explicitly asked. Treat every prompt as a discussion of latest best practice coding approaches.
-5
View File
@@ -1,5 +1,4 @@
val wiremockVersion = "3.12.0" val wiremockVersion = "3.12.0"
val postgresqlVersion = "42.7.11"
plugins { plugins {
java java
@@ -47,10 +46,6 @@ dependencies {
implementation("org.springframework.boot:spring-boot-starter-validation") implementation("org.springframework.boot:spring-boot-starter-validation")
implementation("org.springframework.boot:spring-boot-starter-webmvc") implementation("org.springframework.boot:spring-boot-starter-webmvc")
implementation("org.springframework.ai:spring-ai-starter-model-openai") implementation("org.springframework.ai:spring-ai-starter-model-openai")
implementation("org.postgresql:postgresql:$postgresqlVersion")
implementation("org.springframework.ai:spring-ai-starter-vector-store-pgvector")
compileOnly("org.projectlombok:lombok") compileOnly("org.projectlombok:lombok")
@@ -1,17 +0,0 @@
package com.vaessl.app.connection;
import com.vaessl.app.shared.ServiceType;
/**
* Identifies the connection a request targets. Implemented by request records
* (e.g. {@code SearchRequest}, {@code SyncRequest}) so a single {@code HomeboxItemClient} can
* resolve the underlying connection regardless of which feature is calling it.
*/
public interface ConnectionIdentifiable {
String appUrl();
String username();
ServiceType serviceType();
}
@@ -12,17 +12,22 @@ import org.springframework.web.client.RestClient;
import com.vaessl.app.exception.EmptyCredentialsException; import com.vaessl.app.exception.EmptyCredentialsException;
import com.vaessl.app.exception.RemoteApiException; import com.vaessl.app.exception.RemoteApiException;
import com.vaessl.app.shared.ServiceType; import com.vaessl.app.shared.ServiceType;
import lombok.RequiredArgsConstructor;
import static com.vaessl.app.shared.Endpoint.*; import static com.vaessl.app.shared.Endpoint.*;
@Component @Component
@RequiredArgsConstructor
public class HomeboxConnectionProvider implements ConnectionProvider { public class HomeboxConnectionProvider implements ConnectionProvider {
private final RestClient.Builder restClientBuilder; private final RestClient.Builder restClientBuilder;
private final ConnectionRepository cRepository; private final ConnectionRepository cRepository;
public HomeboxConnectionProvider(RestClient.Builder restClientBuilder,
ConnectionRepository cRepository) {
this.restClientBuilder = restClientBuilder;
this.cRepository = cRepository;
}
@Override @Override
public void checkCredentials(ConnectionRequest request) { public void checkCredentials(ConnectionRequest request) {
if (request.username() == null || request.password() == null) { if (request.username() == null || request.password() == null) {
@@ -77,13 +82,13 @@ public class HomeboxConnectionProvider implements ConnectionProvider {
@Override @Override
public ConnectionEntity connectionToEntity(ConnectionRequest request, public ConnectionEntity connectionToEntity(ConnectionRequest request,
ConnectionResponse response) { ConnectionResponse response) {
return HomeboxConnectionEntity.from(request, response); return HomeboxEntity.from(request, response);
} }
@Override @Override
public void updateToRepository(ConnectionEntity existing, ConnectionResponse response) { public void updateToRepository(ConnectionEntity existing, ConnectionResponse response) {
if (existing instanceof HomeboxConnectionEntity hbE) { if (existing instanceof HomeboxEntity hbE) {
hbE.setToken(response.token()); hbE.setToken(response.token());
hbE.setExpiresAt(response.expiresAt()); hbE.setExpiresAt(response.expiresAt());
@@ -95,7 +100,7 @@ public class HomeboxConnectionProvider implements ConnectionProvider {
@Override @Override
public Instant getTokenExpiry(ConnectionEntity entity) { public Instant getTokenExpiry(ConnectionEntity entity) {
return (entity instanceof HomeboxConnectionEntity he) ? he.getExpiresAt() : null; return (entity instanceof HomeboxEntity he) ? he.getExpiresAt() : null;
} }
private record HomeboxLoginResponse(String token, String attachmentToken, Instant expiresAt) { private record HomeboxLoginResponse(String token, String attachmentToken, Instant expiresAt) {
@@ -11,15 +11,15 @@ import lombok.Setter;
@DiscriminatorValue("HOMEBOX") @DiscriminatorValue("HOMEBOX")
@Getter @Getter
@Setter @Setter
public class HomeboxConnectionEntity extends ConnectionEntity { public class HomeboxEntity extends ConnectionEntity {
private String token; private String token;
private String attachmentToken; private String attachmentToken;
private Instant expiresAt; private Instant expiresAt;
public static HomeboxConnectionEntity from(ConnectionRequest request, ConnectionResponse response) { public static HomeboxEntity from(ConnectionRequest request, ConnectionResponse response) {
HomeboxConnectionEntity he = new HomeboxConnectionEntity(); HomeboxEntity he = new HomeboxEntity();
he.setAppUrl(request.appUrl()); he.setAppUrl(request.appUrl());
he.setUsername(request.username()); he.setUsername(request.username());
@@ -1,112 +0,0 @@
package com.vaessl.app.homebox;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestClient;
import com.vaessl.app.connection.ConnectionEntity;
import com.vaessl.app.connection.ConnectionIdentifiable;
import com.vaessl.app.connection.ConnectionRepository;
import com.vaessl.app.connection.HomeboxConnectionEntity;
import com.vaessl.app.exception.ConnectionNotFoundException;
import com.vaessl.app.exception.RemoteApiException;
import com.vaessl.app.shared.ServiceItem;
import static com.vaessl.app.shared.Endpoint.HOMEBOX_QUERY_ALL_ITEMS;
/**
* Fetches items from the Homebox entities API. Shared by {@code HomeboxSearchProvider} and
* {@code HomeboxSyncProvider} so both keyword search and vector-store sync page through the same
* remote call and item mapping.
*/
@Component
public class HomeboxItemClient {
private final RestClient.Builder restClientBuilder;
private final ConnectionRepository cRepository;
public HomeboxItemClient(RestClient.Builder restClienBuilder,
ConnectionRepository cRepository) {
this.restClientBuilder = restClienBuilder;
this.cRepository = cRepository;
}
/**
* Fetches one page of items from Homebox for the given connection.
*
* @param connection identifies which stored connection (app URL, username) to query
* @param query optional keyword filter; {@code null} returns all items for the page
* @param pageable page number and size to request
* @return the mapped page of items along with the resolved connection ID
* @throws com.vaessl.app.exception.ConnectionNotFoundException if no matching connection is
* stored
* @throws com.vaessl.app.exception.RemoteApiException if Homebox returns an empty response body
*/
public HomeboxItemPage hbResponse(ConnectionIdentifiable connection, String query,
Pageable pageable) {
ConnectionEntity entity =
cRepository.findByAppUrlAndUsername(connection.appUrl(), connection.username());
if (!(entity instanceof HomeboxConnectionEntity hbEntity)) {
throw new ConnectionNotFoundException();
}
HomeboxItemsResponse response = restClientBuilder.baseUrl(connection.appUrl()).build().get()
.uri(u -> u.path(HOMEBOX_QUERY_ALL_ITEMS.getValue()).queryParam("q", query)
.queryParam("page", pageable.getPageNumber() + 1)
.queryParam("pageSize", pageable.getPageSize()).build())
.headers(h -> h.setBearerAuth(hbEntity.getToken())).retrieve()
.body(HomeboxItemsResponse.class);
if (response == null) {
throw new RemoteApiException(connection.appUrl(), HOMEBOX_QUERY_ALL_ITEMS.getValue());
}
List<ServiceItem> items = response.items().stream().map(i -> {
String id = i.id();
String title = i.name();
String description = i.description();
HomeboxParent parent = i.parent();
Map<String, Map<String, Object>> extraData = new LinkedHashMap<>();
Map<String, Object> locationData = new LinkedHashMap<>();
if (parent.name() != null && !parent.name().isBlank()) {
locationData.put("name", parent.name());
}
if (parent.description() != null && !parent.description().isBlank()) {
locationData.put("description", parent.description());
}
if (locationData != null && !locationData.isEmpty()) {
extraData.put("location", locationData);
}
return new ServiceItem(id, title, description, extraData);
}).toList();
return new HomeboxItemPage(new PageImpl<>(items, pageable, response.total()),
hbEntity.getId());
}
public record HomeboxItemPage(Page<ServiceItem> page, Long connectionId) {
}
private record HomeboxItemsResponse(int page, int pageSize, int total,
List<HomeboxItem> items) {
}
private record HomeboxItem(String id, String name, String description, HomeboxParent parent) {
}
private record HomeboxParent(String name, String description) {
}
}
@@ -1,22 +0,0 @@
package com.vaessl.app.search;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Component;
import com.vaessl.app.shared.ServiceItem;
import com.vaessl.app.shared.ServiceType;
@Component
public class HomeboxAiSearchProvider implements SearchProvider {
@Override
public ServiceType getServiceType() {
return ServiceType.HOMEBOX;
}
@Override
public Page<ServiceItem> getSearchResults(SearchRequest request, Pageable pageable) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'getSearchResults'");
}
}
@@ -1,19 +1,35 @@
package com.vaessl.app.search; package com.vaessl.app.search;
import java.util.List;
import java.util.Map;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.client.RestClient;
import com.vaessl.app.homebox.HomeboxItemClient; import com.vaessl.app.connection.ConnectionEntity;
import com.vaessl.app.shared.ServiceItem; import com.vaessl.app.connection.ConnectionRepository;
import com.vaessl.app.connection.HomeboxEntity;
import com.vaessl.app.exception.ConnectionNotFoundException;
import com.vaessl.app.exception.RemoteApiException;
import com.vaessl.app.shared.ServiceType; import com.vaessl.app.shared.ServiceType;
import lombok.RequiredArgsConstructor;
import static com.vaessl.app.shared.Endpoint.*;
@Component @Component
@RequiredArgsConstructor
public class HomeboxSearchProvider implements SearchProvider { public class HomeboxSearchProvider implements SearchProvider {
private final HomeboxItemClient client; private final RestClient.Builder restClientBuilder;
private final ConnectionRepository cRepository;
public HomeboxSearchProvider(RestClient.Builder restClientBuilder,
ConnectionRepository cRepository) {
this.restClientBuilder = restClientBuilder;
this.cRepository = cRepository;
}
@Override @Override
public ServiceType getServiceType() { public ServiceType getServiceType() {
@@ -21,7 +37,45 @@ public class HomeboxSearchProvider implements SearchProvider {
} }
@Override @Override
public Page<ServiceItem> getSearchResults(SearchRequest request, Pageable pageable) { public Page<SearchResponse> getSearchResults(SearchRequest request, Pageable pageable) {
return client.hbResponse(request, request.query(), pageable).page();
ConnectionEntity entity =
cRepository.findByAppUrlAndUsername(request.appUrl(), request.username());
if (!(entity instanceof HomeboxEntity hbEntity)) {
throw new ConnectionNotFoundException();
}
HomeboxSearchResponse hbResponse = restClientBuilder.baseUrl(request.appUrl()).build().get()
.uri(u -> u.path(HOMEBOX_QUERY_ALL_ITEMS.getValue())
.queryParam("q", request.query())
.queryParam("page", pageable.getPageNumber() + 1)
.queryParam("pageSize", pageable.getPageSize()).build())
.headers(h -> h.setBearerAuth(hbEntity.getToken())).retrieve()
.body(HomeboxSearchResponse.class);
if (hbResponse == null) {
throw new RemoteApiException(request.appUrl(), HOMEBOX_QUERY_ALL_ITEMS.getValue());
}
List<SearchResponse> items = hbResponse.items().stream().map(i -> {
String id = i.id();
String title = i.name();
String description = i.description();
Map<String, Object> extraSearchResponseData = Map.of("location", i.parent());
return new SearchResponse(id, title, description, extraSearchResponseData);
}).toList();
return new PageImpl<>(items, pageable, hbResponse.total());
}
private record HomeboxSearchResponse(int page, int pageSize, int total,
List<HomeboxItem> items) {
}
private record HomeboxItem(String id, String name, String description, HomeboxLocation parent) {
}
private record HomeboxLocation(String name, String description) {
} }
} }
@@ -4,11 +4,11 @@ import java.util.List;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
public record PagedSearchResponse<T>(List<T> content, int page, int pageSize, long totalElements, public record PagedSearchResponse<T>(List<T> content, int page, int pageSize, long totalElements,
boolean first, boolean last, String sort, String summary) { boolean first, boolean last, String sort) {
public static <T> PagedSearchResponse<T> from(Page<T> pageResult) { public static <T> PagedSearchResponse<T> from(Page<T> pageResult) {
return new PagedSearchResponse<>(pageResult.getContent(), pageResult.getNumber(), return new PagedSearchResponse<>(pageResult.getContent(), pageResult.getNumber(),
pageResult.getSize(), pageResult.getTotalElements(), pageResult.isFirst(), pageResult.getSize(), pageResult.getTotalElements(), pageResult.isFirst(),
pageResult.isLast(), pageResult.getSort().toString(), null); pageResult.isLast(), pageResult.getSort().toString());
} }
} }
@@ -8,7 +8,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.vaessl.app.shared.ServiceItem;
import com.vaessl.app.shared.SessionKeys; import com.vaessl.app.shared.SessionKeys;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession; import jakarta.servlet.http.HttpSession;
@@ -26,7 +26,7 @@ public class SearchController {
* there is no active session. * there is no active session.
*/ */
@PostMapping("/search") @PostMapping("/search")
public ResponseEntity<PagedSearchResponse<ServiceItem>> search( public ResponseEntity<PagedSearchResponse<SearchResponse>> search(
@Valid @RequestBody SearchRequest request, @Valid @RequestBody SearchRequest request,
@PageableDefault(size = 20) Pageable pageable, HttpServletRequest httpReq) { @PageableDefault(size = 20) Pageable pageable, HttpServletRequest httpReq) {
HttpSession session = httpReq.getSession(false); HttpSession session = httpReq.getSession(false);
@@ -35,7 +35,7 @@ public class SearchController {
return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build(); return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
} }
Page<ServiceItem> result = searchService.search(request, pageable); Page<SearchResponse> result = searchService.search(request, pageable);
return ResponseEntity.ok(PagedSearchResponse.from(result)); return ResponseEntity.ok(PagedSearchResponse.from(result));
} }
@@ -2,7 +2,7 @@ package com.vaessl.app.search;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import com.vaessl.app.shared.ServiceItem;
import com.vaessl.app.shared.ServiceProvider; import com.vaessl.app.shared.ServiceProvider;
/** /**
@@ -17,5 +17,5 @@ public interface SearchProvider extends ServiceProvider {
* @param pageable the Pageable interface * @param pageable the Pageable interface
* @return a list of Page<SearchResponse> items matching the query * @return a list of Page<SearchResponse> items matching the query
*/ */
Page<ServiceItem> getSearchResults(SearchRequest request, Pageable pageable); Page<SearchResponse> getSearchResults(SearchRequest request, Pageable pageable);
} }
@@ -1,10 +1,9 @@
package com.vaessl.app.search; package com.vaessl.app.search;
import com.vaessl.app.connection.ConnectionIdentifiable;
import com.vaessl.app.shared.ServiceType; import com.vaessl.app.shared.ServiceType;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
public record SearchRequest(@NotBlank String appUrl, @NotBlank String username, String query, public record SearchRequest(@NotBlank String appUrl, @NotBlank String username, String query,
@NotNull ServiceType serviceType, boolean aiSearch) implements ConnectionIdentifiable { @NotNull ServiceType serviceType) {
} }
@@ -1,10 +1,9 @@
package com.vaessl.app.shared; package com.vaessl.app.search;
import java.util.Map; import java.util.Map;
import jakarta.validation.constraints.NotNull;
public record ServiceItem(String id, @NotNull String title, String description, public record SearchResponse(String id, String title, String description,
Map<String, Map<String, Object>> extraData) { Map<String, Object> extraData) {
public String getExtra(String key) { public String getExtra(String key) {
if (extraData == null) { if (extraData == null) {
@@ -7,7 +7,6 @@ import java.util.Map;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.vaessl.app.shared.ServiceItem;
import com.vaessl.app.shared.ServiceType; import com.vaessl.app.shared.ServiceType;
import com.vaessl.app.exception.WrongServiceTypeException; import com.vaessl.app.exception.WrongServiceTypeException;
@@ -22,6 +21,7 @@ public class SearchService {
registry.put(provider.getServiceType(), provider); registry.put(provider.getServiceType(), provider);
} }
this.providerRegistry = registry; this.providerRegistry = registry;
} }
/** /**
@@ -33,7 +33,7 @@ public class SearchService {
* @return results returned by the matching provider * @return results returned by the matching provider
* @throws WrongServiceTypeException if no provider is registered for the given service type * @throws WrongServiceTypeException if no provider is registered for the given service type
*/ */
public Page<ServiceItem> search(SearchRequest request, Pageable pageable) { public Page<SearchResponse> search(SearchRequest request, Pageable pageable) {
SearchProvider provider = providerRegistry.get(request.serviceType()); SearchProvider provider = providerRegistry.get(request.serviceType());
@@ -2,8 +2,7 @@ package com.vaessl.app.shared;
public enum Endpoint { public enum Endpoint {
HOMEBOX_LOGIN("/api/v1/users/login"), LOGIN("/login"), CONNECTION_STATUS( HOMEBOX_LOGIN("/api/v1/users/login"), LOGIN("/login"), CONNECTION_STATUS(
"/connections/status"), HOMEBOX_QUERY_ALL_ITEMS( "/connections/status"), HOMEBOX_QUERY_ALL_ITEMS("/api/v1/entities"), SEARCH("/search");
"/api/v1/entities"), SEARCH("/search"), SYNC("/sync");
private final String value; private final String value;
@@ -1,57 +0,0 @@
package com.vaessl.app.sync;
import java.util.ArrayList;
import java.util.List;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Component;
import com.vaessl.app.homebox.HomeboxItemClient;
import com.vaessl.app.homebox.HomeboxItemClient.HomeboxItemPage;
import com.vaessl.app.shared.ServiceItem;
import com.vaessl.app.shared.ServiceType;
import com.vaessl.app.vector.EmbeddingService;
import lombok.RequiredArgsConstructor;
/**
* Pages through the full Homebox catalog and re-indexes it into the vector store. Item IDs are
* collected across all pages before {@link EmbeddingService#deleteStaleVectorEntries} is called
* once at the end, rather than after each page: deleting per page would treat every item outside
* the current page as stale, wiping out entries from pages already synced.
*/
@Component
@RequiredArgsConstructor
public class HomeboxSyncProvider implements SyncProvider {
private final EmbeddingService embeddingService;
private final HomeboxItemClient client;
@Override
public ServiceType getServiceType() {
return ServiceType.HOMEBOX;
}
@Override
public void syncVectorStore(SyncRequest request) {
int batchSize = 100;
int page = 0;
Page<ServiceItem> current;
Long connectionId = null;
List<String> currentItemIds = new ArrayList<>();
do {
Pageable pageable = PageRequest.of(page, batchSize);
HomeboxItemPage result = client.hbResponse(request, null, pageable);
current = result.page();
if (connectionId == null) {
connectionId = result.connectionId();
}
embeddingService.vectorizeData(current.getContent(), request.serviceType(),
result.connectionId(), currentItemIds);
page++;
} while (page < current.getTotalPages());
embeddingService.deleteStaleVectorEntries(connectionId, currentItemIds);
}
}
@@ -1,40 +0,0 @@
package com.vaessl.app.sync;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import com.vaessl.app.shared.SessionKeys;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;
import jakarta.validation.Valid;
@RestController
public class SyncController {
private final SyncService syncService;
public SyncController(SyncService syncService) {
this.syncService = syncService;
}
/**
* Triggers a vector-store sync for the requested service. Returns {@code 401 Unauthorized}
* if there is no active session.
*/
@PostMapping("/sync")
public ResponseEntity<Object> syncVectorStore(@Valid @RequestBody SyncRequest request,
HttpServletRequest httpReq) {
HttpSession session = httpReq.getSession(false);
if (session == null
|| session.getAttribute(SessionKeys.connectionId(request.serviceType())) == null) {
return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
}
syncService.syncServiceVectorStore(request);
return ResponseEntity.noContent().build();
}
}
@@ -1,17 +0,0 @@
package com.vaessl.app.sync;
import com.vaessl.app.shared.ServiceProvider;
/**
* Implemented by any service that supports indexing its items into the vector store.
*/
public interface SyncProvider extends ServiceProvider {
/**
* Fetches all items from the remote service and indexes them into the vector store,
* removing any previously indexed items that no longer exist upstream.
*
* @param request the sync request containing the app URL and user credentials
*/
public void syncVectorStore(SyncRequest request);
}
@@ -1,10 +0,0 @@
package com.vaessl.app.sync;
import com.vaessl.app.connection.ConnectionIdentifiable;
import com.vaessl.app.shared.ServiceType;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
public record SyncRequest(@NotBlank String appUrl, @NotBlank String username,
@NotNull ServiceType serviceType) implements ConnectionIdentifiable {
}
@@ -1,40 +0,0 @@
package com.vaessl.app.sync;
import java.util.EnumMap;
import java.util.List;
import java.util.Map;
import org.springframework.stereotype.Service;
import com.vaessl.app.exception.WrongServiceTypeException;
import com.vaessl.app.shared.ServiceType;
@Service
public class SyncService {
private final Map<ServiceType, SyncProvider> providerRegistry;
public SyncService(List<SyncProvider> providers) {
Map<ServiceType, SyncProvider> registry = new EnumMap<>(ServiceType.class);
for (SyncProvider provider : providers) {
registry.put(provider.getServiceType(), provider);
}
this.providerRegistry = registry;
}
/**
* Dispatches the vector-store sync request to the provider registered for
* {@link SyncRequest#serviceType()}.
*
* @param request the sync request
* @throws WrongServiceTypeException if no provider is registered for the given service type
*/
public void syncServiceVectorStore(SyncRequest request) {
SyncProvider provider = providerRegistry.get(request.serviceType());
if (provider == null) {
throw new WrongServiceTypeException();
}
provider.syncVectorStore(request);
}
}
@@ -1,121 +0,0 @@
package com.vaessl.app.vector;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.springframework.ai.document.Document;
import org.springframework.ai.vectorstore.VectorStore;
import org.springframework.ai.vectorstore.filter.FilterExpressionBuilder;
import org.springframework.stereotype.Service;
import com.vaessl.app.shared.ServiceItem;
import com.vaessl.app.shared.ServiceType;
/**
* Embeds {@link ServiceItem}s into the shared vector store and prunes entries that no longer exist
* upstream. Kept stateless (no instance fields besides {@code vectorStore}) since this is a
* singleton bean shared across concurrent sync runs; callers own the per-sync ID accumulator.
*/
@Service
public class EmbeddingService {
private final VectorStore vectorStore;
public EmbeddingService(VectorStore vectorStore) {
this.vectorStore = vectorStore;
}
/**
* Embeds and upserts {@code items} into the vector store, appending each item's ID to
* {@code currentItemIds} so the caller can later prune stale entries via
* {@link #deleteStaleVectorEntries}. Safe to call repeatedly (e.g. once per page) against the
* same accumulator across a single sync run.
*
* @param items the items to embed for this batch
* @param serviceType the originating service, stored in each document's metadata
* @param connectionId the connection these items belong to
* @param currentItemIds accumulator collecting every item ID seen so far in this sync run
*/
public void vectorizeData(List<ServiceItem> items, ServiceType serviceType, Long connectionId,
List<String> currentItemIds) {
List<Document> documents = new ArrayList<>();
for (ServiceItem item : items) {
documents.add(toDocument(item, serviceType, connectionId));
currentItemIds.add(item.id());
}
vectorStore.add(documents);
}
private Document toDocument(ServiceItem item, ServiceType serviceType, Long connectionId) {
String extraData = buildExtraData(item.extraData());
Map<String, Object> metadata = buildMetadata(item, serviceType, connectionId);
String content = buildContent(item, extraData);
return new Document(connectionId + ":" + item.id(), content, metadata);
}
private String buildExtraData(Map<String, Map<String, Object>> extraData) {
if (extraData == null) {
return "";
}
StringBuilder formattedData = new StringBuilder();
for (Entry<String, Map<String, Object>> entry : extraData.entrySet()) {
StringBuilder data = new StringBuilder();
if (entry.getValue() == null || entry.getValue().toString().isEmpty()) {
continue;
}
if (entry.getValue().entrySet() != null
&& !entry.getValue().entrySet().toString().isEmpty()) {
for (Entry<String, Object> nestedEntry : entry.getValue().entrySet()) {
data.append(" ").append(nestedEntry.getKey()).append(": ")
.append(nestedEntry.getValue()).append("\n");
}
}
formattedData.append(entry.getKey()).append(": ").append("\n").append(data.toString());
}
return formattedData.toString();
}
private Map<String, Object> buildMetadata(ServiceItem item, ServiceType serviceType,
Long connectionId) {
Map<String, Object> metadata = new HashMap<>();
metadata.put("connectionId", connectionId);
metadata.put("serviceType", serviceType.name());
metadata.put("itemId", item.id());
return metadata;
}
private String buildContent(ServiceItem item, String extraData) {
StringBuilder content = new StringBuilder("title: ").append(item.title());
if (item.description() != null && !item.description().isEmpty()) {
content.append("\ndescription: ").append(item.description());
}
if (!extraData.isEmpty()) {
content.append("\n").append(extraData);
}
return content.toString();
}
/**
* Deletes every vector for {@code connectionId} whose item ID is not in {@code currentItemIds},
* then clears the accumulator. Must be called once, after every page for this sync run has gone
* through {@link #vectorizeData}, not per page — otherwise items from pages other than the most
* recent one would look stale and get deleted too.
*
* @param connectionId the connection to prune stale vectors for
* @param currentItemIds every item ID seen across the full sync run; cleared after this call
*/
public void deleteStaleVectorEntries(Long connectionId, List<String> currentItemIds) {
FilterExpressionBuilder b = new FilterExpressionBuilder();
vectorStore.delete(b.and(b.eq("connectionId", connectionId),
b.nin("itemId", new ArrayList<>(currentItemIds))).build());
currentItemIds.clear();
}
}
@@ -21,13 +21,6 @@ spring:
api-key: ${OPENAI_KEY} api-key: ${OPENAI_KEY}
chat: chat:
model: gpt-4o-mini model: gpt-4o-mini
vectorstore:
pgvector:
id-type: text
dimensions: 1536
distance-type: COSINE_DISTANCE
index-type: HNSW
initialize-schema: true
session: session:
store-type: jdbc store-type: jdbc
jdbc: jdbc:
@@ -13,43 +13,4 @@ public final class Mockdata {
public static final String MOCK_ID = "item-1"; public static final String MOCK_ID = "item-1";
public static final String MOCK_TITLE = "title"; public static final String MOCK_TITLE = "title";
public static final String MOCK_DESCRIPTION = "desc"; public static final String MOCK_DESCRIPTION = "desc";
public static final String VALID_HOMEBOX_LOGIN_RESPONSE = """
{
"token": "fake-bearer-token",
"attachmentToken": "fake-attach-token",
"expiresAt": "2099-01-01T00:00:00Z"
}
""";
public static final String VALID_HOMEBOX_ALL_ITEMS_QUERY_RESPONSE = """
{
"page": -1,
"pageSize": -1,
"total": 1,
"items": [
{
"id": "c643e7f9-93d0-4b5f-ae4d-e1c2d90389e0",
"assetId": "000-001",
"name": "MacBook Pro A1398",
"description": "Running Linux (Fedora)",
"quantity": 1,
"insured": false,
"archived": false,
"createdAt": "2026-05-13T19:52:20.016176Z",
"updatedAt": "2026-05-14T12:39:11.836403Z",
"purchasePrice": 0,
"parent": {
"id": "b6f60ab8-3a2a-4a8d-a4bf-897d0555f636",
"name": "Server Schrank Ikea weiß",
"description": "Weißer Ikea Schrank, wo sich der Server befindet.",
"createdAt": "2026-05-13T19:55:55.817576Z",
"updatedAt": "2026-05-14T12:37:24.396651Z"
},
"tags": [],
"imageId": "cb3e44d5-ccd4-421e-9f5a-f52cd5f40ca6",
"thumbnailId": "2bfd53fa-1bf1-483c-8d76-7720464532fa",
"soldTime": "0001-01-01T00:00:00Z"
}
]
}
""";
} }
@@ -180,7 +180,7 @@ class HomeboxIntegrationTest {
assertThat(dbEntry.getAppUrl()).isEqualTo(request.appUrl()); assertThat(dbEntry.getAppUrl()).isEqualTo(request.appUrl());
assertThat(dbEntry.getUsername()).isEqualTo(request.username()); assertThat(dbEntry.getUsername()).isEqualTo(request.username());
if (dbEntry instanceof HomeboxConnectionEntity hbE) { if (dbEntry instanceof HomeboxEntity hbE) {
assertThat(hbE.getToken()).isEqualTo("fake-jwt-token"); assertThat(hbE.getToken()).isEqualTo("fake-jwt-token");
assertThat(hbE.getAttachmentToken()).isEqualTo("fake-attach"); assertThat(hbE.getAttachmentToken()).isEqualTo("fake-attach");
assertThat(hbE.getExpiresAt().toString()) assertThat(hbE.getExpiresAt().toString())
@@ -10,8 +10,8 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import com.vaessl.app.connection.ConnectionRepository;
import com.vaessl.app.exception.ConnectionNotFoundException; import com.vaessl.app.exception.ConnectionNotFoundException;
import com.vaessl.app.homebox.HomeboxItemClient;
import static com.vaessl.app.shared.ServiceType.HOMEBOX; import static com.vaessl.app.shared.ServiceType.HOMEBOX;
@@ -19,7 +19,7 @@ import static com.vaessl.app.shared.ServiceType.HOMEBOX;
class HomeboxSearchProviderTest { class HomeboxSearchProviderTest {
@Mock @Mock
private HomeboxItemClient client; private ConnectionRepository mockRepo;
@InjectMocks @InjectMocks
private HomeboxSearchProvider provider; private HomeboxSearchProvider provider;
@@ -27,11 +27,10 @@ class HomeboxSearchProviderTest {
@Test @Test
void shouldReturnConnectionNotFoundException() { void shouldReturnConnectionNotFoundException() {
when(mockRepo.findByAppUrlAndUsername(MOCK_URL, MOCK_USER)).thenReturn(null);
SearchRequest request = new SearchRequest(MOCK_URL, MOCK_USER, "test query", HOMEBOX);
Pageable pageable = PageRequest.of(0, 10); Pageable pageable = PageRequest.of(0, 10);
SearchRequest request = new SearchRequest(MOCK_URL, MOCK_USER, "", HOMEBOX, false);
when(client.hbResponse(request, "", pageable)).thenThrow(new ConnectionNotFoundException());
assertThrows(ConnectionNotFoundException.class, assertThrows(ConnectionNotFoundException.class,
() -> provider.getSearchResults(request, pageable)); () -> provider.getSearchResults(request, pageable));
} }
@@ -2,14 +2,7 @@ package com.vaessl.app.search;
import static com.vaessl.app.Mockdata.MOCK_PASS; import static com.vaessl.app.Mockdata.MOCK_PASS;
import static com.vaessl.app.Mockdata.MOCK_USER; import static com.vaessl.app.Mockdata.MOCK_USER;
import static com.vaessl.app.Mockdata.VALID_HOMEBOX_ALL_ITEMS_QUERY_RESPONSE; import static com.vaessl.app.shared.Endpoint.*;
import static com.vaessl.app.Mockdata.VALID_HOMEBOX_LOGIN_RESPONSE;
import static com.vaessl.app.shared.Endpoint.LOGIN;
import static com.vaessl.app.shared.Endpoint.SEARCH;
import static com.vaessl.app.shared.Endpoint.HOMEBOX_QUERY_ALL_ITEMS;
import static com.vaessl.app.shared.Endpoint.HOMEBOX_LOGIN;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
@@ -25,11 +18,6 @@ import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
import com.github.tomakehurst.wiremock.junit5.WireMockTest; import com.github.tomakehurst.wiremock.junit5.WireMockTest;
import jakarta.servlet.http.Cookie; import jakarta.servlet.http.Cookie;
/**
* Integration tests for {@code POST /api/search}, verifying the session-gated contract and request
* validation against a mocked Homebox backend (via WireMock) and a real Spring MVC dispatch chain
* (via {@link MockMvc}).
*/
@SpringBootTest @SpringBootTest
@AutoConfigureMockMvc @AutoConfigureMockMvc
@WireMockTest @WireMockTest
@@ -44,14 +32,47 @@ class SearchControllerTest {
private static final String SEARCH_REQUEST = SEARCH.getValue(); private static final String SEARCH_REQUEST = SEARCH.getValue();
/** private static final String VALID_HOMEBOX_LOGIN_RESPONSE = """
* Logs in against a stubbed Homebox instance, then performs a keyword search using the {
* resulting session cookie. Expects {@code 200 OK} with the mocked item mapped into the paged "token": "fake-bearer-token",
* response body. "attachmentToken": "fake-attach-token",
* "expiresAt": "2099-01-01T00:00:00Z"
* @param wm WireMock runtime info, injected by {@link WireMockTest}, used to point the client }
* at the stub server """;
*/
private static final String VALID_HOMEBOX_ALL_ITEMS_QUERY_RESPONSE = """
{
"page": -1,
"pageSize": -1,
"total": 1,
"items": [
{
"id": "c643e7f9-93d0-4b5f-ae4d-e1c2d90389e0",
"assetId": "000-001",
"name": "MacBook Pro A1398",
"description": "Running Linux (Fedora)",
"quantity": 1,
"insured": false,
"archived": false,
"createdAt": "2026-05-13T19:52:20.016176Z",
"updatedAt": "2026-05-14T12:39:11.836403Z",
"purchasePrice": 0,
"parent": {
"id": "b6f60ab8-3a2a-4a8d-a4bf-897d0555f636",
"name": "Server Schrank Ikea weiß",
"description": "Weißer Ikea Schrank, wo sich der Server befindet.",
"createdAt": "2026-05-13T19:55:55.817576Z",
"updatedAt": "2026-05-14T12:37:24.396651Z"
},
"tags": [],
"imageId": "cb3e44d5-ccd4-421e-9f5a-f52cd5f40ca6",
"thumbnailId": "2bfd53fa-1bf1-483c-8d76-7720464532fa",
"soldTime": "0001-01-01T00:00:00Z"
}
]
}
""";
@Test @Test
void shouldReturnListOfQueriedHomeboxItems(WireMockRuntimeInfo wm) throws Exception { void shouldReturnListOfQueriedHomeboxItems(WireMockRuntimeInfo wm) throws Exception {
@@ -76,10 +97,6 @@ class SearchControllerTest {
.value("Server Schrank Ikea weiß")); .value("Server Schrank Ikea weiß"));
} }
/**
* Calls {@code /api/search} with no session cookie attached and expects
* {@code 401 Unauthorized}, confirming the endpoint is session-gated.
*/
@Test @Test
void shouldReturnUnauthorizedWhenNoSession() throws Exception { void shouldReturnUnauthorizedWhenNoSession() throws Exception {
mockMvc.perform(post(SEARCH_REQUEST).contentType(MediaType.APPLICATION_JSON).content(""" mockMvc.perform(post(SEARCH_REQUEST).contentType(MediaType.APPLICATION_JSON).content("""
@@ -87,16 +104,11 @@ class SearchControllerTest {
"appUrl": "http://irrelevant", "appUrl": "http://irrelevant",
"query": "Item", "query": "Item",
"serviceType": "HOMEBOX", "serviceType": "HOMEBOX",
"username": "irrelevant", "username": "irrelevant"
"aiSearch": false
} }
""")).andExpect(status().isUnauthorized()); """)).andExpect(status().isUnauthorized());
} }
/**
* Sends a search request with a {@code serviceType} that doesn't map to any known
* {@link com.vaessl.app.shared.ServiceType} and expects {@code 400 Bad Request}.
*/
@Test @Test
void shouldReturnBadRequestWhenServiceTypeIsInvalid() throws Exception { void shouldReturnBadRequestWhenServiceTypeIsInvalid() throws Exception {
mockMvc.perform(post(SEARCH_REQUEST).contentType(MediaType.APPLICATION_JSON) mockMvc.perform(post(SEARCH_REQUEST).contentType(MediaType.APPLICATION_JSON)
@@ -105,23 +117,22 @@ class SearchControllerTest {
} }
private String searchRequestBody(WireMockRuntimeInfo wm, String serviceType) { private String searchRequestBody(WireMockRuntimeInfo wm, String serviceType) {
return searchRequestBody(wm.getHttpBaseUrl(), serviceType, false); return searchRequestBody(wm.getHttpBaseUrl(), serviceType);
} }
private String searchRequestBody(String serviceType) { private String searchRequestBody(String serviceType) {
return searchRequestBody("http://irrelevant", serviceType, false); return searchRequestBody("http://irrelevant", serviceType);
} }
private String searchRequestBody(String appUrl, String serviceType, boolean aiSearch) { private String searchRequestBody(String appUrl, String serviceType) {
return """ return """
{ {
"appUrl": "%s", "appUrl": "%s",
"query": "Item", "query": "Item",
"serviceType": "%s", "serviceType": "%s",
"username": "%s", "username": "%s"
"aiSearch": "%b"
} }
""".formatted(appUrl, serviceType, MOCK_USER, aiSearch); """.formatted(appUrl, serviceType, MOCK_USER);
} }
private String connectionRequestBody(WireMockRuntimeInfo wm) { private String connectionRequestBody(WireMockRuntimeInfo wm) {
@@ -4,13 +4,12 @@ import static com.vaessl.app.Mockdata.*;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import java.util.Map; import java.util.Map;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import com.vaessl.app.shared.ServiceItem;
class SearchResponseTest { class SearchResponseTest {
@Test @Test
void shouldReturnNullWhenExtraDataIsNull() { void shouldReturnNullWhenExtraDataIsNull() {
ServiceItem response = new ServiceItem(MOCK_ID, MOCK_TITLE, MOCK_DESCRIPTION, null); SearchResponse response = new SearchResponse(MOCK_ID, MOCK_TITLE, MOCK_DESCRIPTION, null);
assertThat(response.getExtra(null)).isNull(); assertThat(response.getExtra(null)).isNull();
} }
@@ -18,7 +17,7 @@ class SearchResponseTest {
@Test @Test
void shouldReturnNullWhenExtraDataKeyIsMissing() { void shouldReturnNullWhenExtraDataKeyIsMissing() {
ServiceItem response = new ServiceItem(MOCK_ID, MOCK_TITLE, MOCK_DESCRIPTION, Map.of("key", Map.of("key", "value"))); SearchResponse response = new SearchResponse(MOCK_ID, MOCK_TITLE, MOCK_DESCRIPTION, Map.of("key", "value"));
assertThat(response.getExtra("missing")).isNull(); assertThat(response.getExtra("missing")).isNull();
} }
@@ -26,8 +25,7 @@ class SearchResponseTest {
@Test @Test
void shouldReturnExtraDataValue() { void shouldReturnExtraDataValue() {
ServiceItem response = new ServiceItem(MOCK_ID, MOCK_TITLE, MOCK_DESCRIPTION, Map.of("key", SearchResponse response = new SearchResponse(MOCK_ID, MOCK_TITLE, MOCK_DESCRIPTION, Map.of("key", "value"));
Map.of("key", "value")));
assertThat(response.id()).isEqualTo(MOCK_ID); assertThat(response.id()).isEqualTo(MOCK_ID);
assertThat(response.getExtra("key")).contains("value"); assertThat(response.getExtra("key")).contains("value");
@@ -1,103 +0,0 @@
package com.vaessl.app.sync;
import static com.vaessl.app.shared.Endpoint.HOMEBOX_LOGIN;
import static com.vaessl.app.shared.Endpoint.HOMEBOX_QUERY_ALL_ITEMS;
import static com.vaessl.app.shared.Endpoint.LOGIN;
import static com.vaessl.app.shared.Endpoint.SYNC;
import static com.vaessl.app.Mockdata.MOCK_USER;
import static com.vaessl.app.Mockdata.MOCK_SERVICE_TYPE;
import static com.vaessl.app.Mockdata.MOCK_PASS;
import static com.vaessl.app.Mockdata.VALID_HOMEBOX_ALL_ITEMS_QUERY_RESPONSE;
import static com.vaessl.app.Mockdata.VALID_HOMEBOX_LOGIN_RESPONSE;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
import org.springframework.http.MediaType;
import com.github.tomakehurst.wiremock.client.WireMock;
import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
import com.github.tomakehurst.wiremock.junit5.WireMockTest;
import jakarta.servlet.http.Cookie;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.MvcResult;
/**
* Integration tests for {@code POST /api/sync}, verifying the session-gated contract against a
* mocked Homebox backend (via WireMock) and a real Spring MVC dispatch chain (via {@link MockMvc}).
*/
@SpringBootTest
@AutoConfigureMockMvc
@WireMockTest
class SyncControllerTest {
@Autowired
MockMvc mockMvc;
private static final String SYNC_PATH = SYNC.getValue();
/**
* Logs in against a stubbed Homebox instance, then performs a sync using the resulting session
* cookie. Expects a {@code 204 No Content} response once the mocked item catalog has been paged
* through and embedded.
*
* @param wm WireMock runtime info, injected by {@link WireMockTest}, used to point the client
* at the stub server
*/
@Test
void shouldReturn204NoContentOnSuccessfulSync(WireMockRuntimeInfo wm) throws Exception {
WireMock.stubFor(WireMock.post(HOMEBOX_LOGIN.getValue())
.willReturn(WireMock.okJson(VALID_HOMEBOX_LOGIN_RESPONSE)));
WireMock.stubFor(WireMock.get(WireMock.urlPathEqualTo(HOMEBOX_QUERY_ALL_ITEMS.getValue()))
.willReturn(WireMock.okJson(VALID_HOMEBOX_ALL_ITEMS_QUERY_RESPONSE)));
MvcResult loginResult =
mockMvc.perform(post(LOGIN.getValue()).contentType(MediaType.APPLICATION_JSON)
.content(connectionRequestBody(wm))).andExpect(status().isOk()).andReturn();
Cookie sessionCookie = loginResult.getResponse().getCookie("SESSION");
mockMvc.perform(post(SYNC_PATH).cookie(sessionCookie)
.contentType(MediaType.APPLICATION_JSON).content(syncRequestBody(wm)))
.andExpect(status().isNoContent());
}
/**
* Calls {@code /api/sync} with no session cookie attached and expects {@code 401 Unauthorized},
* confirming the endpoint is session-gated.
*
* @param wm WireMock runtime info, injected by {@link WireMockTest}, used only to build a
* well-formed request body
*/
@Test
void shouldReturn401UnauthorizedWhenSessionIsNull(WireMockRuntimeInfo wm) throws Exception {
mockMvc.perform(post(SYNC_PATH).contentType(MediaType.APPLICATION_JSON)
.content(syncRequestBody(wm))).andExpect(status().isUnauthorized());
}
private String connectionRequestBody(WireMockRuntimeInfo wm) {
return """
{
"appUrl": "%s",
"serviceType": "%s",
"username": "%s",
"password": "%s"
}
""".formatted(wm.getHttpBaseUrl(), MOCK_SERVICE_TYPE, MOCK_USER, MOCK_PASS);
}
private String syncRequestBody(WireMockRuntimeInfo wm) {
return """
{
"appUrl": "%s",
"serviceType": "%s",
"username": "%s"
}
""".formatted(wm.getHttpBaseUrl(), MOCK_SERVICE_TYPE, MOCK_USER);
}
}
@@ -165,124 +165,43 @@ services:
restart: unless-stopped restart: unless-stopped
``` ```
Note that I'm using my own locally hosted PostgreSQL instances for the main and test database. Just add databases via SQL or PgAdmin and install the pgvector extension to each database manually. There is an official ready-made pgvector docker image but if you already host a PostgreSQL database you need to add the extension yourself. Note that I'm using my own locally hosted PostgreSQL instances for the main and test database. Just add databases via SQL or PgAdmin and install the pgvector extension to each database manually. There is an offical ready-made pgvector docker image but if you already host a PostGreSQL database you need to add the extension yourself.
## Installing pgvector on a self-hosted PostgreSQL container Check the name of your PostGreSQL container:
```
pgvector is a PostgreSQL extension that adds a `vector` data type. It does not create a new database — it adds a `vector_store` table to your existing database. The shared library (`vector.so`) must be installed on the PostgreSQL server itself. docker ps
**Do not install it manually inside a running container.** Manual installations do not survive container recreation (e.g. after a `docker compose up --force-recreate` or image update). Instead, bake it into a custom Docker image.
### Step 1: Create a custom Dockerfile for PostgreSQL
Create a `Dockerfile.postgres` next to your `docker-compose.yaml`:
```dockerfile
FROM postgres:18.4
RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates git build-essential postgresql-server-dev-18 \
&& git clone --branch v0.8.3 https://github.com/pgvector/pgvector.git \
&& cd pgvector && make && make install \
&& cd .. && rm -rf pgvector \
&& apt-get purge -y ca-certificates git build-essential postgresql-server-dev-18 \
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/*
``` ```
- `FROM postgres:18.4` — this is still the standard postgres image, not the pgvector image Enter your container via bash:
- `ca-certificates` — required for git to verify GitHub's SSL certificate during build
- `postgresql-server-dev-18` — provides the PostgreSQL header files needed to compile pgvector
### Step 2: Update docker-compose.yaml to use the custom image ```
docker exec -it 876fb382969f bash
```
Before working on your database backup your databases:
```
su - postgres -c "pg_dumpall > /tmp/backup200526.sql"
#exit the container and copy the backup file to local file system
```yaml docker cp 876fb382969f:/tmp/backup200526.sql .
services:
db:
container_name: postgres
labels:
- "com.centurylinklabs.watchtower.enable=false"
build:
context: .
dockerfile: Dockerfile.postgres
network: host
restart: always
environment:
POSTGRES_USER: ${DB_USER}
POSTGRES_PASSWORD: ${DB_PASSWORD}
POSTGRES_DB: ${DB_NAME}
networks:
- pg_network
volumes:
- /home/pi/docker/postgresql:/var/lib/postgresql
ports:
- "5432:5432"
networks:
pg_network:
external: true
``` ```
### Step 3: Build the image and recreate the container Install dependencies, build and install pgvector:
apt-get update
Before recreating, back up your databases: apt-get install -y build-essential git postgresql-server-dev-all
```bash
docker exec -it <container-name> bash
su - postgres -c "pg_dumpall > /tmp/backup.sql"
exit
docker cp <container-name>:/tmp/backup.sql .
``` ```
git clone https://github.com/pgvector/pgvector.git
Build the image. Use `--network=host` to ensure the build container can reach GitHub: cd pgvector
make
```bash make install
docker build --network=host -t postgres-pgvector -f Dockerfile.postgres . docker restart 876fb382969f
``` ```
Enter PostGreSQL container and create pgvector extension for each databse:
Recreate the container
```bash
docker compose up -d --force-recreate
``` ```
docker exec -it <container-name> psql -h localhost -U <db-user> -d <db-name>
### Step 4: Enable the extensions in each database CREATE EXTENSION vector;
Run this once per database that needs pgvector:
```bash
docker exec -it <container-name> psql -U <db-user> -d <db-name>
``` ```
```sql
CREATE EXTENSION IF NOT EXISTS vector;
CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
```
`uuid-ossp` is also required — Spring AI's `vector_store` table uses `uuid_generate_v4()` for its primary key.
### Step 5: Add pgvector config to application.yaml
Spring AI's pgvector auto-configuration requires these properties:
```yaml
spring:
ai:
vectorstore:
pgvector:
dimensions: 1536 # must match your embedding model output size
distance-type: COSINE_DISTANCE
index-type: HNSW
initialize-schema: true # auto-creates the vector_store table on startup
```
`dimensions` depends on the embedding model:
- `text-embedding-ada-002` / `text-embedding-3-small` → 1536
- `text-embedding-3-large` → 3072
`initialize-schema: true` means Spring AI will create the `vector_store` table automatically on first startup — no manual SQL needed.
# Appendix: Additional config for developing in Code-Server # Appendix: Additional config for developing in Code-Server
When using the code-server container there are additional config steps to mind: When using the code-server container there are additional config steps to mind:
+61
View File
@@ -0,0 +1,61 @@
# Git Conventions
## Branch Naming
```
<type>/<short-kebab-case-description>
```
- All lowercase, hyphens only — no camelCase or Title-Case
- Keep the description short (35 words); the branch name is not the place for detail
- If using a ticket tracker, include the ID: `feature/VAE-123-ai-search`
| Type | Use for |
|---|---|
| `feature/` | New functionality |
| `fix/` | Bug fixes |
| `refactor/` | Code changes with no behavior change |
| `chore/` | Tooling, deps, config, cleanup |
| `docs/` | Documentation only |
**Example:** `feature/ai-search`
---
## Commit Messages
Follow [Conventional Commits](https://www.conventionalcommits.org/):
```
<type>(<scope>): <imperative, present-tense summary>
<optional body — explain WHY, not WHAT>
```
- **Type** — same list as branch types above, plus `test`, `style`
- **Scope** — the module/package touched (e.g. `search`, `sync`, `connection`, `vector`, `frontend`)
- **Summary** — imperative mood ("add", not "added" or "adds"); no period at the end
- **Body** — only when the reasoning isn't obvious from the diff (a constraint, a bug workaround, a decision). Skip it for simple/self-explanatory changes.
**Examples:**
```
feat(search): route SearchRequest.aiSearch to AI provider map
fix(sync): prune stale vectors only after full page loop completes
style: reformat
refactor(vector): nest extraData by section for clearer embedding
```
---
## Ticket Titles
Frame as the outcome, not a task log:
```
<Type>: <what changes for the user/system>
```
**Examples:**
- `Feature: Add AI-powered search to Homebox connector`
- `Bug: /api/sync not triggered on login`
- `Chore: Consolidate SearchService provider maps`
+5 -13
View File
@@ -1,19 +1,11 @@
import { apiFetch } from "./client"; import { apiFetch } from './client'
import type { import type { AuthResponse, ConnectionStatus, LoginRequest, ServiceType } from '../types/connection'
AuthResponse,
ConnectionStatus,
LoginRequest,
ServiceType,
} from "../types/connection";
export const login = (req: LoginRequest) => export const login = (req: LoginRequest) =>
apiFetch<AuthResponse>("/login", { apiFetch<AuthResponse>('/login', { method: 'POST', body: JSON.stringify(req) })
method: "POST",
body: JSON.stringify(req),
});
export const getStatuses = () => export const getStatuses = () =>
apiFetch<ConnectionStatus[]>("/connections/status"); apiFetch<ConnectionStatus[]>('/connections/status')
export const logout = (serviceType: ServiceType) => export const logout = (serviceType: ServiceType) =>
apiFetch<void>(`/connections/${serviceType}`, { method: "DELETE" }); apiFetch<void>(`/connections/${serviceType}`, { method: 'DELETE' })
+2 -10
View File
@@ -1,16 +1,8 @@
import { apiFetch } from "./client"; import { apiFetch } from "./client";
import type { import type { PagedSearchResponse, SearchRequest, SearchResponse } from "../types/search";
PagedSearchResponse,
SearchRequest,
ServiceItem,
SyncRequest,
} from "../types/search";
export const search = (req: SearchRequest) => export const search = (req: SearchRequest) =>
apiFetch<PagedSearchResponse<ServiceItem>>("/search", { apiFetch<PagedSearchResponse<SearchResponse>>("/search", {
method: "POST", method: "POST",
body: JSON.stringify(req), body: JSON.stringify(req),
}); });
export const syncVectorData = (req: SyncRequest) =>
apiFetch<Object>("/sync", { method: "POST", body: JSON.stringify(req) });
@@ -1,7 +1,6 @@
import { useEffect, useRef, useState, type SyntheticEvent } from 'react' import { useEffect, useRef, useState, type SyntheticEvent } from 'react'
import { login } from '../../api/connections' import { login } from '../../api/connections'
import type { LoginRequest, ServiceType } from '../../types/connection' import type { LoginRequest, ServiceType } from '../../types/connection'
import { uiText } from '../../text/uiText'
import '../ui/Modal.scss' import '../ui/Modal.scss'
interface Props { interface Props {
@@ -45,7 +44,7 @@ export function ConnectModal({ serviceType, label, onClose, onSuccess }: Readonl
await login(req) await login(req)
onSuccess() onSuccess()
} catch (err) { } catch (err) {
setError(err instanceof Error ? err.message : uiText.connections.connectModal.loginFailed) setError(err instanceof Error ? err.message : 'Login failed')
} finally { } finally {
setLoading(false) setLoading(false)
} }
@@ -54,31 +53,31 @@ export function ConnectModal({ serviceType, label, onClose, onSuccess }: Readonl
return ( return (
<dialog className="modal" ref={dialogRef}> <dialog className="modal" ref={dialogRef}>
<div className="modal__header"> <div className="modal__header">
<h2 className="modal__title" id="modal-title">{uiText.connections.connectModal.title(label)}</h2> <h2 className="modal__title" id="modal-title">Connect to {label}</h2>
<button className="modal__close" onClick={onClose} aria-label={uiText.modal.closeAriaLabel}>{uiText.modal.closeSymbol}</button> <button className="modal__close" onClick={onClose} aria-label="Close">×</button>
</div> </div>
<form className="modal__form" onSubmit={handleSubmit}> <form className="modal__form" onSubmit={handleSubmit}>
<div className="modal__field"> <div className="modal__field">
<label className="modal__label" htmlFor="appUrl">{uiText.connections.connectModal.appUrlLabel}</label> <label className="modal__label" htmlFor="appUrl">App URL</label>
<input id="appUrl" ref={firstInputRef} className="modal__input" type="url" <input id="appUrl" ref={firstInputRef} className="modal__input" type="url"
placeholder={uiText.connections.connectModal.appUrlPlaceholder} placeholder="https://homebox.example.com"
value={appUrl} onChange={e => setAppUrl(e.target.value)} required /> value={appUrl} onChange={e => setAppUrl(e.target.value)} required />
</div> </div>
<div className="modal__field"> <div className="modal__field">
<label className="modal__label" htmlFor="username">{uiText.connections.connectModal.usernameLabel}</label> <label className="modal__label" htmlFor="username">Username</label>
<input id="username" className="modal__input" type="text" <input id="username" className="modal__input" type="text"
autoComplete="username" autoComplete="username"
value={username} onChange={e => setUsername(e.target.value)} required /> value={username} onChange={e => setUsername(e.target.value)} required />
</div> </div>
<div className="modal__field"> <div className="modal__field">
<label className="modal__label" htmlFor="password">{uiText.connections.connectModal.passwordLabel}</label> <label className="modal__label" htmlFor="password">Password</label>
<input id="password" className="modal__input" type="password" <input id="password" className="modal__input" type="password"
autoComplete="current-password" autoComplete="current-password"
value={password} onChange={e => setPassword(e.target.value)} required /> value={password} onChange={e => setPassword(e.target.value)} required />
</div> </div>
{error && <p className="modal__error">{error}</p>} {error && <p className="modal__error">{error}</p>}
<button className="modal__submit" type="submit" disabled={loading}> <button className="modal__submit" type="submit" disabled={loading}>
{loading ? uiText.connections.connectModal.connectingButton : uiText.connections.connectModal.connectButton} {loading ? 'Connecting…' : 'Connect'}
</button> </button>
</form> </form>
</dialog> </dialog>
@@ -5,7 +5,6 @@ import { ServiceCard } from "./ServiceCard"
import { ConnectModal } from "./ConnectModal" import { ConnectModal } from "./ConnectModal"
import "./Dashboard.scss" import "./Dashboard.scss"
import { SearchModal } from "../search/SearchModal" import { SearchModal } from "../search/SearchModal"
import { uiText } from "../../text/uiText"
const SERVICES = [ const SERVICES = [
{ serviceType: ServiceType.HOMEBOX, label: 'Homebox', icon: '📦' }, { serviceType: ServiceType.HOMEBOX, label: 'Homebox', icon: '📦' },
@@ -33,10 +32,10 @@ export function Dashboard() {
return ( return (
<div className="dashboard"> <div className="dashboard">
<div className="dashboard__header"> <div className="dashboard__header">
<h1 className="dashboard__title">{uiText.dashboard.title}</h1> <h1 className="dashboard__title">Vaessl Dashboard</h1>
</div> </div>
<p className="dashboard__section-label">{uiText.dashboard.servicesLabel}</p> <p className="dashboard__section-label">Services</p>
<div className="dashboard__cards"> <div className="dashboard__cards">
{SERVICES.map(({ serviceType, label, icon }) => ( {SERVICES.map(({ serviceType, label, icon }) => (
<ServiceCard <ServiceCard
@@ -32,6 +32,7 @@
color: var(--text-h); color: var(--text-h);
margin: 0 0 10px; margin: 0 0 10px;
text-align: left; text-align: left;
} }
&__meta { &__meta {
@@ -53,7 +54,7 @@
border-radius: 999px; border-radius: 999px;
&::before { &::before {
content: ""; content: '';
width: 6px; width: 6px;
height: 6px; height: 6px;
border-radius: 50%; border-radius: 50%;
@@ -1,6 +1,5 @@
import type { ConnectionStatus, ServiceType } from '../../types/connection' import type { ConnectionStatus, ServiceType } from '../../types/connection'
import { ActionButton } from '../ui/ActionButton' import { ActionButton } from '../ui/ActionButton'
import { uiText } from '../../text/uiText'
import './ServiceCard.scss' import './ServiceCard.scss'
interface Props { interface Props {
@@ -30,20 +29,20 @@ export function ServiceCard({ serviceType: _serviceType, label, icon, status, on
<p className="service-card__name">{label}</p> <p className="service-card__name">{label}</p>
<p className="service-card__meta"> <p className="service-card__meta">
<span className={`service-card__badge service-card__badge--${connected ? 'connected' : 'disconnected'}`}> <span className={`service-card__badge service-card__badge--${connected ? 'connected' : 'disconnected'}`}>
{connected ? uiText.connections.serviceCard.connected : uiText.connections.serviceCard.notConnected} {connected ? 'Connected' : 'Not connected'}
</span> </span>
{connected && status?.username && <span>{status.username}</span>} {connected && status?.username && <span>{status.username}</span>}
{connected && status?.expiresAt && ( {connected && status?.expiresAt && (
<span>{uiText.connections.serviceCard.expiresPrefix(formatExpiry(status.expiresAt) ?? '')}</span> <span>· expires {formatExpiry(status.expiresAt)}</span>
)} )}
</p> </p>
</div> </div>
</div> </div>
<div className="service-card__actions"> <div className="service-card__actions">
<ActionButton variant={connected ? 'disconnect' : 'connect'} onClick={connected ? onDisconnect : onConnect}> <ActionButton variant={connected ? 'disconnect' : 'connect'} onClick={connected ? onDisconnect : onConnect}>
{connected ? uiText.connections.serviceCard.disconnectButton : uiText.connections.serviceCard.connectButton} {connected ? 'Disconnect' : 'Connect'}
</ActionButton> </ActionButton>
{connected && (<ActionButton variant='search' onClick={onSearch}>{uiText.connections.serviceCard.searchButton}</ActionButton>)} {connected && (<ActionButton variant='search' onClick={onSearch}>Search</ActionButton>)}
</div> </div>
</div> </div>
) )
+16 -33
View File
@@ -1,9 +1,8 @@
import { useEffect, useRef, useState, type SyntheticEvent } from 'react' import { useEffect, useRef, useState, type SyntheticEvent } from 'react'
import '../ui/Modal.scss' import '../ui/Modal.scss'
import { type PagedSearchResponse, type ServiceItem, type SearchRequest, type SyncRequest } from '../../types/search' import { type PagedSearchResponse, type SearchResponse, type SearchRequest } from '../../types/search'
import { syncVectorData, search } from '../../api/searches' import { search } from '../../api/searches'
import type { ServiceType } from '../../types/connection' import type { ServiceType } from '../../types/connection'
import { uiText } from '../../text/uiText'
interface Props { interface Props {
serviceType: ServiceType serviceType: ServiceType
@@ -15,14 +14,11 @@ interface Props {
export function SearchModal({ serviceType, label, appUrl, username, onClose }: Readonly<Props>) { export function SearchModal({ serviceType, label, appUrl, username, onClose }: Readonly<Props>) {
const [query, setQuery] = useState('') const [query, setQuery] = useState('')
const [results, setResults] = useState<PagedSearchResponse<ServiceItem> | null>(null) const [results, setResults] = useState<PagedSearchResponse<SearchResponse> | null>(null)
const [loading, setLoading] = useState(false) const [loading, setLoading] = useState(false)
const [searchError, setSearchError] = useState<string | null>(null) const [error, setError] = useState<string | null>(null)
const [syncError, setSyncError] = useState<string | null>(null)
//TODO: implement aiSearch
const [aiSearch, setAiSearch] = useState(false)
const firstInputRef = useRef<HTMLInputElement>(null) const firstInputRef = useRef<HTMLInputElement>(null)
const dialogRef = useRef<HTMLDialogElement>(null) const dialogRef = useRef<HTMLDialogElement>(null)
useEffect(() => { useEffect(() => {
@@ -42,27 +38,16 @@ export function SearchModal({ serviceType, label, appUrl, username, onClose }: R
const handleSubmit = async (e: SyntheticEvent<HTMLFormElement>) => { const handleSubmit = async (e: SyntheticEvent<HTMLFormElement>) => {
e.preventDefault() e.preventDefault()
setSearchError(null) setError(null)
setLoading(true) setLoading(true)
try { try {
const req: SearchRequest = { appUrl, serviceType, username, query, aiSearch} const req: SearchRequest = { appUrl, serviceType, username, query}
const res = await search(req) const res = await search(req)
console.log(req)
setResults(res) setResults(res)
console.log('results', results)
} catch (err) { } catch (err) {
setSearchError(err instanceof Error ? err.message : uiText.search.searchFailed) setError(err instanceof Error ? err.message : 'Search failed')
} finally {
setLoading(false)
}
}
const handleSync = async () => {
setSyncError(null)
setLoading(true)
try {
const req: SyncRequest = { appUrl, serviceType, username}
await syncVectorData(req)
} catch (err) {
setSyncError(err instanceof Error ? err.message: uiText.search.syncFailed)
} finally { } finally {
setLoading(false) setLoading(false)
} }
@@ -71,20 +56,18 @@ export function SearchModal({ serviceType, label, appUrl, username, onClose }: R
return ( return (
<dialog className='modal' ref={dialogRef}> <dialog className='modal' ref={dialogRef}>
<div className='modal__header'> <div className='modal__header'>
<h2 className='modal__title' id='modal-title'>{uiText.search.title(label)}</h2> <h2 className='modal__title' id='modal-title'>Search in {label}</h2>
<button className='modal__close' onClick={onClose} aria-label={uiText.modal.closeAriaLabel}>{uiText.modal.closeSymbol}</button> <button className='modal__close' onClick={onClose} aria-label='Close'>×</button>
</div> </div>
<form className='modal__form' onSubmit={handleSubmit}> <form className='modal__form' onSubmit={handleSubmit}>
<div className='modal__field'> <div className='modal__field'>
<input id='search' className='modal__input' <input id='search' className='modal__input'
value={query} onChange={e => setQuery(e.target.value)} /> value={query} onChange={e => setQuery(e.target.value)} />
</div> </div>
{searchError && <p className='modal__error'>{searchError}</p>} {error && <p className='modal__error'>{error}</p>}
{syncError && <p className='modal__error'>{syncError}</p>} <button className='modal__submit' type='submit' disabled={loading}>
<div className='modal__actions'> Search
<button className='modal__other' title={uiText.search.syncTooltip(label)} type='button' disabled={loading} onClick={handleSync}>{uiText.search.refreshDataButton}</button> </button>
<button className='modal__submit' type='submit' disabled={loading}>{uiText.search.searchButton}</button>
</div>
</form> </form>
{results && ( {results && (
<div className='modal__results'> <div className='modal__results'>
+1 -3
View File
@@ -5,9 +5,7 @@
border-radius: 6px; border-radius: 6px;
border: 1px solid transparent; border: 1px solid transparent;
cursor: pointer; cursor: pointer;
transition: transition: box-shadow 0.2s, opacity 0.2s;
box-shadow 0.2s,
opacity 0.2s;
&:hover { &:hover {
opacity: 0.85; opacity: 0.85;
+42 -66
View File
@@ -44,13 +44,8 @@
line-height: 1; line-height: 1;
padding: 4px; padding: 4px;
border-radius: 4px; border-radius: 4px;
&:hover { &:hover { color: var(--text-h); }
color: var(--text-h); &:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
}
&:focus-visible {
outline: 2px solid var(--accent);
outline-offset: 2px;
}
} }
&__form { &__form {
@@ -99,81 +94,62 @@
border: 1px solid rgba(239, 68, 68, 0.2); border: 1px solid rgba(239, 68, 68, 0.2);
} }
&__actions { &__submit {
display: flex;
justify-content: flex-end;
gap: 8px;
margin-top: 4px; margin-top: 4px;
}
&__submit,
&__other {
padding: 10px 20px; padding: 10px 20px;
font-size: 15px; font-size: 15px;
font-weight: 500; font-weight: 500;
border-radius: 6px; border-radius: 6px;
border: none; border: none;
background: var(--accent);
color: #fff;
cursor: pointer; cursor: pointer;
transition: opacity 0.2s; transition: opacity 0.2s;
align-self: flex-end;
min-width: 100px; min-width: 100px;
color: #fff;
&:hover:not(:disabled) { &:hover:not(:disabled) { opacity: 0.85; }
opacity: 0.85; &:disabled { opacity: 0.6; cursor: not-allowed; }
&:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
}
&--expanded {
max-height: 70vh;
} }
&:disabled { &__results {
opacity: 0.6; overflow-y: auto;
cursor: not-allowed; flex: 1;
min-height: 0; // required: flex children won't shrink without this
margin-top: 20px;
display: flex;
flex-direction: column;
gap: 8px;
} }
&:focus-visible { &__results-count {
outline: 2px solid var(--accent); font-size: 12px;
outline-offset: 2px; color: var(--text);
margin: 0 0 8px 0;
} }
}
&__submit { &__result-item {
background: var(--accent); padding: 10px 12px;
} border: 1px solid var(--border);
border-radius: 6px;
background: var(--bg);
}
&--expanded { &__result-title {
max-height: 70vh; font-weight: 500;
} font-size: 14px;
color: var(--text-h);
margin: 0;
}
&__results { &__result-desc {
overflow-y: auto; font-size: 13px;
flex: 1; color: var(--text);
min-height: 0; // required: flex children won't shrink without this margin: 4px 0 0 0;
margin-top: 20px; }
display: flex;
flex-direction: column;
gap: 8px;
}
&__results-count {
font-size: 12px;
color: var(--text);
margin: 0 0 8px 0;
}
&__result-item {
padding: 10px 12px;
border: 1px solid var(--border);
border-radius: 6px;
background: var(--bg);
}
&__result-title {
font-weight: 500;
font-size: 14px;
color: var(--text-h);
margin: 0;
}
&__result-desc {
font-size: 13px;
color: var(--text);
margin: 4px 0 0 0;
}
} }
-39
View File
@@ -1,39 +0,0 @@
export const uiText = {
modal: {
closeAriaLabel: "Close",
closeSymbol: "×",
},
dashboard: {
title: "Vaessl Dashboard",
servicesLabel: "Services",
},
connections: {
connectModal: {
title: (label: string) => `Connect to ${label}`,
appUrlLabel: "App URL",
appUrlPlaceholder: "https://homebox.example.com",
usernameLabel: "Username",
passwordLabel: "Password",
loginFailed: "Login failed",
connectButton: "Connect",
connectingButton: "Connecting…",
},
serviceCard: {
connected: "Connected",
notConnected: "Not connected",
expiresPrefix: (date: string) => `· expires ${date}`,
disconnectButton: "Disconnect",
connectButton: "Connect",
searchButton: "Search",
},
},
search: {
title: (label: string) => `Search in ${label}`,
searchFailed: "Search failed",
syncFailed: "Refreshing data failed",
syncTooltip: (label: string) =>
`Syncs your ${label} database for vectorization`,
refreshDataButton: "Refresh Data",
searchButton: "Search",
},
} as const;
+16 -23
View File
@@ -1,32 +1,25 @@
import type { ServiceType } from "./connection"; import type { ServiceType } from "./connection";
export interface SearchRequest { export interface SearchRequest {
appUrl: string; appUrl: string
serviceType: ServiceType; serviceType: ServiceType
username: string; username: string
query: string | null; query: string | null
aiSearch: boolean;
} }
export interface ServiceItem { export interface SearchResponse {
id: string; id: string
title: string; title: string
description: string | null; description: string | null
extraData: Record<string, unknown>; extraData: Record<string, unknown>
} }
export interface PagedSearchResponse<T> { export interface PagedSearchResponse<T> {
content: T[]; content: T[]
page: number; page: number
pageSize: number; pageSize: number
totalElements: number; totalElements: number
first: boolean; first: boolean
last: boolean; last: boolean
sort: string; sort: string
}
export interface SyncRequest {
appUrl: string;
username: string;
serviceType: ServiceType;
} }