Skip to content

Commit 6e00fac

Browse files
domdinicoladomdinicola
committed
lock again
1 parent c1b9bd9 commit 6e00fac

17 files changed

Lines changed: 185 additions & 157 deletions

File tree

‎src/donor_reporting_portal/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
NAME = "donor-reporting-portal"
2-
VERSION = __version__ = "2.3.0"
2+
VERSION = __version__ = "2.3.1"

‎src/donor_reporting_portal/apps/core/backends.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
from django.contrib.auth.backends import ModelBackend
22

3+
from anymail.backends.mailjet import EmailBackend as MailjetEmailBackend
4+
from unicef_notification.backends import EmailBackend as UNICEFEmailBackend
5+
36
from donor_reporting_portal.apps.report_metadata.models import Donor
47
from donor_reporting_portal.apps.roles.models import UserRole
58

@@ -33,3 +36,7 @@ def has_perm(self, user_obj, perm, context_obj):
3336
else:
3437
return set()
3538
return perm in {f"{app_label}.{perm_name}" for app_label, perm_name in perms}
39+
40+
41+
class EmailBackend(MailjetEmailBackend, UNICEFEmailBackend):
42+
pass

‎src/donor_reporting_portal/config/fragments/__init__.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
from .cache import * # noqa
2+
from .celery import * # noqa
3+
from .cors import * # noqa
4+
from .drp import * # noqa
5+
from .email import * # noqa
6+
from .impersonate import * # noqa
7+
from .insight import * # noqa
8+
from .jwt import * # noqa
9+
from .logging import * # noqa
10+
from .matomo import * # noqa
11+
from .rest import * # noqa
12+
from .sentry import * # noqa
13+
from .social_auth import * # noqa

‎src/donor_reporting_portal/config/fragments/cache.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
from ..settings import env
2+
3+
CACHES = {
4+
"default": {
5+
"BACKEND": "redis_cache.RedisCache",
6+
"LOCATION": env("REDIS_URL", default="redis://localhost:6379/0"),
7+
}
8+
}

‎src/donor_reporting_portal/config/fragments/celery.py‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
from ..settings import env
2+
3+
CELERY_ACCEPT_CONTENT = ["pickle", "json", "application/text"]
4+
CELERY_BROKER_URL = env("REDIS_URL", default="redis://localhost:6379/0")
5+
CELERY_BROKER_VISIBILITY_VAR = env("CELERY_VISIBILITY_TIMEOUT", default=1800) # in seconds
6+
CELERY_BROKER_TRANSPORT_OPTIONS = {"visibility_timeout": int(CELERY_BROKER_VISIBILITY_VAR)}
7+
CELERY_RESULT_BACKEND = "django-db"
8+
CELERY_BEAT_SCHEDULER = "django_celery_beat.schedulers.DatabaseScheduler"
9+
# Sensible settings for celery
10+
CELERY_TASK_ALWAYS_EAGER = env("CELERY_TASK_ALWAYS_EAGER", default=False)
11+
CELERY_TASK_ACKS_LATE = True
12+
CELERY_TASK_PUBLISH_RETRY = True
13+
CELERY_WORKER_DISABLE_RATE_LIMITS = False
14+
CELERY_TASK_IGNORE_RESULT = True
15+
CELERY_SEND_TASK_ERROR_EMAILS = False
16+
CELERY_RESULT_EXPIRES = 600
17+
CELERY_WORKER_PREFETCH_MULTIPLIER = 1

‎src/donor_reporting_portal/config/fragments/cors.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
from ..settings import env
2+
3+
CORS_ORIGIN_ALLOW_ALL = env("CORS_ORIGIN_ALLOW_ALL", default=False)

‎src/donor_reporting_portal/config/fragments/drp.py‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
from ..settings import env
2+
3+
DRP_SOURCE_IDS = {
4+
"internal": env("DRP_SOURCE_ID_INTERNAL", default=None),
5+
"external": env("DRP_SOURCE_ID_EXTERNAL", default=None),
6+
"pool_internal": env("DRP_SOURCE_ID_POOL_INTERNAL", default=None),
7+
"pool_external": env("DRP_SOURCE_ID_POOL_EXTERNAL", default=None),
8+
"thematic_internal": env("DRP_SOURCE_ID_THEMATIC_INTERNAL", default=None),
9+
"thematic_external": env("DRP_SOURCE_ID_THEMATIC_EXTERNAL", default=None),
10+
"gavi": env("DRP_SOURCE_ID_GAVI", default=None),
11+
"gavi_soa": env("DRP_SOURCE_ID_GAVI_SOA", default=None),
12+
}
13+
14+
GAVI_DONOR_CODE = "I49928"

‎src/donor_reporting_portal/config/fragments/email.py‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
from ..settings import env
2+
3+
DEFAULT_FROM_EMAIL = "donor_reporting_portal@mail.unicef.org"
4+
EMAIL_BACKEND = "unicef_notification.backends.EmailBackend"
5+
# EMAIL_BACKEND = "donor_reporting_portal.apps.core.backends.EmailBackend"
6+
7+
EMAIL_HOST = env("EMAIL_HOST", default="")
8+
EMAIL_HOST_USER = env("EMAIL_HOST_USER", default="")
9+
EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD", default="")
10+
EMAIL_PORT = env("EMAIL_PORT", default=25)
11+
EMAIL_USE_TLS = env("EMAIL_USE_TLS", default=False)
12+
EMAIL_USE_SSL = env("EMAIL_USE_SSL", default=False)
13+
14+
ANYMAIL = {
15+
"MAILJET_API_KEY": env("MAILJET_API_KEY"),
16+
"MAILJET_SECRET_KEY": env("MAILJET_SECRET_KEY"),
17+
}
18+
19+
POST_OFFICE = {
20+
"DEFAULT_PRIORITY": "now",
21+
"BACKENDS": {"default": "djcelery_email.backends.CeleryEmailBackend"},
22+
}

‎src/donor_reporting_portal/config/fragments/impersonate.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
IMPERSONATE = {
2+
"PAGINATE_COUNT": 50,
3+
"REQUIRE_SUPERUSER": True,
4+
"CUSTOM_USER_QUERYSET": "donor_reporting_portal.libs.impersonate.queryset",
5+
}

‎src/donor_reporting_portal/config/fragments/insight.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
from ..settings import env
2+
3+
INSIGHT_URL = env.str("INSIGHT_URL", "http://invalid_vision_url")
4+
INSIGHT_LOGGER_MODEL = "vision.VisionLog"
5+
INSIGHT_SUB_KEY = env.str("INSIGHT_SUB_KEY", "invalid_vision_password")

0 commit comments

Comments
 (0)