moving alerts to use users instead of email in table

1 files changed, 41 insertions, 34 deletions

diff --git a/perllib/FixMyStreet/DB/Result/Alert.pm b/perllib/FixMyStreet/DB/Result/Alert.pm
index 9b71e16a8..2d5867050 100644
--- a/perllib/FixMyStreet/DB/Result/Alert.pm
+++ b/perllib/FixMyStreet/DB/Result/Alert.pm
@@ -11,42 +11,49 @@ use base 'DBIx::Class::Core';
 __PACKAGE__->load_components("FilterColumn");
 __PACKAGE__->table("alert");
 __PACKAGE__->add_columns(
-    "id",
-    {
-        data_type         => "integer",
-        is_auto_increment => 1,
-        is_nullable       => 0,
-        sequence          => "alert_id_seq",
-    },
-    "alert_type",
-    { data_type => "text", is_foreign_key => 1, is_nullable => 0 },
-    "parameter",
-    { data_type => "text", is_nullable => 1 },
-    "parameter2",
-    { data_type => "text", is_nullable => 1 },
-    "email",
-    { data_type => "text", is_nullable => 0 },
-    "confirmed",
-    { data_type => "integer", default_value => 0, is_nullable => 0 },
-    "lang",
-    { data_type => "text", default_value => "en-gb", is_nullable => 0 },
-    "cobrand",
-    { data_type => "text", default_value => "", is_nullable => 0 },
-    "cobrand_data",
-    { data_type => "text", default_value => "", is_nullable => 0 },
-    "whensubscribed",
-    {
-        data_type     => "timestamp",
-        default_value => \"ms_current_timestamp()",
-        is_nullable   => 0,
-    },
-    "whendisabled",
-    { data_type => "timestamp", is_nullable => 1 },
+  "id",
+  {
+    data_type         => "integer",
+    is_auto_increment => 1,
+    is_nullable       => 0,
+    sequence          => "alert_id_seq",
+  },
+  "alert_type",
+  { data_type => "text", is_foreign_key => 1, is_nullable => 0 },
+  "parameter",
+  { data_type => "text", is_nullable => 1 },
+  "parameter2",
+  { data_type => "text", is_nullable => 1 },
+  "confirmed",
+  { data_type => "integer", default_value => 0, is_nullable => 0 },
+  "lang",
+  { data_type => "text", default_value => "en-gb", is_nullable => 0 },
+  "cobrand",
+  { data_type => "text", default_value => "", is_nullable => 0 },
+  "cobrand_data",
+  { data_type => "text", default_value => "", is_nullable => 0 },
+  "whensubscribed",
+  {
+    data_type     => "timestamp",
+    default_value => \"ms_current_timestamp()",
+    is_nullable   => 0,
+  },
+  "whendisabled",
+  { data_type => "timestamp", is_nullable => 1 },
+  "user_id",
+  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
 );
 __PACKAGE__->set_primary_key("id");
+__PACKAGE__->belongs_to(
+  "user",
+  "FixMyStreet::DB::Result::User",
+  { id => "user_id" },
+  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+);
+
 
-# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-05-10 12:36:15
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:tfT1PBeEOwcLsQaX+HXSKA
+# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-05-11 14:21:33
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:6MMiFASvNi/pG74uxcspuQ
 
 # You can replace this text with custom code or comments, and it will be preserved on regeneration
 
@@ -65,7 +72,7 @@ sub is_from_abuser {
     my $self = shift;
 
     # get the domain
-    my $email = $self->email;
+    my $email = $self->user->email;
     my ($domain) = $email =~ m{ @ (.*) \z }x;
 
     # search for an entry in the abuse table