2 files changed, 84 insertions, 0 deletions
diff --git a/extensions/ComponentWatching/Extension.pm b/extensions/ComponentWatching/Extension.pm
index addbaba70..f85e0010c 100644
--- a/extensions/ComponentWatching/Extension.pm
+++ b/extensions/ComponentWatching/Extension.pm
@@ -530,4 +530,65 @@ sub _addDefaultSettings {
     }
 }
 
+sub reorg_move_component {
+    my ($self, $args) = @_;
+    my $new_product = $args->{new_product};
+    my $component   = $args->{component};
+
+    Bugzilla->dbh->do(
+        "UPDATE component_watch SET product_id=? WHERE component_id=?",
+        undef,
+        $new_product->id, $component->id,
+    );
+}
+
+sub sanitycheck_check {
+    my ($self, $args) = @_;
+    my $status = $args->{status};
+
+    $status->('component_watching_check');
+
+    my ($count) = Bugzilla->dbh->selectrow_array("
+        SELECT COUNT(*)
+          FROM component_watch
+         INNER JOIN components ON components.id = component_watch.component_id
+         WHERE component_watch.product_id <> components.product_id
+    ");
+    if ($count) {
+        $status->('component_watching_alert', undef, 'alert');
+        $status->('component_watching_repair');
+    }
+}
+
+sub sanitycheck_repair {
+    my ($self, $args) = @_;
+    return unless Bugzilla->cgi->param('component_watching_repair');
+
+    my $status = $args->{'status'};
+    my $dbh = Bugzilla->dbh;
+    $status->('component_watching_repairing');
+
+    my $rows = $dbh->selectall_arrayref("
+        SELECT DISTINCT component_watch.product_id AS bad_product_id,
+               components.product_id AS good_product_id,
+               component_watch.component_id
+          FROM component_watch
+         INNER JOIN components ON components.id = component_watch.component_id
+         WHERE component_watch.product_id <> components.product_id
+        ",
+        { Slice => {} }
+    );
+    foreach my $row (@$rows) {
+        $dbh->do("
+            UPDATE component_watch
+               SET product_id=?
+             WHERE product_id=? AND component_id=?
+            ", undef,
+            $row->{good_product_id},
+            $row->{bad_product_id},
+            $row->{component_id},
+        );
+    }
+}
+
 __PACKAGE__->NAME;
diff --git a/extensions/ComponentWatching/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl b/extensions/ComponentWatching/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl
new file mode 100644
index 000000000..c22ffacaa
--- /dev/null
+++ b/extensions/ComponentWatching/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl
@@ -0,0 +1,23 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[% IF san_tag == "component_watching_repair" %]
+    <a href="sanitycheck.cgi?component_watching_repair=1&amp;token=
+       [%- issue_hash_token(['sanitycheck']) FILTER uri %]"
+    >Repair invalid product_id values in the component_watch table</a>
+
+[% ELSIF san_tag == "component_watching_check" %]
+  Checking component_watch table for bad values of product_id.
+
+[% ELSIF san_tag == "component_watching_alert" %]
+  Bad values for product_id found in the component_watch table.
+
+[% ELSIF san_tag == "component_watching_repairing" %]
+  OK, now fixing bad product_id values in the component_watch table.
+
+[% END %]