X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FTicketSystem.pm;h=c1553f17a2a4c3e535e616e11f61620b9a7ae893;hp=63ab865c4db051421f7987cff2d37cf7927e9643;hb=aed8ec35ccb9cdeb7ea0cb6ff2946f9d83d582f6;hpb=5fdd19665fb7c0ad425a99d3dbf9ad7e27fbf44a diff --git a/FS/FS/TicketSystem.pm b/FS/FS/TicketSystem.pm index 63ab865c4..c1553f17a 100644 --- a/FS/FS/TicketSystem.pm +++ b/FS/FS/TicketSystem.pm @@ -4,6 +4,7 @@ use strict; use vars qw( $conf $system $AUTOLOAD ); use FS::Conf; use FS::UID qw( dbh driver_name ); +use FS::Record qw( dbdef ); FS::UID->install_callback( sub { $conf = new FS::Conf; @@ -27,6 +28,54 @@ sub AUTOLOAD { $self->$sub(@_); } +# Our schema changes +my %columns = ( + Tickets => { + WillResolve => { type => 'timestamp', null => 1, default => '', }, + }, + CustomFields => { + Required => { type => 'integer', default => 0, null => 0 }, + }, +); + +sub _upgrade_schema { + my $system = FS::Conf->new->config('ticket_system'); + return if !defined($system) || $system ne 'RT_Internal'; + my ($class, %opts) = @_; + + my $dbh = dbh; + my @sql; + my $case = driver_name eq 'mysql' ? sub {@_} : sub {map lc, @_}; + foreach my $tablename (keys %columns) { + my $table = dbdef->table(&$case($tablename)); + if ( !$table ) { + warn + "$tablename table does not exist. Your RT installation is incomplete.\n"; + next; + } + foreach my $colname (keys %{ $columns{$tablename} }) { + if ( !$table->column(&$case($colname)) ) { + my $col = new DBIx::DBSchema::Column { + table_obj => $table, + name => &$case($colname), + %{ $columns{$tablename}->{$colname} } + }; + $col->table_obj($table); + push @sql, $col->sql_add_column($dbh); + } + } #foreach $colname + } #foreach $tablename + + return if !@sql; + warn "Upgrading RT schema:\n"; + foreach my $statement (@sql) { + warn "$statement\n"; + $dbh->do( $statement ) + or die "Error: ". $dbh->errstr. "\n executing: $statement"; + } + return; +} + sub _upgrade_data { return if !defined($system) || $system ne 'RT_Internal'; my ($class, %opts) = @_; @@ -38,29 +87,31 @@ sub _upgrade_data { # bypass RT ACLs--we're going to do lots of things my $CurrentUser = $RT::SystemUser; - # selfservice user - my $User = RT::User->new($CurrentUser); - $User->Load('%%%SELFSERVICE_USER%%%'); - if (!defined($User->Id)) { - my ($val, $msg) = $User->Create( - 'Name' => '%%%SELFSERVICE_USER%%%', - 'Gecos' => '%%%SELFSERVICE_USER%%%', - 'Privileged' => 1, - # any other fields needed? - ); - die $msg if !$val; - } - my $Principal = $User->PrincipalObj; # can this ever fail? - my @rights = ( qw(ShowTicket SeeQueue ModifyTicket ReplyToTicket - CreateTicket SeeCustomField) ); - foreach (@rights) { - next if $Principal->HasRight( 'Right' => $_, Object => $RT::System ); - my ($val, $msg) = $Principal->GrantRight( - 'Right' => $_, - 'Object' => $RT::System, - ); - die $msg if !$val; - } + # selfservice and cron users + foreach my $username ('%%%SELFSERVICE_USER%%%', 'fs_daily') { + my $User = RT::User->new($CurrentUser); + $User->Load($username); + if (!defined($User->Id)) { + my ($val, $msg) = $User->Create( + 'Name' => $username, + 'Gecos' => $username, + 'Privileged' => 1, + # any other fields needed? + ); + die $msg if !$val; + } + my $Principal = $User->PrincipalObj; # can this ever fail? + my @rights = ( qw(ShowTicket SeeQueue ModifyTicket ReplyToTicket + CreateTicket SeeCustomField) ); + foreach (@rights) { + next if $Principal->HasRight( 'Right' => $_, Object => $RT::System ); + my ($val, $msg) = $Principal->GrantRight( + 'Right' => $_, + 'Object' => $RT::System, + ); + die $msg if !$val; + } + } #foreach $username # EscalateQueue custom field and friends my $CF = RT::CustomField->new($CurrentUser); @@ -85,7 +136,8 @@ sub _upgrade_data { # Load from RT data file our (@Groups, @Users, @ACL, @Queues, @ScripActions, @ScripConditions, - @Templates, @CustomFields, @Scrips, @Attributes, @Initial, @Final); + @Templates, @CustomFields, @Scrips, @Attributes, @Initial, @Final, + %Delete_Scrips); my $datafile = '%%%RT_PATH%%%/etc/initialdata'; eval { require $datafile }; if ( $@ ) { @@ -93,18 +145,30 @@ sub _upgrade_data { return; } - # Cache existing ScripCondition, ScripAction, and Template IDs - my $search = RT::ScripConditions->new($CurrentUser); - $search->UnLimit; - my %condition = map { lc($_->Name), $_->Id } @{ $search->ItemsArrayRef }; - - $search = RT::ScripActions->new($CurrentUser); - $search->UnLimit; - my %action = map { lc($_->Name), $_->Id } @{ $search->ItemsArrayRef }; + # Cache existing ScripCondition, ScripAction, and Template IDs. + # Complicated because we don't want to just step on multiple IDs + # with the same name. + my $cachify = sub { + my ($class, $hash) = @_; + my $search = $class->new($CurrentUser); + $search->UnLimit; + while ( my $item = $search->Next ) { + my $ids = $hash->{lc($item->Name)} ||= []; + if ( $item->Creator == 1 ) { # RT::SystemUser + unshift @$ids, $item->Id; + } + else { + push @$ids, $item->Id; + } + } + }; - $search = RT::Templates->new($CurrentUser); - $search->UnLimit; - my %template = map { lc($_->Name), $_->Id } @{ $search->ItemsArrayRef }; + my (%condition, %action, %template); + &$cachify('RT::ScripConditions', \%condition); + &$cachify('RT::ScripActions', \%action); + &$cachify('RT::Templates', \%template); + # $condition{name} = [ ids... ] + # with the id of the system-created object first, if there is one # ScripConditions my $ScripCondition = RT::ScripCondition->new($CurrentUser); @@ -113,7 +177,7 @@ sub _upgrade_data { next if exists( $condition{ lc($sc->{Name}) } ); my ($val, $msg) = $ScripCondition->Create( %$sc ); die $msg if !$val; - $condition{ lc($ScripCondition->Name) } = $ScripCondition->Id; + $condition{ lc($ScripCondition->Name) } = [ $ScripCondition->Id ]; } # ScripActions @@ -123,7 +187,7 @@ sub _upgrade_data { next if exists( $action{ lc($sa->{Name}) } ); my ($val, $msg) = $ScripAction->Create( %$sa ); die $msg if !$val; - $action{ lc($ScripAction->Name) } = $ScripAction->Id; + $action{ lc($ScripAction->Name) } = [ $ScripAction->Id ]; } # Templates @@ -133,38 +197,59 @@ sub _upgrade_data { next if exists( $template{ lc($t->{Name}) } ); my ($val, $msg) = $Template->Create( %$t ); die $msg if !$val; - $template{ lc($Template->Name) } = $Template->Id; + $template{ lc($Template->Name) } = [ $Template->Id ]; } # Scrips + my %scrip; # $scrips{condition}{action}{template} = id + my $search = RT::Scrips->new($CurrentUser); + $search->Limit(FIELD => 'Queue', VALUE => 0); + while (my $item = $search->Next) { + my ($c, $a, $t) = map {lc $item->$_->Name} + ('ScripConditionObj', 'ScripActionObj', 'TemplateObj'); + if ( exists $scrip{$c}{$a}{$t} and $item->Creator == 1 ) { + warn "Deleting duplicate scrip $c $a [$t]\n"; + my ($val, $msg) = $item->Delete; + warn "error deleting scrip: $msg\n" if !$val; + } + elsif ( exists $Delete_Scrips{$c}{$a}{$t} and $item->Creator == 1 ) { + warn "Deleting obsolete scrip $c $a [$t]\n"; + my ($val, $msg) = $item->Delete; + warn "error deleting scrip: $msg\n" if !$val; + } + else { + $scrip{$c}{$a}{$t} = $item->id; + } + } my $Scrip = RT::Scrip->new($CurrentUser); foreach my $s ( @Scrips ) { my $desc = $s->{'Description'}; my ($c, $a, $t) = map lc, @{ $s }{'ScripCondition', 'ScripAction', 'Template'}; - if ( !$condition{$c} ) { + # skip existing scrips + next if ( exists($scrip{$c}{$a}{$t}) ); + if ( !exists($condition{$c}) ) { warn "ScripCondition '$c' not found.\n"; next; } - if ( !$action{$a} ) { + if ( !exists($action{$a}) ) { warn "ScripAction '$a' not found.\n"; next; } - if ( !$template{$t} ) { + if ( !exists($template{$t}) ) { warn "Template '$t' not found.\n"; next; } - my %param = ( - ScripCondition => $condition{$c}, - ScripAction => $action{$a}, - Template => $template{$t}, + my %new_param = ( + ScripCondition => $condition{$c}->[0], + ScripAction => $action{$a}->[0], + Template => $template{$t}->[0], Queue => 0, + Description => $desc, ); - $Scrip->LoadByCols(%param); - if (!defined($Scrip->Id)) { - my ($val, $msg) = $Scrip->Create(%param, Description => $desc); - die $msg if !$val; - } + warn "Creating scrip: $c $a [$t]\n"; + my ($val, $msg) = $Scrip->Create(%new_param); + die $msg if !$val; } #foreach (@Scrips) return;