SAVE - Améliorations de la personnalisation du mapping ROME/NAF

labonneboite/common/models/office.py

@@ -1,29 +1,29 @@
 # coding: utf8
 
 
-import logging
+from functools import lru_cache
 from urllib.parse import urlencode
+import logging
 
 from babel.dates import format_date
-from slugify import slugify
 from flask import url_for
+from slugify import slugify
 from sqlalchemy import Column, Integer, String, Float, Boolean
-from sqlalchemy.dialects import mysql
 from sqlalchemy import PrimaryKeyConstraint, Index
 from sqlalchemy.dialects import mysql
-
-from functools import lru_cache
+from werkzeug import cached_property
 
 from labonneboite.common import encoding as encoding_util
-from labonneboite.common import scoring as scoring_util
 from labonneboite.common import hiring_type_util
+from labonneboite.common import mapping as mapping_util
+from labonneboite.common import scoring as scoring_util
+from labonneboite.common import util
 from labonneboite.common.database import Base, db_session, DATABASE
 from labonneboite.common.load_data import load_city_codes, load_groupements_employeurs
-from labonneboite.common import util
 from labonneboite.common.models.base import CRUDMixin
 from labonneboite.conf import settings
 from labonneboite.importer import settings as importer_settings
- 
+
 
 logger = logging.getLogger('main')
 
@@ -133,7 +133,7 @@ class Office(FinalOfficeMixin, CRUDMixin, Base):
         # Improve performance of create_index.py parallel jobs
         # by quickly fetching all offices of any given departement.
         Index('_departement', 'departement'),
-        
+
         # Improve performance of create_index.py remove_scam_emails()
         # by quickly locating offices having a given scam email.
         Index('_email', 'email'),
@@ -318,6 +318,20 @@ def naf_text(self):
     def stars(self):
         return self.get_stars_for_rome_code(None)
 
+    @cached_property
+    def romes_for_naf_mapping(self):
+        """
+        Returns a list of named tuples for ROME codes matching the company's NAF code.
+        """
+        return mapping_util.romes_for_naf(self.naf)
+
+    @cached_property
+    def romes_codes(self):
+        """
+        Returns the default set of ROME codes for the current company.
+        """
+        return set([rome.code for rome in self.romes_for_naf_mapping])
+
     def get_stars_for_rome_code(self, rome_code, hiring_type=None):
         hiring_type = hiring_type or hiring_type_util.DEFAULT
         if hiring_type not in hiring_type_util.VALUES:
@@ -361,8 +375,7 @@ def get_url_for_rome_code(self, rome_code, alternance=False, **query_string):
         try:
             if rome_code:
                 return url_for('office.details', siret=self.siret, rome_code=rome_code, _external=True, **query_string)
-            else:
-                return url_for('office.details', siret=self.siret, _external=True, **query_string)
+            return url_for('office.details', siret=self.siret, _external=True, **query_string)
         except RuntimeError:
             # RuntimeError is raised when we are outside of a Flask's application context.
             # Here, we cannot properly generate an URL via url_for.

labonneboite/common/models/recruiter_message.py

@@ -36,7 +36,6 @@ class RecruiterMessageCommon(object):
     def create_from_form(cls, form, is_certified_recruiter=False, uid=''):
         instance = cls()
         instance.siret = form.siret.data
-        instance.siret = form.siret.data
         instance.requested_by_first_name = form.first_name.data
         instance.requested_by_last_name = form.last_name.data
         instance.requested_by_email = form.email.data
@@ -109,21 +108,7 @@ def fill_values(self, form):
         except NoResultFound:
             raise NoOfficeFoundException('No office found with siret : {}'.format(form.data.siret))
 
-        office_romes = set([item.code for item in mapping_util.romes_for_naf(office.naf)])
-
-        _, lbb_romes, lba_romes, hide_romes = forms.compute_romes()
-        lbb_romes = set(lbb_romes)
-        lba_romes = set(lba_romes)
-        hide_romes = set(hide_romes)
-
-
-        # Remove checkboxes and romes not open to applications
-        romes_to_remove = hide_romes.union(office_romes) - lbb_romes
-
-        # Remove checkboxes and romes not open to alternance
-        romes_alternance_to_remove = hide_romes.union(office_romes) - lba_romes
-
-        self.romes_to_add = ','.join(lbb_romes - office_romes)
-        self.romes_to_remove = ','.join(romes_to_remove)
-        self.romes_alternance_to_add = ','.join(lba_romes - office_romes)
-        self.romes_alternance_to_remove = ','.join(romes_alternance_to_remove)
+        self.romes_alternance_to_add = ','.join(form.romes_alternance_to_add)
+        self.romes_alternance_to_remove = ','.join(form.romes_alternance_to_remove)
+        self.romes_to_add = ','.join(form.romes_to_add)
+        self.romes_to_remove = ','.join(form.romes_to_remove)

