X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_pkg_reason.pm;h=7c68e623abec353c189c19179f79b5919c971aea;hp=6bd17b66fee9a7c2d5681f4638ce17bbd7a32390;hb=fdb9aecd3c4bcaef6f13becbe209e7cd7475204b;hpb=1ce2d49c8b5af031066e8dbf4837cf220eb03269 diff --git a/FS/FS/cust_pkg_reason.pm b/FS/FS/cust_pkg_reason.pm index 6bd17b66f..7c68e623a 100644 --- a/FS/FS/cust_pkg_reason.pm +++ b/FS/FS/cust_pkg_reason.pm @@ -1,10 +1,11 @@ package FS::cust_pkg_reason; use strict; -use vars qw( @ISA ); +use vars qw( $ignore_empty_action ); +use base qw( FS::otaker_Mixin FS::Record ); use FS::Record qw( qsearch qsearchs ); -@ISA = qw(FS::Record); +$ignore_empty_action = 0; =head1 NAME @@ -34,16 +35,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 +96,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; @@ -134,44 +139,41 @@ sub reasontext { # # Used by FS::Upgrade to migrate to a new database. +use FS::h_cust_pkg; +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' => '' } ); foreach ( @unmigrated ) { - # we could create h_cust_pkg_reason and h_cust_pkg_reason packages - @FS::h_cust_pkg::ISA = qw( FS::h_Common FS::cust_pkg ); - sub FS::h_cust_pkg::table { 'h_cust_pkg' }; - @FS::h_cust_pkg_reason::ISA = qw( FS::h_Common FS::cust_pkg_reason ); - sub FS::h_cust_pkg_reason::table { 'h_cust_pkg_reason' }; my @history_cust_pkg_reason = qsearch( 'h_cust_pkg_reason', { $_->hash } ); 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', }); - if (@history < 2) { - $hashref->{history_date}++; # more fuzz? - $hashref->{history_action} = { %action_value }; # qsearch distorts this! - push @history, qsearch({ table => 'h_cust_pkg', - hashref => $hashref, - order_by => 'ORDER BY history_action', + my $fuzz = 0; + while (scalar(@history) < 2 && $fuzz < 3) { + $hashref->{history_date}++; + $fuzz++; + push @history, qsearch({ table => 'h_cust_pkg', + hashref => $hashref, + extra_sql => $action_replace, + order_by => 'ORDER BY history_action', }); } @@ -190,10 +192,12 @@ sub _upgrade_data { # class method (!$old[0]->expire || !$old[0]->expire != $new[0]->expire ) ){ $_->action('E'); + $_->date($new[0]->expire); }elsif( $new[0]->adjourn && (!$old[0]->adjourn || $old[0]->adjourn != $new[0]->adjourn ) ){ $_->action('A'); + $_->date($new[0]->adjourn); } my $error = $_->replace @@ -206,8 +210,109 @@ sub _upgrade_data { # class method #remove nullability if scalar(@migrated) - $count == 0 && ->column('action'); - ''; + #seek expirations/adjourns without reason + 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". + " cust_pkg_reason.date = h_cust_pkg.$field AND". + " history_action = 'replace_new')"; + + my $extra_sql = 'AND h_cust_pkg.pkgnum IS NULL'; + + my @unmigrated = qsearch({ table => 'cust_pkg_reason', + hashref => { action => uc(substr($field,0,1)) }, + addl_from => $addl_from, + select => 'cust_pkg_reason.*', + extra_sql => $extra_sql, + }); + foreach ( @unmigrated ) { + + my $hashref = { pkgnum => $_->pkgnum, + history_date => $_->date, + }; + + 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}++; + $fuzz++; + push @history, qsearch({ table => 'h_cust_pkg', + hashref => $hashref, + extra_sql => $action_replace, + order_by => 'ORDER BY history_action', + }); + } + + next unless scalar(@history) == 2; + + my @new = grep { $_->history_action eq 'replace_new' } @history; + my @old = grep { $_->history_action eq 'replace_old' } @history; + + next if (scalar(@new) == 2 || scalar(@old) == 2); + + $_->date($new[0]->get($field)) + if ( $new[0]->get($field) && + ( !$old[0]->get($field) || + $old[0]->get($field) != $new[0]->get($field) + ) + ); + + my $error = $_->replace + if $_->modified; + + die $error if $error; + } + } + + #seek cancels/suspends without reason, but with expire/adjourn reason + foreach my $field (qw( cancel susp )) { + + my %precursor_map = ( 'cancel' => 'expire', 'susp' => 'adjourn' ); + my $precursor = $precursor_map{$field}; + my $preaction = uc(substr($precursor,0,1)); + my $action = uc(substr($field,0,1)); + my $addl_from = + "LEFT JOIN cust_pkg_reason ON ". + "(cust_pkg.pkgnum = cust_pkg_reason.pkgnum AND". + " cust_pkg.$precursor = cust_pkg_reason.date AND". + " cust_pkg_reason.action = '$preaction') ". + "LEFT JOIN cust_pkg_reason AS target ON ". + "(cust_pkg.pkgnum = target.pkgnum AND". + " cust_pkg.$field = target.date AND". + " target.action = '$action')" + ; + + my $extra_sql = "WHERE target.pkgnum IS NULL AND ". + "cust_pkg.$field IS NOT NULL AND ". + "cust_pkg.$field < cust_pkg.$precursor + 86400 AND ". + "cust_pkg_reason.action = '$preaction'"; + + my @unmigrated = qsearch({ table => 'cust_pkg', + hashref => { }, + select => 'cust_pkg.*', + addl_from => $addl_from, + extra_sql => $extra_sql, + }); + foreach ( @unmigrated ) { + my $cpr = new FS::cust_pkg_reason { $_->last_cust_pkg_reason($precursor)->hash, 'num' => '' }; + $cpr->date($_->get($field)); + $cpr->action($action); + + my $error = $cpr->insert; + 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); } =back