@crombolo/data 0.14.4 → 0.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crombolo/data",
-  "version": "0.14.4",
+  "version": "0.16.0",
   "description": "SQLite and Postgres storage for crombolo: schema, migrations and repositories.",
   "license": "MIT",
   "author": "Crombolo",
@@ -28,6 +28,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@crombolo/core": "0.14.4"
+    "@crombolo/core": "0.16.0"
   }
 }

package/src/index.ts

@@ -77,6 +77,7 @@ export * from './schema/site-search.ts'
 export * from './schema/transfer-answers.ts'
 export * from './schema/transfer-run-package.ts'
 export * from './schema/transfer-runs.ts'
+export * from './schema/trashed-date.ts'
 export * from './schema/two-factor.ts'
 export * from './schema/upgrade-report.ts'
 export * from './schema/users-localisation.ts'

package/src/repositories/documents.ts

@@ -1071,10 +1071,14 @@ export class DocumentRepository {
         ).map((row) => Number(row.id))
         const t = tx.dialect.boolValue(true)
         const f = tx.dialect.boolValue(false)
-        await tx.exec('UPDATE document SET original_parent_id = ? WHERE node_id = ?', [
-          node.parentId === SystemNodes.Root ? null : node.parentId,
-          node.id,
-        ])
+        await tx.exec(
+          'UPDATE document SET original_parent_id = ?, trashed_date = ? WHERE node_id = ?',
+          [
+            node.parentId === SystemNodes.Root ? null : node.parentId,
+            DbDate.toDb(new Date()),
+            node.id,
+          ],
+        )
         // The whole branch goes with it, and stays unpublished while trashed.
         await tx.exec('UPDATE node SET trashed = ? WHERE id = ? OR path LIKE ?', [
           t,
@@ -1162,9 +1166,10 @@ export class DocumentRepository {
             node.id,
             `${node.path},%`,
           ])
-          await tx.exec('UPDATE document SET original_parent_id = NULL WHERE node_id = ?', [
-            node.id,
-          ])
+          await tx.exec(
+            'UPDATE document SET original_parent_id = NULL, trashed_date = NULL WHERE node_id = ?',
+            [node.id],
+          )
         }
         await repo.nodes.move(node.id, parentId)
         await tx.exec('UPDATE node SET sort_order = ? WHERE id = ?', [
@@ -1313,7 +1318,10 @@ export class DocumentRepository {
           await repo.#nextSortOrder(parentId, node.id),
           node.id,
         ])
-        await tx.exec('UPDATE document SET original_parent_id = NULL WHERE node_id = ?', [node.id])
+        await tx.exec(
+          'UPDATE document SET original_parent_id = NULL, trashed_date = NULL WHERE node_id = ?',
+          [node.id],
+        )
         return 'restored' as const
       }),
     )
@@ -1643,6 +1651,21 @@ export class DocumentRepository {
     return (await this.trashed(null, 0, Number.MAX_SAFE_INTEGER)).items
   }
 
+  /** When each item went into the recycle bin; absent for one trashed before that was recorded. */
+  async trashedDates(nodeIds: readonly number[]): Promise<Map<number, Date>> {
+    if (nodeIds.length === 0) return new Map()
+    const rows = await this.#db.query<{ node_id: number; trashed_date: unknown }>(
+      `SELECT node_id, trashed_date FROM document WHERE trashed_date IS NOT NULL AND node_id IN (${nodeIds.map(() => '?').join(', ')})`,
+      [...nodeIds],
+    )
+    const out = new Map<number, Date>()
+    for (const row of rows) {
+      const date = DbDate.fromDb(row.trashed_date)
+      if (date) out.set(Number(row.node_id), date)
+    }
+    return out
+  }
+
   async #nextSortOrder(parentId: number, excludingId: number): Promise<number> {
     const rows = await this.#db.query<{ next: number | null }>(
       'SELECT MAX(sort_order) AS next FROM node WHERE parent_id = ? AND node_object_type = ? AND id <> ?',

package/src/repositories/transfer-runs.ts

@@ -138,14 +138,19 @@ export class TransferRunRepository {
   }
 
   /** Runs, newest first. */
-  async recent(limit = 20): Promise<TransferRun[]> {
+  async recent(limit = 20, offset = 0): Promise<TransferRun[]> {
     const rows = await this.#db.query(
-      'SELECT * FROM content_transfer_run ORDER BY started_at DESC, id DESC LIMIT ?',
-      [limit],
+      'SELECT * FROM content_transfer_run ORDER BY started_at DESC, id DESC LIMIT ? OFFSET ?',
+      [limit, offset],
     )
     return rows.map(mapRun)
   }
 
+  async count(): Promise<number> {
+    const rows = await this.#db.query('SELECT COUNT(*) AS n FROM content_transfer_run')
+    return Number(rows[0]?.n ?? 0)
+  }
+
   async changes(runId: string): Promise<TransferChange[]> {
     const rows = await this.#db.query(
       'SELECT * FROM content_transfer_change WHERE run_id = ? ORDER BY id',

package/src/schema/plan.ts

@@ -49,6 +49,7 @@ import { siteSearchMigration } from './site-search.ts'
 import { transferAnswersMigration } from './transfer-answers.ts'
 import { transferRunPackageMigration } from './transfer-run-package.ts'
 import { transferRunsMigration } from './transfer-runs.ts'
+import { trashedDateMigration } from './trashed-date.ts'
 import { twoFactorMigration } from './two-factor.ts'
 import { upgradeReportMigration } from './upgrade-report.ts'
 import { usersLocalisationMigration } from './users-localisation.ts'
@@ -97,4 +98,5 @@ export const cromboloPlan = new MigrationPlan([
   siteSearchMigration,
   twoFactorMigration,
   remoteMigration,
+  trashedDateMigration,
 ])

package/src/schema/trashed-date.ts

@@ -0,0 +1,23 @@
+/**
+ * Migration 042 — `document.trashed_date`: when an item went into the recycle
+ * bin, so `crombolo recycle-bin empty --older-than` can leave what was trashed
+ * recently (story 152). Items trashed before this migration have none, and are
+ * treated as of unknown age.
+ */
+import type { Db } from '../database.ts'
+import type { Migration } from '../migrations.ts'
+import { schemaOps } from '../schema-ops.ts'
+import { STATE_REMOTE } from './remote.ts'
+
+export const STATE_TRASHED_DATE = '{8d3f1a62-0042-4b7e-9c15-2e6a4f0b8d43}'
+
+export const trashedDateMigration: Migration = {
+  from: STATE_REMOTE,
+  to: STATE_TRASHED_DATE,
+  name: 'AddTrashedDate',
+  kind: 'expand',
+  release: '0.16.0',
+  async up(db: Db) {
+    await schemaOps(db).addColumn('document', 'trashed_date', db.dialect.types.timestamp)
+  },
+}