hotsheet 0.14.0 → 0.14.1

package/dist/cli.js

@@ -1051,17 +1051,21 @@ function ordinalValue(field, value) {
   if (field === "status") return STATUS_RANK[value] ?? null;
   return null;
 }
-async function queryTickets(logic, conditions, sortBy, sortDir, requiredTag) {
+async function queryTickets(logic, conditions, sortBy, sortDir, requiredTag, includeArchived) {
   const db = await getDb();
-  const where = [];
+  const systemWhere = [];
+  const userWhere = [];
   const values = [];
   let paramIdx = 1;
-  where.push(`status != 'deleted'`);
+  systemWhere.push(`status != 'deleted'`);
+  if (includeArchived !== true) {
+    systemWhere.push(`status != 'archive'`);
+  }
   for (const cond of conditions) {
     if (!QUERYABLE_FIELDS.has(cond.field)) continue;
     const field = cond.field;
     if (field === "up_next") {
-      where.push(`up_next = $${paramIdx}`);
+      userWhere.push(`up_next = $${paramIdx}`);
       values.push(cond.value === "true");
       paramIdx++;
       continue;
@@ -1070,44 +1074,43 @@ async function queryTickets(logic, conditions, sortBy, sortDir, requiredTag) {
     const ordVal = ordExpr !== null ? ordinalValue(field, cond.value) : null;
     if (ordExpr !== null && ordVal !== null && ["lt", "lte", "gt", "gte"].includes(cond.operator)) {
       const op = cond.operator === "lt" ? "<" : cond.operator === "lte" ? "<=" : cond.operator === "gt" ? ">" : ">=";
-      where.push(`(${ordExpr}) ${op} $${paramIdx}`);
+      userWhere.push(`(${ordExpr}) ${op} $${paramIdx}`);
       values.push(ordVal);
       paramIdx++;
       continue;
     }
     switch (cond.operator) {
       case "equals":
-        where.push(`${field} = $${paramIdx}`);
+        userWhere.push(`${field} = $${paramIdx}`);
         values.push(cond.value);
         paramIdx++;
         break;
       case "not_equals":
-        where.push(`${field} != $${paramIdx}`);
+        userWhere.push(`${field} != $${paramIdx}`);
         values.push(cond.value);
         paramIdx++;
         break;
       case "contains":
-        where.push(`${field} ILIKE $${paramIdx}`);
+        userWhere.push(`${field} ILIKE $${paramIdx}`);
         values.push(`%${cond.value}%`);
         paramIdx++;
         break;
       case "not_contains":
-        where.push(`${field} NOT ILIKE $${paramIdx}`);
+        userWhere.push(`${field} NOT ILIKE $${paramIdx}`);
         values.push(`%${cond.value}%`);
         paramIdx++;
         break;
     }
   }
   if (requiredTag !== void 0 && requiredTag !== "") {
-    where[0] += ` AND tags ILIKE $${paramIdx}`;
+    systemWhere.push(`tags ILIKE $${paramIdx}`);
     values.push(`%${requiredTag}%`);
     paramIdx++;
   }
   const joiner = logic === "any" ? " OR " : " AND ";
-  const userConditions = where.slice(1);
-  let whereClause = where[0];
-  if (userConditions.length > 0) {
-    whereClause += ` AND (${userConditions.join(joiner)})`;
+  let whereClause = systemWhere.join(" AND ");
+  if (userWhere.length > 0) {
+    whereClause += ` AND (${userWhere.join(joiner)})`;
   }
   let orderBy;
   switch (sortBy) {
@@ -17669,7 +17672,8 @@ var QueryTicketsSchema = external_exports.object({
   })),
   sort_by: external_exports.string().optional(),
   sort_dir: SortDirSchema.optional(),
-  required_tag: external_exports.string().optional()
+  required_tag: external_exports.string().optional(),
+  include_archived: external_exports.boolean().optional()
 });
 var UpdateSettingsSchema = external_exports.record(external_exports.string(), external_exports.string());
 var BackupTierSchema = external_exports.enum(["5min", "hourly", "daily"]);
@@ -18466,8 +18470,8 @@ ticketRoutes.post("/tickets/query", async (c) => {
   const raw = await c.req.json();
   const parsed = parseBody(QueryTicketsSchema, raw);
   if (!parsed.success) return c.json({ error: parsed.error }, 400);
-  const { logic, conditions, sort_by, sort_dir, required_tag } = parsed.data;
-  const tickets = await queryTickets(logic, conditions, sort_by, sort_dir, required_tag);
+  const { logic, conditions, sort_by, sort_dir, required_tag, include_archived } = parsed.data;
+  const tickets = await queryTickets(logic, conditions, sort_by, sort_dir, required_tag, include_archived);
   return c.json(tickets);
 });