Merge branch 'release-1.5.0'

Author: Alejandro Zamora Fonseca

.gitlab-ci.yml

@@ -24,12 +24,12 @@ stages:
 
 test:
   stage: test
-  image: alejandrozf/docker-stuff:python-flake8
+  image: freetechsolutions/python-flake8:3.6
   # Pick zero or more services to be used on all builds.
   # Only needed when using a docker container to run your tests in.
   # Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-a-service
   services:
-    - name: alejandrozf/docker-stuff:postgres-plperl-template1
+    - name: freetechsolutions/postgresql:11
       alias: plpython
     - redis
   # This folder is cached between builds
@@ -44,9 +44,9 @@ test:
     - mkdir -p /opt/omnileads/media_root
     # FIXME: what follows is a hack to simulate we have the 'sox' program, we should have the real program
     # as a docker image or installed by this script
-    - touch sox
-    - chmod +x sox
-    - mv sox /usr/bin/
+    #- touch sox
+    #- chmod +x sox
+    #- mv sox /usr/bin/
     - pip install -r requirements/tests.txt
   variables:
     POSTGRES_DB: omnileads
@@ -83,6 +83,8 @@ docker-prodenv-build-push:
     - /^release-.*$/
     - schedules
     - web
+  except:
+    - merge_requests
 
 staging-centos:
   stage: build
@@ -106,54 +108,9 @@ staging-centos:
     - /^pre-release-.*$/
     - schedules
     - web
-
-
-staging-ubuntu:
-  stage: build
-  script:
-    - export CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME
-    - bash /home/ftsinfra/git_cleanup.sh
-    - cd /home/ftsinfra/ominicontacto/deploy/vagrant/host_node/
-    - vagrant halt ubuntu
-    - vagrant destroy ubuntu -f
-    - ./vagrantup.sh ubuntu
-    - python ../edit_ansible.py --internal_ip=$STAGING_IP_UBUNTU --self_hosted=no --admin_pass=$DJANGO_PASS --databases_pass=$DATABASES_PASS
-    - cd ../../ansible
-    - echo "$FTSINFRA_PASS" | sudo -S IS_CICD=$IS_CICD ./deploy.sh -i
-    - TESTS_INTEGRACION=True TESTS_INTEGRACION_HOSTNAME=$STAGING_HOST_UBUNTU ADMIN_USERNAME=admin ADMIN_PASSWORD=$DJANGO_PASS LOGIN_FAILURE_LIMIT=$LOGIN_FAILURE_LIMIT python /home/ftsinfra/ominicontacto/ominicontacto_app/tests/tests.py
-    - cd /home/ftsinfra/ominicontacto/deploy/vagrant/host_node/
-    - vagrant halt ubuntu
-  tags:
-    - build-aio
-  only:
-    - /.*ansible-hostnode.*$/
-    - /^pre-release-.*$/
-    - schedules
-    - web
-
-staging-debian:
-  stage: build
-  script:
-    - export CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME
-    - bash /home/ftsinfra/git_cleanup.sh
-    - cd /home/ftsinfra/ominicontacto/deploy/vagrant/host_node/
-    - vagrant halt debian
-    - vagrant destroy debian -f
-    - ./vagrantup.sh debian
-    - python ../edit_ansible.py --internal_ip=$STAGING_IP_DEBIAN --self_hosted=no --admin_pass=$DJANGO_PASS --databases_pass=$DATABASES_PASS
-    - cd ../../ansible
-    - echo "$FTSINFRA_PASS" | sudo -S IS_CICD=$IS_CICD ./deploy.sh -i
-    - TESTS_INTEGRACION=True TESTS_INTEGRACION_HOSTNAME=$STAGING_HOST_DEBIAN ADMIN_USERNAME=admin ADMIN_PASSWORD=$DJANGO_PASS LOGIN_FAILURE_LIMIT=$LOGIN_FAILURE_LIMIT python /home/ftsinfra/ominicontacto/ominicontacto_app/tests/tests.py
-    - cd /home/ftsinfra/ominicontacto/deploy/vagrant/host_node/
-    - vagrant halt debian
-  tags:
-    - build-aio
-  only:
-    - /.*ansible-hostnode.*$/
-    - /^pre-release-.*$/
-    - schedules
-    - web
-
+  except:
+      - merge_requests
+  
 staging-self-hosted:
   stage: build
   script:
