queries: queue is not named base_queue

Author: pc-m

integration_tests/suite/helpers/database.py

@@ -223,9 +223,9 @@ def insert_queue(self, **kwargs):
                 if 'name' in kwargs:
                     queue_kwargs['name'] = kwargs['name']
                 queue_kwargs.setdefault('category', 'queue')
-                queue = inserter.add_queue(**queue_kwargs)
-                kwargs['_queue'] = queue
-                kwargs.setdefault('name', queue.name)
+                base_queue = inserter.add_base_queue(**queue_kwargs)
+                kwargs['_queue'] = base_queue
+                kwargs.setdefault('name', base_queue.name)
             queue_feature = inserter.add_queuefeatures(**kwargs)
             return {
                 'id': queue_feature.id,

wazo_agid/handlers/groupfeatures.py

@@ -85,24 +85,25 @@ def _set_members(self) -> None:
             'mark_answered_elsewhere',
             'tenant_uuid',
         )
-        queue_columns = ('musicclass', 'timeout', 'strategy', 'retry', 'maxlen')
+        base_queue_columns = ('musicclass', 'timeout', 'strategy', 'retry', 'maxlen')
         extensions_columns = ('exten', 'context')
         columns = [sanitize_column(f"groupfeatures.{c}") for c in groupfeatures_columns]
         columns += [
-            sanitize_aliased_column(f"queue.{c}", f"queue_{c}") for c in queue_columns
+            sanitize_aliased_column(f"base_queue.{c}", f"base_queue_{c}")
+            for c in base_queue_columns
         ]
         columns += [sanitize_column(f"extensions.{c}") for c in extensions_columns]
 
         query = SQL(
             "SELECT {columns} FROM groupfeatures "
-            "INNER JOIN queue "
-            "ON groupfeatures.name = queue.name "
+            "INNER JOIN base_queue "
+            "ON groupfeatures.name = base_queue.name "
             "LEFT JOIN extensions "
             "ON groupfeatures.id::text = extensions.typeval "
             "AND extensions.type = 'group' "
             "WHERE groupfeatures.id = %s "
-            "AND queue.category = 'group' "
-            "AND queue.commented = 0"
+            "AND base_queue.category = 'group' "
+            "AND base_queue.commented = 0"
         )
         self._cursor.execute(query.format(columns=SQL(", ").join(columns)), (self._id,))
         res: DictRow = self._cursor.fetchone()
@@ -121,13 +122,13 @@ def _set_members(self) -> None:
         self._write_calling = res['write_calling']
         self._ignore_forward = res['ignore_forward']
         self._preprocess_subroutine = res['preprocess_subroutine']
-        self._musicclass = res['queue_musicclass']
+        self._musicclass = res['base_queue_musicclass']
         self._mark_answered_elsewhere = res['mark_answered_elsewhere']
         self._tenant_uuid = res['tenant_uuid']
-        self._user_timeout = res['queue_timeout']
-        self._group_strategy = res['queue_strategy']
-        self._group_retry_delay = res['queue_retry']
-        self._max_calls = res['queue_maxlen']
+        self._user_timeout = res['base_queue_timeout']
+        self._group_strategy = res['base_queue_strategy']
+        self._group_retry_delay = res['base_queue_retry']
+        self._max_calls = res['base_queue_maxlen']
 
     def _set_vars(self) -> None:
         self._agi.set_variable(dv.REAL_NUMBER, self._exten)

wazo_agid/modules/user_set_call_rights.py

@@ -78,14 +78,14 @@ def _user_set_call_rights(
             "SELECT groupfeatures.id FROM groupfeatures "
             "INNER JOIN queuemember "
             "ON groupfeatures.name = queuemember.queue_name "
-            "INNER JOIN queue "
-            "ON queue.name = queuemember.queue_name "
+            "INNER JOIN base_queue "
+            "ON base_queue.name = queuemember.queue_name "
             "WHERE queuemember.userid = %s "
             "AND queuemember.usertype = 'user' "
             "AND queuemember.category = 'group' "
             "AND queuemember.commented = 0 "
-            "AND queue.category = 'group' "
-            "AND queue.commented = 0",
+            "AND base_queue.category = 'group' "
+            "AND base_queue.commented = 0",
             (user.id,),
         )
         group_feature_res: list[DictRow] = cursor.fetchall()

wazo_agid/objects.py

@@ -513,7 +513,7 @@ def __init__(self, agi: FastAGI, cursor: DictCursor, queue_id: int):
             'mark_answered_elsewhere',
         ]
         queuefeatures_columns = ["queuefeatures." + c for c in queuefeatures_columns]
-        queue_columns = ['queue.wrapuptime', 'queue.musicclass']
+        queue_columns = ['base_queue.wrapuptime', 'base_queue.musicclass']
 
         columns = queuefeatures_columns + queue_columns
 
@@ -522,11 +522,11 @@ def __init__(self, agi: FastAGI, cursor: DictCursor, queue_id: int):
 
         query = SQL(
             "SELECT {columns} FROM queuefeatures "
-            "INNER JOIN queue "
-            "ON queuefeatures.name = queue.name "
+            "INNER JOIN base_queue "
+            "ON queuefeatures.name = base_queue.name "
             "WHERE queuefeatures.id = %s "
-            "AND queue.commented = 0 "
-            "AND queue.category = 'queue'"
+            "AND base_queue.commented = 0 "
+            "AND base_queue.category = 'queue'"
         )
         cursor.execute(
             query.format(columns=join_column_names(columns)),