TT#127150 contract/subscriber exporter: support delta for terminated subs

Change-Id: I3a840592acf0c01aebb6a5659e0e06169834ab2b

lib/NGCP/BulkProcessor/Projects/ETL/Customer/Dao/Tabular.pm

@@ -69,8 +69,7 @@ sub get_fieldnames {
             $_;
         } @$tabular_fields ];
         $expected_fieldnames = [ @$fieldnames ];
-        push(@$expected_fieldnames,'domain') unless grep { 'domain' eq $_; } @$expected_fieldnames;
+        push(@$expected_fieldnames,'uuid') unless grep { 'uuid' eq $_; } @$expected_fieldnames;
-        push(@$expected_fieldnames,'username') unless grep { 'username' eq $_; } @$expected_fieldnames;
         push(@$expected_fieldnames,'delta');
     }
     return $fieldnames unless $expected;
@@ -78,10 +77,9 @@ sub get_fieldnames {
 }
 
 # table creation:
-my $primarykey_fieldnames = [ 'domain', 'username' ];
+my $primarykey_fieldnames = [ 'uuid' ];
 my $indexes = {
-    #$tablename . '_number' => [ 'number(32)' ],
+    #$tablename . '_username_domain' => [ 'username', 'domain' ],
-    #$tablename . '_rownum' => [ 'rownum(11)' ],
     $tablename . '_delta' => [ 'delta(7)' ],
 };
 #my $fixtable_statements = [];
@@ -156,7 +154,7 @@ sub findby_domainusername {
 
 sub update_delta {
 
-    my ($domain,$username,$delta) = @_;
+    my ($uuid,$delta) = @_;
 
     check_table();
     my $db = &$get_db();
@@ -165,11 +163,10 @@ sub update_delta {
     my $stmt = 'UPDATE ' . $table . ' SET delta = ?';
     my @params = ();
     push(@params,$delta);
-    if (defined $domain or defined $username) {
+    if (defined $uuid) {
         $stmt .= ' WHERE ' .
-            $db->columnidentifier('domain') . ' = ?' .
+            $db->columnidentifier('uuid') . ' = ?';
-            ' AND ' . $db->columnidentifier('username') . ' = ?';
+        push(@params, $uuid);
-        push(@params, $domain, $username);
     }
 
     return $db->db_do($stmt,@params);
@@ -282,8 +279,7 @@ sub getupsertstatement {
     foreach my $fieldname (@{get_fieldnames(1)}) {
         if ('delta' eq $fieldname) {
             my $stmt = 'SELECT \'' . $updated_delta . '\' FROM ' . $table . ' WHERE ' .
-                $db->columnidentifier('domain') . ' = ?' .
+                $db->columnidentifier('uuid') . ' = ?';
-                ' AND ' . $db->columnidentifier('username') . ' = ?';
             push(@values,'COALESCE((' . $stmt . '), \'' . $added_delta . '\')');
         } else {
             push(@values,'?');

lib/NGCP/BulkProcessor/Projects/ETL/Customer/ExportCustomers.pm

@@ -357,10 +357,9 @@ sub _get_subscriber_rows {
             }
             push(@row,$v);
         }
-        push(@row,$bill_subs->{domain}->{domain}) unless grep { 'domain' eq $_; } @{NGCP::BulkProcessor::Projects::ETL::Customer::Dao::Tabular::get_fieldnames()};
+        push(@row,$bill_subs->{uuid}) unless grep { 'uuid' eq $_; } @{NGCP::BulkProcessor::Projects::ETL::Customer::Dao::Tabular::get_fieldnames()};
-        push(@row,$bill_subs->{username}) unless grep { 'username' eq $_; } @{NGCP::BulkProcessor::Projects::ETL::Customer::Dao::Tabular::get_fieldnames()};
         if ($context->{upsert}) {
-            push(@row,$bill_subs->{domain}->{domain},$bill_subs->{username});
+            push(@row,$bill_subs->{uuid});
         } else {
             push(@row,$NGCP::BulkProcessor::Projects::ETL::Customer::Dao::Tabular::added_delta);
         }
@@ -376,7 +375,7 @@ sub _load_contract {
     
     my ($context,$record) = @_;
     $context->{contract} = run_dao_method('billing::contracts::findby_id', $record->{id}, { %$load_recursive,
-        'contracts.voip_subscribers.domain' => 1,
+        #'contracts.voip_subscribers.domain' => 1,
         _context => {
             _info => \&_info,
             _error => \&_error,

lib/NGCP/BulkProcessor/Projects/ETL/Customer/process.pl

@@ -3,7 +3,7 @@ use strict;
 ## no critic
 
 BEGIN {
-our $VERSION = '0.0';
+our $VERSION = "0.0";
 }
 
 use File::Basename;