@@ -173,6 +130,8 @@ staging-self-hosted:
     - /^pre-release-.*$/
     - schedules
     - web
+  except:
+    - merge_requests
 
 #TODO: dejo template de lo que sería el job de upgrade, a probar luego de que salga release-1.3.1
 #upgrade-centos:
@@ -221,49 +180,5 @@ prod-centos:
     - deploy-aio
   only:
     - /^release-.*$/
-
-prod-ubuntu:
-  stage: deploy
-  environment: FTS-UBUNTU_BIONIC
-  script:
-    - export CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME
-    - bash /home/ftsinfra/git_cleanup.sh
-    - cd /home/ftsinfra/ominicontacto/deploy/vagrant/host_node/
-    - vagrant halt ubuntu
-    - vagrant destroy ubuntu -f
-    - ./vagrantup.sh ubuntu
-    - python ../edit_ansible.py --internal_ip=$STAGING_IP_UBUNTU --self_hosted=no --admin_pass=$DJANGO_PASS --databases_pass=$DATABASES_PASS
-    - cd ../../ansible
-    - echo "$FTSINFRA_PASS" | sudo -S IS_CICD=$IS_CICD ./deploy.sh -i
-    - cd /home/ftsinfra/ominicontacto/deploy/vagrant/host_node/
-    - vagrant package --base Ubuntu-Staging --output ubuntu-$CI_COMMIT_REF_NAME.box
-    - cp ubuntu-$CI_COMMIT_REF_NAME.box /home/ftsinfra/oml-boxes
-    - cp -a .vagrant/machines/ubuntu/virtualbox/private_key /home/ftsinfra/oml-boxes/ubuntu_private_key_$CI_COMMIT_REF_NAME
-    - rm -rf ubuntu-$CI_COMMIT_REF_NAME.box
-  tags:
-    - deploy-aio
-  only:
-    - /^release-.*$/
-
-prod-debian:
-  stage: deploy
-  environment: FTS-DEBIAN
-  script:
-    - export CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME
-    - bash /home/ftsinfra/git_cleanup.sh
-    - cd /home/ftsinfra/ominicontacto/deploy/vagrant/host_node/
-    - vagrant halt debian
-    - vagrant destroy debian -f
-    - ./vagrantup.sh debian
-    - python ../edit_ansible.py --internal_ip=$STAGING_IP_DEBIAN --self_hosted=no --admin_pass=$DJANGO_PASS --databases_pass=$DATABASES_PASS
-    - cd ../../ansible
-    - echo "$FTSINFRA_PASS" | sudo -S IS_CICD=$IS_CICD ./deploy.sh -i
-    - cd /home/ftsinfra/ominicontacto/deploy/vagrant/host_node/
-    - vagrant package --base Debian-Staging --output debian-$CI_COMMIT_REF_NAME.box
-    - cp debian-$CI_COMMIT_REF_NAME.box /home/ftsinfra/oml-boxes
-    - cp -a .vagrant/machines/debian/virtualbox/private_key /home/ftsinfra/oml-boxes/debian_private_key_$CI_COMMIT_REF_NAME
-    - rm -rf debian-$CI_COMMIT_REF_NAME.box
-  tags:
-    - deploy-aio
-  only:
-    - /^release-.*$/
+  except:
+    - merge_requests

api_app/serializers.py

@@ -189,12 +189,13 @@ def to_internal_value(self, data):
             campo = data.get(FormularioNuevoContacto.get_nombre_input(nombre))
             datos.append(campo)
         datos_contacto_json = json.dumps(datos)
-        data['datos'] = datos_contacto_json
-        data['telefono'] = telefono
-        data['bd_contacto'] = bd_contacto.pk
-        data['id_externo'] = id_externo
+        tmp_data = data.copy()
+        tmp_data['datos'] = datos_contacto_json
+        tmp_data['telefono'] = telefono
+        tmp_data['bd_contacto'] = bd_contacto.pk
+        tmp_data['id_externo'] = id_externo
 
