X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_pkg_reason.pm;h=a632ab4157b8889dd8ae0a3c3483f49a707c2a20;hb=121510b6337b7f75f25d583730a65f3fc63bbfbe;hp=403751369dd677b3d109d9f4941551ffbc55451f;hpb=027756090552715f79cd3a4de08ee73091ad99f0;p=freeside.git diff --git a/FS/FS/cust_pkg_reason.pm b/FS/FS/cust_pkg_reason.pm index 403751369..a632ab415 100644 --- a/FS/FS/cust_pkg_reason.pm +++ b/FS/FS/cust_pkg_reason.pm @@ -1,10 +1,12 @@ package FS::cust_pkg_reason; +use base qw( FS::otaker_Mixin FS::Record ); use strict; -use vars qw( @ISA ); +use vars qw( $ignore_empty_action ); use FS::Record qw( qsearch qsearchs ); +use FS::upgrade_journal; -@ISA = qw(FS::Record); +$ignore_empty_action = 0; =head1 NAME @@ -34,16 +36,17 @@ currently supported: =over 4 -=item num - primary key +=item num -=item pkgnum - +primary key -=item reasonnum - +=item pkgnum -=item otaker - +=item reasonnum -=item date - +=item usernum +=item date =back @@ -94,12 +97,15 @@ and replace methods. sub check { my $self = shift; + my @actions = ( 'A', 'C', 'E', 'S' ); + push @actions, '' if $ignore_empty_action; + my $error = $self->ut_numbern('num') || $self->ut_number('pkgnum') || $self->ut_number('reasonnum') - || $self->ut_enum('action', [ 'A', 'C', 'E', 'S' ]) - || $self->ut_text('otaker') + || $self->ut_enum('action', \@actions) + || $self->ut_alphan('otaker') || $self->ut_numbern('date') ; return $error if $error; @@ -111,13 +117,6 @@ sub check { Returns the reason (see L) associated with this cust_pkg_reason. -=cut - -sub reason { - my $self = shift; - qsearchs( 'reason', { 'reasonnum' => $self->reasonnum } ); -} - =item reasontext Returns the text of the reason (see L) associated with this @@ -140,8 +139,8 @@ use FS::h_cust_pkg_reason; sub _upgrade_data { # class method my ($class, %opts) = @_; - my $test_cust_pkg_reason = new FS::cust_pkg_reason; - return '' unless $test_cust_pkg_reason->dbdef_table->column('action'); + my $action_replace = + " AND ( history_action = 'replace_old' OR history_action = 'replace_new' )"; my $count = 0; my @unmigrated = qsearch('cust_pkg_reason', { 'action' => '' } ); @@ -151,27 +150,24 @@ sub _upgrade_data { # class method next unless scalar(@history_cust_pkg_reason) == 1; - my %action_value = ( op => 'LIKE', - value => 'replace_%', - ); my $hashref = { pkgnum => $_->pkgnum, history_date => $history_cust_pkg_reason[0]->history_date, - history_action => { %action_value }, }; - my @history = qsearch({ table => 'h_cust_pkg', - hashref => $hashref, - order_by => 'ORDER BY history_action', + my @history = qsearch({ table => 'h_cust_pkg', + hashref => $hashref, + extra_sql => $action_replace, + order_by => 'ORDER BY history_action', }); my $fuzz = 0; while (scalar(@history) < 2 && $fuzz < 3) { $hashref->{history_date}++; - $hashref->{history_action} = { %action_value }; # qsearch distorts this! $fuzz++; - push @history, qsearch({ table => 'h_cust_pkg', - hashref => $hashref, - order_by => 'ORDER BY history_action', + push @history, qsearch({ table => 'h_cust_pkg', + hashref => $hashref, + extra_sql => $action_replace, + order_by => 'ORDER BY history_action', }); } @@ -207,9 +203,76 @@ sub _upgrade_data { # class method } #remove nullability if scalar(@migrated) - $count == 0 && ->column('action'); + + unless ( FS::upgrade_journal->is_done('cust_pkg_reason__missing_reason') ) { + $class->_upgrade_missing_reason(%opts); + FS::upgrade_journal->set_done('cust_pkg_reason__missing_reason'); + } + + # Fix misplaced expire/suspend reasons due to package change (RT#71623). + # These will look like: + # - there is an expire reason linked to pkg1 + # - pkg1 has been canceled before the reason's date + # - pkg2 was changed from pkg1, has an expire date equal to the reason's + # date, and has no expire reason (check this later) + + my $error; + foreach my $action ('expire', 'adjourn') { + # Iterate this, because a package could be scheduled to expire, then + # changed several times, and we need to walk the reason forward to the + # last one. + while(1) { + my @reasons = qsearch( + { + select => 'cust_pkg_reason.*', + table => 'cust_pkg_reason', + addl_from => ' JOIN cust_pkg pkg1 USING (pkgnum) + JOIN cust_pkg pkg2 ON (pkg1.pkgnum = pkg2.change_pkgnum)', + hashref => { 'action' => uc(substr($action, 0, 1)) }, + extra_sql => " AND pkg1.cancel IS NOT NULL + AND cust_pkg_reason.date > pkg1.cancel + AND pkg2.$action = cust_pkg_reason.date" + }); + last if !@reasons; + warn "Checking ".scalar(@reasons)." possible misplaced $action reasons.\n"; + foreach my $cust_pkg_reason (@reasons) { + my $new_pkg = qsearchs('cust_pkg', { change_pkgnum => $cust_pkg_reason->pkgnum }); + my $new_reason = $new_pkg->last_cust_pkg_reason($action); + if ($new_reason and $new_reason->_date == $new_pkg->get($action)) { + # the expiration reason has been recreated on the new package, so + # just delete the old one + warn "Cleaning $action reason from canceled pkg#" . + $cust_pkg_reason->pkgnum . "\n"; + $error = $cust_pkg_reason->delete; + } else { + # then the old reason needs to be transferred + warn "Moving $action reason from canceled pkg#" . + $cust_pkg_reason->pkgnum . + " to new pkg#" . $new_pkg->pkgnum ."\n"; + $cust_pkg_reason->set('pkgnum' => $new_pkg->pkgnum); + $error = $cust_pkg_reason->replace; + } + die $error if $error; + } + } + } + + #still can't fill in an action? don't abort the upgrade + local($ignore_empty_action) = 1; + + $class->_upgrade_otaker(%opts); + +} + +sub _upgrade_missing_reason { + my ($class, %opts) = @_; + + #false laziness w/above + my $action_replace = + " AND ( history_action = 'replace_old' OR history_action = 'replace_new' )"; #seek expirations/adjourns without reason - foreach my $field qw( expire adjourn cancel susp ) { + foreach my $field (qw( expire adjourn cancel susp )) { my $addl_from = "LEFT JOIN h_cust_pkg ON ". "(cust_pkg_reason.pkgnum = h_cust_pkg.pkgnum AND". @@ -226,26 +289,23 @@ sub _upgrade_data { # class method }); foreach ( @unmigrated ) { - my %action_value = ( op => 'LIKE', - value => 'replace_%', - ); my $hashref = { pkgnum => $_->pkgnum, history_date => $_->date, - history_action => { %action_value }, }; - my @history = qsearch({ table => 'h_cust_pkg', - hashref => $hashref, - order_by => 'ORDER BY history_action', + my @history = qsearch({ table => 'h_cust_pkg', + hashref => $hashref, + extra_sql => $action_replace, + order_by => 'ORDER BY history_action', }); my $fuzz = 0; while (scalar(@history) < 2 && $fuzz < 3) { $hashref->{history_date}++; - $hashref->{history_action} = { %action_value }; # qsearch distorts this! $fuzz++; push @history, qsearch({ table => 'h_cust_pkg', hashref => $hashref, + extra_sql => $action_replace, order_by => 'ORDER BY history_action', }); } @@ -272,7 +332,7 @@ sub _upgrade_data { # class method } #seek cancels/suspends without reason, but with expire/adjourn reason - foreach my $field qw( cancel susp ) { + foreach my $field (qw( cancel susp )) { my %precursor_map = ( 'cancel' => 'expire', 'susp' => 'adjourn' ); my $precursor = $precursor_map{$field}; @@ -310,16 +370,12 @@ sub _upgrade_data { # class method } } - ''; - } =back =head1 BUGS -Here be termites. Don't use on wooden computers. - =head1 SEE ALSO L, schema.html from the base documentation.