From 83c6354a0a5dbcc406fd80b894fce9f4265f925d Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 22 Nov 2023 09:37:17 +0100 Subject: [PATCH] :sparkles: Change order of hard and soft validation on file update --- backend/src/app/rpc/commands/files_update.clj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/app/rpc/commands/files_update.clj b/backend/src/app/rpc/commands/files_update.clj index 92d14d96a..f827257cf 100644 --- a/backend/src/app/rpc/commands/files_update.clj +++ b/backend/src/app/rpc/commands/files_update.clj @@ -315,6 +315,12 @@ (update :data cpc/process-changes changes) ;; If `libs` is defined, then full validation is performed + (cond-> (contains? cf/flags :soft-file-validation) + (soft-validate-file! libs)) + + (cond-> (contains? cf/flags :soft-file-schema-validation) + (soft-validate-file-schema!)) + (cond-> (and (contains? cf/flags :file-validation) (not skip-validate)) (val/validate-file! libs)) @@ -323,12 +329,6 @@ (not skip-validate)) (val/validate-file-schema!)) - (cond-> (contains? cf/flags :soft-file-validation) - (soft-validate-file! libs)) - - (cond-> (contains? cf/flags :soft-file-schema-validation) - (soft-validate-file-schema!)) - (cond-> (and (contains? cfeat/*current* "fdata/objects-map") (not (contains? cfeat/*previous* "fdata/objects-map"))) (enable-objects-map))