Merge pull request #2784 from GeotrekCE/update_uml_fix_migrations

Update uml diagrams and fix migrations for outdoor app
GeotrekCE · Oct 6, 2021 · e3a76af · e3a76af
2 parents 08842b7 + 7149409
commit e3a76af
Show file tree

Hide file tree

Showing 19 changed files with 6 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -44,18 +44,18 @@ css:
 
 %.pdf:
 	mkdir -p docs/data-model
-	postgresql_autodoc -h localhost -u geotrek -d geotrekdb -t dot -m "$*_.*"
+	postgresql_autodoc -h localhost -u geotrek -d geotrekdb -t dot -m "$*_.*" --password=geotrek -s "public"
 	dot geotrekdb.dot -T pdf -o docs/data-model/$@
 	rm geotrekdb.dot
 
 authent.pdf:
 	mkdir -p docs/data-model
-	postgresql_autodoc -h localhost -u geotrek -d geotrekdb -t dot -m "auth(ent)?_.*"
+	postgresql_autodoc -h localhost -u geotrek -d geotrekdb -t dot -m "auth(ent)?_.*" --password=geotrek -s "public"
 	dot geotrekdb.dot -T pdf -o docs/data-model/authent.pdf
 	rm geotrekdb.dot
 
 global.pdf:
-	postgresql_autodoc -h localhost -u geotrek -d geotrekdb -t dot
+	postgresql_autodoc -h localhost -u geotrek -d geotrekdb -t dot --password=geotrek -s "public"
 	dot geotrekdb.dot -T pdf -o docs/data-model/global.pdf
 	rm geotrekdb.dot
 

diff --git a/docs/data-model/authent.pdf b/docs/data-model/authent.pdf
diff --git a/docs/data-model/cirkwi.pdf b/docs/data-model/cirkwi.pdf
diff --git a/docs/data-model/core.pdf b/docs/data-model/core.pdf
diff --git a/docs/data-model/diving.pdf b/docs/data-model/diving.pdf
diff --git a/docs/data-model/feedback.pdf b/docs/data-model/feedback.pdf
diff --git a/docs/data-model/flatpages.pdf b/docs/data-model/flatpages.pdf
diff --git a/docs/data-model/global.pdf b/docs/data-model/global.pdf
diff --git a/docs/data-model/infrastructure.pdf b/docs/data-model/infrastructure.pdf
diff --git a/docs/data-model/land.pdf b/docs/data-model/land.pdf
diff --git a/docs/data-model/maintenance.pdf b/docs/data-model/maintenance.pdf
diff --git a/docs/data-model/outdoor.pdf b/docs/data-model/outdoor.pdf
diff --git a/docs/data-model/sensitivity.pdf b/docs/data-model/sensitivity.pdf
diff --git a/docs/data-model/signage.pdf b/docs/data-model/signage.pdf
diff --git a/docs/data-model/tourism.pdf b/docs/data-model/tourism.pdf
diff --git a/docs/data-model/trekking.pdf b/docs/data-model/trekking.pdf
diff --git a/docs/data-model/zoning.pdf b/docs/data-model/zoning.pdf
diff --git a/geotrek/outdoor/migrations/0025_merge_ratings_min_max.py b/geotrek/outdoor/migrations/0025_merge_ratings_min_max.py
@@ -1,11 +1,9 @@
 # Generated by Célia 23.8 on 2021-09-15 15:12
 
-from django.apps import apps
-
 from django.db import migrations
 
 
-def merge_ratings_min_max(app, schema):
+def merge_ratings_min_max(apps, schema):
     site_model = apps.get_model('outdoor', 'Site')
     sites = site_model.objects.all()
     for site in sites:

diff --git a/geotrek/outdoor/migrations/0027_merge_ratings.py b/geotrek/outdoor/migrations/0027_merge_ratings.py
@@ -1,11 +1,9 @@
 # Generated by Célia 23.8 on 2021-09-15 15:12
 
-from django.apps import apps
-
 from django.db import migrations
 
 
-def merge_ratings(app, schema):
+def merge_ratings(apps, schema):
     site_model = apps.get_model('outdoor', 'Site')
     sites = site_model.objects.all()
     for site in sites:
@@ -15,7 +13,7 @@ def merge_ratings(app, schema):
             site.ratings_min.clear()
 
 
-def reverse_merge_ratings(app, schema):
+def reverse_merge_ratings(apps, schema):
     site_model = apps.get_model('outdoor', 'Site')
     sites = site_model.objects.all()
     for site in sites: