From 9885dc0f294b05902fc86eebc22240a5a32e6d88 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Mon, 27 Mar 2023 11:39:09 +0200 Subject: [PATCH] Update protocols migration for linked protocols [SCI-6931] --- app/models/protocol.rb | 6 +++++- db/migrate/20221125133611_add_protocol_versioning.rb | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/models/protocol.rb b/app/models/protocol.rb index 890335247..66a416f3e 100644 --- a/app/models/protocol.rb +++ b/app/models/protocol.rb @@ -351,7 +351,11 @@ class Protocol < ApplicationRecord end def parent_newer? - linked? && parent.newer_published_version_present? + linked? && ( + parent.newer_published_version_present? || + # backward compatibility with original implementation + parent.published_on > updated_at + ) end def number_of_steps diff --git a/db/migrate/20221125133611_add_protocol_versioning.rb b/db/migrate/20221125133611_add_protocol_versioning.rb index da54292e1..93f32eb4f 100644 --- a/db/migrate/20221125133611_add_protocol_versioning.rb +++ b/db/migrate/20221125133611_add_protocol_versioning.rb @@ -36,9 +36,8 @@ class AddProtocolVersioning < ActiveRecord::Migration[6.1] ');' ) execute( - 'UPDATE "protocols" SET "published_on" = "created_at", "published_by_id" = "added_by_id" ' \ - 'WHERE "protocols"."protocol_type" = 5 ' \ - 'AND "protocols"."published_on" IS NULL;' + 'UPDATE "protocols" SET "published_on" = "updated_at", "published_by_id" = "added_by_id" ' \ + 'WHERE "protocols"."protocol_type" = 5;' ) execute(