[freeside-commits] branch FREESIDE_4_BRANCH updated. 2fcc552915112ffb3e5b452d6b9662c386c7eba8
Christopher Burger
burgerc at freeside.biz
Thu Aug 2 06:53:59 PDT 2018
The branch, FREESIDE_4_BRANCH has been updated
via 2fcc552915112ffb3e5b452d6b9662c386c7eba8 (commit)
via 6b73a97818c2f74808a286d614c869b55a1562a3 (commit)
from 83c584e14f5a66f348ec552931b5feafe682921e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2fcc552915112ffb3e5b452d6b9662c386c7eba8
Author: Christopher Burger <burgerc at freeside.biz>
Date: Thu Aug 2 09:45:51 2018 -0400
RT# 78356 - sped up update query
diff --git a/bin/move_svc_broadband_speeds.pl b/bin/move_svc_broadband_speeds.pl
index fed405b43..8a9af99f2 100644
--- a/bin/move_svc_broadband_speeds.pl
+++ b/bin/move_svc_broadband_speeds.pl
@@ -10,19 +10,33 @@ my $dbh = adminsuidsetup($user);
my $fcc_up_speed = "(select part_pkg_fcc_option.optionvalue from part_pkg_fcc_option where fccoptionname = 'broadband_upstream' and pkgpart = cust_pkg.pkgpart) AS fcc477_upstream";
my $fcc_down_speed = "(select part_pkg_fcc_option.optionvalue from part_pkg_fcc_option where fccoptionname = 'broadband_downstream' and pkgpart = cust_pkg.pkgpart) AS fcc477_downstream";
+
foreach my $rec (qsearch({
- 'select' => 'svc_broadband.*, cust_svc.svcpart, cust_pkg.pkgpart, '.$fcc_up_speed.', '.$fcc_down_speed,
- 'table' => 'svc_broadband',
- 'addl_from' => 'LEFT JOIN cust_svc USING ( svcnum ) LEFT JOIN cust_pkg USING ( pkgnum )',
+ 'select' => 'svc_broadband.*, cust_svc.svcpart, cust_pkg.pkgpart, '.$fcc_up_speed.', '.$fcc_down_speed,
+ 'table' => 'svc_broadband',
+ 'addl_from' => 'LEFT JOIN cust_svc USING ( svcnum ) LEFT JOIN cust_pkg USING ( pkgnum )',
})) {
$rec->{Hash}->{speed_test_up} = $rec->{Hash}->{speed_up};
$rec->{Hash}->{speed_test_down} = $rec->{Hash}->{speed_down};
$rec->{Hash}->{speed_up} = $rec->{Hash}->{fcc477_upstream} * 1000;
$rec->{Hash}->{speed_down} = $rec->{Hash}->{fcc477_downstream} * 1000;
- $rec->replace();
+
+ my $sql = "UPDATE svc_broadband set
+ speed_up = $rec->{Hash}->{speed_up},
+ speed_down = $rec->{Hash}->{speed_down},
+ speed_test_up = $rec->{Hash}->{speed_test_up},
+ speed_test_down = $rec->{Hash}->{speed_test_down}
+ WHERE svcnum = $rec->{Hash}->{svcnum}";
+
warn "Fixing broadband service speeds for service ".$rec->{Hash}->{svcnum}."-".$rec->{Hash}->{description}."\n";
+
+ my $sth = $dbh->prepare($sql) or die $dbh->errstr;
+ $sth->execute or die $sth->errstr;
+
}
+$dbh->commit;
+
warn "Completed fixing broadband service speeds!\n";
exit;
commit 6b73a97818c2f74808a286d614c869b55a1562a3
Author: Christopher Burger <burgerc at freeside.biz>
Date: Wed Aug 1 15:22:48 2018 -0400
RT# 78356 - created script to cycle thru svc_broadband and move speed field values.
diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index bbd4a497f..583030e1d 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -156,8 +156,8 @@ sub table_info {
disable_inventory => 1,
},
'serviceid' => 'Torrus serviceid', #but is should be hidden
- 'speed_test_up' => 'Speed test download (Kbps)',
- 'speed_test_down' => 'Speed test upload (Kbps)',
+ 'speed_test_up' => { 'label' => 'Speed test upload (Kbps)' },
+ 'speed_test_down' => { 'label' => 'Speed test download (Kbps)' },
'speed_test_latency' => 'Speed test latency (ms)',
},
};
@@ -364,6 +364,8 @@ sub check {
|| $self->ut_textn('description')
|| $self->ut_numbern('speed_up')
|| $self->ut_numbern('speed_down')
+ || $self->ut_numbern('speed_test_up')
+ || $self->ut_numbern('speed_test_down')
|| $self->ut_ipn('ip_addr')
|| $self->ut_hexn('mac_addr')
|| $self->ut_hexn('auth_key')
diff --git a/bin/move_svc_broadband_speeds.pl b/bin/move_svc_broadband_speeds.pl
new file mode 100644
index 000000000..fed405b43
--- /dev/null
+++ b/bin/move_svc_broadband_speeds.pl
@@ -0,0 +1,52 @@
+#!/usr/bin/perl
+
+use strict;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearchs qsearch);
+use FS::svc_broadband;
+
+my $user = shift or die &usage;
+my $dbh = adminsuidsetup($user);
+
+my $fcc_up_speed = "(select part_pkg_fcc_option.optionvalue from part_pkg_fcc_option where fccoptionname = 'broadband_upstream' and pkgpart = cust_pkg.pkgpart) AS fcc477_upstream";
+my $fcc_down_speed = "(select part_pkg_fcc_option.optionvalue from part_pkg_fcc_option where fccoptionname = 'broadband_downstream' and pkgpart = cust_pkg.pkgpart) AS fcc477_downstream";
+foreach my $rec (qsearch({
+ 'select' => 'svc_broadband.*, cust_svc.svcpart, cust_pkg.pkgpart, '.$fcc_up_speed.', '.$fcc_down_speed,
+ 'table' => 'svc_broadband',
+ 'addl_from' => 'LEFT JOIN cust_svc USING ( svcnum ) LEFT JOIN cust_pkg USING ( pkgnum )',
+})) {
+ $rec->{Hash}->{speed_test_up} = $rec->{Hash}->{speed_up};
+ $rec->{Hash}->{speed_test_down} = $rec->{Hash}->{speed_down};
+ $rec->{Hash}->{speed_up} = $rec->{Hash}->{fcc477_upstream} * 1000;
+ $rec->{Hash}->{speed_down} = $rec->{Hash}->{fcc477_downstream} * 1000;
+ $rec->replace();
+ warn "Fixing broadband service speeds for service ".$rec->{Hash}->{svcnum}."-".$rec->{Hash}->{description}."\n";
+}
+
+warn "Completed fixing broadband service speeds!\n";
+
+exit;
+
+=head1 NAME
+
+move_svc_broadband_speeds
+
+=head1 SYNOPSIS
+
+ move_svc_broadband_speeds.pl [ user ]
+
+=head1 DESCRIPTION
+
+Moves value for speed_down to speed_test_down, speed_up to speed_test_up,
+and sets speed_down, speed_up to matching fcc_477 speeds from package for
+all svc_broadband services.
+
+user: freeside username
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::svc_broadband>
+
+=cut
\ No newline at end of file
diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index 0517c307a..189fe5e6f 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -33,6 +33,9 @@ my @fields = (
{ field => 'routernum', value_callback => \&router },
'speed_down',
'speed_up',
+ 'speed_test_down',
+ 'speed_test_up',
+ 'speed_test_latency',
{ field => 'ip_addr', value_callback => \&ip_addr },
{ field => 'sectornum', value_callback => \§ornum },
{ field => 'mac_addr', type=>'mac_addr', value_callback => \&mac_addr },
-----------------------------------------------------------------------
Summary of changes:
FS/FS/svc_broadband.pm | 6 ++--
bin/move_svc_broadband_speeds.pl | 66 +++++++++++++++++++++++++++++++++++++++
httemplate/view/svc_broadband.cgi | 3 ++
3 files changed, 73 insertions(+), 2 deletions(-)
create mode 100644 bin/move_svc_broadband_speeds.pl
More information about the freeside-commits
mailing list