Merge branch 'develop'

This commit is contained in:
Luc SORIGNET
2024-12-16 10:20:17 +01:00
5 changed files with 81 additions and 17 deletions

View File

@ -2,10 +2,12 @@ import logging
from django.db.models import Q
from GestionInscriptions.models import FicheInscription, Profil, Eleve
logger = logging.getLogger('N3wtSchool')
def getAllObjects(_objectName):
result = _objectName.objects.all()
if not result:
logging.warning("Aucun résultat n'a été trouvé - " + _objectName.__name__)
logger.warning("Aucun résultat n'a été trouvé - " + _objectName.__name__)
return result
def getObject(_objectName, _columnName, _value):
@ -13,7 +15,7 @@ def getObject(_objectName, _columnName, _value):
try :
result = _objectName.objects.get(**{_columnName: _value})
except _objectName.DoesNotExist:
logging.error("Aucun résultat n'a été trouvé - " + _objectName.__name__ + " (" + _columnName + "=" + str(_value) + ")")
logger.error("Aucun résultat n'a été trouvé - " + _objectName.__name__ + " (" + _columnName + "=" + str(_value) + ")")
return result
@ -22,7 +24,7 @@ def getObjects(_objectName, _columnName, _value, _reverseCondition=False):
try :
results = _objectName.objects.filter(**{_columnName: _value}) if _reverseCondition == False else _objectName.objects.filter(~Q(**{_columnName: _value}))
except _objectName.DoesNotExist:
logging.error("Aucun résultat n'a été trouvé - " + _objectName.__name__ + " (" + _columnName + "=" + str(_value) + ")")
logger.error("Aucun résultat n'a été trouvé - " + _objectName.__name__ + " (" + _columnName + "=" + str(_value) + ")")
return results
@ -53,7 +55,7 @@ def getLastId(_object):
try:
result = _object.objects.latest('id').id
except:
logging.warning("Aucun résultat n'a été trouvé - ")
logger.warning("Aucun résultat n'a été trouvé - ")
return result
def searchObjects(_objectName, _searchTerm=None, _excludeStates=None):

View File

@ -55,7 +55,7 @@ MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware', # Déplacez ici, avant CorsMiddleware
'corsheaders.middleware.CorsMiddleware',
'corsheaders.middleware.CorsMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
@ -92,6 +92,68 @@ SESSION_CACHE_ALIAS = 'default'
WSGI_APPLICATION = 'N3wtSchool.wsgi.application'
#LOGGING
LOGGING = {
"version": 1,
"disable_existing_loggers": False,
"formatters": { # Ajout des formateurs
"verbose": {
"format": "{asctime} [{levelname}] [{name}] {module}.{funcName} - {message}",
"style": "{",
"datefmt": "%Y-%m-%d %H:%M:%S"
}
},
"handlers": {
"console": {
"class": "logging.StreamHandler",
"formatter": "verbose", # Utilisation du formateur
},
},
"root": {
"handlers": ["console"],
"level": os.getenv("ROOT_LOG_LEVEL", "INFO"),
},
"loggers": {
"celery": {
"handlers": ["console"],
"level": os.getenv("CELERY_LOG_LEVEL", "INFO"),
"propagate": False,
},
"N3wtSchool": {
"handlers": ["console"],
"level": os.getenv("N3WTSCHOOL_LOG_LEVEL", "INFO"),
"propagate": False,
},
"GestionNotification": {
"handlers": ["console"],
"level": os.getenv("GESTION_NOTIFICATION_LOG_LEVEL", "INFO"),
"propagate": False,
},
"GestionLogin": {
"handlers": ["console"],
"level": os.getenv("GESTION_LOGIN_LOG_LEVEL", "INFO"),
"propagate": False,
},
"GestionInscriptions": {
"handlers": ["console"],
"level": os.getenv("GESTION_INSCRIPTIONS_LOG_LEVEL", "DEBUG"),
"propagate": False,
},
"GestionMessagerie": {
"handlers": ["console"],
"level": os.getenv("GESTION_MESSAGERIE_LOG_LEVEL", "INFO"),
"propagate": False,
},
"GestionEnseignants": {
"handlers": ["console"],
"level": os.getenv("GESTION_ENSEIGNANTS_LOG_LEVEL", "INFO"),
"propagate": False,
},
},
}
# Password validation
# https://docs.djangoproject.com/en/5.0/ref/settings/#auth-password-validators

View File

@ -19,12 +19,12 @@ from django.urls import include, path, re_path
from rest_framework import permissions
from drf_yasg.views import get_schema_view
from drf_yasg import openapi
from __version__ import __version__
schema_view = get_schema_view(
openapi.Info(
title="N3wtSchool API",
default_version='v1',
default_version=__version__,
description="Documentation de l'API de N3wtSchool",
terms_of_service="https://www.google.com/policies/terms/",
contact=openapi.Contact(email="contact@example.com"),