-        contacto_serializer = ContactoSerializer(data=data)
+        contacto_serializer = ContactoSerializer(data=tmp_data)
         if contacto_serializer.is_valid():
             contacto = contacto_serializer.save()
         else:

api_app/tests/tests.py

@@ -22,7 +22,7 @@
 from mock import patch
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase, RequestFactory
 
 from rest_framework.authtoken.models import Token
@@ -215,6 +215,111 @@ def test_servicio_agentes_activos_muestra_activos_no_offline(self, _ami_manager,
             else:
                 self.assertEqual(datos_agente['status'], 'PAUSE')
 
+    @patch('ominicontacto_app.services.asterisk.asterisk_ami.AMIManagerConnector')
+    @patch.object(AMIManagerConnector, "_ami_manager")
+    def test_servicio_agentes_activos_detecta_grupos_menos_lineas_previstas(
+            self, _ami_manager, manager):
+        self.client.login(username=self.supervisor_admin.user.username, password=self.PWD)
+        _ami_manager.return_value = (
+            "/OML/AGENT/1/NAME                                 : John Perkins\r\n"
+            "/OML/AGENT/2/NAME                                 : Silvia Pensive\r\n"
+            "/OML/AGENT/2/SIP                                  : 1001\r\n"
+            "/OML/AGENT/2/STATUS                               : READY:1582309000\r\n"
+            "2 results found."), None
+        url = reverse('api_agentes_activos')
+        response = self.client.get(url)
+        self.assertEqual(len(response.json()), 1)
+        datos_agente = response.json()[0]
+        self.assertEqual(datos_agente['id'], '2')
+        self.assertEqual(datos_agente['status'], 'READY')
+
+    @patch('ominicontacto_app.services.asterisk.asterisk_ami.AMIManagerConnector')
+    @patch.object(AMIManagerConnector, "_ami_manager")
+    def test_servicio_agentes_no_adiciona_grupo_headers_desconocidos(self, _ami_manager, manager):
+        self.client.login(username=self.supervisor_admin.user.username, password=self.PWD)
+        _ami_manager.return_value = (
+            "/OML/AGENT/1/NAME                                 : John Perkins\r\n"
+            "/OML/AGENT/1/SIP                                  : 1001\r\n"
+            "/OML/AGENT/1/STATUS                               : READY:1582309000\r\n"
+            "/OML/AGENT/1/STRANGE-HEADER                       : strange-value\r\n"
+            "/OML/AGENT/2/NAME                                 : Silvia Pensive\r\n"
+            "/OML/AGENT/2/SIP                                  : 1002\r\n"
+            "/OML/AGENT/2/STATUS                               : PAUSE:1582309000\r\n"
+            "2 results found."), None
+        url = reverse('api_agentes_activos')
+        response = self.client.get(url)
+        self.assertEqual(len(response.json()), 2)
+        datos_agente_1 = response.json()[0]
+        datos_agente_2 = response.json()[1]
+        self.assertEqual(datos_agente_2['id'], '2')
+        self.assertEqual(datos_agente_2['status'], 'PAUSE')
+        self.assertEqual([i for i in datos_agente_1.keys()],
+                         ['id', 'nombre', 'sip', 'status', 'tiempo'])
+
+    @patch('ominicontacto_app.services.asterisk.asterisk_ami.AMIManagerConnector')
+    @patch.object(AMIManagerConnector, "_ami_manager")
+    @patch('api_app.utiles.logger')
+    def test_servicio_agentes_activos_detecta_grupos_headers_incompletos(
+            self, logger, _ami_manager, manager):
+        self.client.login(username=self.supervisor_admin.user.username, password=self.PWD)
+        _ami_manager.return_value = (
+            "/OML/AGENT/1/NAME                                 : John Perkins\r\n"
+            "/OML/AGENT/1/SIP                                  : \r\n"
+            "/OML/AGENT/1/STATUS                               : READY:1582309000\r\n"
+            "/OML/AGENT/2/NAME                                 : Silvia Pensive\r\n"
+            "/OML/AGENT/2/SIP                                  : 1002\r\n"
+            "/OML/AGENT/2/STATUS                               : PAUSE:1582309000\r\n"
+            "2 results found."), None
+        url = reverse('api_agentes_activos')
+        response = self.client.get(url)
+        self.assertEqual(len(response.json()), 2)
+        self.assertEqual(logger.warning.call_count, 1)
+
+    @patch('ominicontacto_app.services.asterisk.asterisk_ami.AMIManagerConnector')
+    @patch.object(AMIManagerConnector, "_ami_manager")
+    @patch('api_app.utiles.logger')
+    def test_servicio_agentes_activos_entradas_menos_lineas_son_detectadas_y_excluidas(
+            self, logger, _ami_manager, manager):
+        self.client.login(username=self.supervisor_admin.user.username, password=self.PWD)
+        _ami_manager.return_value = (
+            "/OML/AGENT/1/NAME                                 : John Perkins\r\n"
+            "/OML/AGENT/1/SIP                                  : 1001\r\n"
+            "/OML/AGENT/1/STATUS                               : READY:1582309100\r\n"
+            "/OML/AGENT/2/NAME                                 : Silvia Pensive\r\n"
+            "/OML/AGENT/2/SIP                                  : 1002\r\n"
+            "/OML/AGENT/2/STATUS                               : PAUSE:1582309000\r\n"
+            "/OML/AGENT/3/NAME                                 : Homero Simpson\r\n"
+            "/OML/AGENT/4/NAME                                 : Marge Simpson\r\n"
+            "/OML/AGENT/4/SIP                                  : 1003\r\n"
+            "/OML/AGENT/4/STATUS                               : PAUSE:1582309500\r\n"
+            "/OML/AGENT/5/SIP                                  : 1004\r\n"
+            "2 results found."), None
+        url = reverse('api_agentes_activos')
+        response = self.client.get(url)
+        self.assertEqual(len(response.json()), 3)
+        self.assertEqual(logger.warning.call_count, 2)
+
+    @patch('ominicontacto_app.services.asterisk.asterisk_ami.AMIManagerConnector')
+    @patch.object(AMIManagerConnector, "_ami_manager")
+    @patch('api_app.utiles.logger')
+    def test_servicio_agentes_activos_no_incluye_entradas_lineas_status_vacio(
+            self, logger, _ami_manager, manager):
+        self.client.login(username=self.supervisor_admin.user.username, password=self.PWD)
+        _ami_manager.return_value = (
+            "/OML/AGENT/1/NAME                                : Agente 01\r\n"
+            "/OML/AGENT/1/SIP                                 : 1004 \r\n"
+            "/OML/AGENT/1/STATUS                              : \r\n"
+            "/OML/AGENT/10/NAME                               : Agente10 \n"
+            "/OML/AGENT/10/SIP                                : 1013\r\n"
+            "/OML/AGENT/10/STATUS                             : \r\n"
+            "/OML/AGENT/11/NAME                               : Agente11\r\n"
+            "/OML/AGENT/11/SIP                                : 1014\r\n"
+            "/OML/AGENT/11/STATUS                             : READY:1582309100\r\n"
+            "3 results found."), None
+        url = reverse('api_agentes_activos')
+        response = self.client.get(url)
+        self.assertEqual(len(response.json()), 1)
+
     def test_api_login_devuelve_token_asociado_al_usuario_password(self):
         url = 'https://{0}{1}'.format(settings.OML_OMNILEADS_IP, reverse('api_login'))
         user = self.supervisor_admin.user
@@ -375,7 +480,7 @@ def test_api_modificar_calificacion_impide_calificar_mas_de_una_vez_contacto_cam
         url = reverse('disposition-detail', args=(self.calificacion_cliente.pk,))
         response = client.put(url, post_data)
         self.assertEqual(response.status_code, 400)
-        self.assertEqual(response.data['status'], 'ERROR')
+        self.assertEqual(str(response.data['status']), 'ERROR')
 
     def test_api_muestra_solo_las_calificaciones_que_ha_hecho_el_agente_que_accede(self):
         contacto_nuevo = ContactoFactory(bd_contacto=self.campana_activa.bd_contacto)