Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4049acf76e | ||
|
|
43a2d8c5a1 | ||
|
|
38a4fcf530 | ||
|
|
dc978231e2 |
No files matched your search
@@ -11,7 +11,7 @@
|
||||
- 見直し:見直す日を迎えたもの、または30日間変更されていない未完了タスク。
|
||||
- プロジェクト:名前とメモ、関連Wiki、所属タスクの一覧。タスクは一つのプロジェクトへ所属、または未所属。
|
||||
- タスク:件名、プレーンテキストのメモ、状態、優先度、分単位の見積もり、期限、取り組む日、見直す日、関連Wiki。
|
||||
- 完了/再開、アーカイブ/復元。完了取消でも過去の版は残る。初版は物理削除を提供しない。
|
||||
- 完了/再開、アーカイブ/復元。完了取消でも過去の版は残る。タスクの削除はアーカイブとは別の操作(下記)。
|
||||
- タイトル絞り込みとカーソルページング、変更履歴の版番号・日時表示。
|
||||
- 日本語/英語、既存テーマ、デスクトップの左ナビとモバイルの横ナビ・全画面編集モーダル。
|
||||
|
||||
@@ -34,6 +34,39 @@
|
||||
|
||||
一覧GETは `kind=task|project`、`view`、`project`、`q`、`limit`、`before` を受け付けます。既定60件、上限100件。作成はPOST、更新はPUT、`If-Match: "{version}"` 必須。ヘッダーなしは428、古い版は412。UUIDをクライアントで生成し、同内容の作成再送は同じ版を返します。異内容の再送は競合です。成功時は `item` と現在読める `page_path`、ETagを返します。一覧はメモ本文を省略するため、編集やクイック完了前に必ず詳細を取得します。
|
||||
|
||||
## タスクの削除
|
||||
|
||||
2026-11-08、v0.14.0で本番反映済み。[配備記録](../../operations/releases/2026-11-08-task-deletion.md)。
|
||||
|
||||
UUID検索は追加せず、既存のタスク編集画面で「アーカイブ/復元」の隣に「削除」を置きます。未保存の新規タスク、readonly、プロジェクト編集には表示しません。件名と削除範囲を確認してから実行し、削除失敗時は編集内容を保持します。アーカイブ済みタスクも同じ操作で削除できます。
|
||||
|
||||
- `DELETE /_/api/v1/extension/organizer.tasks/items/{uuid}`。PUTと同じ厳密な `If-Match: "{version}"` を要求し、成功204、未指定428、古い版412。成功応答を失った場合、同じ所有者・同じ削除前の版で再送できます。
|
||||
- 所有者・Domain・active状態・システム拡張の有効状態を同一writer transactionで再検査。他人の対象/削除記録は404。プロジェクトの削除は提供しません。
|
||||
- サブタスクがあれば409 `has_children`(アーカイブ済みも対象)。先に移動または削除します。実行中/一時停止中の集中セッション、実行中の作業記録があれば409 `working`。再帰削除・自動停止はしません。
|
||||
- head・版参照・期限通知予約・達成度メトリクスを削除し、カレンダー時間枠との関連は解除します。Wiki本文、カレンダーの予定、記録済みの作業時間は独立した記録として残します。削除タスクは通常/アーカイブ一覧・詳細・変更履歴から取得できず、復元操作もありません。
|
||||
- `organizer_task_deletions` にDomain、所有者、UUID、collectionで修飾したDAV名/UID、削除版、削除時刻だけを保持します。件名・本文は複写しません。DBとDocument Storeを一緒に保全する既存方針は変わりません。CASファイルや既存バックアップの安全消去を意味せず、保持期間・GCは別課題です。
|
||||
- 削除記録・head除去・関連索引の更新・変更ジャーナル/共通outboxは原子的にコミット。履歴移行ジョブは削除記録から種類を解決し、head欠落で停止しません。
|
||||
- DAVの一覧/REPORTから対象を除き、GETは404、multigetは対象ごとに404。旧ETagでのPUTは412。同じcollectionの同じUIDまたはhrefを使う新規/無条件PUTは既存の `no-uid-conflict` で拒否し、古い端末からの復活を防ぎます。削除済みUUIDへのJSON再作成は410。同名の件名を持つ**新しいUUID/DAV UID・href**のタスクは作成できます。DAV識別子の予約は索引再構築後も保持します。
|
||||
- 従来の「DAV DELETEをアーカイブへ変換する」互換動作は変更しません。今回追加した不可逆操作はWeb/APIからの明示的な削除です。クライアント固有の同期/競合UIの挙動まで保証するものではありません。
|
||||
|
||||
`internal/server/task_delete_test.go` で条件付き削除・権限・再送・DBロールバック・通知取消・作業履歴保全・DAV索引再構築/再送拒否を検証します。既存のChromiumテストに、削除ボタンの位置、確認キャンセル、版競合、成功後の一覧更新を追加しています。本番データの削除は実施しません。
|
||||
|
||||
### 削除済みメール取り込みの再作成
|
||||
|
||||
PagesWiki v0.14.1/pages-cli v0.4.2向け実装。サーバーとCLIの両方の更新が必要です。DBスキーマ変更や既存データの削除はありません。
|
||||
|
||||
`POST /_/api/v1/extension/organizer.tasks/capture` は、受付記録に対応するタスクの状態を本文ハッシュより先に確認します。削除済みなら同じ内容・異なる内容とも410 `deleted`。タスクと削除記録が両方欠落していれば409 `capture_missing` とし、自動修復・再作成はしません。存続中のタスクへの異内容再送は従来どおり412です。
|
||||
|
||||
削除済み要求の保留下書きは `pages task retry REQUEST_UUID --recreate-deleted` で明示的に再取り込みできます。CLIは新しい要求を送る前に保存し、以降の再送用IDを表示します。通信失敗後は表示された新IDで通常の `task retry NEW_REQUEST_UUID` を使います。メール本文・Wiki suffixは保持し、以前のタスクの状態・作業時間・子タスクを復元する操作ではありません。
|
||||
|
||||
- APIには `replaces_deleted` に元のrequest UUIDを渡します。新しい `request_id` はURL名前空間のUUIDv5で、名前は `pages:task-recreate:` と元のrequest UUIDを連結したもの。任意の後継IDを拒否し、同じ再取り込みの二重作成を防ぎます。
|
||||
- 同じDomain・所有者の受付記録と削除記録を要求し、元タスクが存続中なら412、他人の受付記録や不存在の要求は404。writer transaction内でも検査します。受付記録のない直接作成タスクには使えません。
|
||||
- 新しいタスク・受付記録・変更履歴・通知予約を原子的に保存します。旧受付記録、削除記録、DAV識別子の予約は残し、旧端末の再送による復活を防ぎます。
|
||||
- Wiki保存先にページが残っていれば、そのUUIDを新しいタスクに関連付けます。本文・リビジョンは上書きしません。存在しなければ保留本文から作成します。read/create/writeの現在権限と入力上限を検査し、ファイルなどページ以外との衝突は409です。保存先は保留要求と現在の既定値から解決するため、移動済みのWikiや既定Path変更を追跡して復元する機能ではありません。
|
||||
- 再作成済み要求の再送は同じ新タスクを返します。そのタスクも削除済みなら410で停止し、さらに復活させません。元のメールを再入力しただけでは削除済み状態を解除しません。
|
||||
|
||||
`internal/server/task_capture_recreate_test.go` でライフサイクル・並行再送・所有者境界・ロールバック・Wiki保持を検証し、CLIの単体テストとHTTP結合テストでも再送IDの保持を検証します。
|
||||
|
||||
## 保存と復旧の境界
|
||||
|
||||
`organizer_items` はDomain・所有者・UUID・種類・検索用メタデータ・現在版を保持します。本文を含む型付きJSONは既存Document StoreへSHA-256で保存し、同じJSONをDBにも保持します。`organizer_revisions` は版からDocumentへの参照、`organizer_changes` は後続処理用の小さな変更ジャーナルです。head更新・履歴・変更ジャーナルは同じSQLiteトランザクションです。
|
||||
|
||||
@@ -37,3 +37,56 @@ Safari、IME/copy/find、実HTTPSの互換性と証明書エラー、低メモ
|
||||
本番の外向きfirewallは実験機能の昇格前の残件です。
|
||||
|
||||
構成・上限・切り戻しは[Gecko中継の試験導入](../gecko-relay.md)、機能の進捗は[RSS設計](../../design/ja/feeds.md)を参照してください。
|
||||
|
||||
## リリース・本番反映記録
|
||||
|
||||
対象commitは`5321d613b40db36238235ff68e256caa6d4e4cf1`。
|
||||
2026-11-08 16:31:51 JSTに本番の外部HTTPS検証を完了しました。
|
||||
|
||||
- [ビルドCI run 66](https://git.anya.jp/anya/pages/actions/runs/66): success。
|
||||
- [リリースCI run 67](https://git.anya.jp/anya/pages/actions/runs/67): success。
|
||||
- [Gitea Release v0.13.0](https://git.anya.jp/anya/pages/releases/tag/v0.13.0)。
|
||||
|
||||
注釈付きGitタグ`v0.13.0`と同名の3イメージを公開しました。
|
||||
SHAタグから再ビルドせず昇格し、両タグのmanifest digest一致を確認しています。
|
||||
本番`.env.release`は`PAGESWIKI_IMAGE_TAG=v0.13.0`です。
|
||||
app・app2・adaptor-gateway・excalidraw-viewerだけを切り替え、他サービスは変更していません。
|
||||
|
||||
### DBと復旧点
|
||||
|
||||
現在の両DBをSQLiteのオンラインバックアップで独立コピーし、`integrity_check`のokと、
|
||||
新イメージをネットワーク遮断・読み取り専用で実行した`schema check`の成功を確認しました。
|
||||
13管理コンポーネントはすべてcurrentで、feeds v6・task-productivity v4のままです。
|
||||
この検査はlegacy領域の全移行を網羅するものではありません。今回のschema追加はありません。
|
||||
|
||||
最初に選んだ前回切替前バックアップにはfeeds v5が残っていたため、現在のDBのコピーへ検査対象を変更しました。
|
||||
`/tmp`上の検査コピー作成はI/Oエラーで中断し、その一時コピーだけを除去して、
|
||||
空き容量のあるディスク上でコピー・整合性検査を完了しています。本番DBへの検査用書き込みはしていません。
|
||||
|
||||
復旧点は`.deployment-backups/release-v0.13.0-20261108/`です。
|
||||
`config/`に旧構成、`cutover/data`・`cutover/data2`に停止時点の全データを保存しました。
|
||||
16:29:32 JSTに停止を開始し、16:31:01 JSTにchecksum同期・再走査の差分ゼロ・DB一致を確認しました。
|
||||
稼働元とはinodeを共有せず、不変の旧バックアップとのみ未変更ファイルを共有しています。
|
||||
旧3イメージは`rollback-before-v0.13.0-20261108`タグで保持しています。
|
||||
旧版へ戻す場合も更新後の書き込みを失わないよう、データの自動巻き戻しは行いません。
|
||||
|
||||
### 配備後検証
|
||||
|
||||
- 4サービスのrevisionが対象commitと一致、再起動回数0。
|
||||
- app・app2の`/health`と管理スキーマ検査が正常。
|
||||
- 外部HTTPSでhealth・ログイン・カレンダーHTML枠は200、匿名のRSS・設定は303、RSS APIとGecko proxyは401。
|
||||
カレンダーHTML枠の200は既存の仕様で、実予定データの取得・閲覧は検証していません。
|
||||
- `feeds.js`・`task-productivity.js`・`feed-gecko.js`・`feed-gecko-profile.mjs`・`feed-gecko.css`の配信SHA-256がソースと一致。
|
||||
- 起動直後のpanic/fatal・database locked・event job failed・schema errorは各0件。
|
||||
- 本番へのGecko環境変数・asset mount追加なし、Gecko relayの起動なし。
|
||||
|
||||
手元ではGo全体テスト、go vet、関連race検査、CLI、配布ツール、ChromiumによるRSSと合成Gecko記事の試験を通しています。
|
||||
ライセンス同梱を含め専用scratch relayのビルド・起動・statusも確認しましたが、配布イメージへの追加や本番起動はしていません。
|
||||
|
||||
### 配布イメージ
|
||||
|
||||
| イメージ(`git.anya.jp/anya/`、タグ`v0.13.0`) | manifest digest |
|
||||
| --- | --- |
|
||||
| pageswiki-app | `sha256:87e9a2761c136aff734761f296c9dbe34fc391ad5687eaf332d3c9ba15b03ab5` |
|
||||
| pageswiki-adaptor-gateway | `sha256:b82bb2184d21ea692b63fa2f9a70f15392474719e444e8d2b7618723cc80c7f1` |
|
||||
| pageswiki-excalidraw-viewer | `sha256:2fff1ac0191e2fc7d8ad21aba365c82e0500f81d78da3672c030e77cb6a418af` |
|
||||
@@ -0,0 +1,70 @@
|
||||
# PagesWiki v0.14.0
|
||||
|
||||
タスク編集画面に、アーカイブと独立した削除操作を追加するminor releaseです。
|
||||
本日の達成率ウィジェットは説明文を除き、グラフと完了数/総数を表示します。
|
||||
Geckoの追加整備やRSSの追加ショートカットなど、並行作業中の変更は含めません。
|
||||
|
||||
## 変更と削除範囲
|
||||
|
||||
- タスク編集画面の「アーカイブ/復元」の隣に「削除」。確認後に実行し、アーカイブ済みタスクにも対応。
|
||||
- DELETE APIは所有者・Domain・active状態を検査し、If-Matchを要求。更新競合時は入力を保持。
|
||||
- サブタスクが残る場合や作業/集中セッションが実行中の場合は削除を拒否。
|
||||
- タスクhead、版参照、通知予約、達成度メトリクスを削除。カレンダー時間枠との関連は解除。
|
||||
- Wikiメモ、カレンダー予定、記録済みの作業時間は保持。CASファイル・既存バックアップの安全消去ではありません。
|
||||
- CalDAV一覧/REPORTから削除対象を除外。削除済みのUUIDとcollection内のDAV UID/hrefを予約し、古い端末からの再作成を拒否。
|
||||
- 従来のDAV DELETEをアーカイブへ変換する動作は維持。
|
||||
|
||||
詳細は[タスクの実装契約](../../design/ja/tasks-implementation.md#タスクの削除)を参照してください。
|
||||
|
||||
## DBと切り戻し
|
||||
|
||||
`organizer_task_deletions` を追加します。起動時の移行は既存タスクを削除せず、
|
||||
既存のタスクデータや版参照を変更しません。DAV索引再構築は削除記録の識別子予約にも対応します。
|
||||
|
||||
旧版は削除記録を認識しません。削除機能を使用した後の旧版への切り戻しでは、
|
||||
クライアントの再送で同じDAVタスクが作成されるおそれがあります。
|
||||
切り戻す場合は書き込み・DAV同期を停止してから判断し、DBを無断で過去へ戻さないでください。
|
||||
|
||||
## 検証と配備
|
||||
|
||||
対象commitは `38a4fcf5301e0c7c6cad12070e040dc62a03d41b`。
|
||||
2026-11-08 18:20:25 JSTに配備後の検証を完了しました。
|
||||
|
||||
- [ビルドCI run 68](https://git.anya.jp/anya/pages/actions/runs/68)、[リリースCI run 69](https://git.anya.jp/anya/pages/actions/runs/69)はともにsuccess。
|
||||
- [Gitea Release v0.14.0](https://git.anya.jp/anya/pages/releases/tag/v0.14.0)と注釈付きGitタグを公開。
|
||||
- リリース対象だけの独立ソースで `go test -p 1 ./...`、server/storeのgo vet、配布ツール等15テスト、PC・モバイル幅のChromium回帰試験が成功。
|
||||
- 両本番DBのオンラインバックアップを隔離し、`EnsureTasksSchema`を各2回実行。task head・版参照・DAV resource/collection識別子のdigestが移行前後で一致し、削除記録は0件、`integrity_check`はok。
|
||||
- app・app2・adaptor-gateway・excalidraw-viewerを同じv0.14.0へ更新。他サービス・Gecko設定・利用者設定は変更なし。
|
||||
|
||||
本番のタスク削除や外部カレンダー本文を用いた検証は行っていません。
|
||||
|
||||
### 復旧点
|
||||
|
||||
`.deployment-backups/release-v0.14.0-20261108/` の `config/` に旧構成、
|
||||
`cutover/data`・`cutover/data2`に停止時点のデータを保存しています。
|
||||
18:18:53 JSTに停止を開始、18:19:57 JSTにchecksum同期・再走査の差分ゼロ・DB一致を確認しました。
|
||||
稼働元とinodeを共有しません。旧バックアップは削除していません。
|
||||
旧3イメージは `rollback-before-v0.14.0-20261108` タグで保持しています。
|
||||
|
||||
`.env.release` は `PAGESWIKI_IMAGE_TAG=v0.14.0`。
|
||||
新版の4サービスは18:20:12〜18:20:18 JSTに起動しました。
|
||||
|
||||
### 配備後検証
|
||||
|
||||
- 4サービスのrevisionが対象commitと一致、running、再起動回数0。
|
||||
- app・app2のhealthと管理スキーマ検査が正常。legacy task領域は上記の隔離コピー移行試験で別途確認。
|
||||
- 両DBの `quick_check` がok、削除記録0件。
|
||||
- 外部HTTPSのhealth・ログイン画面200。匿名のタスク/ダッシュボード/RSS画面は303、タスクAPIは401。
|
||||
- 実在しないUUIDへの匿名DELETEを401で拒否。
|
||||
- tasks.js、tasks.css、organizer-dashboard.js、feeds.js、feed-gecko.jsの配信SHA-256がリリースcommitと一致。未完了Gecko変更の混入なし。
|
||||
- 起動直後のfatal/panic、DB lock、event job failed、schema/migration errorは両アプリとも各0件。
|
||||
|
||||
### 配布イメージ
|
||||
|
||||
SHAタグから再ビルドせず昇格し、本番ホストで取得したdigestとCIの昇格結果が一致しています。
|
||||
|
||||
| イメージ(`git.anya.jp/anya/`、タグ`v0.14.0`) | manifest digest |
|
||||
| --- | --- |
|
||||
| pageswiki-app | `sha256:46edb2640bfda3be73d8bed354bb1e014b050d68b6c17af8036d65d7732378af` |
|
||||
| pageswiki-adaptor-gateway | `sha256:696f2d0bcdf1a3dce8821c061a78ad9f3d6fcaadda32cc1cb4e5d5a117028fc0` |
|
||||
| pageswiki-excalidraw-viewer | `sha256:4d72abb4c1964553458af2b95e19722e18ae05fcfa2b02ff086407ad962ca62c` |
|
||||
@@ -0,0 +1,226 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
"sync"
|
||||
"testing"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"pageswiki/internal/store"
|
||||
)
|
||||
|
||||
func TestTaskCaptureDeletedRecreation(t *testing.T) {
|
||||
for _, wiki := range []bool{false, true} {
|
||||
t.Run(fmt.Sprint(wiki), func(t *testing.T) {
|
||||
s, token, domain, actor := taskFixture(t)
|
||||
ctx := context.Background()
|
||||
id := uuid.NewString()
|
||||
input := map[string]any{"request_id": id, "title": "Original"}
|
||||
if wiki {
|
||||
input["wiki_body"], input["wiki_prefix"] = "Original private body", "/mail"
|
||||
}
|
||||
w := taskRequest(s, token, "POST", "capture", input, "")
|
||||
if w.Code != 201 {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
var result struct {
|
||||
Item store.TaskRecord `json:"item"`
|
||||
Path string `json:"page_path"`
|
||||
}
|
||||
if err := json.Unmarshal(w.Body.Bytes(), &result); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
page, path := result.Item.PageUUID, result.Path
|
||||
var revision string
|
||||
if wiki {
|
||||
r, err := s.store.GetLatestRevision(page)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
revision = r.UUID
|
||||
}
|
||||
if w = taskRequest(s, token, "DELETE", "items/"+id, nil, `"1"`); w.Code != 204 {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
if w = taskRequest(s, token, "GET", "items/"+id, nil, ""); w.Code != 404 {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
for _, title := range []string{"Original", "Changed"} {
|
||||
input["title"] = title
|
||||
if w = taskRequest(s, token, "POST", "capture", input, ""); w.Code != 410 || !strings.Contains(w.Body.String(), `"deleted"`) {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
}
|
||||
input["replaces_deleted"], input["request_id"] = id, store.TaskRecreationID(id)
|
||||
if wiki {
|
||||
input["wiki_body"] = "Must not overwrite the retained page"
|
||||
for _, invalidBody := range []string{"bad\x00body", strings.Repeat("x", 256<<10+1)} {
|
||||
input["wiki_body"] = invalidBody
|
||||
if w = taskRequest(s, token, "POST", "capture", input, ""); w.Code != 422 {
|
||||
t.Fatal("reused page bypassed body validation", w.Code, w.Body)
|
||||
}
|
||||
}
|
||||
input["wiki_body"] = "Must not overwrite the retained page"
|
||||
}
|
||||
// A lost successful response, including concurrent retries, creates one
|
||||
// successor. It neither revives the original nor revises the Wiki.
|
||||
var wg sync.WaitGroup
|
||||
for i := 0; i < 4; i++ {
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
v := taskRequest(s, token, "POST", "capture", input, "")
|
||||
if v.Code != 201 {
|
||||
t.Errorf("concurrent recreation: %d %s", v.Code, v.Body)
|
||||
}
|
||||
}()
|
||||
}
|
||||
wg.Wait()
|
||||
w = taskRequest(s, token, "POST", "capture", input, "")
|
||||
if w.Code != 201 {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
if err := json.Unmarshal(w.Body.Bytes(), &result); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if result.Item.UUID != store.TaskRecreationID(id) || result.Item.UUID == id || result.Item.Title != "Changed" || result.Item.Version != 1 || result.Item.PageUUID != page || result.Path != path {
|
||||
t.Fatal(result)
|
||||
}
|
||||
if wiki {
|
||||
r, err := s.store.GetLatestRevision(page)
|
||||
if err != nil || r.UUID != revision || !strings.Contains(r.Body, "Original private body") {
|
||||
t.Fatal("Wiki changed", r, err)
|
||||
}
|
||||
}
|
||||
for table, expected := range map[string]int{"organizer_items": 1, "organizer_capture_receipts": 2, "organizer_task_deletions": 1, "organizer_revisions": 1} {
|
||||
var count int
|
||||
if err := s.store.DB.QueryRow("SELECT count(*) FROM " + table).Scan(&count); err != nil || count != expected {
|
||||
t.Fatal(table, count, err)
|
||||
}
|
||||
}
|
||||
if _, err := s.store.SaveTask(ctx, domain, actor, store.TaskRecord{UUID: id, Kind: "task", Title: "Offline resurrection", Status: "todo", Bucket: "inbox", Priority: 1}, 0); err != store.ErrTaskDeleted {
|
||||
t.Fatal("old UUID revived", err)
|
||||
}
|
||||
input["title"] = "Different committed recovery"
|
||||
if w = taskRequest(s, token, "POST", "capture", input, ""); w.Code != 412 {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
// Deleting the successor cannot be undone by replaying the recovery.
|
||||
if w = taskRequest(s, token, "DELETE", "items/"+result.Item.UUID, nil, `"1"`); w.Code != 204 {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
if w = taskRequest(s, token, "POST", "capture", input, ""); w.Code != 410 {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestTaskCaptureRecreationGuards(t *testing.T) {
|
||||
s, token, domain, actor := taskFixture(t)
|
||||
id := uuid.NewString()
|
||||
input := map[string]any{"request_id": id, "title": "Original"}
|
||||
if w := taskRequest(s, token, "POST", "capture", input, ""); w.Code != 201 {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
recreate := map[string]any{"request_id": store.TaskRecreationID(id), "replaces_deleted": id, "title": "New"}
|
||||
if w := taskRequest(s, token, "POST", "capture", recreate, ""); w.Code != 412 {
|
||||
t.Fatal("live capture replaced", w.Code, w.Body)
|
||||
}
|
||||
if w := taskRequest(s, token, "DELETE", "items/"+id, nil, `"1"`); w.Code != 204 {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
other, err := s.store.CreatePasswordAccount(domain, "recreateother", "long fixture password", "Other", "")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
otherToken, err := s.store.CreateAuthSession(domain, other.UUID)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if w := taskRequest(s, otherToken, "POST", "capture", recreate, ""); w.Code != 404 {
|
||||
t.Fatal("other owner", w.Code, w.Body)
|
||||
}
|
||||
if _, err := s.store.RecreateCapturedTask(context.Background(), "other-domain", actor, store.TaskRecreationID(id), "hash", newTaskRecord("task", "Wrong domain"), "", "", id); err != store.ErrAccessDenied {
|
||||
t.Fatal("wrong domain", err)
|
||||
}
|
||||
if err := s.store.SetPrincipalState(domain, actor, "readonly"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := s.store.RecreateCapturedTask(context.Background(), domain, actor, store.TaskRecreationID(id), "hash", newTaskRecord("task", "Readonly"), "", "", id); err != store.ErrAccessDenied {
|
||||
t.Fatal("readonly", err)
|
||||
}
|
||||
if err := s.store.SetPrincipalState(domain, actor, "active"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
token, err = s.store.CreateAuthSession(domain, actor)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := s.store.SetConfigInDomain(domain, "system_extension_states", `{"organizer.tasks":false}`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := s.store.RecreateCapturedTask(context.Background(), domain, actor, store.TaskRecreationID(id), "hash", newTaskRecord("task", "Disabled"), "", "", id); err != store.ErrAccessDenied {
|
||||
t.Fatal("extension disabled", err)
|
||||
}
|
||||
if err := s.store.SetConfigInDomain(domain, "system_extension_states", `{"organizer.tasks":true}`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, invalid := range []string{uuid.NewString(), id, "not-an-id"} {
|
||||
recreate["request_id"] = invalid
|
||||
if w := taskRequest(s, token, "POST", "capture", recreate, ""); w.Code != 422 {
|
||||
t.Fatal("arbitrary recovery ID", w.Code, w.Body)
|
||||
}
|
||||
}
|
||||
recreate["request_id"] = store.TaskRecreationID(id)
|
||||
// Failure during receipt insertion rolls back the task, page and journals.
|
||||
if _, err := s.store.DB.Exec(`CREATE TRIGGER reject_recreation BEFORE INSERT ON organizer_capture_receipts BEGIN SELECT RAISE(ABORT,'fixture rejection'); END`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
recreate["wiki_body"], recreate["wiki_prefix"] = "New body", "/recreated"
|
||||
if w := taskRequest(s, token, "POST", "capture", recreate, ""); w.Code != 500 {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
var count int
|
||||
if err := s.store.DB.QueryRow(`SELECT count(*) FROM organizer_items`).Scan(&count); err != nil || count != 0 {
|
||||
t.Fatal("orphan task", count, err)
|
||||
}
|
||||
if err := s.store.DB.QueryRow(`SELECT count(*) FROM paths WHERE path LIKE '/recreated/%'`).Scan(&count); err != nil || count != 0 {
|
||||
t.Fatal("orphan page", count, err)
|
||||
}
|
||||
if _, err := s.store.DB.Exec(`DROP TRIGGER reject_recreation`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if w := taskRequest(s, token, "POST", "capture", recreate, ""); w.Code != 201 {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
if _, err := s.store.GetTask(context.Background(), domain, actor, store.TaskRecreationID(id)); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTaskCaptureOrphanReceipt(t *testing.T) {
|
||||
s, token, domain, actor := taskFixture(t)
|
||||
id := uuid.NewString()
|
||||
input := map[string]any{"request_id": id, "title": "Original"}
|
||||
if w := taskRequest(s, token, "POST", "capture", input, ""); w.Code != 201 {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
// Simulate preexisting corruption, not a supported user deletion operation.
|
||||
if _, err := s.store.DB.Exec(`DELETE FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND uuid=?`, domain, actor, id); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, title := range []string{"Original", "Changed"} {
|
||||
input["title"] = title
|
||||
if w := taskRequest(s, token, "POST", "capture", input, ""); w.Code != 409 || !strings.Contains(w.Body.String(), "capture_missing") {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
}
|
||||
input["request_id"], input["replaces_deleted"] = store.TaskRecreationID(id), id
|
||||
if w := taskRequest(s, token, "POST", "capture", input, ""); w.Code != 409 || !strings.Contains(w.Body.String(), "capture_missing") {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,272 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"errors"
|
||||
"strconv"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"pageswiki/internal/store"
|
||||
)
|
||||
|
||||
func TestTaskDeleteAPIAndDAVTombstone(t *testing.T) {
|
||||
s, token, domain, actor := taskFixture(t)
|
||||
ctx := context.Background()
|
||||
page, err := s.store.CreatePageAtPathInDomain(domain, "/delete-fixture-note")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
task := newTaskRecord("task", "Delete fixture")
|
||||
task.PageUUID = page
|
||||
task.NotifyDue, task.DueOn = true, "2099-01-01"
|
||||
task, err = s.store.SaveTask(ctx, domain, actor, task, 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
url := "items/" + task.UUID
|
||||
for _, test := range []struct {
|
||||
tag string
|
||||
status int
|
||||
}{{"", 428}, {`W/"1"`, 422}, {`"2"`, 412}} {
|
||||
w := taskRequest(s, token, "DELETE", url, nil, test.tag)
|
||||
if w.Code != test.status {
|
||||
t.Fatalf("precondition %s: %d %s", test.tag, w.Code, w.Body)
|
||||
}
|
||||
}
|
||||
for i := 0; i < 2; i++ {
|
||||
w := taskRequest(s, token, "DELETE", url, nil, `"1"`)
|
||||
if w.Code != 204 {
|
||||
t.Fatalf("delete/retry: %d %s", w.Code, w.Body)
|
||||
}
|
||||
}
|
||||
for _, suffix := range []string{url, url + "/history"} {
|
||||
if w := taskRequest(s, token, "GET", suffix, nil, ""); w.Code != 404 {
|
||||
t.Fatalf("deleted read: %d %s", w.Code, w.Body)
|
||||
}
|
||||
}
|
||||
for _, view := range []string{"all", "archived", "done", "today"} {
|
||||
w := taskRequest(s, token, "GET", "items?view="+view, nil, "")
|
||||
if w.Code != 200 || strings.Contains(w.Body.String(), task.UUID) {
|
||||
t.Fatalf("deleted list %s: %d %s", view, w.Code, w.Body)
|
||||
}
|
||||
}
|
||||
for _, table := range []string{"organizer_items", "organizer_revisions", "organizer_reminders", "organizer_task_metrics"} {
|
||||
var count int
|
||||
if err := s.store.DB.QueryRow(`SELECT count(*) FROM ` + table).Scan(&count); err != nil || count != 0 {
|
||||
t.Fatalf("cleanup %s: %d %v", table, count, err)
|
||||
}
|
||||
}
|
||||
if id, err := s.store.ResolvePathInDomain(domain, "/delete-fixture-note"); err != nil || id != page {
|
||||
t.Fatal("Wiki note removed", id, err)
|
||||
}
|
||||
if _, err := s.store.SaveTask(ctx, domain, actor, task, 0); !errors.Is(err, store.ErrTaskDeleted) {
|
||||
t.Fatal("UUID recreated", err)
|
||||
}
|
||||
if _, _, err := s.store.PublishTaskActivity(ctx, 100); err != nil {
|
||||
t.Fatal("deleted head stalled outbox bridge", err)
|
||||
}
|
||||
for _, project := range []string{"", uuid.NewString()} {
|
||||
if project != "" {
|
||||
p := newTaskRecord("project", "Delete project fixture")
|
||||
p.UUID = project
|
||||
if _, err := s.store.SaveTask(ctx, domain, actor, p, 0); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
davTask := newTaskRecord("task", "DAV fixture")
|
||||
davTask.ProjectUUID = project
|
||||
data := &store.TaskDAVData{Name: "client-fixture.ics", UID: "client-fixture-uid", Data: "fixture"}
|
||||
davTask, err = s.store.SaveTaskDAV(ctx, domain, actor, davTask, 0, data, "", project)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = s.store.DeleteTask(ctx, domain, actor, davTask.UUID, davTask.Version); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// Simulate reopening/rebuilding the derived DAV indexes.
|
||||
if err = s.store.EnsureTasksSchema(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err = s.store.TaskDAVByName(ctx, domain, actor, data.Name, project); !errors.Is(err, sql.ErrNoRows) {
|
||||
t.Fatal("DAV deleted resource exposed", err)
|
||||
}
|
||||
items, err := s.store.TaskDAVList(ctx, domain, actor, project)
|
||||
if err != nil || len(items) != 0 {
|
||||
t.Fatal("DAV deleted resource listed", items, err)
|
||||
}
|
||||
for _, altered := range []string{"neither", "name", "uid"} {
|
||||
candidate := newTaskRecord("task", "Stale client PUT")
|
||||
candidate.ProjectUUID = project
|
||||
d := *data
|
||||
if altered == "name" {
|
||||
d.Name = "other.ics"
|
||||
}
|
||||
if altered == "uid" {
|
||||
d.UID = "other-uid"
|
||||
}
|
||||
if _, err := s.store.SaveTaskDAV(ctx, domain, actor, candidate, 0, &d, "", project); !errors.Is(err, store.ErrTaskDAVIdentity) {
|
||||
t.Fatalf("resurrection %s: %v", altered, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestTaskDeleteGuardsAndAtomicity(t *testing.T) {
|
||||
s, token, domain, actor := taskFixture(t)
|
||||
ctx := context.Background()
|
||||
task, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("task", "Guarded fixture"), 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
other, err := s.store.CreatePasswordAccount(domain, "deleteother", "long fixture password", "Other", "")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := s.store.DeleteTask(ctx, domain, other.UUID, task.UUID, 1); !errors.Is(err, sql.ErrNoRows) {
|
||||
t.Fatal("ownership", err)
|
||||
}
|
||||
if err := s.store.DeleteTask(ctx, "other-domain", actor, task.UUID, 1); !errors.Is(err, store.ErrAccessDenied) {
|
||||
t.Fatal("domain", err)
|
||||
}
|
||||
if err := s.store.SetPrincipalState(domain, actor, "readonly"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if w := taskRequest(s, token, "DELETE", "items/"+task.UUID, nil, `"1"`); w.Code != 401 {
|
||||
t.Fatal("readonly", w.Code, w.Body)
|
||||
}
|
||||
if err := s.store.DeleteTask(ctx, domain, actor, task.UUID, 1); !errors.Is(err, store.ErrAccessDenied) {
|
||||
t.Fatal("readonly store", err)
|
||||
}
|
||||
if err := s.store.SetPrincipalState(domain, actor, "active"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
token, err = s.store.CreateAuthSession(domain, actor)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := s.store.SetConfigInDomain(domain, "system_extension_states", `{"organizer.tasks":false}`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := s.store.DeleteTask(ctx, domain, actor, task.UUID, 1); !errors.Is(err, store.ErrAccessDenied) {
|
||||
t.Fatal("disabled", err)
|
||||
}
|
||||
if _, err := s.store.DB.Exec(`DELETE FROM config WHERE domain_uuid=? AND key='system_extension_states'`, domain); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
child := newTaskRecord("task", "Archived child")
|
||||
child.ParentUUID = task.UUID
|
||||
child.Archived = true
|
||||
child, err = s.store.SaveTask(ctx, domain, actor, child, 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if w := taskRequest(s, token, "DELETE", "items/"+task.UUID, nil, `"1"`); w.Code != 409 || !strings.Contains(w.Body.String(), "has_children") {
|
||||
t.Fatal("children", w.Code, w.Body)
|
||||
}
|
||||
if err = s.store.DeleteTask(ctx, domain, actor, child.UUID, child.Version); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
focus, err := s.store.ChangeTaskFocus(ctx, domain, actor, "start", store.TaskFocus{UUID: uuid.NewString(), TaskUUID: task.UUID, Phase: "focus", DurationMS: 25 * 60 * 1000}, 0, time.Now())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = s.store.DeleteTask(ctx, domain, actor, task.UUID, 1); !errors.Is(err, store.ErrTaskWorking) {
|
||||
t.Fatal("focus", err)
|
||||
}
|
||||
if _, err = s.store.ChangeTaskFocus(ctx, domain, actor, "cancel", focus, focus.Version, time.Now()); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
work, err := s.store.ChangeTaskWork(ctx, domain, actor, "start", store.TaskWork{UUID: uuid.NewString(), TaskUUID: task.UUID}, time.Now())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = s.store.DeleteTask(ctx, domain, actor, task.UUID, 1); !errors.Is(err, store.ErrTaskWorking) {
|
||||
t.Fatal("running work", err)
|
||||
}
|
||||
if _, err = s.store.ChangeTaskWork(ctx, domain, actor, "stop", work, time.Now()); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// Abort at the last delete step: neither a tombstone nor partial cleanup may remain.
|
||||
if _, err = s.store.DB.Exec(`CREATE TRIGGER fail_fixture_delete BEFORE DELETE ON organizer_items BEGIN SELECT RAISE(ABORT,'fixture failure'); END`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = s.store.DeleteTask(ctx, domain, actor, task.UUID, 1); err == nil {
|
||||
t.Fatal("injected failure ignored")
|
||||
}
|
||||
if _, err = s.store.GetTask(ctx, domain, actor, task.UUID); err != nil {
|
||||
t.Fatal("head not rolled back", err)
|
||||
}
|
||||
var n int
|
||||
if err = s.store.DB.QueryRow(`SELECT count(*) FROM organizer_task_deletions WHERE item_uuid=?`, task.UUID).Scan(&n); err != nil || n != 0 {
|
||||
t.Fatal("partial tombstone", n, err)
|
||||
}
|
||||
if _, err = s.store.DB.Exec(`DROP TRIGGER fail_fixture_delete`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
task.Archived = true
|
||||
task, err = s.store.SaveTask(ctx, domain, actor, task, 1)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if w := taskRequest(s, token, "DELETE", "items/"+task.UUID, nil, `"`+strconv.FormatInt(task.Version, 10)+`"`); w.Code != 204 {
|
||||
t.Fatal("archived deletion", w.Code, w.Body)
|
||||
}
|
||||
if err := s.store.DeleteTask(ctx, domain, other.UUID, task.UUID, task.Version); !errors.Is(err, sql.ErrNoRows) {
|
||||
t.Fatal("tombstone ownership", err)
|
||||
}
|
||||
if _, err := s.store.SaveTask(ctx, domain, other.UUID, task, 0); !errors.Is(err, sql.ErrNoRows) {
|
||||
t.Fatal("tombstone creation privacy", err)
|
||||
}
|
||||
if err := s.store.DB.QueryRow(`SELECT count(*) FROM organizer_work_sessions WHERE uuid=? AND end_ms>0`, work.UUID).Scan(&n); err != nil || n != 1 {
|
||||
t.Fatal("work history removed", n, err)
|
||||
}
|
||||
project, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("project", "Keep project"), 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = s.store.DeleteTask(ctx, domain, actor, project.UUID, 1); !errors.Is(err, store.ErrTaskInvalid) {
|
||||
t.Fatal("project unexpectedly deleted", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTaskDeleteDAVHTTP(t *testing.T) {
|
||||
s, token, domain, actor := taskFixture(t)
|
||||
ctx := context.Background()
|
||||
auth, name := "Bearer "+token, "delete-client.ics"
|
||||
url := taskDAVCollection + name
|
||||
if w := davTaskRequest(s, auth, "PUT", url, taskICALFixture, nil); w.Code != 201 {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
item, err := s.store.TaskDAVByName(ctx, domain, actor, name)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
before := davTaskRequest(s, auth, "GET", url, "", nil)
|
||||
if before.Code != 200 {
|
||||
t.Fatal(before.Code, before.Body)
|
||||
}
|
||||
if err = s.store.DeleteTask(ctx, domain, actor, item.UUID, item.Version); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if w := davTaskRequest(s, auth, "GET", url, "", nil); w.Code != 404 {
|
||||
t.Fatal(w.Code, w.Body)
|
||||
}
|
||||
query := `<c:calendar-query xmlns:c="urn:ietf:params:xml:ns:caldav" xmlns:d="DAV:"><d:prop><d:getetag/><c:calendar-data/></d:prop><c:filter><c:comp-filter name="VCALENDAR"><c:comp-filter name="VTODO"/></c:comp-filter></c:filter></c:calendar-query>`
|
||||
if w := davTaskRequest(s, auth, "REPORT", taskDAVCollection, query, nil); w.Code != 207 || strings.Contains(w.Body.String(), name) {
|
||||
t.Fatal("query", w.Code, w.Body)
|
||||
}
|
||||
multi := `<c:calendar-multiget xmlns:c="urn:ietf:params:xml:ns:caldav" xmlns:d="DAV:"><d:prop><d:getetag/><c:calendar-data/></d:prop><d:href>` + url + `</d:href></c:calendar-multiget>`
|
||||
if w := davTaskRequest(s, auth, "REPORT", taskDAVCollection, multi, nil); w.Code != 207 || !strings.Contains(w.Body.String(), "404 Not Found") {
|
||||
t.Fatal("multiget", w.Code, w.Body)
|
||||
}
|
||||
if w := davTaskRequest(s, auth, "PUT", url, taskICALFixture, map[string]string{"If-Match": before.Header().Get("ETag")}); w.Code != 412 {
|
||||
t.Fatal("stale conditional PUT", w.Code, w.Body)
|
||||
}
|
||||
if w := davTaskRequest(s, auth, "PUT", url, taskICALFixture, nil); w.Code != 403 || !strings.Contains(w.Body.String(), "no-uid-conflict") {
|
||||
t.Fatal("stale unconditional PUT", w.Code, w.Body)
|
||||
}
|
||||
}
|
||||
@@ -56,20 +56,21 @@ func applyTaskReminderDefaults(item *store.TaskRecord, p store.TaskPreferences)
|
||||
}
|
||||
|
||||
type taskCaptureInput struct {
|
||||
RequestID string `json:"request_id"`
|
||||
Title string `json:"title"`
|
||||
Notes string `json:"notes"`
|
||||
ProjectUUID *string `json:"project_uuid"`
|
||||
AssigneeUUID *string `json:"assignee_uuid"`
|
||||
DueOn *string `json:"due_on"`
|
||||
StartOn *string `json:"start_on"`
|
||||
PlannedOn *string `json:"planned_on"`
|
||||
ReviewOn *string `json:"review_on"`
|
||||
Estimate *int `json:"estimate_minutes"`
|
||||
Complexity *int `json:"complexity"`
|
||||
WikiBody *string `json:"wiki_body,omitempty"`
|
||||
WikiPrefix *string `json:"wiki_prefix,omitempty"`
|
||||
WikiSuffix *string `json:"wiki_suffix,omitempty"`
|
||||
ReplacesDeleted string `json:"replaces_deleted,omitempty"`
|
||||
RequestID string `json:"request_id"`
|
||||
Title string `json:"title"`
|
||||
Notes string `json:"notes"`
|
||||
ProjectUUID *string `json:"project_uuid"`
|
||||
AssigneeUUID *string `json:"assignee_uuid"`
|
||||
DueOn *string `json:"due_on"`
|
||||
StartOn *string `json:"start_on"`
|
||||
PlannedOn *string `json:"planned_on"`
|
||||
ReviewOn *string `json:"review_on"`
|
||||
Estimate *int `json:"estimate_minutes"`
|
||||
Complexity *int `json:"complexity"`
|
||||
WikiBody *string `json:"wiki_body,omitempty"`
|
||||
WikiPrefix *string `json:"wiki_prefix,omitempty"`
|
||||
WikiSuffix *string `json:"wiki_suffix,omitempty"`
|
||||
}
|
||||
|
||||
func (s *Server) handleTaskProductivity(w http.ResponseWriter, r *http.Request, actor string, active bool, kind string) {
|
||||
@@ -197,6 +198,13 @@ func (s *Server) handleTaskProductivity(w http.ResponseWriter, r *http.Request,
|
||||
taskError(w, store.ErrTaskInvalid)
|
||||
return
|
||||
}
|
||||
if input.ReplacesDeleted != "" {
|
||||
id, err := uuid.Parse(input.ReplacesDeleted)
|
||||
if err != nil || id.String() != input.ReplacesDeleted || input.RequestID != store.TaskRecreationID(input.ReplacesDeleted) {
|
||||
taskError(w, store.ErrTaskInvalid)
|
||||
return
|
||||
}
|
||||
}
|
||||
raw, _ := json.Marshal(input)
|
||||
hash := sha256.Sum256(raw)
|
||||
requestHash := hex.EncodeToString(hash[:])
|
||||
@@ -261,7 +269,11 @@ func (s *Server) handleTaskProductivity(w http.ResponseWriter, r *http.Request,
|
||||
taskError(w, store.ErrTaskInvalid)
|
||||
return
|
||||
}
|
||||
target = store.TaskCaptureWikiPath(prefix, item.Title, input.RequestID)
|
||||
pathID := input.RequestID
|
||||
if input.ReplacesDeleted != "" {
|
||||
pathID = input.ReplacesDeleted
|
||||
}
|
||||
target = store.TaskCaptureWikiPath(prefix, item.Title, pathID)
|
||||
if input.WikiSuffix != nil {
|
||||
if !store.ValidTaskMailSuffix(*input.WikiSuffix) {
|
||||
taskError(w, store.ErrTaskInvalid)
|
||||
@@ -280,7 +292,11 @@ func (s *Server) handleTaskProductivity(w http.ResponseWriter, r *http.Request,
|
||||
taskError(w, store.ErrTaskInvalid)
|
||||
return
|
||||
}
|
||||
item, err = s.store.CaptureTaskWithWiki(r.Context(), domain, actor, input.RequestID, requestHash, item, target, body)
|
||||
if input.ReplacesDeleted != "" {
|
||||
item, err = s.store.RecreateCapturedTask(r.Context(), domain, actor, input.RequestID, requestHash, item, target, body, input.ReplacesDeleted)
|
||||
} else {
|
||||
item, err = s.store.CaptureTaskWithWiki(r.Context(), domain, actor, input.RequestID, requestHash, item, target, body)
|
||||
}
|
||||
if err != nil {
|
||||
taskError(w, err)
|
||||
return
|
||||
|
||||
@@ -62,6 +62,14 @@ func taskError(w http.ResponseWriter, err error) {
|
||||
status, code = 422, "invalid"
|
||||
case errors.Is(err, store.ErrTaskConflict):
|
||||
status, code = 412, "conflict"
|
||||
case errors.Is(err, store.ErrTaskCaptureMissing):
|
||||
status, code = 409, "capture_missing"
|
||||
case errors.Is(err, store.ErrTaskDeleted):
|
||||
status, code = 410, "deleted"
|
||||
case errors.Is(err, store.ErrTaskHasChildren):
|
||||
status, code = 409, "has_children"
|
||||
case errors.Is(err, store.ErrTaskWorking):
|
||||
status, code = 409, "working"
|
||||
case errors.Is(err, store.ErrTaskDAVIdentity):
|
||||
status, code = 409, "uid_conflict"
|
||||
case errors.Is(err, store.ErrTaskDAVRelocated):
|
||||
@@ -323,8 +331,30 @@ func (s *Server) handleTasksAPI(w http.ResponseWriter, r *http.Request) {
|
||||
writeEventJSON(w, 200, map[string]any{"items": items, "parents": parents, "next": next, "today": today})
|
||||
return
|
||||
}
|
||||
if r.Method == "DELETE" && id != "" {
|
||||
if !active {
|
||||
taskError(w, store.ErrAccessDenied)
|
||||
return
|
||||
}
|
||||
tag := r.Header.Get("If-Match")
|
||||
if tag == "" {
|
||||
writeEventJSON(w, 428, map[string]string{"error": "precondition"})
|
||||
return
|
||||
}
|
||||
expected, _ := strconv.ParseInt(strings.Trim(tag, `"`), 10, 64)
|
||||
if expected < 1 || tag != `"`+strconv.FormatInt(expected, 10)+`"` {
|
||||
taskError(w, store.ErrTaskInvalid)
|
||||
return
|
||||
}
|
||||
if err := s.store.DeleteTask(ctx, domain, actor, id, expected); err != nil {
|
||||
taskError(w, err)
|
||||
return
|
||||
}
|
||||
w.WriteHeader(http.StatusNoContent)
|
||||
return
|
||||
}
|
||||
if (r.Method != "POST" || id != "") && (r.Method != "PUT" || id == "") {
|
||||
w.Header().Set("Allow", "GET, POST, PUT")
|
||||
w.Header().Set("Allow", "GET, POST, PUT, DELETE")
|
||||
w.WriteHeader(405)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -40,6 +40,8 @@ window.addEventListener('load',async()=>{const wait=async(fn)=>{for(let i=0;i<12
|
||||
}else if(path==='/v/plan/dashboard'){
|
||||
await wait(()=>document.querySelectorAll('.productivity-day').length>300);if(!document.querySelector('.productivity-day[data-level="2"]'))throw Error('Seven-point completion missing');
|
||||
if(document.querySelectorAll('[data-widget]').length!==6)throw Error('Widget registry missing');
|
||||
await wait(()=>document.querySelector('[data-widget=progress] .dashboard-progress'));
|
||||
if(document.querySelector('[data-widget=progress] .widget-body small'))throw Error('Completion widget explanation should not be displayed');
|
||||
const tab=document.querySelector('[data-tab=done]');tab.click();await wait(()=>document.querySelector('#widget-panel-tasks').textContent.includes('Browser work task'));if(location.pathname!=='/v/plan/dashboard'||document.querySelector('#organizer-dashboard iframe'))throw Error('Tab navigation escaped widget');
|
||||
document.querySelector('#dashboard-controls button[aria-pressed]').click();const width=document.querySelector('[data-widget=tasks] [data-size=width]');width.value='6';width.dispatchEvent(new Event('change'));const height=document.querySelector('[data-widget=tasks] [data-size=height]');height.value='5';height.dispatchEvent(new Event('change'));
|
||||
document.querySelector('[data-widget=tasks] .widget-arrange button').click();document.querySelector('#dashboard-controls button:last-child').click();await wait(()=>document.querySelector('#dashboard-status').textContent.includes('保存しました'));const layout=await fetch('/_/api/v1/extension/organizer.tasks/dashboard').then(r=>r.json());if(layout.widgets[2].id!=='tasks'||layout.widgets[2].width!==6||layout.widgets[2].height!==5||layout.widgets[2].tab!=='done')throw Error('Layout did not persist');
|
||||
|
||||
+20
@@ -130,6 +130,26 @@ window.addEventListener('load', async () => {
|
||||
document.body.dataset.vimReady='true';return;
|
||||
}
|
||||
await wait(()=>$('status').textContent.includes('ありません'));
|
||||
// Deletion shares the archive footer, not a UUID-search workflow.
|
||||
$('new').click();await wait(()=>document.querySelector('#tasks-form [name=title]'));
|
||||
if(!$('delete').hidden)throw Error('Unsaved task must not offer deletion');$('close').click();
|
||||
$('quick-title').value='Disposable deletion fixture';$('capture').requestSubmit();
|
||||
await wait(()=>$('list').querySelector('[data-action=detail]'));$('list').querySelector('[data-action=detail]').click();
|
||||
await wait(()=>!$('delete').hidden);
|
||||
if($('delete').parentElement!==$('archive').parentElement||$('delete').textContent!=='削除')throw Error('Delete action is not beside archive');
|
||||
const deletionID=$('list').querySelector('[data-task-id]').dataset.taskId;
|
||||
window.confirm=()=>false;$('delete').click();
|
||||
if(!$('dialog').open)throw Error('Cancelled deletion closed the editor');
|
||||
const deletionAPI='/_/api/v1/extension/organizer.tasks/items/'+deletionID;
|
||||
const deletionItem=(await fetch(deletionAPI).then(r=>r.json())).item;
|
||||
const changed=await fetch(deletionAPI,{method:'PUT',headers:{'Content-Type':'application/json','If-Match':'"'+deletionItem.version+'"'},body:JSON.stringify({...deletionItem,title:'Updated deletion fixture'})});
|
||||
if(!changed.ok)throw Error('Deletion conflict fixture failed');
|
||||
window.confirm=()=>true;$('delete').click();await wait(()=>$('error').textContent.includes('別の画面'));
|
||||
if(!$('dialog').open||$('delete').disabled)throw Error('Deletion failure did not keep a usable editor');
|
||||
$('close').click();$('refresh').click();await wait(()=>$('list').querySelector('input[name=title]')?.value==='Updated deletion fixture');
|
||||
$('list').querySelector('[data-action=detail]').click();await wait(()=>!$('delete').hidden);$('delete').click();
|
||||
await wait(()=>!$('dialog').open&&!$('list').querySelector('[data-task-id]'));
|
||||
if((await fetch(deletionAPI)).status!==404)throw Error('Deleted task remains readable');
|
||||
$('quick-title').value='Write the first task';$('capture').requestSubmit();
|
||||
await wait(()=>$('list').querySelector('[data-action=detail]'));
|
||||
$('list').querySelector('[data-action=detail]').click();
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"errors"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
// A receipt without a live task or a deletion marker needs repair, not an
|
||||
// implicit create that could silently revive an inconsistent record.
|
||||
var ErrTaskCaptureMissing = errors.New("captured task is missing without a deletion record")
|
||||
|
||||
func TaskRecreationID(request string) string {
|
||||
return uuid.NewSHA1(uuid.NameSpaceURL, []byte("pages:task-recreate:"+request)).String()
|
||||
}
|
||||
|
||||
func deletedCapture(ctx context.Context, q interface {
|
||||
QueryRowContext(context.Context, string, ...any) *sql.Row
|
||||
}, domain, actor, request string) error {
|
||||
var id string
|
||||
if err := q.QueryRowContext(ctx, `SELECT item_uuid FROM organizer_capture_receipts WHERE domain_uuid=? AND owner_uuid=? AND request_uuid=?`, domain, actor, request).Scan(&id); err != nil {
|
||||
return err
|
||||
}
|
||||
var live, deleted bool
|
||||
if err := q.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_items WHERE domain_uuid=? AND uuid=?), EXISTS(SELECT 1 FROM organizer_task_deletions WHERE domain_uuid=? AND owner_uuid=? AND item_uuid=?)`, domain, id, domain, actor, id).Scan(&live, &deleted); err != nil {
|
||||
return err
|
||||
}
|
||||
if live {
|
||||
return ErrTaskConflict
|
||||
}
|
||||
if !deleted {
|
||||
return ErrTaskCaptureMissing
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// RecreateCapturedTask never removes old receipts, tombstones or DAV identity
|
||||
// reservations. A deterministic successor ID makes a lost response retry safe.
|
||||
// The caller authorizes read/create/write for target, including retained pages.
|
||||
func (s *Store) RecreateCapturedTask(ctx context.Context, domain, actor, request, hash string, item TaskRecord, target, body, replaces string) (TaskRecord, error) {
|
||||
id, err := uuid.Parse(replaces)
|
||||
if err != nil || id.String() != replaces || request != TaskRecreationID(replaces) {
|
||||
return TaskRecord{}, ErrTaskInvalid
|
||||
}
|
||||
if err = taskActor(ctx, s.DB, domain, actor, true); err != nil {
|
||||
return TaskRecord{}, err
|
||||
}
|
||||
if err = deletedCapture(ctx, s.DB, domain, actor, replaces); err != nil {
|
||||
return TaskRecord{}, err
|
||||
}
|
||||
return s.captureTaskWithWiki(ctx, domain, actor, request, hash, item, target, body, replaces)
|
||||
}
|
||||
@@ -77,8 +77,12 @@ func ValidTaskMailSuffix(s string) bool {
|
||||
return mailListSuffix.MatchString(s) || (mailMonthSuffix.MatchString(s) && !strings.HasPrefix(s, "0000/"))
|
||||
}
|
||||
|
||||
func validCapturedTaskWiki(target, body string) bool {
|
||||
return target != "" && ValidTaskWikiPrefix(path.Dir(target)) && path.Clean(target) == target && len(body) <= 256<<10 && utf8.ValidString(body) && strings.IndexByte(body, 0) < 0
|
||||
}
|
||||
|
||||
func (s *Store) createCapturedTaskWiki(ctx context.Context, tx *sql.Tx, domain, actor string, item *TaskRecord, target, body string) error {
|
||||
if target == "" || !ValidTaskWikiPrefix(path.Dir(target)) || path.Clean(target) != target || item.PageUUID != "" || len(body) > 256<<10 || !utf8.ValidString(body) || strings.IndexByte(body, 0) >= 0 {
|
||||
if !validCapturedTaskWiki(target, body) || item.PageUUID != "" {
|
||||
return ErrTaskInvalid
|
||||
}
|
||||
var exists bool
|
||||
|
||||
@@ -54,6 +54,9 @@ func (s *Store) ensureTaskDAVSchema() error {
|
||||
`DELETE FROM organizer_dav_collections`,
|
||||
`INSERT INTO organizer_dav_collections(domain_uuid,path,owner_uuid,project_uuid) SELECT domain_uuid,COALESCE(NULLIF(json_extract(data,'$.dav_collection'),''),'tasks/projects/'||uuid),owner_uuid,uuid FROM organizer_items WHERE kind='project'`,
|
||||
`INSERT INTO organizer_dav_resources(domain_uuid,owner_uuid,item_uuid,name,uid) SELECT domain_uuid,owner_uuid,uuid,CASE WHEN project_uuid='' THEN '' ELSE char(0)||project_uuid||char(0) END||COALESCE(json_extract(data,'$.caldav.name'),uuid||'.ics'),CASE WHEN project_uuid='' THEN '' ELSE char(0)||project_uuid||char(0) END||COALESCE(json_extract(data,'$.caldav.uid'),uuid) FROM organizer_items WHERE kind='task'`,
|
||||
// Deleted identities remain reserved after an index rebuild. A stale
|
||||
// client PUT must not silently resurrect a deliberately removed task.
|
||||
`INSERT INTO organizer_dav_resources(domain_uuid,owner_uuid,item_uuid,name,uid) SELECT domain_uuid,owner_uuid,item_uuid,dav_name,dav_uid FROM organizer_task_deletions`,
|
||||
} {
|
||||
if _, err = tx.Exec(q); err != nil {
|
||||
return err
|
||||
|
||||
@@ -0,0 +1,117 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
var ErrTaskDeleted = errors.New("task has been deleted")
|
||||
var ErrTaskHasChildren = errors.New("move or delete subtasks first")
|
||||
var ErrTaskWorking = errors.New("stop task work and focus sessions first")
|
||||
|
||||
// DeleteTask is deliberately separate from reversible archiving. The head and
|
||||
// revision references are removed; minimal identity tombstones prevent offline
|
||||
// clients from resurrecting the same task. Wiki documents, calendar events and
|
||||
// completed work records are independent resources and are not deleted here.
|
||||
// CAS blobs/backups are not securely erased by this operation.
|
||||
func (s *Store) DeleteTask(ctx context.Context, domain, actor, id string, expected int64) error {
|
||||
if s.ReadOnly {
|
||||
return ErrReadOnly
|
||||
}
|
||||
u, err := uuid.Parse(id)
|
||||
if err != nil || u.String() != id || expected < 1 {
|
||||
return ErrTaskInvalid
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
|
||||
defer cancel()
|
||||
tx, err := s.DB.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer tx.Rollback()
|
||||
if _, err = tx.ExecContext(ctx, `UPDATE domain_memberships SET state=state WHERE domain_uuid=? AND principal_uuid=?`, domain, actor); err != nil {
|
||||
return err
|
||||
}
|
||||
if err = taskActor(ctx, tx, domain, actor, true); err != nil {
|
||||
return err
|
||||
}
|
||||
enabled, err := taskReminderExtensionEnabled(ctx, tx, domain)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !enabled {
|
||||
return ErrAccessDenied
|
||||
}
|
||||
var raw string
|
||||
err = tx.QueryRowContext(ctx, `SELECT data FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND uuid=?`, domain, actor, id).Scan(&raw)
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
// A lost successful DELETE response can be retried with its original
|
||||
// precondition, without disclosing another owner's tombstone.
|
||||
var version int64
|
||||
if e := tx.QueryRowContext(ctx, `SELECT version FROM organizer_task_deletions WHERE domain_uuid=? AND owner_uuid=? AND item_uuid=?`, domain, actor, id).Scan(&version); e != nil {
|
||||
return e
|
||||
}
|
||||
if version-1 != expected {
|
||||
return ErrTaskConflict
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var item TaskRecord
|
||||
if err = json.Unmarshal([]byte(raw), &item); err != nil {
|
||||
return err
|
||||
}
|
||||
if item.Kind != "task" {
|
||||
return ErrTaskInvalid
|
||||
}
|
||||
if item.Version != expected {
|
||||
return ErrTaskConflict
|
||||
}
|
||||
var children, working bool
|
||||
if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND parent_uuid=?)`, domain, actor, id).Scan(&children); err != nil {
|
||||
return err
|
||||
}
|
||||
if children {
|
||||
return ErrTaskHasChildren
|
||||
}
|
||||
if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_focus WHERE domain_uuid=? AND owner_uuid=? AND task_uuid=? AND state IN ('running','paused')) OR EXISTS(SELECT 1 FROM organizer_work_sessions WHERE domain_uuid=? AND owner_uuid=? AND task_uuid=? AND end_ms=0 AND cancelled_ms=0)`, domain, actor, id, domain, actor, id).Scan(&working); err != nil {
|
||||
return err
|
||||
}
|
||||
if working {
|
||||
return ErrTaskWorking
|
||||
}
|
||||
name, uid := id+".ics", id
|
||||
if item.CalDAV != nil {
|
||||
name, uid = item.CalDAV.Name, item.CalDAV.UID
|
||||
}
|
||||
now := time.Now().UnixMilli()
|
||||
_, err = tx.ExecContext(ctx, `INSERT INTO organizer_task_deletions(domain_uuid,owner_uuid,item_uuid,dav_name,dav_uid,version,deleted_at_ms) VALUES(?,?,?,?,?,?,?)`, domain, actor, id, taskDAVIndexKey(item.ProjectUUID, name), taskDAVIndexKey(item.ProjectUUID, uid), item.Version+1, now)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for _, q := range []string{
|
||||
`DELETE FROM organizer_reminders WHERE domain_uuid=? AND item_uuid=?`,
|
||||
`DELETE FROM organizer_task_metrics WHERE domain_uuid=? AND task_uuid=?`,
|
||||
`UPDATE organizer_time_blocks SET state='unlinked' WHERE domain_uuid=? AND task_uuid=?`,
|
||||
`DELETE FROM organizer_revisions WHERE domain_uuid=? AND item_uuid=?`,
|
||||
`DELETE FROM organizer_items WHERE domain_uuid=? AND uuid=?`,
|
||||
} {
|
||||
if _, err = tx.ExecContext(ctx, q, domain, id); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if _, err = tx.ExecContext(ctx, `INSERT INTO organizer_changes(domain_uuid,item_uuid,version,actor_uuid,created_at_ms) VALUES(?,?,?,?,?)`, domain, id, item.Version+1, actor, now); err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err = s.appendTaskActivityTx(tx, domain, actor, id, "task", item.Version+1, now); err != nil {
|
||||
return err
|
||||
}
|
||||
return tx.Commit()
|
||||
}
|
||||
@@ -227,10 +227,22 @@ func (s *Store) CapturedTask(ctx context.Context, domain, actor, request, hash s
|
||||
if err != nil {
|
||||
return TaskRecord{}, err
|
||||
}
|
||||
// Check lifecycle before payload equality. A retained receipt must not
|
||||
// disguise a deleted task as an editable version conflict.
|
||||
item, err := s.GetTask(ctx, domain, actor, id)
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
if err = deletedCapture(ctx, s.DB, domain, actor, request); err != nil {
|
||||
return TaskRecord{}, err
|
||||
}
|
||||
return TaskRecord{}, ErrTaskDeleted
|
||||
}
|
||||
if err != nil {
|
||||
return TaskRecord{}, err
|
||||
}
|
||||
if stored != hash {
|
||||
return TaskRecord{}, ErrTaskConflict
|
||||
}
|
||||
return s.GetTask(ctx, domain, actor, id)
|
||||
return item, nil
|
||||
}
|
||||
|
||||
func (s *Store) CaptureTask(ctx context.Context, domain, actor, request, hash string, item TaskRecord) (TaskRecord, error) {
|
||||
@@ -240,6 +252,10 @@ func (s *Store) CaptureTask(ctx context.Context, domain, actor, request, hash st
|
||||
// CaptureTaskWithWiki commits the task, receipt and optional Wiki page together.
|
||||
// The HTTP caller must authorize read/create/write for the exact target path.
|
||||
func (s *Store) CaptureTaskWithWiki(ctx context.Context, domain, actor, request, hash string, item TaskRecord, target, body string) (TaskRecord, error) {
|
||||
return s.captureTaskWithWiki(ctx, domain, actor, request, hash, item, target, body, "")
|
||||
}
|
||||
|
||||
func (s *Store) captureTaskWithWiki(ctx context.Context, domain, actor, request, hash string, item TaskRecord, target, body, replaces string) (TaskRecord, error) {
|
||||
if _, err := uuid.Parse(request); err != nil {
|
||||
return TaskRecord{}, ErrTaskInvalid
|
||||
}
|
||||
@@ -252,11 +268,31 @@ func (s *Store) CaptureTaskWithWiki(ctx context.Context, domain, actor, request,
|
||||
}
|
||||
item.UUID = request
|
||||
out, err := s.saveTask(ctx, domain, actor, item, 0, func(tx *sql.Tx, current *TaskRecord, _ TaskRecord) error {
|
||||
if target != "" {
|
||||
if e := s.createCapturedTaskWiki(ctx, tx, domain, actor, current, target, body); e != nil {
|
||||
if replaces != "" {
|
||||
if e := deletedCapture(ctx, tx, domain, actor, replaces); e != nil {
|
||||
return e
|
||||
}
|
||||
}
|
||||
if target != "" {
|
||||
if !validCapturedTaskWiki(target, body) || current.PageUUID != "" {
|
||||
return ErrTaskInvalid
|
||||
}
|
||||
// Explicit recreation may reuse a surviving Wiki page. Its content
|
||||
// and revisions are independent of task deletion and never replaced.
|
||||
reused := false
|
||||
if replaces != "" {
|
||||
e := tx.QueryRowContext(ctx, `SELECT p.object_uuid FROM paths p JOIN objects o ON o.uuid=p.object_uuid WHERE p.domain_uuid=? AND p.path=? AND o.kind='page'`, domain, target).Scan(¤t.PageUUID)
|
||||
if e != nil && !errors.Is(e, sql.ErrNoRows) {
|
||||
return e
|
||||
}
|
||||
reused = e == nil
|
||||
}
|
||||
if !reused {
|
||||
if e := s.createCapturedTaskWiki(ctx, tx, domain, actor, current, target, body); e != nil {
|
||||
return e
|
||||
}
|
||||
}
|
||||
}
|
||||
_, e := tx.ExecContext(ctx, `INSERT INTO organizer_capture_receipts VALUES(?,?,?,?,?)`, domain, actor, request, hash, item.UUID)
|
||||
return e
|
||||
})
|
||||
|
||||
@@ -81,6 +81,10 @@ func (s *Store) EnsureTasksSchema() error {
|
||||
UNIQUE(domain_uuid,item_uuid,version))`,
|
||||
`CREATE TABLE IF NOT EXISTS organizer_activity_bridge(id INTEGER PRIMARY KEY CHECK(id=1),last_sequence INTEGER NOT NULL DEFAULT 0)`,
|
||||
`INSERT OR IGNORE INTO organizer_activity_bridge(id,last_sequence) VALUES(1,0)`,
|
||||
`CREATE TABLE IF NOT EXISTS organizer_task_deletions (
|
||||
domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,item_uuid TEXT NOT NULL,
|
||||
dav_name TEXT NOT NULL,dav_uid TEXT NOT NULL,version INTEGER NOT NULL,deleted_at_ms INTEGER NOT NULL,
|
||||
PRIMARY KEY(domain_uuid,item_uuid))`,
|
||||
} {
|
||||
if _, err := s.DB.Exec(q); err != nil {
|
||||
return err
|
||||
@@ -227,6 +231,17 @@ func (s *Store) saveTask(ctx context.Context, domain, actor string, item TaskRec
|
||||
if enabled, exists := states["organizer.tasks"]; exists && !enabled {
|
||||
return TaskRecord{}, ErrAccessDenied
|
||||
}
|
||||
var deletedOwner string
|
||||
err = tx.QueryRowContext(ctx, `SELECT owner_uuid FROM organizer_task_deletions WHERE domain_uuid=? AND item_uuid=?`, domain, item.UUID).Scan(&deletedOwner)
|
||||
if err == nil {
|
||||
if deletedOwner != actor {
|
||||
return TaskRecord{}, sql.ErrNoRows
|
||||
}
|
||||
return TaskRecord{}, ErrTaskDeleted
|
||||
}
|
||||
if !errors.Is(err, sql.ErrNoRows) {
|
||||
return TaskRecord{}, err
|
||||
}
|
||||
if item.NotifyDue || item.NotifyPlanned {
|
||||
item.ReminderTimezone = "UTC"
|
||||
err = tx.QueryRowContext(ctx, `SELECT value FROM config WHERE domain_uuid=? AND key='timezone'`, domain).Scan(&item.ReminderTimezone)
|
||||
|
||||
@@ -44,7 +44,7 @@ func (s *Store) PublishTaskActivity(ctx context.Context, limit int) (int, int, e
|
||||
if _, err = tx.ExecContext(ctx, `UPDATE organizer_activity_bridge SET last_sequence=last_sequence WHERE id=1`); err != nil {
|
||||
return 0, 0, err
|
||||
}
|
||||
rows, err := tx.QueryContext(ctx, `SELECT c.sequence,c.domain_uuid,c.item_uuid,c.version,c.actor_uuid,c.created_at_ms,COALESCE(i.kind,'') FROM organizer_changes c LEFT JOIN organizer_items i ON i.domain_uuid=c.domain_uuid AND i.uuid=c.item_uuid WHERE c.sequence>(SELECT last_sequence FROM organizer_activity_bridge WHERE id=1) ORDER BY c.sequence LIMIT ?`, limit)
|
||||
rows, err := tx.QueryContext(ctx, `SELECT c.sequence,c.domain_uuid,c.item_uuid,c.version,c.actor_uuid,c.created_at_ms,COALESCE(i.kind,CASE WHEN d.item_uuid IS NOT NULL THEN 'task' ELSE '' END) FROM organizer_changes c LEFT JOIN organizer_items i ON i.domain_uuid=c.domain_uuid AND i.uuid=c.item_uuid LEFT JOIN organizer_task_deletions d ON d.domain_uuid=c.domain_uuid AND d.item_uuid=c.item_uuid WHERE c.sequence>(SELECT last_sequence FROM organizer_activity_bridge WHERE id=1) ORDER BY c.sequence LIMIT ?`, limit)
|
||||
if err != nil {
|
||||
return 0, 0, err
|
||||
}
|
||||
|
||||
+26
-4
@@ -32,7 +32,7 @@ import urllib.parse as url
|
||||
import urllib.request as http
|
||||
import webbrowser
|
||||
|
||||
VERSION = '0.4.0'
|
||||
VERSION = '0.4.2'
|
||||
|
||||
class Failure(Exception):
|
||||
def __init__(self, message, status=0, payload=None):
|
||||
@@ -569,7 +569,7 @@ def tasks(client, profile, words):
|
||||
for name in ('done','reopen','archive','start'):
|
||||
p=sub.add_parser(name);p.add_argument('uuid',type=task_uuid)
|
||||
sub.add_parser('stop');sub.add_parser('status')
|
||||
p=sub.add_parser('retry');p.add_argument('request_id',type=task_uuid)
|
||||
p=sub.add_parser('retry');p.add_argument('request_id',type=task_uuid);p.add_argument('--recreate-deleted',action='store_true',help='Explicitly recreate a deleted capture with a new UUID; preserve and relink any existing Wiki page')
|
||||
p=sub.add_parser('report');p.add_argument('--from',dest='start');p.add_argument('--to',dest='end')
|
||||
p=sub.add_parser('preferences');p.add_argument('--wiki-prefix');p.add_argument('--project');p.add_argument('--assignee');p.add_argument('--due-days',type=int);p.add_argument('--start-days',type=int);p.add_argument('--planned-days',type=int);p.add_argument('--review-days',type=int);p.add_argument('--estimate',type=int);p.add_argument('--complexity',type=int);p.add_argument('--digest',choices=['on','off']);p.add_argument('--at');p.add_argument('--timezone')
|
||||
for child in sub.choices.values():child.add_argument('--json',action='store_true')
|
||||
@@ -578,10 +578,19 @@ def tasks(client, profile, words):
|
||||
def capture(payload):
|
||||
pending=profile.data.setdefault('task_outbox',{})
|
||||
if len(pending)>=20 and payload['request_id'] not in pending:raise Failure('20 pending captures retained. Retry them before adding more.')
|
||||
if payload['request_id'] in pending and pending[payload['request_id']] != payload:raise Failure('A different draft with this request ID is retained. Use pages task retry '+payload['request_id'])
|
||||
replaced=payload['request_id'] in pending and pending[payload['request_id']] != payload
|
||||
pending[payload['request_id']]=payload;profile.save()
|
||||
if replaced:print('Replaced the retained draft with the current input.',file=sys.stderr)
|
||||
try: result=client.json(TASK_API+'capture',method='POST',data=payload)
|
||||
except Failure as e:
|
||||
if e.status==410 and e.payload.get('error')=='deleted':
|
||||
raise Failure('Draft retained. This task was deleted; normal retry will not restore it. To explicitly create a new task (preserving any existing Wiki body), use: pages task retry '+payload['request_id']+' --recreate-deleted',e.status,e.payload) from e
|
||||
if e.status==409 and e.payload.get('error')=='capture_missing':
|
||||
raise Failure('Draft retained. The server has a capture receipt but no task or deletion record. Server-side consistency repair is required; retry will not fix it.',e.status,e.payload) from e
|
||||
if e.status==412:
|
||||
raise Failure('Draft retained. This request ID conflicts with a server capture or task. An unchanged retry will not resolve it; inspect with: pages task show '+payload['request_id'],e.status,e.payload) from e
|
||||
if e.status==409 and e.payload.get('error')=='note_exists':
|
||||
raise Failure('Draft retained. A Wiki page already occupies the destination; it was not overwritten.',e.status,e.payload) from e
|
||||
print('Draft retained; retry with: pages task retry '+payload['request_id'],file=sys.stderr)
|
||||
if e.payload.get('error') == 'wiki_prefix_required': raise Failure('Set a private Wiki destination first: pages task preferences --wiki-prefix /YOUR/MAIL/PATH',e.status) from e
|
||||
raise
|
||||
@@ -606,6 +615,19 @@ def tasks(client, profile, words):
|
||||
if action=='retry':
|
||||
payload=profile.data.get('task_outbox',{}).get(a.request_id)
|
||||
if not payload:raise Failure('No retained task capture with this request ID.')
|
||||
if a.recreate_deleted:
|
||||
pending=profile.data['task_outbox']
|
||||
replacement=str(uuid.uuid5(uuid.NAMESPACE_URL,'pages:task-recreate:'+a.request_id))
|
||||
payload=dict(payload,request_id=replacement,replaces_deleted=a.request_id)
|
||||
if replacement in pending and pending[replacement]!=payload:
|
||||
raise Failure('A different recreation draft already exists; inspect or retry it first: '+replacement)
|
||||
previous=pending.copy()
|
||||
pending[replacement]=payload;del pending[a.request_id]
|
||||
try:profile.save()
|
||||
except Exception:
|
||||
profile.data['task_outbox']=previous
|
||||
raise
|
||||
print('Recreation draft saved. Existing Wiki content will be preserved. Retry ID: '+replacement,file=sys.stderr)
|
||||
emit(capture(payload));return
|
||||
if action in ('add','from-mail'):
|
||||
payload={'request_id':getattr(a,'request_id',None) or str(uuid.uuid4()),'title':a.title,'notes':a.notes or ''}
|
||||
@@ -622,7 +644,7 @@ def tasks(client, profile, words):
|
||||
value=getattr(a,attr)
|
||||
if value is not None:payload[key]=task_project(client,value) if attr=='project' else value
|
||||
# A retry of the same pending mail must not drift across a month boundary
|
||||
# when Date was missing. Other changed options still fail closed.
|
||||
# when Date was missing. Changed input replaces the pending draft below.
|
||||
old=profile.data.get('task_outbox',{}).get(payload['request_id'])
|
||||
if action=='from-mail' and old and {k:v for k,v in old.items() if k!='wiki_suffix'}=={k:v for k,v in payload.items() if k!='wiki_suffix'}:
|
||||
payload=old.copy()
|
||||
|
||||
@@ -9,6 +9,74 @@ import unittest
|
||||
m=runpy.run_path(str(Path(__file__).with_name('pages')))
|
||||
|
||||
class ProductivityTests(unittest.TestCase):
|
||||
def test_deleted_capture_message_retains_draft_without_retry_loop(self):
|
||||
ident='b5550cab-22d4-54eb-b06d-3b432d3f5101'
|
||||
original={'request_id':ident,'title':'Private title','notes':'Private notes'}
|
||||
for status,code,message in [(410,'deleted','--recreate-deleted'),(409,'capture_missing','consistency repair'),(412,'conflict','unchanged retry'),(409,'note_exists','not overwritten')]:
|
||||
profile=SimpleNamespace(data={'task_outbox':{ident:original.copy()}},save=lambda:None)
|
||||
calls=[]
|
||||
def send(*args,**kw):
|
||||
calls.append(kw)
|
||||
raise m['Failure']('old generic message',status,{'error':code})
|
||||
output=io.StringIO()
|
||||
with contextlib.redirect_stderr(output),self.assertRaises(m['Failure']) as error:
|
||||
m['tasks'](SimpleNamespace(json=send),profile,['retry',ident])
|
||||
self.assertIn(message,str(error.exception))
|
||||
self.assertNotIn('Private',str(error.exception)+output.getvalue())
|
||||
self.assertNotIn('retry with:',output.getvalue())
|
||||
self.assertEqual(profile.data['task_outbox'][ident],original)
|
||||
self.assertEqual(len(calls),1)
|
||||
|
||||
def test_recreate_deleted_persists_successor_and_retries_same_id(self):
|
||||
import uuid
|
||||
ident='b5550cab-22d4-54eb-b06d-3b432d3f5101'
|
||||
replacement=str(uuid.uuid5(uuid.NAMESPACE_URL,'pages:task-recreate:'+ident))
|
||||
payload={'request_id':ident,'title':'Private title','wiki_body':'Private body','wiki_suffix':'2030/01/'+ident}
|
||||
saved,calls=[],[]
|
||||
profile=SimpleNamespace(data={'task_outbox':{ident:payload.copy()}})
|
||||
profile.save=lambda:saved.append(json.loads(json.dumps(profile.data)))
|
||||
def send(route,**kw):
|
||||
calls.append(kw['data'].copy())
|
||||
self.assertEqual(saved[-1]['task_outbox'][replacement],kw['data'])
|
||||
self.assertNotIn(ident,saved[-1]['task_outbox'])
|
||||
if len(calls)==1:raise m['Failure']('Connection lost')
|
||||
return {'item':{'uuid':replacement}}
|
||||
output,error=io.StringIO(),io.StringIO()
|
||||
with contextlib.redirect_stdout(output),contextlib.redirect_stderr(error):
|
||||
with self.assertRaises(m['Failure']):m['tasks'](SimpleNamespace(json=send),profile,['retry',ident,'--recreate-deleted'])
|
||||
self.assertEqual(len(profile.data['task_outbox']),1)
|
||||
m['tasks'](SimpleNamespace(json=send),profile,['retry',replacement])
|
||||
self.assertEqual(calls[0],calls[1])
|
||||
self.assertEqual(calls[0]['request_id'],replacement)
|
||||
self.assertEqual(calls[0]['replaces_deleted'],ident)
|
||||
self.assertEqual(calls[0]['wiki_suffix'],payload['wiki_suffix'])
|
||||
self.assertEqual(calls[0]['wiki_body'],payload['wiki_body'])
|
||||
self.assertEqual(profile.data['task_outbox'],{})
|
||||
self.assertIn(replacement,error.getvalue())
|
||||
self.assertNotIn('Private',error.getvalue())
|
||||
|
||||
def test_recreate_deleted_save_failure_keeps_original_and_sends_nothing(self):
|
||||
ident='b5550cab-22d4-54eb-b06d-3b432d3f5101'
|
||||
payload={'request_id':ident,'title':'Draft'}
|
||||
def fail():raise m['Failure']('disk full')
|
||||
profile=SimpleNamespace(data={'task_outbox':{ident:payload.copy()}},save=fail)
|
||||
calls=[]
|
||||
with self.assertRaises(m['Failure']):m['tasks'](SimpleNamespace(json=lambda *a,**kw:calls.append(kw)),profile,['retry',ident,'--recreate-deleted'])
|
||||
self.assertEqual(calls,[])
|
||||
self.assertEqual(profile.data['task_outbox'],{ident:payload})
|
||||
|
||||
def test_recreate_deleted_never_clobbers_different_successor_draft(self):
|
||||
import uuid
|
||||
ident='b5550cab-22d4-54eb-b06d-3b432d3f5101'
|
||||
replacement=str(uuid.uuid5(uuid.NAMESPACE_URL,'pages:task-recreate:'+ident))
|
||||
pending={ident:{'request_id':ident,'title':'Original'},replacement:{'request_id':replacement,'title':'Different'}}
|
||||
before=json.loads(json.dumps(pending))
|
||||
calls=[]
|
||||
profile=SimpleNamespace(data={'task_outbox':pending},save=lambda:calls.append('save'))
|
||||
with self.assertRaises(m['Failure']):m['tasks'](SimpleNamespace(json=lambda *a,**kw:calls.append('send')),profile,['retry',ident,'--recreate-deleted'])
|
||||
self.assertEqual(calls,[])
|
||||
self.assertEqual(pending,before)
|
||||
|
||||
def test_mail_path_priority_and_dates(self):
|
||||
import datetime,hashlib
|
||||
ident='06cb3a24-61f8-4a9f-a0bf-89eea9632f25'
|
||||
@@ -24,7 +92,7 @@ class ProductivityTests(unittest.TestCase):
|
||||
raw=b'Subject: [../unsafe 123] Title\r\n'+date+b'\r\nbody'
|
||||
self.assertEqual(suffix(raw,ident,now),'2030/02/'+hashlib.sha256(raw).hexdigest())
|
||||
|
||||
def test_pending_mail_month_and_options_are_preserved(self):
|
||||
def test_pending_mail_keeps_month_but_replaces_changed_options(self):
|
||||
from unittest.mock import patch
|
||||
raw=b'Subject: Test\r\nMessage-ID: <same@example.invalid>\r\n\r\nbody'
|
||||
calls=[]
|
||||
@@ -37,10 +105,86 @@ class ProductivityTests(unittest.TestCase):
|
||||
with patch.dict(m['tasks'].__globals__,task_mail_suffix=lambda raw,ident:month+'/'+ident),patch('sys.stdin',SimpleNamespace(buffer=io.BytesIO(raw))),contextlib.redirect_stderr(io.StringIO()),self.assertRaises(m['Failure']):
|
||||
m['tasks'](client,profile,['from-mail'])
|
||||
self.assertEqual(calls[0],calls[1])
|
||||
with patch('sys.stdin',SimpleNamespace(buffer=io.BytesIO(raw))),self.assertRaises(m['Failure']):
|
||||
with patch('sys.stdin',SimpleNamespace(buffer=io.BytesIO(raw))),contextlib.redirect_stderr(io.StringIO()),self.assertRaises(m['Failure']):
|
||||
m['tasks'](client,profile,['from-mail','--wiki-prefix','/changed'])
|
||||
self.assertEqual(len(calls),2)
|
||||
self.assertEqual(next(iter(profile.data['task_outbox'].values())),calls[0])
|
||||
self.assertEqual(len(calls),3)
|
||||
self.assertEqual(calls[2]['request_id'],calls[0]['request_id'])
|
||||
self.assertEqual(calls[2]['wiki_prefix'],'/changed')
|
||||
self.assertEqual(next(iter(profile.data['task_outbox'].values())),calls[2])
|
||||
|
||||
def test_changed_capture_is_saved_before_send_and_retained_on_conflict(self):
|
||||
ident='b5550cab-22d4-54eb-b06d-3b432d3f5101'
|
||||
saved,calls=[],[]
|
||||
old={'request_id':ident,'title':'Old draft','notes':'Old private notes'}
|
||||
profile=SimpleNamespace(data={'task_outbox':{ident:old}})
|
||||
profile.save=lambda:saved.append(json.loads(json.dumps(profile.data)))
|
||||
def send(route,**kw):
|
||||
payload=kw['data'].copy();calls.append(payload)
|
||||
self.assertEqual(saved[-1]['task_outbox'][ident],payload)
|
||||
if len(calls)==1:raise m['Failure']('conflict',412,{'error':'conflict'})
|
||||
return {'item':{'uuid':ident}}
|
||||
client=SimpleNamespace(json=send)
|
||||
out,err=io.StringIO(),io.StringIO()
|
||||
with contextlib.redirect_stdout(out),contextlib.redirect_stderr(err):
|
||||
with self.assertRaises(m['Failure']) as failure:
|
||||
m['tasks'](client,profile,['add','New draft','--request-id',ident,'--notes','New private notes'])
|
||||
self.assertEqual(failure.exception.status,412)
|
||||
self.assertEqual(profile.data['task_outbox'][ident],calls[0])
|
||||
self.assertEqual(len(calls),1) # No automatic server overwrite/retry.
|
||||
m['tasks'](client,profile,['retry',ident])
|
||||
self.assertEqual(calls[0],calls[1])
|
||||
self.assertEqual(calls[0]['title'],'New draft')
|
||||
self.assertEqual(profile.data['task_outbox'],{})
|
||||
self.assertIn('Replaced the retained draft',err.getvalue())
|
||||
self.assertNotIn('private notes',err.getvalue())
|
||||
self.assertEqual(json.loads(out.getvalue())['item']['uuid'],ident)
|
||||
|
||||
def test_replacing_draft_does_not_send_when_local_save_fails(self):
|
||||
ident='b5550cab-22d4-54eb-b06d-3b432d3f5101'
|
||||
def fail_save():raise m['Failure']('local write failed')
|
||||
profile=SimpleNamespace(data={'task_outbox':{ident:{'request_id':ident,'title':'Old','notes':''}}},save=fail_save)
|
||||
calls=[]
|
||||
client=SimpleNamespace(json=lambda *a,**kw:calls.append(kw))
|
||||
with self.assertRaises(m['Failure']):m['tasks'](client,profile,['add','New','--request-id',ident])
|
||||
self.assertEqual(calls,[])
|
||||
|
||||
def test_full_outbox_allows_replacement_but_not_new_id(self):
|
||||
import uuid
|
||||
pending={str(uuid.uuid4()):{'title':'Old'} for _ in range(20)}
|
||||
ident=next(iter(pending))
|
||||
profile=SimpleNamespace(data={'task_outbox':pending},save=lambda:None)
|
||||
calls=[]
|
||||
def send(route,**kw):
|
||||
calls.append(kw['data'].copy())
|
||||
raise m['Failure']('offline')
|
||||
client=SimpleNamespace(json=send)
|
||||
with contextlib.redirect_stderr(io.StringIO()),self.assertRaises(m['Failure']):
|
||||
m['tasks'](client,profile,['add','Replacement','--request-id',ident])
|
||||
self.assertEqual(len(calls),1)
|
||||
self.assertEqual(pending[ident]['title'],'Replacement')
|
||||
with self.assertRaises(m['Failure']):m['tasks'](client,profile,['add','Another'])
|
||||
self.assertEqual(len(calls),1)
|
||||
self.assertEqual(len(pending),20)
|
||||
|
||||
def test_reimported_mail_replaces_body_and_removes_obsolete_options(self):
|
||||
from unittest.mock import patch
|
||||
raw=b'Subject: Old\r\nMessage-ID: <same@example.invalid>\r\n\r\nOLD BODY'
|
||||
calls=[]
|
||||
def send(route,**kw):
|
||||
calls.append(kw['data'].copy())
|
||||
raise m['Failure']('offline')
|
||||
client=SimpleNamespace(base='https://example.invalid',json=send)
|
||||
profile=SimpleNamespace(data={'username':'test'},save=lambda:None)
|
||||
changed=raw.replace(b'Subject: Old',b'Subject: New').replace(b'OLD BODY',b'NEW BODY')
|
||||
for mail,args in [(raw,['--wiki-prefix','/old']),(changed,['--wiki-prefix','/new']),(changed,['--metadata-only'])]:
|
||||
with patch('sys.stdin',SimpleNamespace(buffer=io.BytesIO(mail))),contextlib.redirect_stderr(io.StringIO()),self.assertRaises(m['Failure']):
|
||||
m['tasks'](client,profile,['from-mail',*args])
|
||||
self.assertEqual(len({c['request_id'] for c in calls}),1)
|
||||
self.assertEqual(calls[1]['title'],'New')
|
||||
self.assertIn('NEW BODY',calls[1]['wiki_body'])
|
||||
self.assertNotIn('OLD BODY',calls[1]['wiki_body'])
|
||||
for key in ('wiki_body','wiki_prefix','wiki_suffix'):self.assertNotIn(key,calls[2])
|
||||
self.assertEqual(next(iter(profile.data['task_outbox'].values())),calls[2])
|
||||
|
||||
def test_mail_privacy_and_long_subject_override(self):
|
||||
raw=b'Subject: Test\r\nFrom: Person <person@example.invalid>\r\nMessage-ID: <id@example.invalid>\r\nContent-Type: text/plain; charset=utf-8\r\n\r\nPRIVATE BODY'
|
||||
|
||||
@@ -5,6 +5,7 @@ import json
|
||||
from pathlib import Path
|
||||
import runpy
|
||||
import sys
|
||||
import uuid
|
||||
from types import SimpleNamespace
|
||||
from unittest.mock import patch
|
||||
from email.message import EmailMessage
|
||||
@@ -61,5 +62,50 @@ def run():
|
||||
output=io.StringIO()
|
||||
with contextlib.redirect_stdout(output):m['contacts'](client,['export',contact['uuid']])
|
||||
assert 'UID:urn:test:cli' in output.getvalue()
|
||||
# Failed captures can be replaced locally; committed receipts remain protected.
|
||||
request_id=str(uuid.uuid4())
|
||||
with contextlib.redirect_stderr(io.StringIO()):
|
||||
try:task('add','Rejected draft','--request-id',request_id,'--estimate','-1')
|
||||
except m['Failure'] as error:assert error.status==422
|
||||
else:raise AssertionError('Invalid estimate accepted')
|
||||
assert profile.data['task_outbox'][request_id]['estimate_minutes']==-1
|
||||
corrected=task('add','Corrected draft','--request-id',request_id,'--estimate','15')['item']
|
||||
assert corrected['uuid']==request_id and corrected['title']=='Corrected draft'
|
||||
assert request_id not in profile.data['task_outbox']
|
||||
try:task('add','Changed after commit','--request-id',request_id,'--estimate','30')
|
||||
except m['Failure'] as error:assert error.status==412
|
||||
else:raise AssertionError('Committed capture silently overwritten')
|
||||
assert profile.data['task_outbox'][request_id]['title']=='Changed after commit'
|
||||
stored=task('show',request_id)['item']
|
||||
assert stored['title']=='Corrected draft' and stored['estimate_minutes']==15
|
||||
# Deleted receipts must not be mistaken for editable conflicts. An
|
||||
# explicit recreation preserves the old tombstone and changes identity.
|
||||
client.request(m['TASK_API']+'items/'+request_id,method='DELETE',etag='"'+str(stored['version'])+'"')
|
||||
with contextlib.redirect_stderr(io.StringIO()):
|
||||
try:task('retry',request_id)
|
||||
except m['Failure'] as error:
|
||||
assert error.status==410 and '--recreate-deleted' in str(error)
|
||||
else:raise AssertionError('Deleted task implicitly recreated')
|
||||
recreated=task('retry',request_id,'--recreate-deleted')['item']
|
||||
replacement=str(uuid.uuid5(uuid.NAMESPACE_URL,'pages:task-recreate:'+request_id))
|
||||
assert recreated['uuid']==replacement and recreated['title']=='Changed after commit'
|
||||
assert recreated['estimate_minutes']==30 and not profile.data.get('task_outbox')
|
||||
try:task('show',request_id)
|
||||
except m['Failure'] as error:assert error.status==404
|
||||
else:raise AssertionError('Deleted UUID resurrected')
|
||||
# Reimport a deleted mail with a changed body: reconnect the surviving
|
||||
# Wiki note, without overwriting its independent content or revision.
|
||||
mail_id=captured['item']['uuid']
|
||||
client.request(m['TASK_API']+'items/'+mail_id,method='DELETE',etag='"1"')
|
||||
changed_mail=mail.replace(b'Private mail body',b'Changed private body')
|
||||
with patch('sys.stdin',SimpleNamespace(buffer=io.BytesIO(changed_mail))),contextlib.redirect_stderr(io.StringIO()):
|
||||
try:task('from-mail')
|
||||
except m['Failure'] as error:assert error.status==410
|
||||
else:raise AssertionError('Deleted mail task recreated implicitly')
|
||||
with contextlib.redirect_stderr(io.StringIO()):recreated_mail=task('retry',mail_id,'--recreate-deleted')
|
||||
assert recreated_mail['item']['page_uuid']==captured['item']['page_uuid']
|
||||
assert recreated_mail['page_path']==captured['page_path']
|
||||
body,_=client.raw('path:'+recreated_mail['page_path'])
|
||||
assert 'Private mail body' in body.decode() and 'Changed private body' not in body.decode()
|
||||
|
||||
if __name__=='__main__':run()
|
||||
@@ -19,6 +19,7 @@ body:has(#tasks-app)>.topbar{min-width:0}#tasks-app{box-sizing:border-box}
|
||||
#tasks-app button{font:inherit;color:var(--fg);border:1px solid var(--border,#8885);background:var(--panel,var(--bg));border-radius:.45rem;padding:.5rem .7rem;cursor:pointer}#tasks-app button:hover{border-color:var(--accent)}#tasks-app :focus-visible{outline:2px solid var(--accent);outline-offset:2px}#tasks-app button:disabled{opacity:.5;cursor:default}
|
||||
#tasks-capture{display:flex;gap:.5rem;margin:1rem 0}#tasks-quick-title{flex:1}.tasks-search{display:flex;align-items:center;gap:.6rem;margin:1rem 0}.tasks-search input{flex:1}#tasks-status:empty{display:none}
|
||||
#tasks-list{border-top:1px solid var(--border,#8885)}.task-row{display:flex;align-items:center;gap:.8rem;padding:.6rem .2rem;border-bottom:1px solid var(--border,#8885);content-visibility:auto;contain-intrinsic-size:auto 62px}.task-row-main{min-width:0;flex:1;display:flex;flex-direction:column;gap:.2rem}.task-row-main>a{color:var(--fg);text-decoration:none;overflow-wrap:anywhere}.task-row-main>a:hover{color:var(--accent)}.task-row[data-done=true] .task-row-main>a{text-decoration:line-through;opacity:.65}.task-row-meta{display:flex;gap:.7rem;flex-wrap:wrap}.task-row-meta .task-overdue{color:var(--danger,#da6161);opacity:1}#tasks-more{margin:1rem 0;width:100%}
|
||||
#tasks-app #tasks-delete{color:var(--danger,#da6161);border-color:currentColor}
|
||||
#tasks-dialog{box-sizing:border-box;color:var(--fg);background:var(--panel,var(--bg));border:1px solid var(--border,#8885);border-radius:1rem;width:min(680px,95vw);max-height:92dvh;padding:1.5rem;box-shadow:0 1rem 4rem #0005;overflow:auto}#tasks-dialog::backdrop{background:#0007;backdrop-filter:blur(3px)}#tasks-fields{display:grid;grid-template-columns:1fr 1fr;gap:.8rem;margin:1rem 0}#tasks-fields label{display:flex;flex-direction:column;gap:.3rem;font-size:.9rem}#tasks-fields label.task-full{grid-column:1/-1}#tasks-fields input,#tasks-fields select,#tasks-fields textarea{width:100%}#tasks-fields textarea{min-height:7rem;resize:vertical}#tasks-fields a{overflow-wrap:anywhere;color:var(--accent)}#tasks-form footer{justify-content:flex-end;margin-top:1rem}#tasks-error{color:var(--danger,#d55)}#tasks-history{font-size:.8rem}#tasks-app [hidden]{display:none!important}
|
||||
@media(max-width:760px){#tasks-app{display:block;padding:.75rem}#tasks-nav{flex-direction:row;overflow:auto;padding:0 0 .7rem;gap:.1rem;white-space:nowrap}#tasks-nav a{padding:.5rem}.tasks-toolbar h1{font-size:1.3rem}#tasks-dialog{width:100%;height:100dvh;max-height:100dvh;margin:0;border-radius:0;padding:1rem}#tasks-fields{gap:.7rem}.task-row{gap:.5rem}}
|
||||
@media(max-width:760px){body:has(#tasks-app)>.topbar{flex-wrap:wrap;padding:.65rem;gap:.5rem}body:has(#tasks-app)>.topbar>.brand{flex:1;min-width:0}body:has(#tasks-app)>.topbar>.brand>a{display:block;overflow:hidden;text-overflow:ellipsis}body:has(#tasks-app)>.topbar>nav{order:2;width:100%}body:has(#tasks-app)>.topbar>.city-map-launch{margin-inline:0;flex-shrink:0}#tasks-fields{grid-template-columns:minmax(0,1fr) minmax(0,1fr)}}
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
if(item.id==='progress'){
|
||||
const data=await request(api+'progress',{signal});if(controller.signal.aborted)return;body.replaceChildren();const percentage=data.total?Math.round(data.done*100/data.total):null;
|
||||
const ring=el('div',percentage===null?'—':percentage+'%','dashboard-progress');ring.style.setProperty('--progress',(percentage||0)+'%');
|
||||
body.append(ring,el('p',data.done+' / '+data.total),el('small',t('Completed / tasks planned for today. Cancelled and archived tasks are excluded.','今日に計画したタスクの完了数/総数。取りやめ・アーカイブは除きます。')));return;
|
||||
body.append(ring,el('p',data.done+' / '+data.total));return;
|
||||
}
|
||||
if(item.id==='schedule'){
|
||||
if(root.dataset.calendar!=='true'){body.replaceChildren(el('p',t('Calendar extension is disabled.','カレンダー拡張は無効です。')));return;}
|
||||
|
||||
+16
-2
@@ -3,6 +3,7 @@
|
||||
const app = document.getElementById('tasks-app'); if (!app) return;
|
||||
const ja = document.documentElement.lang.startsWith('ja');
|
||||
const words = {
|
||||
delete:['Delete','削除'],deleted:['This task has been deleted.','このタスクは削除されています。'],has_children:['Move or delete the subtasks first, including archived subtasks.','先にサブタスクを移動または削除してください(アーカイブ済みも含みます)。'],working:['Stop the running work timer or focus session before deleting this task.','作業時間の記録・集中セッションを停止してから削除してください。'],deleteConfirm:['Delete this task? This cannot be undone. Wiki notes, calendar events and recorded work time will remain. Unsaved changes will be discarded.','このタスクを削除しますか?復元できません。Wikiメモ、カレンダーの予定、記録済みの作業時間は残ります。未保存の変更は破棄されます。'],
|
||||
carryover:['Carryover','持ち越し'],tomorrow:['Tomorrow','明日'],day:['Daily plan','日別の計画'],notes_subpath:['Wiki note subfolder (relative to the project Wiki page)','Wikiメモのサブ階層(プロジェクトの関連Wiki配下)'],
|
||||
start_on:['Work starts','工程開始'],end_on:['Work ends','工程終了'],schedule:['Day schedule','日割り工程表'],
|
||||
notify_due:['Notify on due date','期限日にInboxへ通知'],notify_planned:['Notify on planned date','取り組む日にInboxへ通知'],reminder_time:['Notification time','通知時刻'],reminder_help:['Inbox only. Saved using the Domain timezone. Missed reminders from earlier days are skipped.','Inbox通知のみ。保存時のドメインのタイムゾーンを使用します。前日以前の未配信分は送りません。'],reminder_zone:['Timezone on save','保存時のタイムゾーン'],
|
||||
@@ -120,7 +121,7 @@
|
||||
}
|
||||
async function open(id,kind='task') {
|
||||
if($('dialog').open&&!closeDialog())return;
|
||||
const ticket=++detailGeneration;dialogController?.abort();dialogController=new AbortController();$('error').textContent='';editing=null;dirty=false;$('fields').replaceChildren();Object.keys(fields).forEach(k=>delete fields[k]);$('history').open=false;$('history').querySelector('ol').replaceChildren();$('dialog-title').textContent=t('loading');$('save').disabled=true;$('archive').hidden=true;$('history').hidden=true;$('project-open').hidden=true;$('dialog').showModal();
|
||||
const ticket=++detailGeneration;dialogController?.abort();dialogController=new AbortController();$('error').textContent='';editing=null;dirty=false;$('fields').replaceChildren();Object.keys(fields).forEach(k=>delete fields[k]);$('history').open=false;$('history').querySelector('ol').replaceChildren();$('dialog-title').textContent=t('loading');$('save').disabled=true;$('archive').hidden=$('delete').hidden=true;$('history').hidden=true;$('project-open').hidden=true;$('dialog').showModal();
|
||||
try {
|
||||
if(!id&&kind==='task')await refreshDefaults();
|
||||
const data=id?await request(api+'/'+id,{signal:dialogController.signal}):{item:blank(kind),page_path:''};if(ticket!==detailGeneration)return;editing=data.item;
|
||||
@@ -155,6 +156,7 @@
|
||||
plan.addEventListener('click',()=>{if(dirty){$('error').textContent=ja?'先にタスクの変更を保存してください。':'Save your task changes first.';return;}app.dispatchEvent(new CustomEvent('task-plan',{detail:{...editing}}));});$('fields').append(plan);
|
||||
}
|
||||
$('archive').hidden=!id||!writable;$('archive').textContent=t(editing.archived?'restore':'archive');$('save').hidden=!writable;$('save').disabled=false;$('history').hidden=!id;
|
||||
$('delete').hidden=!id||!writable||editing.kind!=='task';$('delete').textContent=t('delete');
|
||||
if(editing.kind==='project'&&id){$('project-open').hidden=false;$('project-open').href=href(editing);$('project-open').textContent=t('openProject');}
|
||||
arrangeEditor();title.focus();
|
||||
}catch(e){if(e.name!=='AbortError'&&ticket===detailGeneration)$('error').textContent=e.message;}
|
||||
@@ -165,7 +167,19 @@
|
||||
$('form').addEventListener('invalid',event=>{const details=event.target.closest('details');if(details)details.open=true;},true);
|
||||
function readForm(){const item={...editing};['title','notes','notes_subpath','status','bucket','project_uuid','assignee_uuid','due_on','planned_on','review_on','start_on','end_on','reminder_time'].forEach(k=>{if(fields[k])item[k]=fields[k].value;});['notify_due','notify_planned'].forEach(k=>{if(fields[k])item[k]=fields[k].checked;});['priority','estimate_minutes','complexity'].forEach(k=>{if(fields[k])item[k]=Number(fields[k].value);});if(fields.page_path?.dataset.changed||(!item.page_uuid&&fields.page_path?.value))item.page_path=fields.page_path.value;return item;}
|
||||
async function saveItem(item){const data=await request(api+(item.version?'/'+item.uuid:''),{method:item.version?'PUT':'POST',headers:item.version?{'If-Match':'"'+item.version+'"'}:{},body:JSON.stringify(item)});app.dispatchEvent(new Event('task-today-refresh'));return data;}
|
||||
async function submit(archive=false){if(!editing||saving||!writable)return;if(!$('form').reportValidity())return;const item=readForm();if(archive)item.archived=!item.archived;saving=true;Object.values(fields).forEach(f=>f.disabled=true);$('save').disabled=$('archive').disabled=true;$('error').textContent='';try{await saveItem(item);saving=false;closeDialog(true);await load();if(projectID)await loadProject();}catch(e){$('error').textContent=e.message;}finally{saving=false;Object.values(fields).forEach(f=>f.disabled=!writable);$('save').disabled=$('archive').disabled=false;}}
|
||||
async function submit(archive=false){if(!editing||saving||!writable)return;if(!$('form').reportValidity())return;const item=readForm();if(archive)item.archived=!item.archived;saving=true;Object.values(fields).forEach(f=>f.disabled=true);$('save').disabled=$('archive').disabled=$('delete').disabled=true;$('error').textContent='';try{await saveItem(item);saving=false;closeDialog(true);await load();if(projectID)await loadProject();}catch(e){$('error').textContent=e.message;}finally{saving=false;Object.values(fields).forEach(f=>f.disabled=!writable);$('save').disabled=$('archive').disabled=$('delete').disabled=false;}}
|
||||
$('delete').addEventListener('click',async()=>{
|
||||
if(!editing?.version||editing.kind!=='task'||saving||!writable)return;
|
||||
if(!confirm(editing.title+'\n\n'+t('deleteConfirm')))return;
|
||||
saving=true;Object.values(fields).forEach(f=>f.disabled=true);$('save').disabled=$('archive').disabled=$('delete').disabled=true;$('error').textContent='';
|
||||
try{
|
||||
await request(api+'/'+editing.uuid,{method:'DELETE',headers:{'If-Match':'"'+editing.version+'"'}});
|
||||
saving=false;closeDialog(true);app.dispatchEvent(new Event('task-today-refresh'));
|
||||
if(view==='detail'){location.replace('/v/plan/tasks');return;}
|
||||
await load();
|
||||
}catch(e){$('error').textContent=e.message;}
|
||||
finally{saving=false;Object.values(fields).forEach(f=>f.disabled=!writable);$('save').disabled=$('archive').disabled=$('delete').disabled=false;}
|
||||
});
|
||||
$('form').addEventListener('submit',e=>{e.preventDefault();submit();});$('archive').addEventListener('click',()=>submit(true));
|
||||
$('history').addEventListener('toggle',async()=>{if(!$('history').open||!editing?.version)return;const id=editing.uuid;try{const data=await request(api+'/'+id+'/history');if(editing?.uuid!==id)return;const ol=$('history').querySelector('ol');ol.replaceChildren();data.items.forEach(v=>ol.append(el('li','#'+v.version+' · '+new Date(v.created_at_ms).toLocaleString())));}catch(e){$('error').textContent=e.message;}});
|
||||
$('new').addEventListener('click',()=>open('',view==='projects'?'project':'task'));
|
||||
|
||||
@@ -4,4 +4,4 @@
|
||||
{{ template "organizer-nav" . }}
|
||||
<main id="organizer-dashboard" data-writable="{{ .TaskWritable }}" data-calendar="{{ .CalendarEnabled }}" data-today="{{ .Today }}" data-timezone="{{ .Timezone }}">
|
||||
<header class="dashboard-toolbar"><div><h1>{{ T "organizer.dashboard" }}</h1><small>{{ .Today }} · {{ .Timezone }}</small></div><div id="dashboard-controls"></div></header><p id="dashboard-status" role="status" aria-live="polite"></p><div id="dashboard-grid"></div>
|
||||
</main><script src="/static/js/organizer-dashboard.js?v=1" defer></script><script src="/static/js/task-productivity.js?v=8" defer></script></body></html>{{ end }}
|
||||
</main><script src="/static/js/organizer-dashboard.js?v=2" defer></script><script src="/static/js/task-productivity.js?v=8" defer></script></body></html>{{ end }}
|
||||
@@ -1,6 +1,6 @@
|
||||
{{ define "tasks.gohtml" }}<!doctype html>
|
||||
<html lang="{{ .Locale }}"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>{{ T "tasks.title" }} · {{ .WikiName }}</title>
|
||||
<link rel="stylesheet" href="/static/css/main.css"><link rel="stylesheet" href="/static/css/theme/base.css"><link rel="stylesheet" href="{{ .ThemeCSS }}"><link rel="stylesheet" href="/static/css/tasks.css?v=10"></head>
|
||||
<link rel="stylesheet" href="/static/css/main.css"><link rel="stylesheet" href="/static/css/theme/base.css"><link rel="stylesheet" href="{{ .ThemeCSS }}"><link rel="stylesheet" href="/static/css/tasks.css?v=11"></head>
|
||||
<body class="mode-view organizer-page"><header class="topbar"><div class="brand"><a href="/">{{ .WikiName }}</a></div>{{ template "auth-menu" . }}</header>{{ template "organizer-nav" . }}
|
||||
<main id="tasks-app" data-view="{{ .TaskView }}" data-id="{{ .TaskID }}" data-today="{{ .TaskToday }}" data-selected-date="{{ .TaskSelectedDate }}" data-timezone="{{ .TaskTimezone }}" data-writable="{{ .TaskWritable }}">
|
||||
<nav id="tasks-nav" aria-label="Tasks"></nav><section class="tasks-workspace">
|
||||
@@ -10,5 +10,5 @@
|
||||
<label id="tasks-kind-control" class="tasks-search" hidden><span></span><select id="tasks-kind"></select></label><a id="tasks-project-archive" href="/v/plan/tasks/archived?kind=project" hidden></a>
|
||||
<p id="tasks-status" role="status" aria-live="polite"></p><div class="tasks-list-scroll"><div id="tasks-list" role="list"></div></div><button type="button" id="tasks-more" hidden></button>
|
||||
</section>
|
||||
<dialog id="tasks-dialog" aria-labelledby="tasks-dialog-title"><form id="tasks-form"><header class="tasks-toolbar"><h2 id="tasks-dialog-title"></h2><button type="button" id="tasks-close">×</button></header><div id="tasks-fields"></div><p id="tasks-error" role="alert"></p><details id="tasks-history"><summary></summary><ol></ol></details><footer class="tasks-actions"><button type="button" id="tasks-archive"></button><a id="tasks-project-open" hidden></a><button type="submit" id="tasks-save"></button></footer></form></dialog>
|
||||
</main><link rel="stylesheet" href="/static/css/dav-settings.css?v=3"><script src="/static/js/task-inline.js?v=4" defer></script><script src="/static/js/task-today.js?v=1" defer></script><script src="/static/js/task-planning.js?v=3" defer></script><script src="/static/js/task-focus.js?v=2" defer></script><script src="/static/js/task-work.js?v=1" defer></script><script src="/static/js/tasks.js?v=10" defer></script><script src="/static/js/task-dav-settings.js?v=4" defer></script></body></html>{{ end }}
|
||||
<dialog id="tasks-dialog" aria-labelledby="tasks-dialog-title"><form id="tasks-form"><header class="tasks-toolbar"><h2 id="tasks-dialog-title"></h2><button type="button" id="tasks-close">×</button></header><div id="tasks-fields"></div><p id="tasks-error" role="alert"></p><details id="tasks-history"><summary></summary><ol></ol></details><footer class="tasks-actions"><button type="button" id="tasks-archive"></button><button type="button" id="tasks-delete" class="danger" hidden></button><a id="tasks-project-open" hidden></a><button type="submit" id="tasks-save"></button></footer></form></dialog>
|
||||
</main><link rel="stylesheet" href="/static/css/dav-settings.css?v=3"><script src="/static/js/task-inline.js?v=4" defer></script><script src="/static/js/task-today.js?v=1" defer></script><script src="/static/js/task-planning.js?v=3" defer></script><script src="/static/js/task-focus.js?v=2" defer></script><script src="/static/js/task-work.js?v=1" defer></script><script src="/static/js/tasks.js?v=11" defer></script><script src="/static/js/task-dav-settings.js?v=4" defer></script></body></html>{{ end }}
|
||||
Reference in new issue
Block a user