removed deploy CI #42

Repo structure complete redesign
Fixes #38

.gitignore

@@ -5,7 +5,6 @@ db.sqlite3
 /static
 .DS_Store
 /media/*
-node_modules
 .coverage
 htmlcov
 .vscode

.gitlab-ci.yml

@@ -54,22 +54,3 @@ pages:
     - master
   tags:
     - docker
-
-deliver_for_production:
-  type: deploy
-  before_script:
-    ## look here for info : https://docs.gitlab.com/ee/ci/ssh_keys/#ssh-keys-when-using-the-docker-executor
-    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
-    - eval $(ssh-agent -s)
-    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
-    - mkdir -p ~/.ssh
-    - chmod 700 ~/.ssh
-    - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
-    - chmod 644 ~/.ssh/known_hosts
-  script:
-    - ssh $SERVER_USER_USERNAME@$SERVER 'bash -s' < deploy.sh
-  only:
-    - production 
-  tags:
-    - docker
-

.coveragerc → backend/.coveragerc

@@ -3,7 +3,7 @@ omit =
     *migrations*
     */tests/*
     manage.py
-    general/wsgi.py 
+    base_app/wsgi.py 
     */urls.py
     */admin.py
     

.flake8 → backend/.flake8

@@ -4,7 +4,4 @@ ignore = E501
 exclude = 
     env/*
     node_modules/*
-    backend/urls.py
-    backend/admin.py
-    backend/permissions/__list_user_post_permission.py
-    general/settings/development.py
+    base_app/settings/development.py

backend/.gitignore

+/static
\ No newline at end of file

backend/__init__.py

-default_app_config = 'backend.apps.BackendConfig'

backend/apps.py

-from django.apps import AppConfig
-
-
-class BackendConfig(AppConfig):
-    name = 'backend'
-
-    def ready(self):
-        import backend.signals.__create_user_modules_post_create  # noqa: F401
-        import backend.signals.__squash_revision_by_user  # noqa: F401
-        import backend.signals.__create_univ_modules_post_save  # noqa: F401

backend/backend_app/__init__.py

+default_app_config = 'backend_app.apps.BackendAppConfig'

backend/admin.py → backend/backend_app/admin.py

@@ -14,7 +14,7 @@ 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):
-            module = importlib.import_module("backend.models.{}".format     (model.import_location))
+            module = importlib.import_module("backend_app.models.{}".format     (model.import_location))
             if model.versionned:
                 VERSIONNED_MODELS.append(getattr(module, model.model))
             else:

backend/backend_app/apps.py

+from django.apps import AppConfig
+
+
+class BackendAppConfig(AppConfig):
+    name = 'backend_app'
+
+    def ready(self):
+        import backend_app.signals.__create_user_modules_post_create  # noqa: F401
+        import backend_app.signals.__squash_revision_by_user  # noqa: F401
+        import backend_app.signals.__create_univ_modules_post_save  # noqa: F401

backend/custom/mySerializerWithJSON.py → backend/backend_app/custom/mySerializerWithJSON.py

-from backend.fields import JSONField
+from backend_app.fields import JSONField
 from rest_framework import serializers
 
 field_mapping = serializers.ModelSerializer.serializer_field_mapping

backend/load_data/loading_scripts/loadCountries.py → backend/backend_app/load_data/loading_scripts/loadCountries.py

-from backend.models.country import Country
+from backend_app.models.country import Country
 import os
 import pandas as pd
 from .loadGeneric import LoadGeneric

backend/load_data/loading_scripts/loadCurrencies.py → backend/backend_app/load_data/loading_scripts/loadCurrencies.py

-from backend.models.currency import Currency
+from backend_app.models.currency import Currency
 import os
 import csv
 from .loadGeneric import LoadGeneric

backend/load_data/loading_scripts/loadTags.py → backend/backend_app/load_data/loading_scripts/loadTags.py

-from backend.models.tag import Tag
+from backend_app.models.tag import Tag
 
 import os
 import json

backend/load_data/loading_scripts/loadUniversities.py → backend/backend_app/load_data/loading_scripts/loadUniversities.py

-from backend.models.country import Country
-from backend.models.city import City
-from backend.models.university import University
-from backend.models.campus import Campus
+from backend_app.models.country import Country
+from backend_app.models.city import City
+from backend_app.models.university import University
+from backend_app.models.campus import Campus
 
 import os
 import pandas as pd

backend/load_data/loading_scripts/loadUniversityEx.py → backend/backend_app/load_data/loading_scripts/loadUniversityEx.py

 from .loadGeneric import LoadGeneric
-from backend.models.university import University
-from backend.models.university import UniversityDri
-from backend.models.university import UniversityInfo
-from backend.models.university import UniversitySemestersDates
-from backend.models.country import CountryScholarship
-from backend.models.country import Country
-from backend.models.university import UniversityTaggedItem
+from backend_app.models.university import University
+from backend_app.models.university import UniversityDri
+from backend_app.models.university import UniversityInfo
+from backend_app.models.university import UniversitySemestersDates
+from backend_app.models.country import CountryScholarship
+from backend_app.models.country import Country
+from backend_app.models.university import UniversityTaggedItem
 
-from backend.models.currency import Currency
-from backend.models.tag import Tag
+from backend_app.models.currency import Currency
+from backend_app.models.tag import Tag
 
 from datetime import datetime
 

backend/migrations/0002_auto_20180916_1555.py → backend/backend_app/migrations/0002_auto_20180916_1555.py

 # Generated by Django 2.0.3 on 2018-09-16 13:55
 
-import backend.models.university.university
+import backend_app.models.university.university
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('backend', '0001_initial'),
+        ('backend_app', '0001_initial'),
     ]
 
     operations = [
@@ -144,7 +144,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='university',
             name='logo',
-            field=models.URLField(blank=True, default='', validators=[backend.models.university.university.validate_extension_django]),
+            field=models.URLField(blank=True, default='', validators=[backend_app.models.university.university.validate_extension_django]),
         ),
         migrations.AlterField(
             model_name='university',

backend/migrations/0003_auto_20180916_1624.py → backend/backend_app/migrations/0003_auto_20180916_1624.py

@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('backend', '0002_auto_20180916_1555'),
+        ('backend_app', '0002_auto_20180916_1555'),
     ]
 
     operations = [

backend/models/abstract/basic_module/basicModule.py → backend/backend_app/models/abstract/basic_module/basicModule.py

 from django.db import models
-from backend.models.abstract.my_model import MyModelVersionned, MyModelVersionnedSerializer, MyModelVersionnedViewSet
-from backend.fields import JSONField
-from backend.validators.tag import validate_content_against_config
-from backend.validators.tag.tags_config import USEFULL_LINKS_CONFIG
+from backend_app.models.abstract.my_model import MyModelVersionned, MyModelVersionnedSerializer, MyModelVersionnedViewSet
+from backend_app.fields import JSONField
+from backend_app.validators.tag import validate_content_against_config
+from backend_app.validators.tag.tags_config import USEFULL_LINKS_CONFIG
 
 IMPORTANCE_LEVEL = (
     ('-', 'normal'),

backend/models/abstract/my_model/forTestingModeration.py → backend/backend_app/models/abstract/my_model/forTestingModeration.py

@@ -2,7 +2,7 @@ from .myModel import MyModel
 from .myModelSerializer import MyModelSerializer
 from .myModelViewSet import MyModelViewSet
 from django.db import models
-from backend.utils import get_model_config, get_viewset_permissions
+from backend_app.utils import get_model_config, get_viewset_permissions
 
 
 class ForTestingModeration(MyModel):

backend/models/abstract/my_model/forTestingVersioning.py → backend/backend_app/models/abstract/my_model/forTestingVersioning.py

 from .myModelVersionned import MyModelVersionned, MyModelVersionnedSerializer, MyModelVersionnedViewSet
 from django.db import models
 import reversion
-from backend.utils import get_model_config, get_viewset_permissions
+from backend_app.utils import get_model_config, get_viewset_permissions
 
 
 @reversion.register()

backend/models/abstract/my_model/myModelSerializer.py → backend/backend_app/models/abstract/my_model/myModelSerializer.py

@@ -5,9 +5,9 @@ from .pendingModeration import PendingModeration
 from django.contrib.contenttypes.models import ContentType
 from .myModel import MyModel
 from .pendingModeration import PendingModerationSerializer
-from backend.utils import get_user_level
-from backend.permissions import is_moderation_required
-from backend.custom import MySerializerWithJSON
+from backend_app.utils import get_user_level
+from backend_app.permissions import is_moderation_required
+from backend_app.custom import MySerializerWithJSON
 
 CLEANED_MY_MODEL_DATA = {
     'moderated_by': None,

backend/models/abstract/my_model/myModelVersionned.py → backend/backend_app/models/abstract/my_model/myModelVersionned.py

-from backend.models.abstract.my_model import MyModel, MyModelSerializer, MyModelViewSet
-from backend.signals.__squash_revision_by_user import new_revision_saved
+from backend_app.models.abstract.my_model import MyModel, MyModelSerializer, MyModelViewSet
+from backend_app.signals.__squash_revision_by_user import new_revision_saved
 from rest_framework import serializers, mixins, viewsets
 import reversion
 from reversion.models import Version
 from django.contrib.contenttypes.models import ContentType
 from django.core.serializers.base import DeserializationError
 from django.core import serializers as djangoSerializers
-from backend.utils import get_viewset_permissions
-from backend.custom import MySerializerWithJSON
+from backend_app.utils import get_viewset_permissions
+from backend_app.custom import MySerializerWithJSON
 
 
 class MyModelVersionned(MyModel):

backend/models/abstract/my_model/myModelViewSet.py → backend/backend_app/models/abstract/my_model/myModelViewSet.py

 from .myModelSerializer import MyModelSerializer
-from backend.permissions import DEFAULT_VIEWSET_PERMISSIONS
-from backend.custom import DictModeViewSet
+from backend_app.permissions import DEFAULT_VIEWSET_PERMISSIONS
+from backend_app.custom import DictModeViewSet
 
 
 class MyModelViewSet(DictModeViewSet):

backend/models/abstract/my_model/pendingModeration.py → backend/backend_app/models/abstract/my_model/pendingModeration.py

@@ -2,10 +2,10 @@ from django.db import models
 from rest_framework import serializers, viewsets
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.fields import GenericForeignKey
-from backend.fields import JSONField
+from backend_app.fields import JSONField
 from django.contrib.auth.models import User
-from backend.utils import get_viewset_permissions, get_model_config
-from backend.custom import MySerializerWithJSON
+from backend_app.utils import get_viewset_permissions, get_model_config
+from backend_app.custom import MySerializerWithJSON
 
 
 class PendingModeration(models.Model):

backend/models/abstract/scholarship/scholarship.py → backend/backend_app/models/abstract/scholarship/scholarship.py

 from django.db import models
-from backend.models.abstract.basic_module import BasicModule, BasicModuleSerializer, BasicModuleViewSet
-from backend.models.currency import Currency
+from backend_app.models.abstract.basic_module import BasicModule, BasicModuleSerializer, BasicModuleViewSet
+from backend_app.models.currency import Currency
 from rest_framework import serializers
 from django.core.validators import MinValueValidator
 

backend/models/abstract/taggedItem/taggedItem.py → backend/backend_app/models/abstract/taggedItem/taggedItem.py

 from django.db import models
-from backend.models.abstract.basic_module import BasicModule, BasicModuleSerializer, BasicModuleViewSet
-from backend.models.tag import Tag
-from backend.validators.tag import tagged_item_validation
-from backend.fields import JSONField
+from backend_app.models.abstract.basic_module import BasicModule, BasicModuleSerializer, BasicModuleViewSet
+from backend_app.models.tag import Tag
+from backend_app.validators.tag import tagged_item_validation
+from backend_app.fields import JSONField
 
 
 class TaggedItem(BasicModule):

backend/models/campus/campus.py → backend/backend_app/models/campus/campus.py

 from django.db import models
-from backend.models.abstract.basic_module import BasicModule, BasicModuleSerializer, BasicModuleViewSet
-from backend.models.city import City
-from backend.models.university import University
+from backend_app.models.abstract.basic_module import BasicModule, BasicModuleSerializer, BasicModuleViewSet
+from backend_app.models.city import City
+from backend_app.models.university import University
 from django.core.validators import MinValueValidator, MaxValueValidator
-from backend.utils import get_model_config, get_viewset_permissions
+from backend_app.utils import get_model_config, get_viewset_permissions
 
 
 class Campus(BasicModule):

backend/models/campus/campusTaggedItem.py → backend/backend_app/models/campus/campusTaggedItem.py

 from django.db import models
-from backend.models.campus import Campus
-from backend.models.abstract.taggedItem import TaggedItem, TaggedItemSerializer, TaggedItemViewSet
-from backend.utils import get_model_config, get_viewset_permissions
+from backend_app.models.campus import Campus
+from backend_app.models.abstract.taggedItem import TaggedItem, TaggedItemSerializer, TaggedItemViewSet
+from backend_app.utils import get_model_config, get_viewset_permissions
 
 
 class CampusTaggedItem(TaggedItem):

backend/models/city/city.py → backend/backend_app/models/city/city.py

 from django.db import models
-from backend.models.country import Country
-from backend.models.abstract.my_model import MyModel, MyModelSerializer, MyModelVersionnedViewSet
-from backend.utils import get_model_config, get_viewset_permissions
+from backend_app.models.country import Country
+from backend_app.models.abstract.my_model import MyModel, MyModelSerializer, MyModelVersionnedViewSet
+from backend_app.utils import get_model_config, get_viewset_permissions
 
 
 class City(MyModel):

backend/models/city/cityTaggedItem.py → backend/backend_app/models/city/cityTaggedItem.py

 from django.db import models
-from backend.models.abstract.taggedItem import TaggedItem, TaggedItemSerializer, TaggedItemViewSet
-from backend.models.city import City
-from backend.utils import get_model_config, get_viewset_permissions
+from backend_app.models.abstract.taggedItem import TaggedItem, TaggedItemSerializer, TaggedItemViewSet
+from backend_app.models.city import City
+from backend_app.utils import get_model_config, get_viewset_permissions
 
 
 class CityTaggedItem(TaggedItem):

backend/models/country/country.py → backend/backend_app/models/country/country.py

 from django.db import models
-from backend.models.abstract.my_model import MyModel, MyModelSerializer, MyModelVersionnedViewSet
-from backend.utils import get_model_config, get_viewset_permissions
+from backend_app.models.abstract.my_model import MyModel, MyModelSerializer, MyModelVersionnedViewSet
+from backend_app.utils import get_model_config, get_viewset_permissions
 # Data model based on : https://unstats.un.org/unsd/methodology/m49/overview/
 
 

backend/models/country/countryDri.py → backend/backend_app/models/country/countryDri.py

 from django.db import models
-from backend.models.country import Country
-from backend.models.abstract.basic_module import BasicModule, BasicModuleSerializer, BasicModuleViewSet
-from backend.utils import get_model_config, get_viewset_permissions
+from backend_app.models.country import Country
+from backend_app.models.abstract.basic_module import BasicModule, BasicModuleSerializer, BasicModuleViewSet
+from backend_app.utils import get_model_config, get_viewset_permissions
 
 
 class CountryDri(BasicModule):

backend/models/country/countryScholarship.py → backend/backend_app/models/country/countryScholarship.py

 from django.db import models
-from backend.models.country import Country
-from backend.models.abstract.scholarship import Scholarship, ScholarshipSerializer, ScholarshipViewSet
-from backend.utils import get_model_config, get_viewset_permissions
+from backend_app.models.country import Country
+from backend_app.models.abstract.scholarship import Scholarship, ScholarshipSerializer, ScholarshipViewSet
+from backend_app.utils import get_model_config, get_viewset_permissions
 
 
 class CountryScholarship(Scholarship):

backend/models/country/countryTaggedItem.py → backend/backend_app/models/country/countryTaggedItem.py

 from django.db import models
-from backend.models.abstract.taggedItem import TaggedItem, TaggedItemSerializer, TaggedItemViewSet
-from backend.models.country import Country
-from backend.utils import get_model_config, get_viewset_permissions
+from backend_app.models.abstract.taggedItem import TaggedItem, TaggedItemSerializer, TaggedItemViewSet
+from backend_app.models.country import Country
+from backend_app.utils import get_model_config, get_viewset_permissions
 
 
 class CountryTaggedItem(TaggedItem):

backend/models/currency/currency.py → backend/backend_app/models/currency/currency.py

 from django.db import models
 from django.core.validators import MinValueValidator
-from backend.models.abstract.my_model import MyModel, MyModelSerializer, MyModelViewSet
-from backend.utils import get_model_config, get_viewset_permissions
+from backend_app.models.abstract.my_model import MyModel, MyModelSerializer, MyModelViewSet
+from backend_app.utils import get_model_config, get_viewset_permissions
 
 
 class Currency(MyModel):

backend/models/other_core/department.py → backend/backend_app/models/other_core/department.py

 from django.db import models
-from backend.models.abstract.my_model import MyModel, MyModelSerializer, MyModelViewSet
-from backend.utils import get_model_config, get_viewset_permissions
+from backend_app.models.abstract.my_model import MyModel, MyModelSerializer, MyModelViewSet
+from backend_app.utils import get_model_config, get_viewset_permissions
 
 
 class Department(MyModel):

backend/models/other_core/offer.py → backend/backend_app/models/other_core/offer.py

 from django.db import models
-from backend.models.university import University
-from backend.models.other_core import Semester, Specialty
-from backend.models.abstract.my_model import MyModel, MyModelSerializer, MyModelViewSet
-from backend.utils import get_model_config, get_viewset_permissions
+from backend_app.models.university import University
+from backend_app.models.other_core import Semester, Specialty
+from backend_app.models.abstract.my_model import MyModel, MyModelSerializer, MyModelViewSet
+from backend_app.utils import get_model_config, get_viewset_permissions
 
 
 class Offer(MyModel):

backend/models/other_core/semester.py → backend/backend_app/models/other_core/semester.py

 from django.db import models
-from backend.models.abstract.my_model import MyModel, MyModelSerializer, MyModelViewSet
-from backend.utils import get_model_config, get_viewset_permissions
+from backend_app.models.abstract.my_model import MyModel, MyModelSerializer, MyModelViewSet
+from backend_app.utils import get_model_config, get_viewset_permissions
 
 
 class Semester(MyModel):

backend/models/other_core/specialty.py → backend/backend_app/models/other_core/specialty.py

 from django.db import models
-from backend.models.other_core import Department
-from backend.models.abstract.my_model import MyModel, MyModelSerializer, MyModelViewSet
-from backend.utils import get_model_config, get_viewset_permissions
+from backend_app.models.other_core import Department
+from backend_app.models.abstract.my_model import MyModel, MyModelSerializer, MyModelViewSet
+from backend_app.utils import get_model_config, get_viewset_permissions
 
 
 class Specialty(MyModel):

backend/models/tag/tag.py → backend/backend_app/models/tag/tag.py

 from django.db import models
-from backend.models.abstract.my_model import MyModel, MyModelSerializer, MyModelViewSet
-from backend.fields import JSONField
-from backend.utils import get_viewset_permissions, get_model_config
+from backend_app.models.abstract.my_model import MyModel, MyModelSerializer, MyModelViewSet
+from backend_app.fields import JSONField
+from backend_app.utils import get_viewset_permissions, get_model_config
 
 
 class Tag(MyModel):

backend/models/university/university.py → backend/backend_app/models/university/university.py

 from django.db import models
-from backend.models.abstract.my_model import MyModel
-from backend.utils import get_model_config
+from backend_app.models.abstract.my_model import MyModel
+from backend_app.utils import get_model_config
 from django.core.exceptions import ValidationError
 from rest_framework.validators import ValidationError as RFValidationError
-from backend.validators.tag.url import validate_extension
+from backend_app.validators.tag.url import validate_extension
 from django.conf import settings
-from backend.models.abstract.my_model import MyModelSerializer, MyModelViewSet
-from backend.utils import get_viewset_permissions
+from backend_app.models.abstract.my_model import MyModelSerializer, MyModelViewSet
+from backend_app.utils import get_viewset_permissions
 
 
 def validate_extension_django(url):

backend/models/university/universityDri.py → backend/backend_app/models/university/universityDri.py

 from django.db import models
-from backend.models.university import University
-from backend.models.abstract.basic_module import BasicModule, BasicModuleSerializer, BasicModuleViewSet
-from backend.utils import get_model_config, get_viewset_permissions
+from backend_app.models.university import University
+from backend_app.models.abstract.basic_module import BasicModule, BasicModuleSerializer, BasicModuleViewSet
+from backend_app.utils import get_model_config, get_viewset_permissions
 
 
 class UniversityDri(BasicModule):

backend/models/university/universityInfo.py → backend/backend_app/models/university/universityInfo.py

 from django.db import models
-from backend.models.abstract.basic_module import BasicModule, BasicModuleSerializer, BasicModuleViewSet
-from backend.models.university import University
-from backend.models.currency import Currency
+from backend_app.models.abstract.basic_module import BasicModule, BasicModuleSerializer, BasicModuleViewSet
+from backend_app.models.university import University
+from backend_app.models.currency import Currency
 from django.core.validators import MinValueValidator
-from backend.utils import get_model_config, get_viewset_permissions
+from backend_app.utils import get_model_config, get_viewset_permissions
 
 
 class UniversityInfo(BasicModule):

backend/models/university/universityScholarship.py → backend/backend_app/models/university/universityScholarship.py

 from django.db import models
-from backend.models.university import University