From 09083ebf9c74a5a0d940872ad5bd0bf5355ab555 Mon Sep 17 00:00:00 2001
From: Rene Krenn <rkrenn@sipwise.com>
Date: Wed, 20 May 2020 12:00:22 +0200
Subject: [PATCH] TT#81770 magenta openser mig: comply mr103 and trunk db
 schema

(cherry picked from commit 82e6d737500335568ad6d1fb2045c7216b605a37)
(cherry picked from commit 72f22eb5a0d6a94f2053685655c423cc0b488152)

Change-Id: I91423eef7b9b24aa1390c74c86e19053747c017d
---
 lib/NGCP/BulkProcessor/Dao/mr103/billing/contracts.pm       | 6 +++---
 .../Dao/mr103/provisioning/voip_subscribers.pm              | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/NGCP/BulkProcessor/Dao/mr103/billing/contracts.pm b/lib/NGCP/BulkProcessor/Dao/mr103/billing/contracts.pm
index 75e8913..8cdfbbe 100644
--- a/lib/NGCP/BulkProcessor/Dao/mr103/billing/contracts.pm
+++ b/lib/NGCP/BulkProcessor/Dao/mr103/billing/contracts.pm
@@ -47,7 +47,7 @@ my $get_db = \&get_billing_db;
 my $expected_fieldnames = [
     'id',
     'customer_id',
-    'reseller_id',
+    #'reseller_id',
     'contact_id',
     'order_id',
     'status',
@@ -174,7 +174,7 @@ sub source_process_records {
         destroy_reader_dbs_code     => $destroy_reader_dbs_code,
         multithreading              => $multithreading,
         tableprocessing_threads     => $numofthreads,
-        'select'                    => 'SELECT c.*,r.name as reseller_name FROM ' . $table . ' c left join billing.resellers r on c.reseller_id = r.id WHERE c.status != "' . $TERMINATED_STATE . '"', # and id = 7185',
+        'select'                    => 'SELECT c.*,"UPC" as reseller_name FROM ' . $table . ' c WHERE status != "' . $TERMINATED_STATE . '"', # and id = 7185',
         'selectcount'               => 'SELECT COUNT(c.id) FROM ' . $table . ' c WHERE c.status != "' . $TERMINATED_STATE . '"', # and id = 7185',
     );
 }
@@ -188,7 +188,7 @@ sub source_findby_id {
     my $db = &$source_db();
     my $table = $db->tableidentifier($tablename);
 
-    my $stmt = 'SELECT c.*,r.name as reseller_name FROM ' . $table . ' c join billing.resellers r on c.reseller_id = r.id WHERE ' .
+    my $stmt = 'SELECT c.*,"UPC" as reseller_name FROM ' . $table . ' c WHERE ' .
             'c.id = ?';
 
     my @params = ($id);
diff --git a/lib/NGCP/BulkProcessor/Dao/mr103/provisioning/voip_subscribers.pm b/lib/NGCP/BulkProcessor/Dao/mr103/provisioning/voip_subscribers.pm
index 4e2172f..6184468 100644
--- a/lib/NGCP/BulkProcessor/Dao/mr103/provisioning/voip_subscribers.pm
+++ b/lib/NGCP/BulkProcessor/Dao/mr103/provisioning/voip_subscribers.pm
@@ -45,15 +45,15 @@ my $expected_fieldnames = [
 
     'uuid',
     'password',
-    'timezone',
+    #'timezone',
 
     'admin',
     'account_id',
     'webusername',
     'webpassword',
 
-    'autoconf_displayname',
-    'autoconf_group_id',
+    #'autoconf_displayname',
+    #'autoconf_group_id',
 
     'modify_timestamp',
     'create_timestamp',