mdel: move into apps/ (#15687)

passerelle/settings.py

@@ -138,6 +138,7 @@ INSTALLED_APPS = (
     'passerelle.apps.gdc',
     'passerelle.apps.jsondatastore',
     'passerelle.apps.sp_fr',
+    'passerelle.apps.mdel',
     'passerelle.apps.mobyt',
     'passerelle.apps.okina',
     'passerelle.apps.opengis',

tests/settings.py

@@ -27,7 +27,6 @@ INSTALLED_APPS += (
     'passerelle.contrib.iws',
     'passerelle.contrib.lille_urban_card',
     'passerelle.contrib.maarch',
-    'passerelle.contrib.mdel',
     'passerelle.contrib.mdph13',
     'passerelle.contrib.meyzieu_newsletters',
     'passerelle.contrib.nancypoll',

tests/test_generic_endpoint.py

@@ -29,7 +29,7 @@ import utils
 
 from passerelle.apps.arcgis.models import ArcGIS
 from passerelle.base.models import ResourceLog, ProxyLogger, BaseResource, HTTPResource
-from passerelle.contrib.mdel.models import MDEL
+from passerelle.apps.mdel.models import MDEL
 from passerelle.contrib.stub_invoices.models import StubInvoicesConnector
 from passerelle.utils.api import endpoint
 
@@ -53,8 +53,8 @@ DEMAND_STATUS = {
 }
 
 
-@mock.patch('passerelle.contrib.mdel.models.Demand.get_status', lambda x: DEMAND_STATUS)
-@mock.patch('passerelle.contrib.mdel.models.Demand.create_zip', lambda x, y: '1-14-ILE-LA')
+@mock.patch('passerelle.apps.mdel.models.Demand.get_status', lambda x: DEMAND_STATUS)
+@mock.patch('passerelle.apps.mdel.models.Demand.create_zip', lambda x, y: '1-14-ILE-LA')
 def test_generic_payload_logging(caplog, app, mdel):
     filename = os.path.join(os.path.dirname(__file__), 'data', 'mdel', 'formdata.json')
     payload = json.load(open(filename))

tests/test_mdel.py

@@ -27,9 +27,9 @@ from lxml import etree as letree
 
 import pytest
 
-from passerelle.contrib.mdel.models import MDEL, Demand
-from passerelle.contrib.mdel.mdel import Message, Description, AttachedFile, get_resource_base_dir
-from passerelle.contrib.mdel.utils import parse_date
+from passerelle.apps.mdel.models import MDEL, Demand
+from passerelle.apps.mdel.mdel import Message, Description, AttachedFile, get_resource_base_dir
+from passerelle.apps.mdel.utils import parse_date
 
 import utils