fix(pr): Some PR review fixes

Author: niedch

src/main/java/ai/labs/eddi/datastore/postgres/PostgresContentHashStore.java

@@ -110,6 +110,7 @@ public boolean shouldIngest(String sourceId, String documentId, String content)
                             "ON CONFLICT (source_id, document_id) DO UPDATE SET " +
                             "  hash = EXCLUDED.hash, " +
                             "  stale = false, " +
+                            "  stale_at = NULL, " +
                             "  ingested_at = CASE WHEN rag_ingestion_hashes.hash = EXCLUDED.hash THEN rag_ingestion_hashes.ingested_at ELSE ? END, "
                             +
                             "  updated_at = ? " +

src/main/java/ai/labs/eddi/modules/ingestion/FetchResult.java

@@ -4,8 +4,6 @@
  */
 package ai.labs.eddi.modules.ingestion;
 
-import ai.labs.eddi.configs.ingestion.model.SourceConfig;
-
 import java.util.List;
 import java.util.Map;
 

src/main/java/ai/labs/eddi/modules/ingestion/HtmlToMarkdownConverter.java

@@ -12,10 +12,8 @@
 import org.jsoup.nodes.TextNode;
 import org.jsoup.select.Elements;
 
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 
 /**
  * Converts HTML to clean Markdown format using JSoup.

src/main/java/ai/labs/eddi/modules/ingestion/MongoContentHashStore.java

@@ -100,6 +100,7 @@ public boolean shouldIngest(String sourceId, String documentId, String content)
                 Updates.set("ingestedAt", now),
                 Updates.set("updatedAt", now),
                 Updates.set("stale", false),
+                Updates.set("staleAt", null),
                 Updates.setOnInsert("sourceId", sourceId),
                 Updates.setOnInsert("documentId", documentId));
 
@@ -142,7 +143,7 @@ public int markStaleDocuments(String sourceId, List<String> documentIds) {
                 filter,
                 new Document("$set", new Document()
                         .append("stale", true)
-                        .append("staleAt", Instant.now().toString())));
+                        .append("staleAt", Instant.now())));
 
         int markedStale = (int) result.getModifiedCount();
         if (markedStale > 0) {

src/main/java/ai/labs/eddi/modules/ingestion/RagIngestionDirectExecutor.java

@@ -12,6 +12,8 @@
 import jakarta.inject.Inject;
 import org.jboss.logging.Logger;
 
+import java.util.regex.Pattern;
+
 /**
  * Direct schedule executor for RAG ingestion.
  * <p>
@@ -29,7 +31,7 @@ public class RagIngestionDirectExecutor implements DirectScheduleExecutor {
 
     private static final Logger LOGGER = Logger.getLogger(RagIngestionDirectExecutor.class);
 
-    private static final String OBJECTID_PATTERN = "^[0-9a-fA-F]{24}$";
+    private static final Pattern OBJECTID_PATTERN = Pattern.compile("^[0-9a-fA-F]{24}$");
 
     private final RagIngestionService ingestionService;
     private final IRagIngestionSourceStore sourceStore;
@@ -64,7 +66,7 @@ public void execute(ScheduleConfiguration schedule) throws Exception {
         sourceId = stripIdParams(sourceId);
 
         // Validate sourceId is a valid MongoDB ObjectId (24-char hex)
-        if (!sourceId.matches(OBJECTID_PATTERN)) {
+        if (!OBJECTID_PATTERN.matcher(sourceId).matches()) {
             throw new IllegalArgumentException(
                     "Schedule metadata field 'sourceId' is not a valid MongoDB ObjectId "
                             + "(expected 24-character hex string, got '" + sourceId + "' of length "

src/main/java/ai/labs/eddi/modules/ingestion/RagIngestionService.java

@@ -32,7 +32,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 /**
  * Orchestrates the RAG ingestion pipeline: fetch → convert → dedup → chunk →

src/main/java/ai/labs/eddi/modules/ingestion/RagIngestionTask.java

@@ -10,7 +10,6 @@
 import ai.labs.eddi.engine.lifecycle.exceptions.LifecycleException;
 import ai.labs.eddi.engine.lifecycle.exceptions.WorkflowConfigurationException;
 import ai.labs.eddi.engine.memory.IConversationMemory;
-import ai.labs.eddi.engine.memory.IData;
 import ai.labs.eddi.engine.memory.IDataFactory;
 import ai.labs.eddi.engine.runtime.client.configuration.IResourceClientLibrary;
 import ai.labs.eddi.configs.workflows.model.ExtensionDescriptor;
@@ -26,6 +25,7 @@
 import java.util.Map;
 
 import static ai.labs.eddi.utils.LogSanitizer.sanitize;
+import static ai.labs.eddi.utils.RestUtilities.extractResourceId;
 
 /**
  * Lifecycle task for RAG ingestion.
@@ -161,7 +161,8 @@ public Object configure(Map<String, Object> configuration, Map<String, Object> e
             RagIngestionSource sourceConfig = resourceClientLibrary.getResource(uri, RagIngestionSource.class);
 
             // Extract source ID from URI path
-            String sourceId = extractSourceId(uriStr);
+            var resourceId = extractResourceId(uri);
+            String sourceId = resourceId != null ? resourceId.getId() : "unknown";
 
             LOGGER.infof("[INGESTION TASK] Configured with source: %s (type=%s, name=%s)",
                     sanitize(sourceId), sanitize(sourceConfig.type()), sanitize(sourceConfig.name()));
@@ -174,23 +175,6 @@ public Object configure(Map<String, Object> configuration, Map<String, Object> e
         }
     }
 
-    private String extractSourceId(String uriStr) {
-        // Extract ID from URI like:
-        // eddi://ai.labs.ingestion/ingestionstore/ingestionsources/{id}?version=1
-        try {
-            int lastSlash = uriStr.lastIndexOf('/');
-            int queryStart = uriStr.indexOf('?', lastSlash);
-            if (queryStart > lastSlash) {
-                return uriStr.substring(lastSlash + 1, queryStart);
-            } else if (lastSlash > 0) {
-                return uriStr.substring(lastSlash + 1);
-            }
-        } catch (Exception e) {
-            LOGGER.warnf("Could not extract source ID from URI: %s", sanitize(uriStr));
-        }
-        return "unknown";
-    }
-
     @Override
     public ExtensionDescriptor getExtensionDescriptor() {
         ExtensionDescriptor descriptor = new ExtensionDescriptor(TASK_ID);

src/test/java/ai/labs/eddi/engine/exception/ExceptionMappersTest.java

@@ -44,15 +44,17 @@ void returns500() {
     class IllegalArgMapper {
 
         @Test
-        @DisplayName("should return 400 with exception message")
+        @DisplayName("should return 400 with JSON body")
+        @SuppressWarnings("unchecked")
         void returns400() {
             var mapper = new IllegalArgumentExceptionMapper();
             var ex = new IllegalArgumentException("Invalid parameter");
 
             Response response = mapper.toResponse(ex);
 
             assertEquals(400, response.getStatus());
-            assertEquals("Invalid parameter", response.getEntity());
+            var entity = (Map<String, String>) response.getEntity();
+            assertEquals("Invalid parameter", entity.get("message"));
         }
     }