feat: add bounded Ticket and Objective query pages
This commit is contained in:
+185
-2
@@ -93,6 +93,26 @@ fn io_err(path: impl Into<PathBuf>, source: io::Error) -> TicketError {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn read_ticket_summary_row(row: &rusqlite::Row<'_>) -> rusqlite::Result<TicketSummary> {
|
||||||
|
let workflow_state = row.get::<_, String>(7)?;
|
||||||
|
Ok(TicketSummary {
|
||||||
|
id: row.get(0)?,
|
||||||
|
slug: row.get(1)?,
|
||||||
|
title: row.get(2)?,
|
||||||
|
status: ExtensibleTicketStatus::from(row.get::<_, String>(3)?.as_str()),
|
||||||
|
kind: row.get(4)?,
|
||||||
|
priority: row.get(5)?,
|
||||||
|
labels: Vec::new(),
|
||||||
|
readiness: row.get(6)?,
|
||||||
|
workflow_state: TicketWorkflowState::parse(&workflow_state)
|
||||||
|
.unwrap_or(TicketWorkflowState::Planning),
|
||||||
|
workflow_state_explicit: row.get::<_, i64>(8)? != 0,
|
||||||
|
queued_by: row.get(9)?,
|
||||||
|
queued_at: row.get(10)?,
|
||||||
|
updated_at: row.get(11)?,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
fn sqlite_err(error: impl std::fmt::Display) -> TicketError {
|
fn sqlite_err(error: impl std::fmt::Display) -> TicketError {
|
||||||
TicketError::Sqlite(error.to_string())
|
TicketError::Sqlite(error.to_string())
|
||||||
}
|
}
|
||||||
@@ -1404,6 +1424,26 @@ pub struct SqliteTicketListProjection {
|
|||||||
pub items: Vec<SqliteTicketListItem>,
|
pub items: Vec<SqliteTicketListItem>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq)]
|
||||||
|
pub struct SqliteTicketListCursor {
|
||||||
|
pub updated_at: Option<String>,
|
||||||
|
pub ticket_id: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq)]
|
||||||
|
pub struct SqliteTicketListPageQuery {
|
||||||
|
pub states: Vec<TicketWorkflowState>,
|
||||||
|
pub limit: usize,
|
||||||
|
pub after: Option<SqliteTicketListCursor>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Eq)]
|
||||||
|
pub struct SqliteTicketListPage {
|
||||||
|
pub items: Vec<SqliteTicketListItem>,
|
||||||
|
pub has_more: bool,
|
||||||
|
pub next: Option<SqliteTicketListCursor>,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
pub struct TicketInvalidRecord {
|
pub struct TicketInvalidRecord {
|
||||||
pub label: String,
|
pub label: String,
|
||||||
@@ -2354,6 +2394,89 @@ impl SqliteTicketBackend {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Lists one stable keyset-paginated Workspace summary page.
|
||||||
|
///
|
||||||
|
/// Filtering, ordering, and `limit + 1` are applied by SQLite before the bounded blocker
|
||||||
|
/// hydration query. The returned cursor is storage data; callers must wrap it in their own
|
||||||
|
/// opaque, query-bound transport cursor.
|
||||||
|
pub fn list_workspace_projection_page(
|
||||||
|
&self,
|
||||||
|
query: SqliteTicketListPageQuery,
|
||||||
|
) -> Result<SqliteTicketListPage> {
|
||||||
|
self.with_read(|conn| {
|
||||||
|
let states = serde_json::to_string(
|
||||||
|
&query
|
||||||
|
.states
|
||||||
|
.iter()
|
||||||
|
.map(|state| state.as_str())
|
||||||
|
.collect::<Vec<_>>(),
|
||||||
|
)
|
||||||
|
.map_err(|error| TicketError::Sqlite(error.to_string()))?;
|
||||||
|
let cursor_updated_at = query
|
||||||
|
.after
|
||||||
|
.as_ref()
|
||||||
|
.and_then(|cursor| cursor.updated_at.clone());
|
||||||
|
let cursor_id = query
|
||||||
|
.after
|
||||||
|
.as_ref()
|
||||||
|
.map(|cursor| cursor.ticket_id.as_str());
|
||||||
|
let fetch_limit = query.limit.saturating_add(1);
|
||||||
|
let mut statement = conn
|
||||||
|
.prepare(
|
||||||
|
"SELECT ticket_id, slug, title, status, kind, priority, readiness,
|
||||||
|
workflow_state, workflow_state_explicit, queued_by, queued_at, updated_at
|
||||||
|
FROM typed_tickets AS ticket
|
||||||
|
WHERE workspace_id = ?1
|
||||||
|
AND (json_array_length(?2) = 0 OR EXISTS (
|
||||||
|
SELECT 1 FROM json_each(?2) AS state
|
||||||
|
WHERE state.value = ticket.workflow_state
|
||||||
|
))
|
||||||
|
AND (?3 IS NULL OR COALESCE(ticket.updated_at, '') < COALESCE(?4, '')
|
||||||
|
OR (COALESCE(ticket.updated_at, '') = COALESCE(?4, '')
|
||||||
|
AND ticket.ticket_id > ?3))
|
||||||
|
ORDER BY ticket.updated_at DESC, ticket.ticket_id ASC
|
||||||
|
LIMIT ?5",
|
||||||
|
)
|
||||||
|
.map_err(sqlite_err)?;
|
||||||
|
let rows = statement
|
||||||
|
.query_map(
|
||||||
|
params![
|
||||||
|
self.workspace_id,
|
||||||
|
states,
|
||||||
|
cursor_id,
|
||||||
|
cursor_updated_at,
|
||||||
|
i64::try_from(fetch_limit).unwrap_or(i64::MAX)
|
||||||
|
],
|
||||||
|
read_ticket_summary_row,
|
||||||
|
)
|
||||||
|
.map_err(sqlite_err)?;
|
||||||
|
let mut summaries = rows
|
||||||
|
.collect::<std::result::Result<Vec<_>, _>>()
|
||||||
|
.map_err(sqlite_err)?;
|
||||||
|
let has_more = summaries.len() > query.limit;
|
||||||
|
summaries.truncate(query.limit);
|
||||||
|
let next = has_more.then(|| {
|
||||||
|
let summary = summaries.last().expect("non-empty page with continuation");
|
||||||
|
SqliteTicketListCursor {
|
||||||
|
updated_at: summary.updated_at.clone(),
|
||||||
|
ticket_id: summary.id.clone(),
|
||||||
|
}
|
||||||
|
});
|
||||||
|
let blockers = self.list_workspace_blockers(conn, &summaries)?;
|
||||||
|
Ok(SqliteTicketListPage {
|
||||||
|
items: summaries
|
||||||
|
.into_iter()
|
||||||
|
.map(|summary| SqliteTicketListItem {
|
||||||
|
relation_blockers: blockers.get(&summary.id).cloned().unwrap_or_default(),
|
||||||
|
summary,
|
||||||
|
})
|
||||||
|
.collect(),
|
||||||
|
has_more,
|
||||||
|
next,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
fn list_workspace_summaries(
|
fn list_workspace_summaries(
|
||||||
&self,
|
&self,
|
||||||
conn: &Connection,
|
conn: &Connection,
|
||||||
@@ -6745,6 +6868,66 @@ state: planning
|
|||||||
assert!(!debug.contains("full-artifact-marker"));
|
assert!(!debug.contains("full-artifact-marker"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn sqlite_workspace_projection_page_uses_stable_keyset_and_state_filter() {
|
||||||
|
let tmp = TempDir::new().unwrap();
|
||||||
|
let db_path = tmp.path().join("workspace.db");
|
||||||
|
let backend = SqliteTicketBackend::open(&db_path, "workspace-test").unwrap();
|
||||||
|
let mut ids = Vec::new();
|
||||||
|
for (title, state, updated_at) in [
|
||||||
|
("Newest", TicketWorkflowState::Ready, "2026-08-12T03:00:00Z"),
|
||||||
|
("Middle", TicketWorkflowState::Ready, "2026-08-12T02:00:00Z"),
|
||||||
|
(
|
||||||
|
"Oldest",
|
||||||
|
TicketWorkflowState::Planning,
|
||||||
|
"2026-08-12T01:00:00Z",
|
||||||
|
),
|
||||||
|
] {
|
||||||
|
let mut input = NewTicket::new(title);
|
||||||
|
input.workflow_state = Some(state);
|
||||||
|
let ticket = backend.create(input).unwrap();
|
||||||
|
Connection::open(&db_path)
|
||||||
|
.unwrap()
|
||||||
|
.execute(
|
||||||
|
"UPDATE typed_tickets SET updated_at=?3 WHERE workspace_id=?1 AND ticket_id=?2",
|
||||||
|
params!["workspace-test", ticket.id, updated_at],
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
ids.push(ticket.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
let first = backend
|
||||||
|
.list_workspace_projection_page(SqliteTicketListPageQuery {
|
||||||
|
states: vec![TicketWorkflowState::Ready],
|
||||||
|
limit: 1,
|
||||||
|
after: None,
|
||||||
|
})
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(first.items[0].summary.id, ids[0]);
|
||||||
|
assert!(first.has_more);
|
||||||
|
|
||||||
|
let mut inserted = NewTicket::new("Inserted");
|
||||||
|
inserted.workflow_state = Some(TicketWorkflowState::Ready);
|
||||||
|
let inserted = backend.create(inserted).unwrap();
|
||||||
|
Connection::open(&db_path)
|
||||||
|
.unwrap()
|
||||||
|
.execute(
|
||||||
|
"UPDATE typed_tickets SET updated_at='2026-08-12T04:00:00Z' WHERE workspace_id=?1 AND ticket_id=?2",
|
||||||
|
params!["workspace-test", inserted.id],
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let second = backend
|
||||||
|
.list_workspace_projection_page(SqliteTicketListPageQuery {
|
||||||
|
states: vec![TicketWorkflowState::Ready],
|
||||||
|
limit: 1,
|
||||||
|
after: first.next,
|
||||||
|
})
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(second.items[0].summary.id, ids[1]);
|
||||||
|
assert!(!second.has_more);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn sqlite_workspace_projection_sql_shape_is_constant_for_ticket_count() {
|
fn sqlite_workspace_projection_sql_shape_is_constant_for_ticket_count() {
|
||||||
let source = include_str!("lib.rs");
|
let source = include_str!("lib.rs");
|
||||||
@@ -6756,8 +6939,8 @@ state: planning
|
|||||||
.map(|offset| start + offset)
|
.map(|offset| start + offset)
|
||||||
.expect("following method");
|
.expect("following method");
|
||||||
let projection_source = &source[start..end];
|
let projection_source = &source[start..end];
|
||||||
assert_eq!(projection_source.matches("self.with_read(").count(), 1);
|
assert_eq!(projection_source.matches("self.with_read(").count(), 2);
|
||||||
assert_eq!(projection_source.matches(".prepare(").count(), 2);
|
assert_eq!(projection_source.matches(".prepare(").count(), 3);
|
||||||
let item_loop = projection_source
|
let item_loop = projection_source
|
||||||
.split("items: summaries")
|
.split("items: summaries")
|
||||||
.nth(1)
|
.nth(1)
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ use crate::{Result, TicketError, sqlite_err};
|
|||||||
|
|
||||||
const MIGRATION_TABLE: &str = "ticket_schema_migrations";
|
const MIGRATION_TABLE: &str = "ticket_schema_migrations";
|
||||||
const MAX_SCHEMA_DIAGNOSTICS: usize = 32;
|
const MAX_SCHEMA_DIAGNOSTICS: usize = 32;
|
||||||
pub const LATEST_SQLITE_TICKET_SCHEMA_VERSION: i64 = 3;
|
pub const LATEST_SQLITE_TICKET_SCHEMA_VERSION: i64 = 4;
|
||||||
|
|
||||||
#[derive(Clone, Copy)]
|
#[derive(Clone, Copy)]
|
||||||
struct Migration {
|
struct Migration {
|
||||||
@@ -32,6 +32,11 @@ const MIGRATIONS: &[Migration] = &[
|
|||||||
name: "convert_legacy_reviews_to_comments",
|
name: "convert_legacy_reviews_to_comments",
|
||||||
apply: retire_legacy_ticket_review_events,
|
apply: retire_legacy_ticket_review_events,
|
||||||
},
|
},
|
||||||
|
Migration {
|
||||||
|
version: 4,
|
||||||
|
name: "add_ticket_query_indexes",
|
||||||
|
apply: add_ticket_query_indexes,
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
#[derive(Clone, Copy)]
|
#[derive(Clone, Copy)]
|
||||||
@@ -507,6 +512,29 @@ fn retire_legacy_ticket_review_events(connection: &Connection) -> Result<()> {
|
|||||||
.map_err(sqlite_err)
|
.map_err(sqlite_err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn add_ticket_query_indexes(connection: &Connection) -> Result<()> {
|
||||||
|
connection
|
||||||
|
.execute_batch(
|
||||||
|
r#"
|
||||||
|
CREATE INDEX IF NOT EXISTS typed_tickets_workspace_state_updated
|
||||||
|
ON typed_tickets(workspace_id, workflow_state, updated_at DESC, ticket_id);
|
||||||
|
CREATE INDEX IF NOT EXISTS typed_tickets_workspace_updated
|
||||||
|
ON typed_tickets(workspace_id, updated_at DESC, ticket_id);
|
||||||
|
CREATE INDEX IF NOT EXISTS typed_tickets_workspace_created
|
||||||
|
ON typed_tickets(workspace_id, created_at DESC, ticket_id);
|
||||||
|
CREATE INDEX IF NOT EXISTS typed_tickets_workspace_title
|
||||||
|
ON typed_tickets(workspace_id, title COLLATE NOCASE, ticket_id);
|
||||||
|
CREATE INDEX IF NOT EXISTS typed_ticket_events_workspace_kind_ticket
|
||||||
|
ON typed_ticket_events(workspace_id, kind, ticket_id, event_index);
|
||||||
|
CREATE INDEX IF NOT EXISTS typed_ticket_relations_workspace_source_kind
|
||||||
|
ON typed_ticket_relations(workspace_id, ticket_id, kind, target);
|
||||||
|
CREATE INDEX IF NOT EXISTS typed_ticket_relations_workspace_target_kind
|
||||||
|
ON typed_ticket_relations(workspace_id, target, kind, ticket_id);
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.map_err(sqlite_err)
|
||||||
|
}
|
||||||
|
|
||||||
fn add_column_if_missing(
|
fn add_column_if_missing(
|
||||||
connection: &Connection,
|
connection: &Connection,
|
||||||
table: &str,
|
table: &str,
|
||||||
@@ -841,10 +869,10 @@ mod tests {
|
|||||||
verify_sqlite_ticket_schema(&connection).unwrap();
|
verify_sqlite_ticket_schema(&connection).unwrap();
|
||||||
|
|
||||||
let versions = load_applied_migrations(&connection).unwrap();
|
let versions = load_applied_migrations(&connection).unwrap();
|
||||||
assert_eq!(versions.len(), 3);
|
assert_eq!(versions.len(), 4);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
versions.get(&LATEST_SQLITE_TICKET_SCHEMA_VERSION),
|
versions.get(&LATEST_SQLITE_TICKET_SCHEMA_VERSION),
|
||||||
Some(&"convert_legacy_reviews_to_comments".to_string())
|
Some(&"add_ticket_query_indexes".to_string())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -989,7 +1017,7 @@ mod tests {
|
|||||||
.to_string()
|
.to_string()
|
||||||
.contains("unsupported Ticket schema migration version 99")
|
.contains("unsupported Ticket schema migration version 99")
|
||||||
);
|
);
|
||||||
assert_eq!(load_applied_migrations(&connection).unwrap().len(), 4);
|
assert_eq!(load_applied_migrations(&connection).unwrap().len(), 5);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -1090,7 +1118,7 @@ mod tests {
|
|||||||
connection.execute("INSERT INTO typed_ticket_events (workspace_id,ticket_id,event_index,kind,author,at,status,heading,body) VALUES ('workspace-1','ticket-1',0,'review','reviewer','2026-08-11T00:00:00Z','approve','Review','legacy evidence')",[]).unwrap();
|
connection.execute("INSERT INTO typed_ticket_events (workspace_id,ticket_id,event_index,kind,author,at,status,heading,body) VALUES ('workspace-1','ticket-1',0,'review','reviewer','2026-08-11T00:00:00Z','approve','Review','legacy evidence')",[]).unwrap();
|
||||||
connection.execute("INSERT INTO typed_ticket_event_attributes (workspace_id,ticket_id,event_index,key,value) VALUES ('workspace-1','ticket-1',0,'result','approve')",[]).unwrap();
|
connection.execute("INSERT INTO typed_ticket_event_attributes (workspace_id,ticket_id,event_index,key,value) VALUES ('workspace-1','ticket-1',0,'result','approve')",[]).unwrap();
|
||||||
connection
|
connection
|
||||||
.execute("DELETE FROM ticket_schema_migrations WHERE version=3", [])
|
.execute("DELETE FROM ticket_schema_migrations WHERE version>=3", [])
|
||||||
.unwrap();
|
.unwrap();
|
||||||
migrate_sqlite_ticket_schema(&connection).unwrap();
|
migrate_sqlite_ticket_schema(&connection).unwrap();
|
||||||
let (kind,status,heading,body):(String,Option<String>,Option<String>,Option<String>)=connection.query_row("SELECT kind,status,heading,body FROM typed_ticket_events WHERE workspace_id='workspace-1' AND ticket_id='ticket-1' AND event_index=0",[],|row|Ok((row.get(0)?,row.get(1)?,row.get(2)?,row.get(3)?))).unwrap();
|
let (kind,status,heading,body):(String,Option<String>,Option<String>,Option<String>)=connection.query_row("SELECT kind,status,heading,body FROM typed_ticket_events WHERE workspace_id='workspace-1' AND ticket_id='ticket-1' AND event_index=0",[],|row|Ok((row.get(0)?,row.get(1)?,row.get(2)?,row.get(3)?))).unwrap();
|
||||||
@@ -1129,6 +1157,6 @@ mod tests {
|
|||||||
|
|
||||||
let connection = Connection::open(database).unwrap();
|
let connection = Connection::open(database).unwrap();
|
||||||
verify_sqlite_ticket_schema(&connection).unwrap();
|
verify_sqlite_ticket_schema(&connection).unwrap();
|
||||||
assert_eq!(load_applied_migrations(&connection).unwrap().len(), 3);
|
assert_eq!(load_applied_migrations(&connection).unwrap().len(), 4);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,9 +6,11 @@ use merge_request::{
|
|||||||
ReviewDecision,
|
ReviewDecision,
|
||||||
};
|
};
|
||||||
use project_record::{allocate_record_id, unix_epoch_millis_now};
|
use project_record::{allocate_record_id, unix_epoch_millis_now};
|
||||||
|
use rusqlite::{params_from_iter, types::Value as SqlValue};
|
||||||
|
|
||||||
use ticket::{
|
use ticket::{
|
||||||
SqliteTicketBackend, TicketBackend, TicketEvent, TicketIdOrSlug, TicketWorkspaceActionPriority,
|
SqliteTicketBackend, SqliteTicketListCursor, SqliteTicketListItem, SqliteTicketListPageQuery,
|
||||||
|
TicketBackend, TicketEvent, TicketIdOrSlug, TicketWorkflowState, TicketWorkspaceActionPriority,
|
||||||
project_ticket_workspace_item,
|
project_ticket_workspace_item,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -17,8 +19,9 @@ use crate::records::{
|
|||||||
ObjectiveQueryItem, ObjectiveQueryRequest, ObjectiveQueryResponse, ObjectiveResourceSummary,
|
ObjectiveQueryItem, ObjectiveQueryRequest, ObjectiveQueryResponse, ObjectiveResourceSummary,
|
||||||
ObjectiveShowRequest, ObjectiveSummary, ProjectRecordList, QueryPage, TicketAssignmentSummary,
|
ObjectiveShowRequest, ObjectiveSummary, ProjectRecordList, QueryPage, TicketAssignmentSummary,
|
||||||
TicketDetail, TicketEventDetail, TicketEvidenceEvent, TicketEvidenceSummary,
|
TicketDetail, TicketEventDetail, TicketEvidenceEvent, TicketEvidenceSummary,
|
||||||
TicketMergeRequestSummary, TicketQueryItem, TicketQueryRequest, TicketQueryResponse,
|
TicketListPageRequest, TicketMergeRequestSummary, TicketQueryItem, TicketQueryRequest,
|
||||||
TicketShowRequest, TicketSummary, summarize_body, truncate_body, validate_project_id,
|
TicketQueryResponse, TicketShowRequest, TicketSummary, TicketSummaryPage, summarize_body,
|
||||||
|
truncate_body, validate_project_id,
|
||||||
};
|
};
|
||||||
use crate::store::{
|
use crate::store::{
|
||||||
ControlPlaneStore, MemoryDocumentRecord, MemoryStagingRecord, MemoryStagingResolutionRecord,
|
ControlPlaneStore, MemoryDocumentRecord, MemoryStagingRecord, MemoryStagingResolutionRecord,
|
||||||
@@ -43,6 +46,7 @@ impl<T> WorkspaceAuthority for T where T: ObjectiveAuthority + TicketAuthority +
|
|||||||
|
|
||||||
pub trait TicketAuthority {
|
pub trait TicketAuthority {
|
||||||
fn list_tickets(&self, limit: usize) -> Result<ProjectRecordList<TicketSummary>>;
|
fn list_tickets(&self, limit: usize) -> Result<ProjectRecordList<TicketSummary>>;
|
||||||
|
fn list_ticket_page(&self, request: TicketListPageRequest) -> Result<TicketSummaryPage>;
|
||||||
fn query_tickets(&self, query: TicketQueryRequest) -> Result<TicketQueryResponse>;
|
fn query_tickets(&self, query: TicketQueryRequest) -> Result<TicketQueryResponse>;
|
||||||
fn ticket(&self, id: &str) -> Result<TicketDetail>;
|
fn ticket(&self, id: &str) -> Result<TicketDetail>;
|
||||||
fn show_ticket(&self, id: &str, query: TicketShowRequest) -> Result<TicketDetail>;
|
fn show_ticket(&self, id: &str, query: TicketShowRequest) -> Result<TicketDetail>;
|
||||||
@@ -317,11 +321,318 @@ impl SqliteWorkspaceAuthority {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn query_ticket_candidate_ids(
|
||||||
|
&self,
|
||||||
|
query: &TicketQueryRequest,
|
||||||
|
sort: TicketQuerySort,
|
||||||
|
after: Option<&(String, String)>,
|
||||||
|
limit: usize,
|
||||||
|
) -> Result<Vec<String>> {
|
||||||
|
let mut values = vec![SqlValue::Text(self.workspace_id.clone())];
|
||||||
|
let mut predicates = vec!["t.workspace_id=?1".to_string()];
|
||||||
|
let mut bind = |value: SqlValue| {
|
||||||
|
values.push(value);
|
||||||
|
format!("?{}", values.len())
|
||||||
|
};
|
||||||
|
if !query.states.is_empty() {
|
||||||
|
let states = query
|
||||||
|
.states
|
||||||
|
.iter()
|
||||||
|
.map(|state| bind(SqlValue::Text(state.clone())))
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
predicates.push(format!("t.workflow_state IN ({})", states.join(",")));
|
||||||
|
}
|
||||||
|
if let Some(text) = query.query.as_deref().filter(|text| !text.is_empty()) {
|
||||||
|
let pattern = bind(SqlValue::Text(format!("%{}%", text.to_lowercase())));
|
||||||
|
predicates.push(format!(
|
||||||
|
"(lower(t.title) LIKE {p} OR lower(t.body) LIKE {p} OR EXISTS (
|
||||||
|
SELECT 1 FROM typed_ticket_events e
|
||||||
|
WHERE e.workspace_id=t.workspace_id AND e.ticket_id=t.ticket_id
|
||||||
|
AND lower(e.body) LIKE {p}))",
|
||||||
|
p = pattern
|
||||||
|
));
|
||||||
|
}
|
||||||
|
if let Some(value) = &query.updated_after {
|
||||||
|
let value = bind(SqlValue::Text(value.clone()));
|
||||||
|
predicates.push(format!("COALESCE(t.updated_at,'')>={value}"));
|
||||||
|
}
|
||||||
|
if let Some(value) = &query.updated_before {
|
||||||
|
let value = bind(SqlValue::Text(value.clone()));
|
||||||
|
predicates.push(format!("COALESCE(t.updated_at,'')<={value}"));
|
||||||
|
}
|
||||||
|
if let Some(value) = &query.linked_objective_id {
|
||||||
|
let value = bind(SqlValue::Text(value.clone()));
|
||||||
|
predicates.push(format!("EXISTS (SELECT 1 FROM objective_ticket_links link WHERE link.workspace_id=t.workspace_id AND link.ticket_id=t.ticket_id AND link.objective_id={value})"));
|
||||||
|
}
|
||||||
|
if query.related_ticket_id.is_some() || query.relation_kind.is_some() {
|
||||||
|
let related = query
|
||||||
|
.related_ticket_id
|
||||||
|
.as_ref()
|
||||||
|
.map(|value| bind(SqlValue::Text(value.clone())));
|
||||||
|
let kind = query
|
||||||
|
.relation_kind
|
||||||
|
.as_ref()
|
||||||
|
.map(|value| bind(SqlValue::Text(value.clone())));
|
||||||
|
let related = related.map(|value| format!("AND ((r.ticket_id=t.ticket_id AND r.target={value}) OR (r.target=t.ticket_id AND r.ticket_id={value}))")).unwrap_or_default();
|
||||||
|
let kind = kind
|
||||||
|
.map(|value| format!("AND r.kind={value}"))
|
||||||
|
.unwrap_or_default();
|
||||||
|
predicates.push(format!("EXISTS (SELECT 1 FROM typed_ticket_relations r WHERE r.workspace_id=t.workspace_id {related} {kind})"));
|
||||||
|
}
|
||||||
|
let blocker = "EXISTS (SELECT 1 FROM typed_ticket_relations relation
|
||||||
|
JOIN typed_tickets blocker ON blocker.workspace_id=relation.workspace_id
|
||||||
|
AND blocker.ticket_id=CASE WHEN relation.ticket_id=t.ticket_id THEN relation.target ELSE relation.ticket_id END
|
||||||
|
WHERE relation.workspace_id=t.workspace_id
|
||||||
|
AND ((relation.ticket_id=t.ticket_id AND relation.kind='depends_on')
|
||||||
|
OR (relation.target=t.ticket_id AND relation.kind='blocks'))
|
||||||
|
AND blocker.workflow_state NOT IN ('done','closed'))";
|
||||||
|
let active_blocker = "EXISTS (SELECT 1 FROM typed_ticket_relations relation
|
||||||
|
JOIN typed_tickets blocker ON blocker.workspace_id=relation.workspace_id
|
||||||
|
AND blocker.ticket_id=CASE WHEN relation.ticket_id=t.ticket_id THEN relation.target ELSE relation.ticket_id END
|
||||||
|
WHERE relation.workspace_id=t.workspace_id
|
||||||
|
AND ((relation.ticket_id=t.ticket_id AND relation.kind='depends_on')
|
||||||
|
OR (relation.target=t.ticket_id AND relation.kind='blocks'))
|
||||||
|
AND blocker.workflow_state NOT IN ('queued','inprogress','done','closed'))";
|
||||||
|
let report_index = "(SELECT max(event.event_index) FROM typed_ticket_events event WHERE event.workspace_id=t.workspace_id AND event.ticket_id=t.ticket_id AND event.kind='implementation_report')";
|
||||||
|
let edit_index = "(SELECT max(event.event_index) FROM typed_ticket_events event WHERE event.workspace_id=t.workspace_id AND event.ticket_id=t.ticket_id AND event.kind='item_edit')";
|
||||||
|
let current_report = format!(
|
||||||
|
"({report_index} IS NOT NULL AND ({edit_index} IS NULL OR {report_index}>={edit_index}))"
|
||||||
|
);
|
||||||
|
let merge_request_id = "(SELECT relation.merge_request_id FROM merge_request_ticket_relations relation
|
||||||
|
JOIN merge_requests request ON request.workspace_id=relation.workspace_id AND request.merge_request_id=relation.merge_request_id
|
||||||
|
WHERE relation.workspace_id=t.workspace_id AND relation.ticket_id=t.ticket_id
|
||||||
|
ORDER BY CASE WHEN request.state='open' THEN 0 ELSE 1 END, request.created_at DESC LIMIT 1)";
|
||||||
|
let review_decision = format!("(SELECT json_extract(event.payload_json,'$.decision') FROM merge_request_events event
|
||||||
|
WHERE event.workspace_id=t.workspace_id AND event.merge_request_id={merge_request_id} AND event.kind='review'
|
||||||
|
AND json_extract(event.payload_json,'$.subject_ref')=(SELECT selector_from FROM merge_requests request WHERE request.workspace_id=t.workspace_id AND request.merge_request_id={merge_request_id})
|
||||||
|
AND NOT EXISTS (SELECT 1 FROM merge_request_events revoked WHERE revoked.workspace_id=event.workspace_id AND revoked.merge_request_id=event.merge_request_id AND revoked.kind='review_revoked' AND json_extract(revoked.payload_json,'$.review_event_id')=event.event_id)
|
||||||
|
ORDER BY event.sequence DESC LIMIT 1)");
|
||||||
|
let review_status = format!(
|
||||||
|
"CASE WHEN {merge_request_id} IS NULL THEN 'none' WHEN {review_decision}='approve' THEN 'approved' WHEN {review_decision}='request_changes' THEN 'request_changes' ELSE 'pending' END"
|
||||||
|
);
|
||||||
|
let has_commit = format!(
|
||||||
|
"({merge_request_id} IS NOT NULL OR EXISTS (SELECT 1 FROM typed_ticket_event_references reference WHERE reference.workspace_id=t.workspace_id AND reference.ticket_id=t.ticket_id AND reference.kind='commit'))"
|
||||||
|
);
|
||||||
|
for event_kind in &query.event_kinds {
|
||||||
|
let event_kind = bind(SqlValue::Text(event_kind.clone()));
|
||||||
|
predicates.push(format!("EXISTS (SELECT 1 FROM typed_ticket_events event WHERE event.workspace_id=t.workspace_id AND event.ticket_id=t.ticket_id AND event.kind={event_kind})"));
|
||||||
|
}
|
||||||
|
for evidence in &query.evidence {
|
||||||
|
predicates.push(match evidence.as_str() {
|
||||||
|
"merge_request" => format!("{merge_request_id} IS NOT NULL"),
|
||||||
|
"commit" => has_commit.clone(),
|
||||||
|
"approved_review" => format!("{review_status}='approved'"),
|
||||||
|
other => {
|
||||||
|
return Err(Error::InvalidRecordId(format!(
|
||||||
|
"unsupported evidence filter `{other}`"
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if let Some(status) = &query.review_status {
|
||||||
|
let status = if status == "unresolved_changes" {
|
||||||
|
"request_changes"
|
||||||
|
} else {
|
||||||
|
status.as_str()
|
||||||
|
};
|
||||||
|
let status = bind(SqlValue::Text(status.to_string()));
|
||||||
|
predicates.push(format!("{review_status}={status}"));
|
||||||
|
}
|
||||||
|
for attention in &query.attention {
|
||||||
|
predicates.push(match attention.as_str() {
|
||||||
|
"done_not_closed" => "t.workflow_state='done'".to_string(),
|
||||||
|
"unresolved_review" | "unresolved_changes" => format!("{review_status}='request_changes'"),
|
||||||
|
"missing_commit" => format!("NOT {has_commit}"),
|
||||||
|
"blocked" => blocker.to_string(),
|
||||||
|
"unblocked" => format!("NOT {blocker}"),
|
||||||
|
"ready" => format!("t.workflow_state='ready' AND NOT {active_blocker}"),
|
||||||
|
"awaiting_review" => format!("t.workflow_state='inprogress' AND {current_report} AND {review_status}='pending'"),
|
||||||
|
"stale_after_rescope" => format!("{report_index} IS NOT NULL AND {edit_index}>{report_index}"),
|
||||||
|
"missing_evidence" => format!("NOT ({current_report} AND {has_commit} AND {review_status}='approved')"),
|
||||||
|
other => return Err(Error::InvalidRecordId(format!("unsupported attention filter `{other}`"))),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
let rank_expression = match sort {
|
||||||
|
TicketQuerySort::Priority => format!(
|
||||||
|
"CASE WHEN t.workflow_state='ready' AND NOT {active_blocker} THEN 0 WHEN t.workflow_state IN ('queued','inprogress') THEN 1 ELSE 2 END"
|
||||||
|
),
|
||||||
|
TicketQuerySort::Relevance => {
|
||||||
|
if let Some(text) = query.query.as_deref().filter(|text| !text.is_empty()) {
|
||||||
|
let pattern = bind(SqlValue::Text(format!("%{}%", text.to_lowercase())));
|
||||||
|
format!(
|
||||||
|
"CASE WHEN lower(t.title) LIKE {pattern} THEN 0 WHEN lower(t.body) LIKE {pattern} THEN 1 WHEN EXISTS (SELECT 1 FROM typed_ticket_events event WHERE event.workspace_id=t.workspace_id AND event.ticket_id=t.ticket_id AND lower(event.body) LIKE {pattern}) THEN 2 ELSE 3 END"
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
"3".to_string()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => "0".to_string(),
|
||||||
|
};
|
||||||
|
if let Some((key, id)) = after {
|
||||||
|
match sort {
|
||||||
|
TicketQuerySort::UpdatedDesc => {
|
||||||
|
let key = bind(SqlValue::Text(key.clone()));
|
||||||
|
let id = bind(SqlValue::Text(id.clone()));
|
||||||
|
predicates.push(format!("(COALESCE(t.updated_at,'')<{key} OR (COALESCE(t.updated_at,'')={key} AND t.ticket_id>{id}))"));
|
||||||
|
}
|
||||||
|
TicketQuerySort::CreatedDesc => {
|
||||||
|
let key = bind(SqlValue::Text(key.clone()));
|
||||||
|
let id = bind(SqlValue::Text(id.clone()));
|
||||||
|
predicates.push(format!("(COALESCE(t.created_at,'')<{key} OR (COALESCE(t.created_at,'')={key} AND t.ticket_id>{id}))"));
|
||||||
|
}
|
||||||
|
TicketQuerySort::Title => {
|
||||||
|
let key = bind(SqlValue::Text(key.clone()));
|
||||||
|
let id = bind(SqlValue::Text(id.clone()));
|
||||||
|
predicates.push(format!(
|
||||||
|
"(lower(t.title)>{key} OR (lower(t.title)={key} AND t.ticket_id>{id}))"
|
||||||
|
));
|
||||||
|
}
|
||||||
|
TicketQuerySort::Priority | TicketQuerySort::Relevance => {
|
||||||
|
let (rank, updated_at) = key.split_once('|').unwrap_or(("9", ""));
|
||||||
|
let rank = bind(SqlValue::Integer(rank.parse::<i64>().unwrap_or(9)));
|
||||||
|
let updated_at = bind(SqlValue::Text(updated_at.to_string()));
|
||||||
|
let id = bind(SqlValue::Text(id.clone()));
|
||||||
|
predicates.push(format!("({rank_expression}>{rank} OR ({rank_expression}={rank} AND (COALESCE(t.updated_at,'')<{updated_at} OR (COALESCE(t.updated_at,'')={updated_at} AND t.ticket_id>{id}))))"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let order = match sort {
|
||||||
|
TicketQuerySort::Title => "t.title COLLATE NOCASE ASC, t.ticket_id ASC".to_string(),
|
||||||
|
TicketQuerySort::CreatedDesc => "t.created_at DESC, t.ticket_id ASC".to_string(),
|
||||||
|
TicketQuerySort::UpdatedDesc => "t.updated_at DESC, t.ticket_id ASC".to_string(),
|
||||||
|
TicketQuerySort::Priority | TicketQuerySort::Relevance => {
|
||||||
|
format!("{rank_expression} ASC, t.updated_at DESC, t.ticket_id ASC")
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let limit = bind(SqlValue::Integer(i64::try_from(limit).unwrap_or(i64::MAX)));
|
||||||
|
let sql = format!(
|
||||||
|
"SELECT t.ticket_id FROM typed_tickets t WHERE {} ORDER BY {order} LIMIT {limit}",
|
||||||
|
predicates.join(" AND ")
|
||||||
|
);
|
||||||
|
self.store.with_conn(|connection| {
|
||||||
|
let mut statement = connection.prepare(&sql)?;
|
||||||
|
let rows = statement.query_map(params_from_iter(values.iter()), |row| row.get(0))?;
|
||||||
|
Ok(rows.collect::<std::result::Result<Vec<_>, _>>()?)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn query_objective_candidate_ids(
|
||||||
|
&self,
|
||||||
|
query: &ObjectiveQueryRequest,
|
||||||
|
sort: ObjectiveQuerySort,
|
||||||
|
after: Option<&(String, String)>,
|
||||||
|
limit: usize,
|
||||||
|
) -> Result<Vec<String>> {
|
||||||
|
let mut values = vec![SqlValue::Text(self.workspace_id.clone())];
|
||||||
|
let mut predicates = vec!["o.workspace_id=?1".to_string()];
|
||||||
|
let mut bind = |value: SqlValue| {
|
||||||
|
values.push(value);
|
||||||
|
format!("?{}", values.len())
|
||||||
|
};
|
||||||
|
if !query.states.is_empty() {
|
||||||
|
let states = query
|
||||||
|
.states
|
||||||
|
.iter()
|
||||||
|
.map(|state| bind(SqlValue::Text(state.clone())))
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
predicates.push(format!("o.state IN ({})", states.join(",")));
|
||||||
|
}
|
||||||
|
if let Some(text) = query.query.as_deref().filter(|text| !text.is_empty()) {
|
||||||
|
let pattern = bind(SqlValue::Text(format!("%{}%", text.to_lowercase())));
|
||||||
|
predicates.push(format!(
|
||||||
|
"(lower(o.title) LIKE {pattern} OR lower(o.body_md) LIKE {pattern})"
|
||||||
|
));
|
||||||
|
}
|
||||||
|
if let Some(value) = &query.updated_after {
|
||||||
|
let value = bind(SqlValue::Text(value.clone()));
|
||||||
|
predicates.push(format!("o.updated_at>={value}"));
|
||||||
|
}
|
||||||
|
if let Some(value) = &query.updated_before {
|
||||||
|
let value = bind(SqlValue::Text(value.clone()));
|
||||||
|
predicates.push(format!("o.updated_at<={value}"));
|
||||||
|
}
|
||||||
|
if let Some(value) = &query.linked_ticket_id {
|
||||||
|
let value = bind(SqlValue::Text(value.clone()));
|
||||||
|
predicates.push(format!("EXISTS (SELECT 1 FROM objective_ticket_links link WHERE link.workspace_id=o.workspace_id AND link.objective_id=o.objective_id AND link.ticket_id={value})"));
|
||||||
|
}
|
||||||
|
let relevance_rank = if let Some(text) =
|
||||||
|
query.query.as_deref().filter(|text| !text.is_empty())
|
||||||
|
{
|
||||||
|
let pattern = bind(SqlValue::Text(format!("%{}%", text.to_lowercase())));
|
||||||
|
format!(
|
||||||
|
"CASE WHEN lower(o.title) LIKE {pattern} THEN 0 WHEN lower(o.body_md) LIKE {pattern} THEN 1 ELSE 2 END"
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
"2".to_string()
|
||||||
|
};
|
||||||
|
if let Some((key, id)) = after {
|
||||||
|
match sort {
|
||||||
|
ObjectiveQuerySort::UpdatedDesc => {
|
||||||
|
let key = bind(SqlValue::Text(key.clone()));
|
||||||
|
let id = bind(SqlValue::Text(id.clone()));
|
||||||
|
predicates.push(format!(
|
||||||
|
"(o.updated_at<{key} OR (o.updated_at={key} AND o.objective_id>{id}))"
|
||||||
|
));
|
||||||
|
}
|
||||||
|
ObjectiveQuerySort::CreatedDesc => {
|
||||||
|
let key = bind(SqlValue::Text(key.clone()));
|
||||||
|
let id = bind(SqlValue::Text(id.clone()));
|
||||||
|
predicates.push(format!(
|
||||||
|
"(o.created_at<{key} OR (o.created_at={key} AND o.objective_id>{id}))"
|
||||||
|
));
|
||||||
|
}
|
||||||
|
ObjectiveQuerySort::Title => {
|
||||||
|
let key = bind(SqlValue::Text(key.clone()));
|
||||||
|
let id = bind(SqlValue::Text(id.clone()));
|
||||||
|
predicates.push(format!(
|
||||||
|
"(lower(o.title)>{key} OR (lower(o.title)={key} AND o.objective_id>{id}))"
|
||||||
|
));
|
||||||
|
}
|
||||||
|
ObjectiveQuerySort::Relevance => {
|
||||||
|
let (rank, updated_at) = key.split_once('|').unwrap_or(("9", ""));
|
||||||
|
let rank = bind(SqlValue::Integer(rank.parse::<i64>().unwrap_or(9)));
|
||||||
|
let updated_at = bind(SqlValue::Text(updated_at.to_string()));
|
||||||
|
let id = bind(SqlValue::Text(id.clone()));
|
||||||
|
predicates.push(format!("({relevance_rank}>{rank} OR ({relevance_rank}={rank} AND (o.updated_at<{updated_at} OR (o.updated_at={updated_at} AND o.objective_id>{id}))))"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let order = match sort {
|
||||||
|
ObjectiveQuerySort::Title => {
|
||||||
|
"o.title COLLATE NOCASE ASC, o.objective_id ASC".to_string()
|
||||||
|
}
|
||||||
|
ObjectiveQuerySort::CreatedDesc => "o.created_at DESC, o.objective_id ASC".to_string(),
|
||||||
|
ObjectiveQuerySort::UpdatedDesc => "o.updated_at DESC, o.objective_id ASC".to_string(),
|
||||||
|
ObjectiveQuerySort::Relevance => {
|
||||||
|
format!("{relevance_rank} ASC, o.updated_at DESC, o.objective_id ASC")
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let limit = bind(SqlValue::Integer(i64::try_from(limit).unwrap_or(i64::MAX)));
|
||||||
|
let sql = format!(
|
||||||
|
"SELECT o.objective_id FROM objectives o WHERE {} ORDER BY {order} LIMIT {limit}",
|
||||||
|
predicates.join(" AND ")
|
||||||
|
);
|
||||||
|
self.store.with_conn(|connection| {
|
||||||
|
let mut statement = connection.prepare(&sql)?;
|
||||||
|
let rows = statement.query_map(params_from_iter(values.iter()), |row| row.get(0))?;
|
||||||
|
Ok(rows.collect::<std::result::Result<Vec<_>, _>>()?)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
fn read_ticket_detail(&self, id: &str, request: TicketShowRequest) -> Result<TicketDetail> {
|
fn read_ticket_detail(&self, id: &str, request: TicketShowRequest) -> Result<TicketDetail> {
|
||||||
validate_project_id(id)?;
|
validate_project_id(id)?;
|
||||||
let ticket = self
|
let ticket = self
|
||||||
.ticket_backend
|
.ticket_backend
|
||||||
.show(TicketIdOrSlug::Id(id.to_string()))?;
|
.show(TicketIdOrSlug::Id(id.to_string()))?;
|
||||||
|
self.ticket_detail_from_ticket(ticket, request)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn ticket_detail_from_ticket(
|
||||||
|
&self,
|
||||||
|
ticket: ticket::Ticket,
|
||||||
|
request: TicketShowRequest,
|
||||||
|
) -> Result<TicketDetail> {
|
||||||
|
let id = ticket.meta.id.as_str();
|
||||||
let (body, body_truncated) =
|
let (body, body_truncated) =
|
||||||
truncate_body(ticket.document.body.as_str(), DETAIL_BODY_LIMIT);
|
truncate_body(ticket.document.body.as_str(), DETAIL_BODY_LIMIT);
|
||||||
let event_limit = request
|
let event_limit = request
|
||||||
@@ -458,42 +769,97 @@ impl TicketAuthority for SqliteWorkspaceAuthority {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn list_ticket_page(&self, request: TicketListPageRequest) -> Result<TicketSummaryPage> {
|
||||||
|
let limit = request.limit.unwrap_or(30).clamp(1, 100);
|
||||||
|
let mut states = request.states;
|
||||||
|
states.sort();
|
||||||
|
states.dedup();
|
||||||
|
let parsed_states = states
|
||||||
|
.iter()
|
||||||
|
.map(|state| {
|
||||||
|
TicketWorkflowState::parse(state).ok_or_else(|| {
|
||||||
|
Error::InvalidRecordId(format!("unsupported ticket state `{state}`"))
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect::<Result<Vec<_>>>()?;
|
||||||
|
let fingerprint = format!("ticket-summary:v1:states={}", states.join(","));
|
||||||
|
let after = request
|
||||||
|
.cursor
|
||||||
|
.as_deref()
|
||||||
|
.map(|cursor| parse_ticket_summary_cursor(cursor, &fingerprint))
|
||||||
|
.transpose()?;
|
||||||
|
let page =
|
||||||
|
self.ticket_backend
|
||||||
|
.list_workspace_projection_page(SqliteTicketListPageQuery {
|
||||||
|
states: parsed_states,
|
||||||
|
limit,
|
||||||
|
after,
|
||||||
|
})?;
|
||||||
|
let items = page
|
||||||
|
.items
|
||||||
|
.into_iter()
|
||||||
|
.map(ticket_summary_from_sqlite_item)
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
let next_cursor = page
|
||||||
|
.next
|
||||||
|
.map(|position| make_ticket_summary_cursor(&fingerprint, position));
|
||||||
|
Ok(TicketSummaryPage {
|
||||||
|
page: QueryPage {
|
||||||
|
limit,
|
||||||
|
returned: items.len(),
|
||||||
|
has_more: page.has_more,
|
||||||
|
next_cursor,
|
||||||
|
sort: "updated_desc".to_string(),
|
||||||
|
source_limit: None,
|
||||||
|
source_truncated: false,
|
||||||
|
},
|
||||||
|
items,
|
||||||
|
invalid_records: Vec::new(),
|
||||||
|
record_authority: RECORD_SOURCE_WORKSPACE_SQLITE.to_string(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
fn query_tickets(&self, query: TicketQueryRequest) -> Result<TicketQueryResponse> {
|
fn query_tickets(&self, query: TicketQueryRequest) -> Result<TicketQueryResponse> {
|
||||||
validate_ticket_query(&query)?;
|
validate_ticket_query(&query)?;
|
||||||
let limit = query.limit.unwrap_or(50).clamp(1, 100);
|
let limit = query.limit.unwrap_or(50).clamp(1, 100);
|
||||||
let sort = normalize_ticket_sort(query.sort.as_deref(), query.query.is_some())?;
|
let sort = normalize_ticket_sort(query.sort.as_deref(), query.query.is_some())?;
|
||||||
|
let fingerprint = ticket_query_fingerprint(&query, sort);
|
||||||
let cursor = query
|
let cursor = query
|
||||||
.cursor
|
.cursor
|
||||||
.as_deref()
|
.as_deref()
|
||||||
.map(parse_query_cursor)
|
.map(|cursor| parse_bound_query_cursor(cursor, &fingerprint))
|
||||||
.transpose()?;
|
.transpose()?;
|
||||||
let mut summaries = self.list_tickets(1_001)?.items;
|
let candidate_limit = limit.saturating_add(1);
|
||||||
let source_truncated = summaries.len() > 1_000;
|
let candidate_ids =
|
||||||
summaries.truncate(1_000);
|
self.query_ticket_candidate_ids(&query, sort, cursor.as_ref(), candidate_limit)?;
|
||||||
|
let source_truncated = candidate_ids.len() == candidate_limit;
|
||||||
let mut items = Vec::new();
|
let mut items = Vec::new();
|
||||||
for summary in summaries {
|
for ticket_id in candidate_ids {
|
||||||
let detail = self.read_ticket_detail(
|
let authoritative = self
|
||||||
&summary.id,
|
.ticket_backend
|
||||||
|
.show(TicketIdOrSlug::Id(ticket_id.clone()))?;
|
||||||
|
let summary = ticket_summary_from_ticket(&authoritative);
|
||||||
|
let authoritative_body = authoritative.document.body.clone();
|
||||||
|
let authoritative_events = authoritative.events.clone();
|
||||||
|
let detail = self.ticket_detail_from_ticket(
|
||||||
|
authoritative,
|
||||||
TicketShowRequest {
|
TicketShowRequest {
|
||||||
event_limit: Some(TICKET_EVENT_LIMIT),
|
event_limit: Some(TICKET_EVENT_LIMIT),
|
||||||
event_cursor: None,
|
event_cursor: None,
|
||||||
},
|
},
|
||||||
)?;
|
)?;
|
||||||
let authoritative = self
|
|
||||||
.ticket_backend
|
|
||||||
.show(TicketIdOrSlug::Id(summary.id.clone()))?;
|
|
||||||
if ticket_matches_query(
|
if ticket_matches_query(
|
||||||
&summary,
|
&summary,
|
||||||
&detail,
|
&detail,
|
||||||
authoritative.document.body.as_str(),
|
authoritative_body.as_str(),
|
||||||
&authoritative.events,
|
&authoritative_events,
|
||||||
&query,
|
&query,
|
||||||
) {
|
) {
|
||||||
items.push(ticket_query_item(
|
items.push(ticket_query_item(
|
||||||
summary,
|
summary,
|
||||||
&detail,
|
&detail,
|
||||||
authoritative.document.body.as_str(),
|
authoritative_body.as_str(),
|
||||||
&authoritative.events,
|
&authoritative_events,
|
||||||
&query,
|
&query,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
@@ -505,7 +871,11 @@ impl TicketAuthority for SqliteWorkspaceAuthority {
|
|||||||
let has_more = items.len() > limit;
|
let has_more = items.len() > limit;
|
||||||
items.truncate(limit);
|
items.truncate(limit);
|
||||||
let next_cursor = has_more
|
let next_cursor = has_more
|
||||||
.then(|| items.last().map(|item| make_ticket_cursor(item, sort)))
|
.then(|| {
|
||||||
|
items
|
||||||
|
.last()
|
||||||
|
.map(|item| make_ticket_cursor(item, sort, &fingerprint))
|
||||||
|
})
|
||||||
.flatten();
|
.flatten();
|
||||||
Ok(TicketQueryResponse {
|
Ok(TicketQueryResponse {
|
||||||
page: QueryPage {
|
page: QueryPage {
|
||||||
@@ -514,7 +884,7 @@ impl TicketAuthority for SqliteWorkspaceAuthority {
|
|||||||
has_more,
|
has_more,
|
||||||
next_cursor,
|
next_cursor,
|
||||||
sort: sort.to_string(),
|
sort: sort.to_string(),
|
||||||
source_limit: Some(1_000),
|
source_limit: Some(candidate_limit),
|
||||||
source_truncated,
|
source_truncated,
|
||||||
},
|
},
|
||||||
items,
|
items,
|
||||||
@@ -566,33 +936,36 @@ impl ObjectiveAuthority for SqliteWorkspaceAuthority {
|
|||||||
)?;
|
)?;
|
||||||
let limit = query.limit.unwrap_or(50).clamp(1, 100);
|
let limit = query.limit.unwrap_or(50).clamp(1, 100);
|
||||||
let sort = normalize_objective_sort(query.sort.as_deref(), query.query.is_some())?;
|
let sort = normalize_objective_sort(query.sort.as_deref(), query.query.is_some())?;
|
||||||
|
let fingerprint = objective_query_fingerprint(&query, sort);
|
||||||
let cursor = query
|
let cursor = query
|
||||||
.cursor
|
.cursor
|
||||||
.as_deref()
|
.as_deref()
|
||||||
.map(parse_query_cursor)
|
.map(|cursor| parse_bound_query_cursor(cursor, &fingerprint))
|
||||||
.transpose()?;
|
.transpose()?;
|
||||||
let mut objectives = self.list_objectives(1_001)?.items;
|
let candidate_limit = limit.saturating_add(1);
|
||||||
let source_truncated = objectives.len() > 1_000;
|
let objective_ids =
|
||||||
objectives.truncate(1_000);
|
self.query_objective_candidate_ids(&query, sort, cursor.as_ref(), candidate_limit)?;
|
||||||
|
let source_truncated = objective_ids.len() == candidate_limit;
|
||||||
let mut items = Vec::new();
|
let mut items = Vec::new();
|
||||||
for objective in objectives {
|
for objective_id in objective_ids {
|
||||||
let body_md = self.objective_record(&objective.id)?.body_md;
|
let record = self.objective_record(&objective_id)?;
|
||||||
if !objective_matches_query(&objective, &body_md, &query) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
let linked_tickets = self
|
let linked_tickets = self
|
||||||
.store
|
.store
|
||||||
.list_objective_ticket_links(&self.workspace_id, &objective.id)?
|
.list_objective_ticket_links(&self.workspace_id, &objective_id)?
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|link| link.ticket_id)
|
.map(|link| link.ticket_id)
|
||||||
.collect::<Vec<_>>();
|
.collect::<Vec<_>>();
|
||||||
if query
|
let body_md = record.body_md.clone();
|
||||||
.linked_ticket_id
|
let objective = ObjectiveSummary {
|
||||||
.as_ref()
|
id: record.objective_id,
|
||||||
.is_some_and(|id| !linked_tickets.iter().any(|ticket_id| ticket_id == id))
|
title: record.title,
|
||||||
{
|
state: record.state,
|
||||||
continue;
|
created_at: Some(record.created_at),
|
||||||
}
|
updated_at: Some(record.updated_at),
|
||||||
|
summary: summarize_body(&body_md),
|
||||||
|
linked_tickets: linked_tickets.clone(),
|
||||||
|
record_source: RECORD_SOURCE_WORKSPACE_SQLITE.to_string(),
|
||||||
|
};
|
||||||
items.push(objective_query_item(
|
items.push(objective_query_item(
|
||||||
objective,
|
objective,
|
||||||
linked_tickets,
|
linked_tickets,
|
||||||
@@ -607,7 +980,11 @@ impl ObjectiveAuthority for SqliteWorkspaceAuthority {
|
|||||||
let has_more = items.len() > limit;
|
let has_more = items.len() > limit;
|
||||||
items.truncate(limit);
|
items.truncate(limit);
|
||||||
let next_cursor = has_more
|
let next_cursor = has_more
|
||||||
.then(|| items.last().map(|item| make_objective_cursor(item, sort)))
|
.then(|| {
|
||||||
|
items
|
||||||
|
.last()
|
||||||
|
.map(|item| make_objective_cursor(item, sort, &fingerprint))
|
||||||
|
})
|
||||||
.flatten();
|
.flatten();
|
||||||
Ok(ObjectiveQueryResponse {
|
Ok(ObjectiveQueryResponse {
|
||||||
page: QueryPage {
|
page: QueryPage {
|
||||||
@@ -616,7 +993,7 @@ impl ObjectiveAuthority for SqliteWorkspaceAuthority {
|
|||||||
has_more,
|
has_more,
|
||||||
next_cursor,
|
next_cursor,
|
||||||
sort: sort.to_string(),
|
sort: sort.to_string(),
|
||||||
source_limit: Some(1_000),
|
source_limit: Some(candidate_limit),
|
||||||
source_truncated,
|
source_truncated,
|
||||||
},
|
},
|
||||||
items,
|
items,
|
||||||
@@ -1240,6 +1617,35 @@ fn parse_offset_cursor(cursor: &str, field: &str) -> Result<usize> {
|
|||||||
.map_err(|_| Error::InvalidRecordId(format!("invalid {field}")))
|
.map_err(|_| Error::InvalidRecordId(format!("invalid {field}")))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn make_bound_query_cursor(fingerprint: &str, key: &str, id: &str) -> String {
|
||||||
|
make_query_cursor(&format!("{fingerprint}\n{key}"), id)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn parse_bound_query_cursor(value: &str, fingerprint: &str) -> Result<(String, String)> {
|
||||||
|
let (key, id) = parse_query_cursor(value)?;
|
||||||
|
let prefix = format!("{fingerprint}\n");
|
||||||
|
let key = key.strip_prefix(&prefix).ok_or_else(|| {
|
||||||
|
Error::InvalidRecordId("cursor does not match the current filters or sort".to_string())
|
||||||
|
})?;
|
||||||
|
Ok((key.to_string(), id))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn ticket_query_fingerprint(query: &TicketQueryRequest, sort: TicketQuerySort) -> String {
|
||||||
|
let mut query = query.clone();
|
||||||
|
query.cursor = None;
|
||||||
|
query.limit = None;
|
||||||
|
query.sort = Some(sort.to_string());
|
||||||
|
serde_json::to_string(&query).expect("ticket query fingerprint must serialize")
|
||||||
|
}
|
||||||
|
|
||||||
|
fn objective_query_fingerprint(query: &ObjectiveQueryRequest, sort: ObjectiveQuerySort) -> String {
|
||||||
|
let mut query = query.clone();
|
||||||
|
query.cursor = None;
|
||||||
|
query.limit = None;
|
||||||
|
query.sort = Some(sort.to_string());
|
||||||
|
serde_json::to_string(&query).expect("objective query fingerprint must serialize")
|
||||||
|
}
|
||||||
|
|
||||||
fn make_query_cursor(key: &str, id: &str) -> String {
|
fn make_query_cursor(key: &str, id: &str) -> String {
|
||||||
format!("v1:{}:{key}{id}", key.len())
|
format!("v1:{}:{key}{id}", key.len())
|
||||||
}
|
}
|
||||||
@@ -1545,8 +1951,8 @@ fn sort_ticket_query_items(items: &mut [TicketQueryItem], sort: TicketQuerySort)
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
fn make_ticket_cursor(item: &TicketQueryItem, sort: TicketQuerySort) -> String {
|
fn make_ticket_cursor(item: &TicketQueryItem, sort: TicketQuerySort, fingerprint: &str) -> String {
|
||||||
make_query_cursor(&ticket_sort_key(item, sort), &item.id)
|
make_bound_query_cursor(fingerprint, &ticket_sort_key(item, sort), &item.id)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn ticket_item_after_cursor(
|
fn ticket_item_after_cursor(
|
||||||
@@ -1571,31 +1977,6 @@ fn ticket_item_after_cursor(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn objective_matches_query(
|
|
||||||
objective: &ObjectiveSummary,
|
|
||||||
body_md: &str,
|
|
||||||
query: &ObjectiveQueryRequest,
|
|
||||||
) -> bool {
|
|
||||||
if !query.states.is_empty() && !query.states.iter().any(|state| state == &objective.state) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if query
|
|
||||||
.updated_after
|
|
||||||
.as_ref()
|
|
||||||
.is_some_and(|after| objective.updated_at.as_deref().unwrap_or("") <= after.as_str())
|
|
||||||
|| query
|
|
||||||
.updated_before
|
|
||||||
.as_ref()
|
|
||||||
.is_some_and(|before| objective.updated_at.as_deref().unwrap_or("") >= before.as_str())
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
query.query.as_ref().is_none_or(|text| {
|
|
||||||
let needle = text.to_lowercase();
|
|
||||||
objective.title.to_lowercase().contains(&needle) || body_md.to_lowercase().contains(&needle)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
fn objective_query_item(
|
fn objective_query_item(
|
||||||
objective: ObjectiveSummary,
|
objective: ObjectiveSummary,
|
||||||
linked_tickets: Vec<String>,
|
linked_tickets: Vec<String>,
|
||||||
@@ -1673,8 +2054,12 @@ fn sort_objective_query_items(items: &mut [ObjectiveQueryItem], sort: ObjectiveQ
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
fn make_objective_cursor(item: &ObjectiveQueryItem, sort: ObjectiveQuerySort) -> String {
|
fn make_objective_cursor(
|
||||||
make_query_cursor(&objective_sort_key(item, sort), &item.id)
|
item: &ObjectiveQueryItem,
|
||||||
|
sort: ObjectiveQuerySort,
|
||||||
|
fingerprint: &str,
|
||||||
|
) -> String {
|
||||||
|
make_bound_query_cursor(fingerprint, &objective_sort_key(item, sort), &item.id)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn objective_item_after_cursor(
|
fn objective_item_after_cursor(
|
||||||
@@ -1802,6 +2187,80 @@ fn memory_resolution_from_record(record: MemoryStagingResolutionRecord) -> Memor
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn ticket_summary_from_ticket(ticket: &ticket::Ticket) -> TicketSummary {
|
||||||
|
let summary = ticket::TicketSummary {
|
||||||
|
id: ticket.meta.id.clone(),
|
||||||
|
slug: ticket.meta.slug.clone(),
|
||||||
|
title: ticket.meta.title.clone(),
|
||||||
|
status: ticket.meta.status.clone(),
|
||||||
|
kind: ticket.meta.kind.clone(),
|
||||||
|
priority: ticket.meta.priority.clone(),
|
||||||
|
labels: ticket.meta.labels.clone(),
|
||||||
|
readiness: ticket.meta.readiness.clone(),
|
||||||
|
workflow_state: ticket.meta.workflow_state,
|
||||||
|
workflow_state_explicit: ticket.meta.workflow_state_explicit,
|
||||||
|
queued_by: ticket.meta.queued_by.clone(),
|
||||||
|
queued_at: ticket.meta.queued_at.clone(),
|
||||||
|
updated_at: ticket.meta.updated_at.clone(),
|
||||||
|
};
|
||||||
|
ticket_summary_from_sqlite_item(SqliteTicketListItem {
|
||||||
|
summary,
|
||||||
|
relation_blockers: ticket.relations.blockers.clone(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn ticket_summary_from_sqlite_item(item: SqliteTicketListItem) -> TicketSummary {
|
||||||
|
let projection = project_ticket_workspace_item(&item.summary, &item.relation_blockers, None);
|
||||||
|
TicketSummary {
|
||||||
|
id: item.summary.id,
|
||||||
|
title: item.summary.title,
|
||||||
|
state: item.summary.workflow_state.as_str().to_string(),
|
||||||
|
priority: item.summary.priority,
|
||||||
|
updated_at: item.summary.updated_at,
|
||||||
|
queued_by: item.summary.queued_by,
|
||||||
|
queued_at: item.summary.queued_at,
|
||||||
|
workspace_action_priority: workspace_action_priority_name(projection.priority).to_string(),
|
||||||
|
record_source: "sqlite_yoi_ticket".to_string(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
|
||||||
|
struct TicketSummaryCursorEnvelope {
|
||||||
|
version: u8,
|
||||||
|
fingerprint: String,
|
||||||
|
position: SqliteTicketListCursor,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn make_ticket_summary_cursor(fingerprint: &str, position: SqliteTicketListCursor) -> String {
|
||||||
|
make_query_cursor(
|
||||||
|
&serde_json::to_string(&TicketSummaryCursorEnvelope {
|
||||||
|
version: 1,
|
||||||
|
fingerprint: fingerprint.to_string(),
|
||||||
|
position,
|
||||||
|
})
|
||||||
|
.expect("ticket summary cursor must serialize"),
|
||||||
|
"",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn parse_ticket_summary_cursor(
|
||||||
|
value: &str,
|
||||||
|
expected_fingerprint: &str,
|
||||||
|
) -> Result<SqliteTicketListCursor> {
|
||||||
|
let (encoded, trailing) = parse_query_cursor(value)?;
|
||||||
|
if !trailing.is_empty() {
|
||||||
|
return Err(Error::InvalidRecordId("cursor is malformed".to_string()));
|
||||||
|
}
|
||||||
|
let cursor: TicketSummaryCursorEnvelope = serde_json::from_str(&encoded)
|
||||||
|
.map_err(|_| Error::InvalidRecordId("cursor is malformed".to_string()))?;
|
||||||
|
if cursor.version != 1 || cursor.fingerprint != expected_fingerprint {
|
||||||
|
return Err(Error::InvalidRecordId(
|
||||||
|
"cursor does not match the current ticket filters or sort".to_string(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
Ok(cursor.position)
|
||||||
|
}
|
||||||
|
|
||||||
fn workspace_action_priority_name(priority: TicketWorkspaceActionPriority) -> &'static str {
|
fn workspace_action_priority_name(priority: TicketWorkspaceActionPriority) -> &'static str {
|
||||||
match priority {
|
match priority {
|
||||||
TicketWorkspaceActionPriority::ReadyForQueue => "ready_for_queue",
|
TicketWorkspaceActionPriority::ReadyForQueue => "ready_for_queue",
|
||||||
@@ -2135,6 +2594,25 @@ mod tests {
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
assert_eq!(exact_relation.items.len(), 1);
|
assert_eq!(exact_relation.items.len(), 1);
|
||||||
assert_eq!(exact_relation.items[0].id, "00000000001J2");
|
assert_eq!(exact_relation.items[0].id, "00000000001J2");
|
||||||
|
let summary_page = authority
|
||||||
|
.list_ticket_page(TicketListPageRequest {
|
||||||
|
states: vec!["planning".to_string(), "ready".to_string()],
|
||||||
|
limit: Some(1),
|
||||||
|
cursor: None,
|
||||||
|
})
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(summary_page.items.len(), 1);
|
||||||
|
assert!(summary_page.page.has_more);
|
||||||
|
let mismatched_summary_cursor = authority.list_ticket_page(TicketListPageRequest {
|
||||||
|
states: vec!["done".to_string()],
|
||||||
|
limit: Some(1),
|
||||||
|
cursor: summary_page.page.next_cursor,
|
||||||
|
});
|
||||||
|
assert!(matches!(
|
||||||
|
mismatched_summary_cursor,
|
||||||
|
Err(Error::InvalidRecordId(_))
|
||||||
|
));
|
||||||
|
|
||||||
let first_page = authority
|
let first_page = authority
|
||||||
.query_tickets(TicketQueryRequest {
|
.query_tickets(TicketQueryRequest {
|
||||||
sort: Some("title".to_string()),
|
sort: Some("title".to_string()),
|
||||||
@@ -2154,6 +2632,13 @@ mod tests {
|
|||||||
assert_eq!(second_page.items.len(), 1);
|
assert_eq!(second_page.items.len(), 1);
|
||||||
assert_ne!(first_page.items[0].id, second_page.items[0].id);
|
assert_ne!(first_page.items[0].id, second_page.items[0].id);
|
||||||
assert!(second_page.page.has_more);
|
assert!(second_page.page.has_more);
|
||||||
|
let mismatched_cursor = authority.query_tickets(TicketQueryRequest {
|
||||||
|
sort: Some("updated_desc".to_string()),
|
||||||
|
limit: Some(1),
|
||||||
|
cursor: first_page.page.next_cursor.clone(),
|
||||||
|
..TicketQueryRequest::default()
|
||||||
|
});
|
||||||
|
assert!(matches!(mismatched_cursor, Err(Error::InvalidRecordId(_))));
|
||||||
let third_page = authority
|
let third_page = authority
|
||||||
.query_tickets(TicketQueryRequest {
|
.query_tickets(TicketQueryRequest {
|
||||||
sort: Some("title".to_string()),
|
sort: Some("title".to_string()),
|
||||||
|
|||||||
@@ -12,6 +12,14 @@ pub struct ProjectRecordList<T> {
|
|||||||
pub record_authority: String,
|
pub record_authority: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||||
|
pub struct TicketSummaryPage {
|
||||||
|
pub items: Vec<TicketSummary>,
|
||||||
|
pub page: QueryPage,
|
||||||
|
pub invalid_records: Vec<InvalidProjectRecord>,
|
||||||
|
pub record_authority: String,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||||
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
|
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
|
||||||
pub struct InvalidProjectRecord {
|
pub struct InvalidProjectRecord {
|
||||||
@@ -33,12 +41,23 @@ pub struct TicketSummary {
|
|||||||
pub record_source: String,
|
pub record_source: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Default)]
|
||||||
|
pub struct TicketListPageRequest {
|
||||||
|
#[serde(default)]
|
||||||
|
pub states: Vec<String>,
|
||||||
|
#[serde(default)]
|
||||||
|
pub limit: Option<usize>,
|
||||||
|
#[serde(default)]
|
||||||
|
pub cursor: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||||
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
|
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
|
||||||
pub struct TicketListResponse {
|
pub struct TicketListResponse {
|
||||||
pub workspace_id: String,
|
pub workspace_id: String,
|
||||||
pub limit: usize,
|
pub limit: usize,
|
||||||
pub items: Vec<TicketSummary>,
|
pub items: Vec<TicketSummary>,
|
||||||
|
pub page: QueryPage,
|
||||||
pub invalid_records: Vec<InvalidProjectRecord>,
|
pub invalid_records: Vec<InvalidProjectRecord>,
|
||||||
pub record_authority: String,
|
pub record_authority: String,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2229,6 +2229,9 @@ struct ObjectiveEditRequest {
|
|||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
struct TicketListQuery {
|
struct TicketListQuery {
|
||||||
limit: Option<usize>,
|
limit: Option<usize>,
|
||||||
|
cursor: Option<String>,
|
||||||
|
/// Comma-separated workflow states. Repeated lane requests normally pass one state group.
|
||||||
|
states: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
@@ -8316,17 +8319,35 @@ async fn list_tickets(
|
|||||||
State(api): State<WorkspaceApi>,
|
State(api): State<WorkspaceApi>,
|
||||||
Query(query): Query<TicketListQuery>,
|
Query(query): Query<TicketListQuery>,
|
||||||
) -> ApiResult<Json<crate::records::TicketListResponse>> {
|
) -> ApiResult<Json<crate::records::TicketListResponse>> {
|
||||||
let requested_limit = query.limit.unwrap_or(api.config.max_records);
|
let limit = query.limit.unwrap_or(30).clamp(1, 100);
|
||||||
let limit = requested_limit.min(1000);
|
let states = query
|
||||||
let ProjectRecordList {
|
.states
|
||||||
|
.as_deref()
|
||||||
|
.map(|states| {
|
||||||
|
states
|
||||||
|
.split(',')
|
||||||
|
.filter(|state| !state.is_empty())
|
||||||
|
.map(str::to_string)
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
})
|
||||||
|
.unwrap_or_default();
|
||||||
|
let crate::records::TicketSummaryPage {
|
||||||
items,
|
items,
|
||||||
|
page,
|
||||||
invalid_records,
|
invalid_records,
|
||||||
record_authority,
|
record_authority,
|
||||||
} = api.authority.list_tickets(limit)?;
|
} = api
|
||||||
|
.authority
|
||||||
|
.list_ticket_page(crate::records::TicketListPageRequest {
|
||||||
|
states,
|
||||||
|
limit: Some(limit),
|
||||||
|
cursor: query.cursor,
|
||||||
|
})?;
|
||||||
Ok(Json(crate::records::TicketListResponse {
|
Ok(Json(crate::records::TicketListResponse {
|
||||||
workspace_id: api.config.workspace_id,
|
workspace_id: api.config.workspace_id,
|
||||||
limit,
|
limit,
|
||||||
items,
|
items,
|
||||||
|
page,
|
||||||
invalid_records,
|
invalid_records,
|
||||||
record_authority,
|
record_authority,
|
||||||
}))
|
}))
|
||||||
|
|||||||
@@ -196,6 +196,11 @@ const MIGRATIONS: &[Migration] = &[
|
|||||||
name: "remove Worker control delegation authority",
|
name: "remove Worker control delegation authority",
|
||||||
apply: remove_worker_control_delegation_authority,
|
apply: remove_worker_control_delegation_authority,
|
||||||
},
|
},
|
||||||
|
Migration {
|
||||||
|
version: 36,
|
||||||
|
name: "add Objective query indexes",
|
||||||
|
apply: add_objective_query_indexes,
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
struct Migration {
|
struct Migration {
|
||||||
@@ -5046,6 +5051,24 @@ fn create_worker_control_delegation_operation_authority(conn: &Connection) -> Re
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn add_objective_query_indexes(conn: &Connection) -> Result<()> {
|
||||||
|
conn.execute_batch(
|
||||||
|
r#"
|
||||||
|
CREATE INDEX IF NOT EXISTS objectives_workspace_state_updated
|
||||||
|
ON objectives(workspace_id, state, updated_at DESC, objective_id);
|
||||||
|
CREATE INDEX IF NOT EXISTS objectives_workspace_updated
|
||||||
|
ON objectives(workspace_id, updated_at DESC, objective_id);
|
||||||
|
CREATE INDEX IF NOT EXISTS objectives_workspace_created
|
||||||
|
ON objectives(workspace_id, created_at DESC, objective_id);
|
||||||
|
CREATE INDEX IF NOT EXISTS objectives_workspace_title
|
||||||
|
ON objectives(workspace_id, title COLLATE NOCASE, objective_id);
|
||||||
|
CREATE INDEX IF NOT EXISTS objective_ticket_links_workspace_ticket_objective
|
||||||
|
ON objective_ticket_links(workspace_id, ticket_id, objective_id);
|
||||||
|
"#,
|
||||||
|
)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
fn remove_worker_control_delegation_authority(conn: &Connection) -> Result<()> {
|
fn remove_worker_control_delegation_authority(conn: &Connection) -> Result<()> {
|
||||||
let mut statement =
|
let mut statement =
|
||||||
conn.prepare("SELECT workspace_id, grant_id, permissions_json FROM worker_control_grants")?;
|
conn.prepare("SELECT workspace_id, grant_id, permissions_json FROM worker_control_grants")?;
|
||||||
@@ -5799,7 +5822,7 @@ INSERT INTO worker_control_grants (
|
|||||||
|
|
||||||
apply_migrations(&conn).unwrap();
|
apply_migrations(&conn).unwrap();
|
||||||
|
|
||||||
assert_eq!(current_schema_version(&conn).unwrap(), 35);
|
assert_eq!(current_schema_version(&conn).unwrap(), 36);
|
||||||
assert!(!table_exists(&conn, "worker_control_delegation_operations").unwrap());
|
assert!(!table_exists(&conn, "worker_control_delegation_operations").unwrap());
|
||||||
let (permissions_json, revoked_at): (String, Option<String>) = conn
|
let (permissions_json, revoked_at): (String, Option<String>) = conn
|
||||||
.query_row(
|
.query_row(
|
||||||
@@ -5847,7 +5870,7 @@ INSERT INTO worker_control_grants (
|
|||||||
|
|
||||||
apply_migrations(&conn).unwrap();
|
apply_migrations(&conn).unwrap();
|
||||||
|
|
||||||
assert_eq!(current_schema_version(&conn).unwrap(), 35);
|
assert_eq!(current_schema_version(&conn).unwrap(), 36);
|
||||||
assert!(table_exists(&conn, "worker_workdir_attachment_reservations").unwrap());
|
assert!(table_exists(&conn, "worker_workdir_attachment_reservations").unwrap());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5880,7 +5903,7 @@ CREATE TABLE flow_events (event_id TEXT PRIMARY KEY);
|
|||||||
|
|
||||||
apply_migrations(&conn).unwrap();
|
apply_migrations(&conn).unwrap();
|
||||||
|
|
||||||
assert_eq!(current_schema_version(&conn).unwrap(), 35);
|
assert_eq!(current_schema_version(&conn).unwrap(), 36);
|
||||||
assert!(table_exists(&conn, "flow_sources").unwrap());
|
assert!(table_exists(&conn, "flow_sources").unwrap());
|
||||||
assert!(table_exists(&conn, "flow_source_revisions").unwrap());
|
assert!(table_exists(&conn, "flow_source_revisions").unwrap());
|
||||||
assert!(!table_exists(&conn, "flow_instances").unwrap());
|
assert!(!table_exists(&conn, "flow_instances").unwrap());
|
||||||
@@ -5947,7 +5970,7 @@ INSERT INTO worker_workdir_attachment_reservations (
|
|||||||
|
|
||||||
apply_migrations(&conn).unwrap();
|
apply_migrations(&conn).unwrap();
|
||||||
|
|
||||||
assert_eq!(current_schema_version(&conn).unwrap(), 35);
|
assert_eq!(current_schema_version(&conn).unwrap(), 36);
|
||||||
let repositories_sql: String = conn
|
let repositories_sql: String = conn
|
||||||
.query_row(
|
.query_row(
|
||||||
"SELECT sql FROM sqlite_master WHERE type = 'table' AND name = 'repositories'",
|
"SELECT sql FROM sqlite_master WHERE type = 'table' AND name = 'repositories'",
|
||||||
@@ -6127,7 +6150,7 @@ INSERT INTO workdir_registry (
|
|||||||
let db = dir.path().join("control-plane.sqlite");
|
let db = dir.path().join("control-plane.sqlite");
|
||||||
let store = SqliteWorkspaceStore::open(&db).unwrap();
|
let store = SqliteWorkspaceStore::open(&db).unwrap();
|
||||||
|
|
||||||
assert_eq!(store.schema_version().await.unwrap(), 35);
|
assert_eq!(store.schema_version().await.unwrap(), 36);
|
||||||
assert!(
|
assert!(
|
||||||
!store
|
!store
|
||||||
.with_conn(|conn| table_exists(conn, "worker_workspace_credentials"))
|
.with_conn(|conn| table_exists(conn, "worker_workspace_credentials"))
|
||||||
@@ -6144,7 +6167,7 @@ INSERT INTO workdir_registry (
|
|||||||
store.upsert_workspace(&record).await.unwrap();
|
store.upsert_workspace(&record).await.unwrap();
|
||||||
|
|
||||||
let reopened = SqliteWorkspaceStore::open(&db).unwrap();
|
let reopened = SqliteWorkspaceStore::open(&db).unwrap();
|
||||||
assert_eq!(reopened.schema_version().await.unwrap(), 35);
|
assert_eq!(reopened.schema_version().await.unwrap(), 36);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
reopened.get_workspace("local-dev").await.unwrap(),
|
reopened.get_workspace("local-dev").await.unwrap(),
|
||||||
Some(record)
|
Some(record)
|
||||||
@@ -6691,7 +6714,7 @@ INSERT INTO workdir_registry (
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
let store = SqliteWorkspaceStore::from_connection(conn).unwrap();
|
let store = SqliteWorkspaceStore::from_connection(conn).unwrap();
|
||||||
assert_eq!(store.schema_version().await.unwrap(), 35);
|
assert_eq!(store.schema_version().await.unwrap(), 36);
|
||||||
|
|
||||||
store
|
store
|
||||||
.with_conn(|conn| {
|
.with_conn(|conn| {
|
||||||
@@ -6880,7 +6903,7 @@ CREATE TABLE ticket_assignment_operations (
|
|||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn repository_records_round_trip() {
|
async fn repository_records_round_trip() {
|
||||||
let store = SqliteWorkspaceStore::in_memory().unwrap();
|
let store = SqliteWorkspaceStore::in_memory().unwrap();
|
||||||
assert_eq!(store.schema_version().await.unwrap(), 35);
|
assert_eq!(store.schema_version().await.unwrap(), 36);
|
||||||
let workspace = WorkspaceRecord {
|
let workspace = WorkspaceRecord {
|
||||||
workspace_id: "local-dev".to_string(),
|
workspace_id: "local-dev".to_string(),
|
||||||
owner_account_id: None,
|
owner_account_id: None,
|
||||||
@@ -6946,7 +6969,7 @@ CREATE TABLE ticket_assignment_operations (
|
|||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn memory_authority_records_round_trip_and_close_staging() {
|
async fn memory_authority_records_round_trip_and_close_staging() {
|
||||||
let store = SqliteWorkspaceStore::in_memory().unwrap();
|
let store = SqliteWorkspaceStore::in_memory().unwrap();
|
||||||
assert_eq!(store.schema_version().await.unwrap(), 35);
|
assert_eq!(store.schema_version().await.unwrap(), 36);
|
||||||
let workspace = WorkspaceRecord {
|
let workspace = WorkspaceRecord {
|
||||||
workspace_id: "local-dev".to_string(),
|
workspace_id: "local-dev".to_string(),
|
||||||
owner_account_id: None,
|
owner_account_id: None,
|
||||||
@@ -7337,7 +7360,7 @@ CREATE TABLE ticket_assignment_operations (
|
|||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn account_and_login_records_round_trip() {
|
async fn account_and_login_records_round_trip() {
|
||||||
let store = SqliteWorkspaceStore::in_memory().unwrap();
|
let store = SqliteWorkspaceStore::in_memory().unwrap();
|
||||||
assert_eq!(store.schema_version().await.unwrap(), 35);
|
assert_eq!(store.schema_version().await.unwrap(), 36);
|
||||||
let now = "2026-07-22T00:00:00Z".to_string();
|
let now = "2026-07-22T00:00:00Z".to_string();
|
||||||
let account = AccountRecord {
|
let account = AccountRecord {
|
||||||
account_id: "acct-user-alice".to_string(),
|
account_id: "acct-user-alice".to_string(),
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ export type TicketListResponse = {
|
|||||||
workspace_id: string;
|
workspace_id: string;
|
||||||
limit: number;
|
limit: number;
|
||||||
items: Array<TicketSummary>;
|
items: Array<TicketSummary>;
|
||||||
|
page: QueryPage;
|
||||||
invalid_records: Array<InvalidProjectRecord>;
|
invalid_records: Array<InvalidProjectRecord>;
|
||||||
record_authority: string;
|
record_authority: string;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user