From a4ac62ce39d851ae97bfa90222c8bfdd05e91c30 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Fri, 20 Sep 2019 21:56:44 +0200
Subject: [PATCH] mdel: move into apps/ (#15687)

---
 passerelle/{contrib => apps}/mdel/__init__.py               | 0
 passerelle/{contrib => apps}/mdel/mdel.py                   | 0
 .../{contrib => apps}/mdel/migrations/0001_initial.py       | 0
 .../mdel/migrations/0002_auto_20170123_0311.py              | 0
 .../mdel/migrations/0003_auto_20170125_0450.py              | 0
 .../mdel/migrations/0004_auto_20171220_1109.py              | 0
 .../mdel/migrations/0005_remove_mdel_log_level.py           | 0
 passerelle/{contrib => apps}/mdel/migrations/__init__.py    | 0
 passerelle/{contrib => apps}/mdel/models.py                 | 0
 .../{contrib => apps}/mdel/templates/mdel/mdel_detail.html  | 0
 passerelle/{contrib => apps}/mdel/utils.py                  | 0
 passerelle/settings.py                                      | 1 +
 tests/settings.py                                           | 1 -
 tests/test_generic_endpoint.py                              | 6 +++---
 tests/test_mdel.py                                          | 6 +++---
 15 files changed, 7 insertions(+), 7 deletions(-)
 rename passerelle/{contrib => apps}/mdel/__init__.py (100%)
 rename passerelle/{contrib => apps}/mdel/mdel.py (100%)
 rename passerelle/{contrib => apps}/mdel/migrations/0001_initial.py (100%)
 rename passerelle/{contrib => apps}/mdel/migrations/0002_auto_20170123_0311.py (100%)
 rename passerelle/{contrib => apps}/mdel/migrations/0003_auto_20170125_0450.py (100%)
 rename passerelle/{contrib => apps}/mdel/migrations/0004_auto_20171220_1109.py (100%)
 rename passerelle/{contrib => apps}/mdel/migrations/0005_remove_mdel_log_level.py (100%)
 rename passerelle/{contrib => apps}/mdel/migrations/__init__.py (100%)
 rename passerelle/{contrib => apps}/mdel/models.py (100%)
 rename passerelle/{contrib => apps}/mdel/templates/mdel/mdel_detail.html (100%)
 rename passerelle/{contrib => apps}/mdel/utils.py (100%)

diff --git a/passerelle/contrib/mdel/__init__.py b/passerelle/apps/mdel/__init__.py
similarity index 100%
rename from passerelle/contrib/mdel/__init__.py
rename to passerelle/apps/mdel/__init__.py
diff --git a/passerelle/contrib/mdel/mdel.py b/passerelle/apps/mdel/mdel.py
similarity index 100%
rename from passerelle/contrib/mdel/mdel.py
rename to passerelle/apps/mdel/mdel.py
diff --git a/passerelle/contrib/mdel/migrations/0001_initial.py b/passerelle/apps/mdel/migrations/0001_initial.py
similarity index 100%
rename from passerelle/contrib/mdel/migrations/0001_initial.py
rename to passerelle/apps/mdel/migrations/0001_initial.py
diff --git a/passerelle/contrib/mdel/migrations/0002_auto_20170123_0311.py b/passerelle/apps/mdel/migrations/0002_auto_20170123_0311.py
similarity index 100%
rename from passerelle/contrib/mdel/migrations/0002_auto_20170123_0311.py
rename to passerelle/apps/mdel/migrations/0002_auto_20170123_0311.py
diff --git a/passerelle/contrib/mdel/migrations/0003_auto_20170125_0450.py b/passerelle/apps/mdel/migrations/0003_auto_20170125_0450.py
similarity index 100%
rename from passerelle/contrib/mdel/migrations/0003_auto_20170125_0450.py
rename to passerelle/apps/mdel/migrations/0003_auto_20170125_0450.py
diff --git a/passerelle/contrib/mdel/migrations/0004_auto_20171220_1109.py b/passerelle/apps/mdel/migrations/0004_auto_20171220_1109.py
similarity index 100%
rename from passerelle/contrib/mdel/migrations/0004_auto_20171220_1109.py
rename to passerelle/apps/mdel/migrations/0004_auto_20171220_1109.py
diff --git a/passerelle/contrib/mdel/migrations/0005_remove_mdel_log_level.py b/passerelle/apps/mdel/migrations/0005_remove_mdel_log_level.py
similarity index 100%
rename from passerelle/contrib/mdel/migrations/0005_remove_mdel_log_level.py
rename to passerelle/apps/mdel/migrations/0005_remove_mdel_log_level.py
diff --git a/passerelle/contrib/mdel/migrations/__init__.py b/passerelle/apps/mdel/migrations/__init__.py
similarity index 100%
rename from passerelle/contrib/mdel/migrations/__init__.py
rename to passerelle/apps/mdel/migrations/__init__.py
diff --git a/passerelle/contrib/mdel/models.py b/passerelle/apps/mdel/models.py
similarity index 100%
rename from passerelle/contrib/mdel/models.py
rename to passerelle/apps/mdel/models.py
diff --git a/passerelle/contrib/mdel/templates/mdel/mdel_detail.html b/passerelle/apps/mdel/templates/mdel/mdel_detail.html
similarity index 100%
rename from passerelle/contrib/mdel/templates/mdel/mdel_detail.html
rename to passerelle/apps/mdel/templates/mdel/mdel_detail.html
diff --git a/passerelle/contrib/mdel/utils.py b/passerelle/apps/mdel/utils.py
similarity index 100%
rename from passerelle/contrib/mdel/utils.py
rename to passerelle/apps/mdel/utils.py
diff --git a/passerelle/settings.py b/passerelle/settings.py
index d30235b6..49553cb3 100644
--- a/passerelle/settings.py
+++ b/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',
diff --git a/tests/settings.py b/tests/settings.py
index e8f8dabb..cff87ca9 100644
--- a/tests/settings.py
+++ b/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',
diff --git a/tests/test_generic_endpoint.py b/tests/test_generic_endpoint.py
index 9e070330..7a66645b 100644
--- a/tests/test_generic_endpoint.py
+++ b/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))
diff --git a/tests/test_mdel.py b/tests/test_mdel.py
index 2e8bac29..362b3f8b 100644
--- a/tests/test_mdel.py
+++ b/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
 
-- 
2.23.0