removed nasty backend generation #39

.gitignore

@@ -10,8 +10,5 @@ node_modules
 htmlcov
 .vscode
 .pytest_cache
-/backend/urls.py
-/backend/admin.py
 database.db
 database.db-journal
-backend/permissions/__list_user_post_permission.py

.vscode/settings.json

 {
-    "python.pythonPath": "~/Env/outgoing/bin/python",
+    "python.pythonPath": "env/bin/python",
     "files.exclude": {
         "**/.git": true,
         "**/.svn": true,

backend/generate/templates/admin.tpl → backend/admin.py

-{% autoescape off %}
-# WARNING
-# THIS FILE HAS BEEN AUTOMATICALLY GENERATED
-# WITH /backend/generate/generate_backend_files.py
-# MODIFY THE FILE ABOVE IF YOUR NOT SATISFIED 
-# THIS WARNING DOESN'T APPLY TO .tpl FILES...
-
 from django.contrib import admin
+from dotmap import DotMap
 from reversion_compare.admin import CompareVersionAdmin
 
-{% spaceless %}
-{% for model in data %}
-from backend.models.{{model.import_location}} import {{model.model}}
-{% endfor %}
-{% endspaceless %}
+from shared import get_api_config
+
+api_config = get_api_config()
 
+CLASSIC_MODELS_str = ""
+VERSIONNED_MODELS_str = ""
 
+for model in api_config:
+    if "model" in model and model['model']:
+        model = DotMap(model)
+        if (not model.requires_testing) and (not model.ignore_in_admin):
+            exec("from backend.models.{} import {}".format(model.import_location, model.model))
+            if model.versionned:
+                VERSIONNED_MODELS_str += model.model + ','                
+            else:
+                CLASSIC_MODELS_str += model.model + ','
 
-CLASSIC_MODELS = [
-{% for model in data %}{% if not model.versionned %}
-    {{model.model}},
-{% endif %}{% endfor %}
-]
+exec("CLASSIC_MODELS = [{}]".format(CLASSIC_MODELS_str))
+exec("VERSIONNED_MODELS = [{}]".format(VERSIONNED_MODELS_str))
 
-VERSIONNED_MODELS = [
-{% for model in data %}{% if model.versionned %}
-    {{model.model}},
-{% endif %}{% endfor %}
-]
 
 for model in CLASSIC_MODELS:
     admin.site.register(model)
     try:
         model.get_serializer()
-        raise Exception("CLASSIX MODEL SHOULDN'T have this method")
+        raise Exception("CLASSIC MODEL SHOULDN'T have this method")
     except AttributeError:
         pass
-        
+
 for model in VERSIONNED_MODELS:
     admin.site.register(model, CompareVersionAdmin)
     if (model.get_serializer().Meta.model != model):
         raise Exception(
             "Get_serializer configuration incorrect in", str(model))
-
-{% endautoescape %}

backend/generate/generate_backend_files.py

-#####
-# This python file is used to generate some backend files
-from django import template
-from os.path import join, realpath, dirname
-from general.api import get_api_config
-
-############
-# Need to do this first so that Django template engine is working
-import django
-from django.conf import settings
-
-settings.configure(TEMPLATES=[
-    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': ['.'],  # if you want the templates from a file
-        'APP_DIRS': False,  # we have no apps
-    },
-])
-django.setup()
-##########
-
-
-def render_and_save(template_path, context, output_path):
-    with open(template_path, 'r') as f:
-        t = f.read()
-    t = template.Template(t)
-    c = template.Context({'data': context})
-    output = t.render(c)
-
-    with open(output_path, 'w') as f:
-        f.write(output)
-
-
-current_dir = dirname(realpath(__file__))
-templates_dir = current_dir + '/templates/'
-saving_dir = realpath(current_dir + "/../")
-
-
-api_config = get_api_config()
-
-# Render urls.py
-template_path = join(templates_dir, 'urls.tpl')
-output_path = join(saving_dir, 'urls.py')
-render_and_save(template_path, api_config, output_path)
-
-# render list_user_post_permission.py
-template_path = join(templates_dir, 'list_user_post_permission.tpl')
-output_path = join(saving_dir, './permissions/__list_user_post_permission.py')
-render_and_save(template_path, api_config, output_path)
-
-# Render admin.py
-data = []
-for obj in api_config:
-    if 'model' in obj and obj['model']:
-        if obj['requires_testing']:
-            continue  # we don't want testing models to be register in admin
-        if obj['ignore_in_admin']:
-            continue
-        data.append(obj)
-
-template_path = join(templates_dir, 'admin.tpl')
-output_path = join(saving_dir, 'admin.py')
-render_and_save(template_path, data, output_path)

backend/generate/templates/urls.tpl

-{% autoescape off %}
-# WARNING
-# THIS FILE HAS BEEN AUTOMATICALLY GENERATED
-# WITH /backend/generate/generate_backend_files.py
-# MODIFY THE FILE ABOVE IF YOUR NOT SATISFIED 
-# THIS WARNING DOESN'T APPLY TO .tpl FILES...
-
-from django.conf.urls import url, include
-from django.conf import settings
-from rest_framework import routers
-from django.urls import path
-from . import views
-
-ALL_MODELS = []
-ALL_VIEWSETS = []
-{% for model in data %}
-    {% if not model.requires_testing %}
-from backend.models.{{model.import_location}} import {{model.viewset}}
-ALL_VIEWSETS.append({{model.viewset}})
-        {% if model.model is not None and not model.ignore_in_admin%}
-from backend.models.{{model.import_location}} import {{model.model}}
-ALL_MODELS.append({{model.model}})
-        {% endif %}
-    {% endif %}
-{% endfor %}
-
-from rest_framework.documentation import include_docs_urls
-
-urlpatterns = [
-    url(r'^api-docs/', include_docs_urls(title='Outgoing API'))
-]
-
-router = routers.DefaultRouter()
-
-if settings.TESTING:
-    {% for model in data %}{% if model.requires_testing %}
-    from backend.models.{{model.import_location}} import {{model.viewset}}
-    ALL_VIEWSETS.append({{model.viewset}})
-    {% if model.model is not None %}
-    from backend.models.{{model.import_location}} import {{model.model}}
-    ALL_MODELS.append({{model.model}})
-    {% endif %}
-    router.register(
-        r'{{model.api_end_point}}{% if 'api_attr' in model %}/{{model.api_attr}}{% endif %}', 
-        {{model.viewset}}{%if 'api_name' in model%},"{{model.api_name}}"{% endif %}
-    ){% endif %}{% endfor %}
-
-
-{% for model in data %}{% if not model.requires_testing %}
-router.register(
-    r'{{model.api_end_point}}{% if 'api_attr' in model %}/{{model.api_attr}}{% endif %}', 
-    {{model.viewset}}{%if 'api_name' in model%},"{{model.api_name}}"{% endif %}
-){% endif %}{% endfor %}
-
-urlpatterns += [url(r'^api/', include(router.urls))]
-urlpatterns.append(path('api/serverModerationStatus/', views.app_moderation_status))
-
-for model in ALL_MODELS:
-    for key in model.model_config:
-        val = model.model_config[key]
-        if val is None:
-            raise Exception("You forgot to set the {} config variable in the model {}".format(key, str(model)))
-
-from backend.permissions import DEFAULT_VIEWSET_PERMISSIONS
-for viewset in ALL_VIEWSETS:
-    for p in DEFAULT_VIEWSET_PERMISSIONS:
-        v_p = viewset.permission_classes
-        if p not in v_p:
-            raise Exception("Permission_classes are not defined correctly in the viewset {}".format(str(viewset)))
-{% endautoescape %}

backend/models/abstract/my_model/myModel.py

@@ -2,8 +2,8 @@ from django.db import models
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.fields import GenericRelation
 from .pendingModeration import PendingModeration
-from backend.permissions import OBJ_MODERATION_PERMISSIONS
-from backend.permissions import DEFAULT_OBJ_MODERATION_LV
+from shared import OBJ_MODERATION_PERMISSIONS
+from shared import DEFAULT_OBJ_MODERATION_LV
 from django.core.validators import MinValueValidator
 from django.core.exceptions import ValidationError
 

backend/permissions/__init__.py

-from .obj_moderation_permission import OBJ_MODERATION_PERMISSIONS  # noqa: F401
-from .obj_moderation_permission import DEFAULT_OBJ_MODERATION_LV  # noqa: F401
-try:
-    # the two imports are used outside of django
-    # the try catch is here to prevent the raise of error
-    from .noDeleteIfNotStaff import NoDeleteIfNotStaff  # noqa: F401
-    from .isOwner import IsOwner  # noqa: F401
-    from .noDelete import NoDelete  # noqa: F401
-    from .isStaffOrReadOnly import IsStaffOrReadOnly  # noqa: F401
-    from .readOnly import ReadOnly  # noqa: F401
-    from .isDriOrReadOnly import IsDriOrReadOnly  # noqa: F401
-    from .isDriOrNoPost import IsDriOrNoPost  # noqa: F401
-    from .noPostIfNotStaff import NoPostIfNotStaff  # noqa: F401
-    from .default_viewset_permissions import DEFAULT_VIEWSET_PERMISSIONS  # noqa: F401
-    from .__is_moderation_required import is_moderation_required  # noqa: F401
-except Exception:
-    pass
+from .noDeleteIfNotStaff import NoDeleteIfNotStaff  # noqa: F401
+from .isOwner import IsOwner  # noqa: F401
+from .noDelete import NoDelete  # noqa: F401
+from .isStaffOrReadOnly import IsStaffOrReadOnly  # noqa: F401
+from .readOnly import ReadOnly  # noqa: F401
+from .isDriOrReadOnly import IsDriOrReadOnly  # noqa: F401
+from .isDriOrNoPost import IsDriOrNoPost  # noqa: F401
+from .noPostIfNotStaff import NoPostIfNotStaff  # noqa: F401
+from .default_viewset_permissions import DEFAULT_VIEWSET_PERMISSIONS  # noqa: F401
+from .__is_moderation_required import is_moderation_required  # noqa: F401

backend/permissions/__is_moderation_required.py

 from backend.utils.__get_user_level import get_user_level
 from django.conf import settings
-from .obj_moderation_permission import OBJ_MODERATION_PERMISSIONS
+from shared import OBJ_MODERATION_PERMISSIONS
 
 
 ######################################

backend/generate/templates/list_user_post_permission.tpl → backend/permissions/__list_user_post_permission.py

-{% autoescape off %}
-# WARNING
-# THIS FILE HAS BEEN AUTOMATICALLY GENERATED
-# WITH /backend/generate/generate_backend_files.py
-# MODIFY THE FILE ABOVE IF YOUR NOT SATISFIED 
-# THIS WARNING DOESN'T APPLY TO .tpl FILES...
-
 from django.conf import settings
+from dotmap import DotMap
+
+from shared import get_api_config
+
+api_config = get_api_config()
 
 ALL_VIEWSETS = {}
-{% for model in data %}{% if not model.requires_testing %}{% if model.viewset != 'UserDataViewSet' %}
-from backend.models.{{model.import_location}} import {{model.viewset}}
-ALL_VIEWSETS["{{model.viewset}}"] = {{model.viewset}}
-{% endif %}{% endif %}{% endfor %}
+
+for model in api_config:
+    model = DotMap(model)
+    if not model.requires_testing:
+        if model.viewset != 'UserDataViewSet':
+            exec("from backend.models.{} import {}".format(model.import_location, model.viewset))
+            exec("ALL_VIEWSETS['{}'] = {}".format(model.viewset, model.viewset))
 
 if settings.TESTING:
-    {% for model in data %}{% if model.requires_testing %}
-    from backend.models.{{model.import_location}} import {{model.viewset}}
-    ALL_VIEWSETS["{{model.viewset}}"] = {{model.viewset}}
-    {% endif %}{% endfor %}
+    for model in api_config:
+        model = DotMap(model)
+        if model.requires_testing:
+            if model.viewset != 'UserDataViewSet':
+                exec("from backend.models.{} import {}".format(model.import_location, model.viewset))
+                exec("ALL_VIEWSETS['{}'] = {}".format(model.viewset, model.viewset))
 
 
 class Request(object):
@@ -25,6 +28,7 @@ class Request(object):
         self.user = user
         self.method = method
 
+
 def list_user_post_permission(user):
     viewsets_user_can_post = []
     request = Request(user, 'POST')
@@ -40,5 +44,3 @@ def list_user_post_permission(user):
             name = name[0].lower() + name[1:]
             viewsets_user_can_post.append(name)
     return viewsets_user_can_post
-
-{% endautoescape %}

backend/tests/test_mymodel_validate.py

@@ -2,7 +2,7 @@ from django.test import TestCase
 from backend.models.abstract.my_model.myModel import validate_obj_model_lv
 import pytest
 from django.core.exceptions import ValidationError
-from backend.permissions import OBJ_MODERATION_PERMISSIONS
+from shared import OBJ_MODERATION_PERMISSIONS
 
 
 class MyModelTestCase(TestCase):

backend/urls.py

+from django.conf import settings
+from django.conf.urls import include, url
+from django.urls import path
+from rest_framework import routers
+from rest_framework.documentation import include_docs_urls
+
+from backend.permissions import DEFAULT_VIEWSET_PERMISSIONS
+from shared import get_api_config
+
+from . import views
+from dotmap import DotMap
+
+urlpatterns = [
+    url(r'^api-docs/', include_docs_urls(title='Outgoing API')),
+]
+router = routers.DefaultRouter()
+
+ALL_MODELS = []
+ALL_VIEWSETS = []
+
+# Automatically loading models based on API config file
+api_config = get_api_config()
+
+for model in api_config:
+    model = DotMap(model)
+    if not model.requires_testing:
+        exec("from backend.models.{} import {}".format(model.import_location, model.viewset))
+        exec("ALL_VIEWSETS.append({})".format(model.viewset))
+        if model.model is not None and not model.ignore_in_admin:
+            exec("from backend.models.{} import {}".format(model.import_location, model.model))
+            exec("ALL_MODELS.append({})".format(model.model))
+
+
+if settings.TESTING:
+
+    for model in api_config:
+        model = DotMap(model)
+        if model.requires_testing:
+            exec("from backend.models.{} import {}".format(model.import_location, model.viewset))
+            exec("ALL_VIEWSET.append({})".format(model.viewset))
+            if model.model is not None:
+                exec("from backend.models.{} import {}".format(model.import_location, model.model))
+                exec("ALL_MODELS.append({})".format(model.model))
+
+            str_url = model.api_end_point
+            if 'api_attr' in model:
+                str_url += '/{}'.format(model.api_attr)
+            if 'api_name' in model:
+                cmd = "r'{}', {}, '{}'".format(str_url, model.viewset, model.api_name)
+            else:
+                cmd = "r'{}', {}".format(str_url, model.viewset)
+            exec("router.register({})".format(cmd))
+
+
+for model in api_config:
+    model = DotMap(model)
+    if not model.requires_testing:
+        str_url = model.api_end_point
+        if 'api_attr' in model:
+            str_url += '/{}'.format(model.api_attr)
+        if 'api_name' in model:
+            cmd = "r'{}', {}, '{}'".format(str_url, model.viewset, model.api_name)
+        else:
+            cmd = "r'{}', {}".format(str_url, model.viewset)
+        exec("router.register({})".format(cmd))
+
+
+urlpatterns += [url(r'^api/', include(router.urls))]
+urlpatterns.append(path('api/serverModerationStatus/', views.app_moderation_status))
+
+for Model in ALL_MODELS:
+    for key in Model.model_config:
+        val = Model.model_config[key]
+        if val is None:
+            raise Exception("You forgot to set the {} config variable in the model {}".format(key, str(model)))
+
+for Viewset in ALL_VIEWSETS:
+    for p in DEFAULT_VIEWSET_PERMISSIONS:
+        v_p = Viewset.permission_classes
+        if p not in v_p:
+            raise Exception("Permission_classes are not defined correctly in the viewset {}".format(str(viewset)))

backend/utils/__find_api_end_point_for_viewset.py

-from general.api import get_api_config
+from shared import get_api_config
 
 
 def find_api_end_point_for_viewset(viewset_name):

backend/utils/__get_model_config.py

-from general.api import get_api_config
+from shared import get_api_config
 
 
 def get_model_config(model):

backend/utils/__get_user_level.py

 from .__is_member import is_member
-from backend.permissions import OBJ_MODERATION_PERMISSIONS
+from shared import OBJ_MODERATION_PERMISSIONS
 
 
 def get_user_level(user):

backend/utils/__get_viewset_permissions.py

 from backend.permissions import IsOwner, IsStaffOrReadOnly, IsDriOrReadOnly, ReadOnly, IsDriOrNoPost, NoPostIfNotStaff
 from rest_framework.permissions import IsAdminUser
 from backend.permissions import DEFAULT_VIEWSET_PERMISSIONS
-from general.api import get_api_config
+from shared import get_api_config
 
 
 def get_viewset_permissions(viewset):

backend/views.py

@@ -2,7 +2,7 @@ from django.conf import settings
 from django.http import HttpResponse
 import json
 
-from backend.permissions.obj_moderation_permission import OBJ_MODERATION_PERMISSIONS
+from shared import OBJ_MODERATION_PERMISSIONS
 
 
 def app_moderation_status(request):

frontend/src/utils/getObjModerationLevels.js

-import OBJ_MODERATION_PERMISSIONS from "../../../backend/permissions/OBJ_MODERATION_PERMISSIONS.json";
+import OBJ_MODERATION_PERMISSIONS from "../../../shared/OBJ_MODERATION_PERMISSIONS.json";
 
 export default function getObjModerationLevel(userLevel, restrict = false) {
   let out = Array();

requirements.txt

@@ -14,4 +14,5 @@ django-debug-toolbar==1.9.1
 pandas
 pyyaml
 git+https://github.com/FloChehab/django-extensions.git@30c1a807aeb985739358d70907496e98d1857abb#egg=django-extensions
-uwsgi
+uwsgi
\ No newline at end of file
+dotmap
\ No newline at end of file

general/api/__init__.py → shared/__init__.py

 from .get_api_config import get_api_config  # noqa: F401
+from .obj_moderation_permission import DEFAULT_OBJ_MODERATION_LV, OBJ_MODERATION_PERMISSIONS
\ No newline at end of file