github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-10-29 05:50:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Andrey Antukh 2026-10-09 09:01:39 +02:00
commit bcb7a8329c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/app/loggers/audit/archive_task.clj
View File

@ -82,6 +82,7 @@
"change-organization-advanced-permission"
"create-file"
"create-organization"
"create-organization-attribute"
"create-organization-invitation"
"create-project"
"create-team"

6
backend/test/backend_tests/loggers_audit_archive_task_test.clj
View File

@ -76,14 +76,16 @@
(with-mocks [nitrate-mock {:target 'app.nitrate/call :return nil}
http-mock {:target 'app.http.client/req :return {:status 204}}]
(insert-audit-row! (:id prof) "create-project")
(insert-audit-row! (:id prof) "create-organization-attribute")
(insert-audit-row! (:id prof) "unrelated-event")
(th/run-task! :audit-log-archive {:uri archive-uri})
(t/is (:called? @nitrate-mock))
(t/is (:called? @http-mock))
(let [[_ _ params] (:call-args @nitrate-mock)]
(t/is (= ["create-project"] (mapv :name (:events params)))))
(t/is (= #{"create-project" "create-organization-attribute"}
(into #{} (map :name) (:events params)))))
(let [rows (th/db-exec! ["select * from audit_log where archived_at is not null"])]
(t/is (= 2 (count rows))))))))
(t/is (= 3 (count rows))))))))
(t/deftest archive-events-skips-nitrate-when-no-matching-names
(let [prof (th/create-profile* 1 {:is-active true})]