labonneboite/conf/common/settings_common.py

@@ -1,4 +1,3 @@
-# coding: utf8
 """
 Main app default settings.
 
@@ -42,6 +41,8 @@
 SENTRY_ENVIRONMENT = ""
 
 ADMIN_EMAIL = 'no-reply@labonneboite.pole-emploi.fr'
+LBB_EMAIL = 'labonneboite@pole-emploi.fr'
+LBA_EMAIL = 'labonnealternance@pole-emploi.fr'
 
 SERVER_NAME = 'labonneboite.pole-emploi.fr'
 PREFERRED_URL_SCHEME = 'http'
@@ -208,4 +209,5 @@
     from .overrides.development import *
 elif get_current_env() == ENV_TEST:
     # pylint: disable=wildcard-import,unused-wildcard-import
-    from .overrides.test import *
+    from .overrides.test import *
+

labonneboite/tests/app/maps/test_cache.py

@@ -28,7 +28,7 @@ def setUp(self):
         self.cache = cache.RedisCache()
 
     def test_access_cache_with_disconnected_redis(self):
-        with self.test_request_context:
+        with self.test_request_context():
             self.assertIsNone(self.cache.get("new key"))
             self.assertIsNone(self.cache.set("new key", 1))
             self.assertIsNone(self.cache.get("new key"))
@@ -48,5 +48,5 @@ def test_master_not_found(self):
             )
         )
 
-        with self.test_request_context:
+        with self.test_request_context():
             self.assertIsNone(self.cache.get('somekey'))

labonneboite/tests/app/maps/test_ign.py

@@ -38,7 +38,7 @@ def test_ign_500_error(self):
         )
         requests_get = mock.Mock(return_value=response)
 
-        with self.test_request_context:
+        with self.test_request_context():
             with mock.patch.object(ign.requests, 'get', requests_get):
                 self.assertRaises(exceptions.BackendUnreachable,
                                   ign.isochrone, places.vallouise, constants.ISOCHRONE_DURATIONS_MINUTES[0])
@@ -50,15 +50,15 @@ def test_ign_authentication_error(self):
         )
         requests_get = mock.Mock(return_value=response)
 
-        with self.test_request_context:
+        with self.test_request_context():
             with mock.patch.object(ign.requests, 'get', requests_get):
                 self.assertRaises(exceptions.BackendUnreachable,
                                   ign.isochrone, places.metz, constants.ISOCHRONE_DURATIONS_MINUTES[0])
 
     def test_ign_timeout(self):
         requests_get = mock.Mock(side_effect=ign.requests.exceptions.Timeout())
 
-        with self.test_request_context:
+        with self.test_request_context():
             with mock.patch.object(ign.requests, 'get', requests_get):
                 self.assertRaises(exceptions.BackendUnreachable,
                                   ign.isochrone, places.metz, constants.ISOCHRONE_DURATIONS_MINUTES[0])

labonneboite/tests/app/test_api_scripts.py

@@ -38,7 +38,7 @@ def test_update_office_boost_flag_specific_romes_alternance(self):
             'contract': 'alternance'
         })
 
-        with self.test_request_context:
+        with self.test_request_context():
             rv = self.app.get(self.url_for("api.company_list", **params))
             self.assertEqual(rv.status_code, 200)
             data_list = json.loads(rv.data.decode())
@@ -72,7 +72,7 @@ def test_update_office_boost_flag_all_romes_alternance(self):
             'contract': 'alternance'
         })
 
-        with self.test_request_context:
+        with self.test_request_context():
             rv = self.app.get(self.url_for("api.company_list", **params))
             self.assertEqual(rv.status_code, 200, msg=rv.data)
             data_list = json.loads(rv.data.decode())