From 475dbb04f593de9b9b78d89548d4fde4fc7edd5c Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 20 Jun 2025 18:01:41 +0200 Subject: [PATCH 1/3] half way --- .#config.yaml | 1 - rowsandall_app/settings.py | 31 +++++++++++++++++++------------ rowsandall_app/settings_dev.py | 18 +++++++++--------- 3 files changed, 28 insertions(+), 22 deletions(-) delete mode 120000 .#config.yaml diff --git a/.#config.yaml b/.#config.yaml deleted file mode 120000 index b90ba2a6..00000000 --- a/.#config.yaml +++ /dev/null @@ -1 +0,0 @@ -sander@rowsandall-2.14384:1749892836 \ No newline at end of file diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index c079cfb7..00653b67 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -85,6 +85,7 @@ INSTALLED_APPS = [ 'taggit', 'boatmovers', 'django_recaptcha', + 'anymail', ] AUTHENTICATION_BACKENDS = ( @@ -446,22 +447,28 @@ CACHE_MIDDLEWARE_SECONDS = 900 # EMAIL_USE_TLS = CFG['email_use_tls'] # DEFAULT_FROM_EMAIL = 'admin@rowsandall.com' -EMAIL_BACKEND = 'django_ses.SESBackend' +#EMAIL_BACKEND = 'django_ses.SESBackend' -AWS_SES_REGION_NAME = CFG['aws_region'] -AWS_SES_REGION_ENDPOINT = CFG['aws_smtp'] +ANYMAIL = { + 'MAILERSEND_API_TOKEN': CFG['mailersend_api_key'], + } +EMAIL_BACKEND = 'anymail.backends.mailersend.EmailBackend' -AWS_SES_ACCESS_KEY_ID = CFG['aws_access_key_id'] -AWS_SES_SECRET_ACCESS_KEY = CFG['aws_secret_access_key'] -AWS_ACCESS_KEY_ID = CFG['aws_access_key_id'] -AWS_SECRET_ACCESS_KEY = CFG['aws_secret_access_key'] +#AWS_SES_REGION_NAME = CFG['aws_region'] +#AWS_SES_REGION_ENDPOINT = CFG['aws_smtp'] -EMAIL_HOST = CFG['aws_smtp'] -EMAIL_PORT = CFG['aws_port'] -EMAIL_HOST_USER = CFG['aws_smtp_username'] -EMAIL_HOST_PASSWORD = CFG['aws_smtp_password'] -EMAIL_USE_TLS = CFG['email_use_tls'] +#AWS_SES_ACCESS_KEY_ID = CFG['aws_access_key_id'] +#AWS_SES_SECRET_ACCESS_KEY = CFG['aws_secret_access_key'] +#AWS_ACCESS_KEY_ID = CFG['aws_access_key_id'] +#AWS_SECRET_ACCESS_KEY = CFG['aws_secret_access_key'] + +#EMAIL_HOST = CFG['aws_smtp'] +#EMAIL_PORT = CFG['aws_port'] +#EMAIL_HOST_USER = CFG['aws_smtp_username'] +#EMAIL_HOST_PASSWORD = CFG['aws_smtp_password'] +#EMAIL_USE_TLS = CFG['email_use_tls'] DEFAULT_FROM_EMAIL = 'info@rowsandall.com' +SERVER_EMAIL = 'support@rowsandall.com' # weather stuff diff --git a/rowsandall_app/settings_dev.py b/rowsandall_app/settings_dev.py index 1adb217b..53cf1694 100644 --- a/rowsandall_app/settings_dev.py +++ b/rowsandall_app/settings_dev.py @@ -105,16 +105,16 @@ SITE_URL = "http://localhost:8000" # EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend' # EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' -EMAIL_BACKEND = 'django_ses.SESBackend' +#EMAIL_BACKEND = 'django_ses.SESBackend' -AWS_SES_REGION_NAME = 'eu-west-1' -AWS_SES_REGION_ENDPOINT = 'email.eu-west-1.amazonaws.com' +#AWS_SES_REGION_NAME = 'eu-west-1' +#AWS_SES_REGION_ENDPOINT = 'email.eu-west-1.amazonaws.com' -EMAIL_HOST = CFG['aws_smtp'] -EMAIL_PORT = CFG['aws_port'] -EMAIL_HOST_USER = CFG['aws_smtp_username'] -EMAIL_HOST_PASSWORD = CFG['aws_smtp_password'] -EMAIL_USE_TLS = CFG['email_use_tls'] -DEFAULT_FROM_EMAIL = 'info@rowsandall.com' +#EMAIL_HOST = CFG['aws_smtp'] +#EMAIL_PORT = CFG['aws_port'] +#EMAIL_HOST_USER = CFG['aws_smtp_username'] +#EMAIL_HOST_PASSWORD = CFG['aws_smtp_password'] +#EMAIL_USE_TLS = CFG['email_use_tls'] +#DEFAULT_FROM_EMAIL = 'info@rowsandall.com' SETTINGS_NAME = 'rowsandall_app.settings_dev' From 8399b907d04e836d611963b33b3271ae47cce1a5 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 23 Jun 2025 18:47:28 +0200 Subject: [PATCH 2/3] fixes --- rowers/integrations/nk.py | 2 +- rowers/tests/testdata/testdata.tcx.gz | Bin 3989 -> 3989 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/rowers/integrations/nk.py b/rowers/integrations/nk.py index e6694482..ce4d8b90 100644 --- a/rowers/integrations/nk.py +++ b/rowers/integrations/nk.py @@ -71,7 +71,7 @@ class NKIntegration(SyncIntegration): try: _ = self.open() except NoTokenError: # pragma: no cover - dologging("nklog.log","NK Token error for user {id}".format(id=rower.user.id)) + dologging("nklog.log","NK Token error for user {id}".format(id=self.rower.user.id)) return 0 workouts = self.get_workout_list(before=before, after=after) diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 1d07dcefdafdaa6b0dffef9c3fda959fea19ce61..06f31d629aad4487c06f6882e28a2322c00ef10a 100644 GIT binary patch delta 15 WcmbO#KUJPhzMF%?WBx|AetrNWA_Qds delta 15 WcmbO#KUJPhzMF$%$()UB{rmtWI|RM} From d3fee93df92c0d6a560fa7f808be204f2a901a34 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 23 Jun 2025 19:56:47 +0200 Subject: [PATCH 3/3] tested, waiting for account approval --- rowers/tests/testdata/testdata.tcx.gz | Bin 3989 -> 3989 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 8be32d41843def2351fa629ff0930631e6d0623f..04a5d6c6b75ba9ed2a263ef98c9451a7f7dc96f3 100644 GIT binary patch delta 16 XcmbO#KUJPxzMF%?ZF1yB_C9_9C#D3k delta 16 XcmbO#KUJPxzMF$%*RtS^?0x(ID<%ap