From ea03be8129e337d411f689c1c237649d1f6d01f4 Mon Sep 17 00:00:00 2001 From: Rene Krenn Date: Thu, 22 Oct 2020 12:15:58 +0200 Subject: [PATCH] TT#87561 remove fax prefs from openser mr1.0.2 dao db schema Change-Id: Ie31e3d67d6bdaced8e51596fc5ce111648029053 (cherry picked from commit 3e7bab759b86db3d9bbb291ea1cb0baed5120f60) --- .../provisioning/voip_fax_destinations.pm | 132 ------------------ .../provisioning/voip_fax_preferences.pm | 131 ----------------- .../mr102/provisioning/voip_subscribers.pm | 13 +- 3 files changed, 9 insertions(+), 267 deletions(-) delete mode 100644 lib/NGCP/BulkProcessor/Dao/mr102/provisioning/voip_fax_destinations.pm delete mode 100644 lib/NGCP/BulkProcessor/Dao/mr102/provisioning/voip_fax_preferences.pm diff --git a/lib/NGCP/BulkProcessor/Dao/mr102/provisioning/voip_fax_destinations.pm b/lib/NGCP/BulkProcessor/Dao/mr102/provisioning/voip_fax_destinations.pm deleted file mode 100644 index 832cf13..0000000 --- a/lib/NGCP/BulkProcessor/Dao/mr102/provisioning/voip_fax_destinations.pm +++ /dev/null @@ -1,132 +0,0 @@ -package NGCP::BulkProcessor::Dao::mr102::provisioning::voip_fax_destinations; -use strict; - -## no critic - -use threads::shared; - -use NGCP::BulkProcessor::Logging qw( - getlogger -); - -use NGCP::BulkProcessor::ConnectorPool qw( - get_provisioning_db -); - -use NGCP::BulkProcessor::SqlProcessor qw( - checktableinfo - copy_row -); -use NGCP::BulkProcessor::SqlRecord qw(); - -require Exporter; -our @ISA = qw(Exporter NGCP::BulkProcessor::SqlRecord); -our @EXPORT_OK = qw( - gettablename - check_table - - source_findby_subscriberid -); - -my $tablename = 'voip_fax_destinations'; -my $get_db = \&get_provisioning_db; - -my $expected_fieldnames = [ - 'id', - 'subscriber_id', - 'destination', - 'filetype', - 'cc', - 'incoming', - 'outgoing', - 'status', - -]; - -my $indexes = {}; - - -sub new { - - my $class = shift; - my $self = NGCP::BulkProcessor::SqlRecord->new($class,$get_db, - $tablename,$expected_fieldnames,$indexes); - - copy_row($self,shift,$expected_fieldnames); - - return $self; - -} - -sub gettablename { - - return $tablename; - -} - -sub check_table { - - return checktableinfo(shift // $get_db, - __PACKAGE__,$tablename, - $expected_fieldnames, - $indexes); - -} - - -sub source_new { - - my $class = shift; - my $self = NGCP::BulkProcessor::SqlRecord->new_shared($class,shift, - $tablename,$expected_fieldnames,$indexes); - - copy_row($self,shift,$expected_fieldnames); - - return $self; - -} - -sub source_findby_subscriberid { - - my ($source_dbs,$subscriber_id) = @_; - - my $source_db = $source_dbs->{provisioning_db}; - check_table($source_db); - my $db = &$source_db(); - my $table = $db->tableidentifier($tablename); - - my $stmt = 'SELECT * FROM ' . $table . ' WHERE ' . - $db->columnidentifier('subscriber_id') . ' = ?'; - my @params = ($subscriber_id); - - my $rows = $db->db_get_all_arrayref($stmt,@params); - - return source_buildrecords_fromrows($rows,$source_dbs); - -} - -sub source_buildrecords_fromrows { - - my ($rows,$source_dbs) = @_; - - my @records : shared = (); - my $record; - - if (defined $rows and ref $rows eq 'ARRAY') { - foreach my $row (@$rows) { - $record = __PACKAGE__->source_new($source_dbs->{provisioning_db},$row); - - # transformations go here ... - - #delete $record->{subscriber_id}; - #delete $record->{id}; - - push @records,$record; - } - } - - return \@records; - -} - -1; diff --git a/lib/NGCP/BulkProcessor/Dao/mr102/provisioning/voip_fax_preferences.pm b/lib/NGCP/BulkProcessor/Dao/mr102/provisioning/voip_fax_preferences.pm deleted file mode 100644 index b504af5..0000000 --- a/lib/NGCP/BulkProcessor/Dao/mr102/provisioning/voip_fax_preferences.pm +++ /dev/null @@ -1,131 +0,0 @@ -package NGCP::BulkProcessor::Dao::mr102::provisioning::voip_fax_preferences; -use strict; - -## no critic - -use threads::shared; - -use NGCP::BulkProcessor::Logging qw( - getlogger -); - -use NGCP::BulkProcessor::ConnectorPool qw( - get_provisioning_db -); - -use NGCP::BulkProcessor::SqlProcessor qw( - checktableinfo - copy_row -); -use NGCP::BulkProcessor::SqlRecord qw(); - -require Exporter; -our @ISA = qw(Exporter NGCP::BulkProcessor::SqlRecord); -our @EXPORT_OK = qw( - gettablename - check_table - - source_findby_subscriberid -); - -my $tablename = 'voip_fax_preferences'; -my $get_db = \&get_provisioning_db; - -my $expected_fieldnames = [ - 'id', - 'subscriber_id', - 'password', - 'name', - 'active', - 'send_status', - 'send_copy', - -]; - -my $indexes = {}; - - -sub new { - - my $class = shift; - my $self = NGCP::BulkProcessor::SqlRecord->new($class,$get_db, - $tablename,$expected_fieldnames,$indexes); - - copy_row($self,shift,$expected_fieldnames); - - return $self; - -} - -sub gettablename { - - return $tablename; - -} - -sub check_table { - - return checktableinfo(shift // $get_db, - __PACKAGE__,$tablename, - $expected_fieldnames, - $indexes); - -} - - -sub source_new { - - my $class = shift; - my $self = NGCP::BulkProcessor::SqlRecord->new_shared($class,shift, - $tablename,$expected_fieldnames,$indexes); - - copy_row($self,shift,$expected_fieldnames); - - return $self; - -} - -sub source_findby_subscriberid { - - my ($source_dbs,$subscriber_id) = @_; - - my $source_db = $source_dbs->{provisioning_db}; - check_table($source_db); - my $db = &$source_db(); - my $table = $db->tableidentifier($tablename); - - my $stmt = 'SELECT * FROM ' . $table . ' WHERE ' . - $db->columnidentifier('subscriber_id') . ' = ?'; - my @params = ($subscriber_id); - - my $rows = $db->db_get_all_arrayref($stmt,@params); - - return source_buildrecords_fromrows($rows,$source_dbs)->[0]; - -} - -sub source_buildrecords_fromrows { - - my ($rows,$source_dbs) = @_; - - my @records : shared = (); - my $record; - - if (defined $rows and ref $rows eq 'ARRAY') { - foreach my $row (@$rows) { - $record = __PACKAGE__->source_new($source_dbs->{provisioning_db},$row); - - # transformations go here ... - - #delete $record->{subscriber_id}; - #delete $record->{id}; - - push @records,$record; - } - } - - return \@records; - -} - -1; diff --git a/lib/NGCP/BulkProcessor/Dao/mr102/provisioning/voip_subscribers.pm b/lib/NGCP/BulkProcessor/Dao/mr102/provisioning/voip_subscribers.pm index d90400e..41c2fc3 100644 --- a/lib/NGCP/BulkProcessor/Dao/mr102/provisioning/voip_subscribers.pm +++ b/lib/NGCP/BulkProcessor/Dao/mr102/provisioning/voip_subscribers.pm @@ -23,8 +23,8 @@ use NGCP::BulkProcessor::SqlRecord qw(); use NGCP::BulkProcessor::Dao::mr102::provisioning::voip_dbaliases qw(); use NGCP::BulkProcessor::Dao::mr102::provisioning::voip_usr_preferences qw(); use NGCP::BulkProcessor::Dao::mr102::openser::voicemail_users qw(); -use NGCP::BulkProcessor::Dao::mr102::provisioning::voip_fax_preferences qw(); -use NGCP::BulkProcessor::Dao::mr102::provisioning::voip_fax_destinations qw(); +#use NGCP::BulkProcessor::Dao::mr102::provisioning::voip_fax_preferences qw(); +#use NGCP::BulkProcessor::Dao::mr102::provisioning::voip_fax_destinations qw(); require Exporter; our @ISA = qw(Exporter NGCP::BulkProcessor::SqlRecord); @@ -137,8 +137,13 @@ sub source_buildrecords_fromrows { $record->{voicemail_users} = NGCP::BulkProcessor::Dao::mr102::openser::voicemail_users::source_findby_customerid($source_dbs,$record->{uuid}); - $record->{voip_fax_preferences} = NGCP::BulkProcessor::Dao::mr102::provisioning::voip_fax_preferences::source_findby_subscriberid($source_dbs,$record->{id}); - $record->{voip_fax_destinations} = NGCP::BulkProcessor::Dao::mr102::provisioning::voip_fax_destinations::source_findby_subscriberid($source_dbs,$record->{id}); + #$record->{voip_fax_preferences} = NGCP::BulkProcessor::Dao::mr102::provisioning::voip_fax_preferences::source_findby_subscriberid($source_dbs,$record->{id}); + #$record->{voip_fax_destinations} = NGCP::BulkProcessor::Dao::mr102::provisioning::voip_fax_destinations::source_findby_subscriberid($source_dbs,$record->{id}); + + my %fax_preferences : shared = (); + $record->{voip_fax_preferences} = \%fax_preferences; + my @fax_destinations : shared = (); + $record->{voip_fax_destinations} = \@fax_destinations; #delete $record->{account_id}; #delete $record->{autoconf_displayname};