2524 add configregistrar to the find_sip_user_settings query

debian/changelog

 xivo-dao (2020.07.00) xivo-electra; urgency=medium
 
+  [ Tomas Taraba ]
   * 3162 As a user with UA I should have only one presence state displayed for other users
 
+  [ esevellec ]
+  * 2524 add configregistrar to the sip user retrieving query
+
  -- Tomas Taraba <ttaraba@avencall.com>  Thu, 02 Apr 2020 14:57:19 +0200
 
 xivo-dao (2019.12.07) xivo-deneb; urgency=medium

xivo_dao/asterisk_conf_dao.py

@@ -538,6 +538,7 @@ def find_sip_user_settings(session):
             UserFeatures.id.label('user_id'),
             UserFeatures.uuid.label('uuid'),
             (Voicemail.mailbox + '@' + Voicemail.context).label('mailbox'),
+            LineFeatures.configregistrar
         ).join(
             LineFeatures, and_(LineFeatures.protocolid == UserSIP.id,
                                LineFeatures.protocol == 'sip')
@@ -574,9 +575,10 @@ def find_sip_user_settings(session):
             row.mailbox,
             namedpickupgroup,
             namedcallgroup,
+            row.configregistrar
             ],
             labels=['UserSIP', 'protocol', 'context', 'number', 'mohsuggest', 'user_id',
-            'uuid', 'mailbox', 'namedpickupgroup', 'namedcallgroup']
+            'uuid', 'mailbox', 'namedpickupgroup', 'namedcallgroup', 'configregistrar']
         )
         yield updatedrow
 

xivo_dao/tests/test_asterisk_conf_dao.py

@@ -1495,7 +1495,7 @@ class TestFindSipUserSettings(DAOTestCase, PickupHelperMixin):
         voicemail = self.add_voicemail(mailbox='1000', context='default')
         user = self.add_user(firstname="John", lastname="Smith", voicemailid=voicemail.id, musiconhold='musiconhold')
         sip = self.add_usersip(category='user')
-        line = self.add_line(protocol='sip', protocolid=sip.id, context="default")
+        line = self.add_line(protocol='sip', protocolid=sip.id, context="default", configregistrar="mds1")
         self.add_user_line(user_id=user.id, line_id=line.id, extension_id=extension.id)
 
         mailbox = '{}@{}'.format(voicemail.mailbox, voicemail.context)
@@ -1506,7 +1506,8 @@ class TestFindSipUserSettings(DAOTestCase, PickupHelperMixin):
                     'mailbox': mailbox,
                     'mohsuggest': user.musiconhold,
                     'user_id': user.id,
-                    'uuid': user.uuid}
+                    'uuid': user.uuid,
+                    'configregistrar': 'mds1'}
 
         results = asterisk_conf_dao.find_sip_user_settings()