Compare commits
2 Commits
main
...
all-inclus
| Author | SHA1 | Date |
|---|---|---|
 Christian Merten
|
e98f60aab9
|
6 months ago |
|
Christian Merten
|
5f89d118d7
|
6 months ago |
@ -1,147 +0,0 @@
|
||||
name: Build and test
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
env:
|
||||
REGISTRY: ghcr.io
|
||||
APP_IMAGE_NAME: ${{ github.repository }}
|
||||
NGINX_IMAGE_NAME: ${{ github.repository }}-nginx
|
||||
|
||||
jobs:
|
||||
build-test-and-deploy:
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: write
|
||||
packages: write
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Log in to GitHub Container Registry
|
||||
if: github.event_name != 'pull_request'
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: ${{ env.REGISTRY }}
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Extract metadata for application image
|
||||
id: meta-app
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: ${{ env.REGISTRY }}/${{ env.APP_IMAGE_NAME }}
|
||||
tags: |
|
||||
type=ref,event=branch
|
||||
type=ref,event=pr
|
||||
type=sha,prefix={{branch}}-
|
||||
type=raw,value=latest,enable={{is_default_branch}}
|
||||
|
||||
- name: Extract metadata for nginx image
|
||||
id: meta-nginx
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: ${{ env.REGISTRY }}/${{ env.NGINX_IMAGE_NAME }}
|
||||
tags: |
|
||||
type=ref,event=branch
|
||||
type=ref,event=pr
|
||||
type=sha,prefix={{branch}}-
|
||||
type=raw,value=latest,enable={{is_default_branch}}
|
||||
|
||||
- name: Build application image
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: .
|
||||
file: docker/production/Dockerfile
|
||||
load: true
|
||||
tags: kompass:test
|
||||
cache-from: |
|
||||
type=gha,scope=app-${{ github.ref_name }}
|
||||
type=gha,scope=app-master
|
||||
type=gha,scope=app-main
|
||||
type=registry,ref=ghcr.io/${{ github.repository }}:latest
|
||||
cache-to: type=gha,mode=max,scope=app-${{ github.ref_name }}
|
||||
build-args: |
|
||||
BUILDKIT_INLINE_CACHE=1
|
||||
|
||||
- name: Build documentation
|
||||
run: |
|
||||
# Create output directory with proper permissions
|
||||
mkdir -p docs-output
|
||||
chmod 777 docs-output
|
||||
|
||||
# Run sphinx-build inside the container
|
||||
docker run --rm \
|
||||
-v ${{ github.workspace }}/docs:/app/docs:ro \
|
||||
-v ${{ github.workspace }}/docs-output:/app/docs-output \
|
||||
kompass:test \
|
||||
bash -c "cd /app/docs && sphinx-build -b html source /app/docs-output"
|
||||
|
||||
- name: Deploy to GitHub Pages
|
||||
uses: peaceiris/actions-gh-pages@v4
|
||||
with:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
publish_dir: ./docs-output
|
||||
destination_dir: ${{ github.ref == 'refs/heads/main' && '.' || github.ref_name }}
|
||||
keep_files: true
|
||||
|
||||
- name: Run tests
|
||||
run: make test-only
|
||||
|
||||
- name: Check coverage
|
||||
run: |
|
||||
COVERAGE=$(python3 -c "import json; data=json.load(open('docker/test/htmlcov/coverage.json')); print(data['totals']['percent_covered'])")
|
||||
echo "Coverage: ${COVERAGE}%"
|
||||
if (( $(echo "$COVERAGE < 100" | bc -l) )); then
|
||||
echo "Error: Coverage is ${COVERAGE}%, must be 100%"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Tag and push application image
|
||||
if: github.event_name != 'pull_request'
|
||||
run: |
|
||||
# Tag the built image with all required tags
|
||||
echo "${{ steps.meta-app.outputs.tags }}" | while read -r tag; do
|
||||
docker tag kompass:test "$tag"
|
||||
docker push "$tag"
|
||||
done
|
||||
|
||||
- name: Build and push nginx image
|
||||
if: github.event_name != 'pull_request'
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: docker/production/nginx
|
||||
file: docker/production/nginx/Dockerfile
|
||||
push: true
|
||||
tags: ${{ steps.meta-nginx.outputs.tags }}
|
||||
labels: ${{ steps.meta-nginx.outputs.labels }}
|
||||
cache-from: |
|
||||
type=gha,scope=nginx-${{ github.ref_name }}
|
||||
type=gha,scope=nginx-master
|
||||
type=gha,scope=nginx-main
|
||||
type=registry,ref=ghcr.io/${{ github.repository }}-nginx:latest
|
||||
cache-to: type=gha,mode=max,scope=nginx-${{ github.ref_name }}
|
||||
build-args: |
|
||||
BUILDKIT_INLINE_CACHE=1
|
||||
|
||||
- name: Output image tags
|
||||
if: github.event_name != 'pull_request'
|
||||
run: |
|
||||
echo "Application image tags:"
|
||||
echo "${{ steps.meta-app.outputs.tags }}"
|
||||
echo ""
|
||||
echo "Nginx image tags:"
|
||||
echo "${{ steps.meta-nginx.outputs.tags }}"
|
||||
@ -1,2 +0,0 @@
|
||||
This repository contains third-party assets. Attributions are either placed in the file itself or
|
||||
in a file `NOTICE.txt` in the respective folder.
|
||||
@ -0,0 +1,26 @@
|
||||
[django]
|
||||
deployed = true
|
||||
debug = true
|
||||
secret_key = 'secret'
|
||||
allowed_hosts = ['*']
|
||||
protocol = 'http'
|
||||
base_url = 'localhost:8000'
|
||||
media_root = '/var/www/jdav_web/media'
|
||||
static_root = '/var/www/jdav_web/static'
|
||||
broker_url = 'redis://redis:6379/0'
|
||||
memcached_url = 'cache:11211'
|
||||
default_static_path = '/var/www/jdav_web/static'
|
||||
|
||||
[database]
|
||||
host = 'db'
|
||||
port = 3306
|
||||
database = 'kompass'
|
||||
user = 'kompass'
|
||||
password = 'secret'
|
||||
|
||||
[mail]
|
||||
host = 'mailserver'
|
||||
user = 'info@jdav-town.de'
|
||||
password = 'secret'
|
||||
default_sending_address = 'info@jdav-town.de'
|
||||
default_sending_name = 'JDAV Tuetown'
|
||||
@ -0,0 +1,11 @@
|
||||
FROM mariadb
|
||||
|
||||
COPY create_users.sql /docker-entrypoint-initdb.d/create_users.sql
|
||||
COPY replace_placeholders.sh /replace_placeholders.sh
|
||||
|
||||
ARG KOMPASS_DB_HOST
|
||||
ARG KOMPASS_DB_PASSWORD
|
||||
ARG KOMPASS_DB_PAM_PASSWORD
|
||||
ARG KOMPASS_DB_QUERYMAIL_PASSWORD
|
||||
|
||||
RUN chmod +x /replace_placeholders.sh && /replace_placeholders.sh
|
||||
@ -0,0 +1,28 @@
|
||||
CREATE DATABASE kompass;
|
||||
|
||||
-- main kompass user
|
||||
CREATE USER 'kompass'@'KOMPASS_DB_HOST' IDENTIFIED BY 'KOMPASS_DB_PASSWORD';
|
||||
GRANT ALL PRIVILEGES ON kompass.* TO 'kompass'@'KOMPASS_DB_HOST';
|
||||
|
||||
-- pam user
|
||||
CREATE USER 'pam'@'KOMPASS_DB_HOST' IDENTIFIED BY 'KOMPASS_DB_PAM_PASSWORD';
|
||||
GRANT SELECT ON kompass.* TO 'pam'@'KOMPASS_DB_HOST';
|
||||
|
||||
-- TODO: allow for this more granular permission configuration
|
||||
-- GRANT SELECT ON kompass.auth_user TO 'pam'@'KOMPASS_DB_HOST';
|
||||
-- GRANT SELECT ON kompass.mailer_emailaddress TO 'pam'@'KOMPASS_DB_HOST';
|
||||
|
||||
-- querymail user
|
||||
CREATE USER 'querymail'@'KOMPASS_DB_HOST' IDENTIFIED BY 'KOMPASS_DB_QUERYMAIL_PASSWORD';
|
||||
GRANT SELECT on kompass.* TO 'querymail'@'KOMPASS_DB_HOST';
|
||||
|
||||
-- TODO: allow for this more granular permission configuration
|
||||
-- GRANT SELECT (username, id) on kompass.auth_user TO 'querymail'@'KOMPASS_DB_HOST';
|
||||
-- GRANT SELECT ON kompass.members_member_group TO 'querymail'@'KOMPASS_DB_HOST';
|
||||
-- GRANT SELECT ON kompass.mailer_emailaddress_to_groups TO 'querymail'@'KOMPASS_DB_HOST';
|
||||
-- GRANT SELECT ON kompass.members_member TO 'querymail'@'KOMPASS_DB_HOST';
|
||||
-- GRANT SELECT ON kompass.mailer_emailaddress_to_groups TO 'querymail'@'KOMPASS_DB_HOST';
|
||||
-- GRANT SELECT ON kompass.mailer_emailaddress_to_members TO 'querymail'@'KOMPASS_DB_HOST';
|
||||
-- GRANT SELECT ON kompass.mailer_emailaddress TO 'querymail'@'KOMPASS_DB_HOST';
|
||||
|
||||
FLUSH PRIVILEGES;
|
||||
@ -0,0 +1,17 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Check if the required variables are set
|
||||
if [ -z "${KOMPASS_DB_HOST}" ]; then
|
||||
echo "Error: KOMPASS_DB_HOST is not set. Exiting."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Replace placeholders with environment variables in the SQL file
|
||||
if [ -f /docker-entrypoint-initdb.d/create_users.sql ]; then
|
||||
sed -i "s/KOMPASS_DB_PASSWORD/${KOMPASS_DB_PASSWORD}/g" /docker-entrypoint-initdb.d/create_users.sql
|
||||
sed -i "s/KOMPASS_DB_PAM_PASSWORD/${KOMPASS_DB_PAM_PASSWORD}/g" /docker-entrypoint-initdb.d/create_users.sql
|
||||
sed -i "s/KOMPASS_DB_QUERYMAIL_PASSWORD/${KOMPASS_DB_QUERYMAIL_PASSWORD}/g" /docker-entrypoint-initdb.d/create_users.sql
|
||||
sed -i "s/KOMPASS_DB_HOST/${KOMPASS_DB_HOST}/g" /docker-entrypoint-initdb.d/create_users.sql
|
||||
fi
|
||||
|
||||
echo "Update create_users.sql."
|
||||
@ -0,0 +1,135 @@
|
||||
x-kompass:
|
||||
&kompass
|
||||
image: kompass:production
|
||||
environment:
|
||||
- DJANGO_SETTINGS_MODULE=jdav_web.settings
|
||||
- KOMPASS_CONFIG_DIR_PATH=/app/config/
|
||||
restart: always
|
||||
depends_on:
|
||||
- redis
|
||||
- cache
|
||||
- db
|
||||
|
||||
services:
|
||||
mailserver:
|
||||
env_file: docker.env
|
||||
build:
|
||||
context: git@git.jdav-hd.merten.dev:digitales/kompass-mailserver#master
|
||||
dockerfile: master/Dockerfile
|
||||
args:
|
||||
DOMAIN:
|
||||
INTERNAL_DOMAINS:
|
||||
DOMAINS:
|
||||
MAIL_SERVER_ADMIN:
|
||||
KOMPASS_DB_NAME:
|
||||
KOMPASS_DB_HOST:
|
||||
KOMPASS_DB_PAM_USER:
|
||||
KOMPASS_DB_PAM_PASSWORD:
|
||||
KOMPASS_DB_QUERYMAIL_USER:
|
||||
KOMPASS_DB_QUERYMAIL_PASSWORD:
|
||||
ports:
|
||||
- "25:25"
|
||||
- "993:993"
|
||||
- "587:587"
|
||||
- "465:465"
|
||||
volumes:
|
||||
- ./mail/:/var/vmail/
|
||||
- ./cert.pem:/etc/ssl/cert.pem
|
||||
- ./key.pem:/etc/ssl/key.pem
|
||||
extra_hosts:
|
||||
- "host:10.26.43.1"
|
||||
restart: always
|
||||
|
||||
milter:
|
||||
build:
|
||||
context: git@git.jdav-hd.merten.dev:digitales/kompass-mailserver#master
|
||||
dockerfile: opendkim/Dockerfile
|
||||
volumes:
|
||||
- ./keys/:/etc/opendkim/keys/
|
||||
env_file: docker.env
|
||||
restart: always
|
||||
|
||||
master:
|
||||
<<: *kompass
|
||||
build:
|
||||
context: git@git.jdav-hd.merten.dev:digitales/kompass#main
|
||||
dockerfile: docker/production/Dockerfile
|
||||
args:
|
||||
DJANGO_SUPERUSER_PASSWORD:
|
||||
DJANGO_SUPERUSER_USERNAME:
|
||||
env_file: docker.env
|
||||
entrypoint: /app/docker/production/entrypoint-master.sh
|
||||
volumes:
|
||||
- uwsgi_data:/tmp/uwsgi/
|
||||
- web_static:/app/static/
|
||||
- web_static:/var/www/jdav_web/static/
|
||||
- ./media:/var/www/jdav_web/media/
|
||||
- ./config:/app/config:ro
|
||||
extra_hosts:
|
||||
- "host:10.26.42.1"
|
||||
|
||||
nginx:
|
||||
build: git@git.jdav-hd.merten.dev:digitales/kompass#main:docker/production/nginx
|
||||
restart: always
|
||||
volumes:
|
||||
- uwsgi_data:/tmp/uwsgi/
|
||||
- web_static:/var/www/jdav_web/static/:ro
|
||||
- ./media:/var/www/jdav_web/media/:ro
|
||||
ports:
|
||||
- "3000:80"
|
||||
depends_on:
|
||||
- master
|
||||
|
||||
cache:
|
||||
restart: always
|
||||
image: memcached:alpine
|
||||
|
||||
redis:
|
||||
restart: always
|
||||
image: redis:6-alpine
|
||||
|
||||
celery_worker:
|
||||
<<: *kompass
|
||||
entrypoint: /app/docker/production/entrypoint-celery-worker.sh
|
||||
volumes:
|
||||
- ./config:/app/config:ro
|
||||
extra_hosts:
|
||||
- "host:10.26.42.1"
|
||||
|
||||
celery_beat:
|
||||
<<: *kompass
|
||||
entrypoint: /app/docker/production/entrypoint-celery-beat.sh
|
||||
volumes:
|
||||
- ./config:/app/config:ro
|
||||
extra_hosts:
|
||||
- "host:10.26.42.1"
|
||||
|
||||
db:
|
||||
restart: always
|
||||
build:
|
||||
context: ./database/
|
||||
dockerfile: Dockerfile
|
||||
args:
|
||||
KOMPASS_DB_HOST:
|
||||
KOMPASS_DB_PASSWORD:
|
||||
KOMPASS_DB_PAM_PASSWORD:
|
||||
KOMPASS_DB_QUERYMAIL_PASSWORD:
|
||||
volumes:
|
||||
- ./db:/var/lib/mysql
|
||||
env_file: docker.env
|
||||
# networks:
|
||||
# main:
|
||||
# # assign static ip address
|
||||
# ipv4_address: 10.26.42.2
|
||||
|
||||
volumes:
|
||||
uwsgi_data:
|
||||
web_static:
|
||||
|
||||
#networks:
|
||||
# main:
|
||||
# driver: bridge
|
||||
# ipam:
|
||||
# config:
|
||||
# - subnet: 10.26.42.0/24
|
||||
# gateway: 10.26.42.1
|
||||
@ -0,0 +1,17 @@
|
||||
DOMAIN="jdav-town.de"
|
||||
DOMAINS="jdav-town.de"
|
||||
INTERNAL_DOMAINS="jdav-town.de alpenverein-town.de"
|
||||
|
||||
KOMPASS_DB_NAME="kompass"
|
||||
KOMPASS_DB_HOST="%"
|
||||
KOMPASS_DB_PASSWORD="secret"
|
||||
KOMPASS_DB_PAM_USER="pam"
|
||||
KOMPASS_DB_PAM_PASSWORD="secret"
|
||||
KOMPASS_DB_QUERYMAIL_USER="querymail"
|
||||
KOMPASS_DB_QUERYMAIL_PASSWORD="secret"
|
||||
MARIADB_ROOT_PASSWORD="secret"
|
||||
|
||||
MAIL_SERVER_ADMIN="digitales@jdav-town.de"
|
||||
|
||||
DJANGO_SUPERUSER_USERNAME="superuser"
|
||||
DJANGO_SUPERUSER_PASSWORD="secret"
|
||||
@ -1,12 +0,0 @@
|
||||
confirm_mail = """
|
||||
Hiho custom test test {name},
|
||||
|
||||
du hast bei der JDAV %(SEKTION)s eine E-Mail Adresse hinterlegt. Da bei uns alle Kommunikation
|
||||
per Email funktioniert, brauchen wir eine Bestätigung {whattoconfirm}.
|
||||
|
||||
Custom!
|
||||
|
||||
{link}
|
||||
|
||||
Test test
|
||||
Deine JDAV test test %(SEKTION)s"""
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 48 KiB |
@ -1,40 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 27.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{display:none;}
|
||||
.st1{display:inline;fill:#254D49;}
|
||||
.st2{display:inline;opacity:0.27;fill:url(#SVGID_1_);}
|
||||
.st3{fill:none;stroke:#1B2E2C;stroke-width:3;stroke-miterlimit:10;}
|
||||
.st4{fill:#1B2E2C;}
|
||||
.st5{fill:none;stroke:#508480;stroke-width:3.2;stroke-miterlimit:10;}
|
||||
.st6{fill:#BADDD9;}
|
||||
.st7{fill:#508480;}
|
||||
.st8{opacity:0.36;}
|
||||
.st9{opacity:0.24;fill:#FFFFFF;}
|
||||
</style>
|
||||
<g id="Hintergrund_x5F_Uni" class="st0">
|
||||
<rect class="st1" width="48" height="48"/>
|
||||
</g>
|
||||
<g id="Verlauf" class="st0">
|
||||
<radialGradient id="SVGID_1_" cx="23.348" cy="21.0566" r="25.4002" fx="3.9002" fy="4.7179" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" style="stop-color:#000000;stop-opacity:0"/>
|
||||
<stop offset="1" style="stop-color:#000000"/>
|
||||
</radialGradient>
|
||||
<circle class="st2" cx="23.6" cy="23.6" r="22.9"/>
|
||||
</g>
|
||||
<g id="Logo_x5F_Schatten">
|
||||
<circle class="st3" cx="24.3" cy="24.3" r="21.7"/>
|
||||
<polygon class="st4" points="21.4,22.9 15.8,42.4 27.5,25.7 33.2,6.2 "/>
|
||||
</g>
|
||||
<g id="LogooVordergrund">
|
||||
<circle class="st5" cx="23.7" cy="23.7" r="21.7"/>
|
||||
<g>
|
||||
<polygon class="st6" points="14.9,41.8 26.6,25.1 20.5,22.2 "/>
|
||||
<polygon class="st7" points="32.3,5.5 20.5,22.2 26.6,25.1 "/>
|
||||
<polyline class="st8" points="14.9,41.8 26.6,25.1 32.3,5.5 "/>
|
||||
<circle class="st9" cx="23.6" cy="23.6" r="1.6"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.6 KiB |
@ -1,175 +1,3 @@
|
||||
from datetime import datetime, timedelta
|
||||
from decimal import Decimal
|
||||
from django.test import TestCase, RequestFactory
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.contrib import admin
|
||||
from django.db import models
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.core.files.uploadedfile import SimpleUploadedFile
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from unittest.mock import Mock, patch
|
||||
from rules.contrib.models import RulesModelMixin, RulesModelBase
|
||||
from contrib.models import CommonModel
|
||||
from contrib.rules import has_global_perm
|
||||
from contrib.admin import CommonAdminMixin
|
||||
from utils import file_size_validator, RestrictedFileField, cvt_to_decimal, get_member, normalize_name, normalize_filename, coming_midnight, mondays_until_nth
|
||||
from django.test import TestCase
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
class CommonModelTestCase(TestCase):
|
||||
def test_common_model_abstract_base(self):
|
||||
"""Test that CommonModel provides the correct meta attributes"""
|
||||
meta = CommonModel._meta
|
||||
self.assertTrue(meta.abstract)
|
||||
expected_permissions = (
|
||||
'add_global', 'change_global', 'view_global', 'delete_global', 'list_global', 'view',
|
||||
)
|
||||
self.assertEqual(meta.default_permissions, expected_permissions)
|
||||
|
||||
def test_common_model_inheritance(self):
|
||||
"""Test that CommonModel has rules mixin functionality"""
|
||||
# Test that CommonModel has the expected functionality
|
||||
# Since it's abstract, we can't instantiate it directly
|
||||
# but we can check its metaclass and mixins
|
||||
self.assertTrue(issubclass(CommonModel, RulesModelMixin))
|
||||
self.assertEqual(CommonModel.__class__, RulesModelBase)
|
||||
|
||||
|
||||
class GlobalPermissionRulesTestCase(TestCase):
|
||||
def setUp(self):
|
||||
self.user = User.objects.create_user(
|
||||
username='testuser',
|
||||
email='test@example.com',
|
||||
password='testpass123'
|
||||
)
|
||||
|
||||
def test_has_global_perm_predicate_creation(self):
|
||||
"""Test that has_global_perm creates a predicate function"""
|
||||
# has_global_perm is a decorator factory, not a direct predicate
|
||||
predicate = has_global_perm('auth.add_user')
|
||||
self.assertTrue(callable(predicate))
|
||||
|
||||
def test_has_global_perm_with_superuser(self):
|
||||
"""Test that superusers have global permissions"""
|
||||
self.user.is_superuser = True
|
||||
self.user.save()
|
||||
|
||||
predicate = has_global_perm('auth.add_user')
|
||||
result = predicate(self.user, None)
|
||||
self.assertTrue(result)
|
||||
|
||||
def test_has_global_perm_with_regular_user(self):
|
||||
"""Test that regular users don't automatically have global permissions"""
|
||||
predicate = has_global_perm('auth.add_user')
|
||||
result = predicate(self.user, None)
|
||||
self.assertFalse(result)
|
||||
|
||||
|
||||
class CommonAdminMixinTestCase(TestCase):
|
||||
def setUp(self):
|
||||
self.user = User.objects.create_user(username='testuser', password='testpass')
|
||||
|
||||
def test_formfield_for_dbfield_with_formfield_overrides(self):
|
||||
"""Test formfield_for_dbfield when db_field class is in formfield_overrides"""
|
||||
# Create a test admin instance that inherits from Django's ModelAdmin
|
||||
class TestAdmin(CommonAdminMixin, admin.ModelAdmin):
|
||||
formfield_overrides = {
|
||||
models.ForeignKey: {'widget': Mock()}
|
||||
}
|
||||
|
||||
# Create a mock model to use with the admin
|
||||
class TestModel:
|
||||
_meta = Mock()
|
||||
_meta.app_label = 'test'
|
||||
|
||||
admin_instance = TestAdmin(TestModel, admin.site)
|
||||
|
||||
# Create a mock ForeignKey field to trigger the missing line 147
|
||||
db_field = models.ForeignKey(User, on_delete=models.CASCADE)
|
||||
|
||||
# Create a test request
|
||||
request = RequestFactory().get('/')
|
||||
request.user = self.user
|
||||
|
||||
# Call the method to test formfield_overrides usage
|
||||
result = admin_instance.formfield_for_dbfield(db_field, request, help_text='Test help text')
|
||||
|
||||
# Verify that the formfield_overrides were used
|
||||
self.assertIsNotNone(result)
|
||||
|
||||
|
||||
class UtilsTestCase(TestCase):
|
||||
def setUp(self):
|
||||
self.user = User.objects.create_user(
|
||||
username='testuser',
|
||||
email='test@example.com',
|
||||
password='testpass123'
|
||||
)
|
||||
|
||||
def test_file_size_validator_exceeds_limit(self):
|
||||
"""Test file_size_validator when file exceeds size limit"""
|
||||
validator = file_size_validator(1) # 1MB limit
|
||||
|
||||
# Create a mock file that exceeds the limit (2MB)
|
||||
mock_file = Mock()
|
||||
mock_file.size = 2 * 1024 * 1024 # 2MB
|
||||
|
||||
with self.assertRaises(ValidationError) as cm:
|
||||
validator(mock_file)
|
||||
|
||||
# Check for the translated error message
|
||||
expected_message = str(_('Please keep filesize under {} MiB. Current filesize: {:10.2f} MiB.').format(1, 2.00))
|
||||
self.assertIn(expected_message, str(cm.exception))
|
||||
|
||||
def test_restricted_file_field_content_type_not_supported(self):
|
||||
"""Test RestrictedFileField when content type is not supported"""
|
||||
field = RestrictedFileField(content_types=['image/jpeg'])
|
||||
|
||||
# Create mock data with unsupported content type
|
||||
mock_data = Mock()
|
||||
mock_data.file = Mock()
|
||||
mock_data.file.content_type = "text/plain"
|
||||
|
||||
# Mock the super().clean() to return our mock data
|
||||
with patch.object(models.FileField, 'clean', return_value=mock_data):
|
||||
with self.assertRaises(ValidationError) as cm:
|
||||
field.clean("dummy")
|
||||
|
||||
# Check for the translated error message
|
||||
expected_message = str(_('Filetype not supported.'))
|
||||
self.assertIn(expected_message, str(cm.exception))
|
||||
|
||||
def test_restricted_file_field_size_exceeds_limit(self):
|
||||
"""Test RestrictedFileField when file size exceeds limit"""
|
||||
field = RestrictedFileField(max_upload_size=1) # 1 byte limit
|
||||
|
||||
# Create mock data with file that exceeds size limit
|
||||
mock_data = Mock()
|
||||
mock_data.file = Mock()
|
||||
mock_data.file.content_type = "text/plain"
|
||||
mock_data.file._size = 2 # 2 bytes, exceeds limit
|
||||
|
||||
# Mock the super().clean() to return our mock data
|
||||
with patch.object(models.FileField, 'clean', return_value=mock_data):
|
||||
with self.assertRaises(ValidationError) as cm:
|
||||
field.clean("dummy")
|
||||
|
||||
# Check for the translated error message
|
||||
expected_message = str(_('Please keep filesize under {}. Current filesize: {}').format(1, 2))
|
||||
self.assertIn(expected_message, str(cm.exception))
|
||||
|
||||
def test_mondays_until_nth(self):
|
||||
"""Test mondays_until_nth function"""
|
||||
# Test with n=2 to get 3 Mondays (including the 0th)
|
||||
result = mondays_until_nth(2)
|
||||
|
||||
# Should return a list of 3 dates
|
||||
self.assertEqual(len(result), 3)
|
||||
|
||||
# All dates should be Mondays (weekday 0)
|
||||
for date in result:
|
||||
self.assertEqual(date.weekday(), 0) # Monday is 0
|
||||
|
||||
# Dates should be consecutive weeks
|
||||
self.assertEqual(result[1] - result[0], timedelta(days=7))
|
||||
self.assertEqual(result[2] - result[1], timedelta(days=7))
|
||||
# Create your tests here.
|
||||
|
||||
@ -0,0 +1,3 @@
|
||||
from django.shortcuts import render
|
||||
|
||||
# Create your views here.
|
||||
@ -1,39 +0,0 @@
|
||||
# Generated by Django 4.2.20 on 2025-10-11 15:43
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
def set_status_from_old_fields(apps, schema_editor):
|
||||
"""
|
||||
Set the status field based on the existing submitted and confirmed fields.
|
||||
- If confirmed is True, status = CONFIRMED (2)
|
||||
- If submitted is True but confirmed is False, status = SUBMITTED (1)
|
||||
- Otherwise, status = UNSUBMITTED (0)
|
||||
"""
|
||||
Statement = apps.get_model('finance', 'Statement')
|
||||
UNSUBMITTED, SUBMITTED, CONFIRMED = 0, 1, 2
|
||||
|
||||
for statement in Statement.objects.all():
|
||||
if statement.confirmed:
|
||||
statement.status = CONFIRMED
|
||||
elif statement.submitted:
|
||||
statement.status = SUBMITTED
|
||||
else:
|
||||
statement.status = UNSUBMITTED
|
||||
statement.save(update_fields=['status'])
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('finance', '0009_statement_ljp_to'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='statement',
|
||||
name='status',
|
||||
field=models.IntegerField(choices=[(0, 'In preparation'), (1, 'Submitted'), (2, 'Confirmed')], default=0, verbose_name='Status'),
|
||||
),
|
||||
migrations.RunPython(set_status_from_old_fields, reverse_code=migrations.RunPython.noop),
|
||||
]
|
||||
@ -1,21 +0,0 @@
|
||||
# Generated by Django 4.2.20 on 2025-10-11 16:01
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('finance', '0010_statement_status'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RemoveField(
|
||||
model_name='statement',
|
||||
name='confirmed',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='statement',
|
||||
name='submitted',
|
||||
),
|
||||
]
|
||||
@ -1,28 +0,0 @@
|
||||
# Generated by Django 4.2.20 on 2025-10-12 19:16
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('finance', '0011_remove_statement_confirmed_and_submitted'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='StatementOnExcursionProxy',
|
||||
fields=[
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Statement',
|
||||
'verbose_name_plural': 'Statements',
|
||||
'abstract': False,
|
||||
'proxy': True,
|
||||
'default_permissions': ('add_global', 'change_global', 'view_global', 'delete_global', 'list_global', 'view'),
|
||||
'indexes': [],
|
||||
'constraints': [],
|
||||
},
|
||||
bases=('finance.statement',),
|
||||
),
|
||||
]
|
||||
@ -1,4 +0,0 @@
|
||||
from .admin import *
|
||||
from .models import *
|
||||
from .rules import *
|
||||
from .migrations import *
|
||||
@ -1,713 +0,0 @@
|
||||
import unittest
|
||||
from http import HTTPStatus
|
||||
from django.test import TestCase, override_settings
|
||||
from django.contrib.admin.sites import AdminSite
|
||||
from django.test import RequestFactory, Client
|
||||
from django.contrib.auth.models import User, Permission
|
||||
from django.contrib.auth import models as authmodels
|
||||
from django.utils import timezone
|
||||
from django.contrib.sessions.middleware import SessionMiddleware
|
||||
from django.contrib.messages.middleware import MessageMiddleware
|
||||
from django.contrib.messages.storage.fallback import FallbackStorage
|
||||
from django.contrib.messages import get_messages
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.urls import reverse, reverse_lazy
|
||||
from django.http import HttpResponseRedirect, HttpResponse
|
||||
from unittest.mock import Mock, patch
|
||||
from django.test.utils import override_settings
|
||||
from django.urls import path, include
|
||||
from django.contrib import admin as django_admin
|
||||
|
||||
from members.tests.utils import create_custom_user
|
||||
from members.models import Member, MALE, Freizeit, GEMEINSCHAFTS_TOUR, MUSKELKRAFT_ANREISE
|
||||
from ..models import (
|
||||
Ledger, Statement, StatementUnSubmitted, StatementConfirmed, Transaction, Bill,
|
||||
StatementSubmitted
|
||||
)
|
||||
from ..admin import (
|
||||
LedgerAdmin, StatementAdmin, TransactionAdmin, BillAdmin
|
||||
)
|
||||
|
||||
|
||||
class AdminTestCase(TestCase):
|
||||
def setUp(self, model, admin):
|
||||
self.factory = RequestFactory()
|
||||
self.model = model
|
||||
if model is not None and admin is not None:
|
||||
self.admin = admin(model, AdminSite())
|
||||
superuser = User.objects.create_superuser(
|
||||
username='superuser', password='secret'
|
||||
)
|
||||
standard = create_custom_user('standard', ['Standard'], 'Paul', 'Wulter')
|
||||
trainer = create_custom_user('trainer', ['Standard', 'Trainings'], 'Lise', 'Lotte')
|
||||
treasurer = create_custom_user('treasurer', ['Standard', 'Finance'], 'Lara', 'Litte')
|
||||
materialwarden = create_custom_user('materialwarden', ['Standard', 'Material'], 'Loro', 'Lutte')
|
||||
|
||||
def _login(self, name):
|
||||
c = Client()
|
||||
res = c.login(username=name, password='secret')
|
||||
# make sure we logged in
|
||||
assert res
|
||||
return c
|
||||
|
||||
|
||||
class StatementUnSubmittedAdminTestCase(AdminTestCase):
|
||||
"""Test cases for StatementAdmin in the case of unsubmitted statements"""
|
||||
|
||||
def setUp(self):
|
||||
super().setUp(model=Statement, admin=StatementAdmin)
|
||||
|
||||
self.superuser = User.objects.get(username='superuser')
|
||||
self.member = Member.objects.create(
|
||||
prename="Test", lastname="User", birth_date=timezone.now().date(),
|
||||
email="test@example.com", gender=MALE, user=self.superuser
|
||||
)
|
||||
|
||||
self.statement = StatementUnSubmitted.objects.create(
|
||||
short_description='Test Statement',
|
||||
explanation='Test explanation',
|
||||
night_cost=25
|
||||
)
|
||||
|
||||
# Create excursion for testing
|
||||
self.excursion = Freizeit.objects.create(
|
||||
name='Test Excursion',
|
||||
kilometers_traveled=100,
|
||||
tour_type=GEMEINSCHAFTS_TOUR,
|
||||
tour_approach=MUSKELKRAFT_ANREISE,
|
||||
difficulty=1
|
||||
)
|
||||
|
||||
# Create confirmed statement with excursion
|
||||
self.statement_with_excursion = StatementUnSubmitted.objects.create(
|
||||
short_description='With Excursion',
|
||||
explanation='Test explanation',
|
||||
night_cost=25,
|
||||
excursion=self.excursion,
|
||||
)
|
||||
|
||||
def test_save_model_with_member(self):
|
||||
"""Test save_model sets created_by for new objects"""
|
||||
request = self.factory.post('/')
|
||||
request.user = self.superuser
|
||||
|
||||
# Test with change=False (new object)
|
||||
new_statement = Statement(short_description='New Statement')
|
||||
self.admin.save_model(request, new_statement, None, change=False)
|
||||
self.assertEqual(new_statement.created_by, self.member)
|
||||
|
||||
def test_has_delete_permission(self):
|
||||
"""Test if unsubmitted statements may be deleted"""
|
||||
request = self.factory.post('/')
|
||||
request.user = self.superuser
|
||||
self.assertTrue(self.admin.has_delete_permission(request, self.statement))
|
||||
|
||||
def test_get_fields(self):
|
||||
"""Test get_fields when excursion is set or not set."""
|
||||
request = self.factory.post('/')
|
||||
request.user = self.superuser
|
||||
self.assertIn('excursion', self.admin.get_fields(request, self.statement_with_excursion))
|
||||
self.assertNotIn('excursion', self.admin.get_fields(request, self.statement))
|
||||
self.assertNotIn('excursion', self.admin.get_fields(request))
|
||||
|
||||
def test_get_inlines(self):
|
||||
"""Test get_inlines"""
|
||||
request = self.factory.post('/')
|
||||
request.user = self.superuser
|
||||
self.assertEqual(len(self.admin.get_inlines(request, self.statement)), 1)
|
||||
|
||||
def test_get_readonly_fields_submitted(self):
|
||||
"""Test readonly fields when statement is submitted"""
|
||||
# Mark statement as submitted
|
||||
self.statement.status = Statement.SUBMITTED
|
||||
readonly_fields = self.admin.get_readonly_fields(None, self.statement)
|
||||
self.assertIn('status', readonly_fields)
|
||||
self.assertIn('excursion', readonly_fields)
|
||||
self.assertIn('short_description', readonly_fields)
|
||||
|
||||
def test_get_readonly_fields_not_submitted(self):
|
||||
"""Test readonly fields when statement is not submitted"""
|
||||
readonly_fields = self.admin.get_readonly_fields(None, self.statement)
|
||||
self.assertEqual(readonly_fields, ['status', 'excursion'])
|
||||
|
||||
def test_submit_view_insufficient_permission(self):
|
||||
url = reverse('admin:finance_statement_submit',
|
||||
args=(self.statement.pk,))
|
||||
c = self._login('standard')
|
||||
response = c.get(url, follow=True)
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('Insufficient permissions.'))
|
||||
|
||||
def test_submit_view_get(self):
|
||||
url = reverse('admin:finance_statement_submit',
|
||||
args=(self.statement.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.get(url, follow=True)
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('Submit statement'))
|
||||
|
||||
def test_submit_view_get_with_excursion(self):
|
||||
url = reverse('admin:finance_statement_submit',
|
||||
args=(self.statement_with_excursion.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.get(url, follow=True)
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('Finance overview'))
|
||||
|
||||
def test_submit_view_post(self):
|
||||
url = reverse('admin:finance_statement_submit',
|
||||
args=(self.statement.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.post(url, follow=True, data={'apply': ''})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
text = _("Successfully submited %(name)s. The finance department will notify the requestors as soon as possible.") % {'name': str(self.statement)}
|
||||
self.assertContains(response, text)
|
||||
|
||||
|
||||
class StatementSubmittedAdminTestCase(AdminTestCase):
|
||||
"""Test cases for StatementAdmin in the case of submitted statements"""
|
||||
|
||||
def setUp(self):
|
||||
super().setUp(model=Statement, admin=StatementAdmin)
|
||||
|
||||
self.user = User.objects.create_user('testuser', 'test@example.com', 'pass')
|
||||
self.member = Member.objects.create(
|
||||
prename="Test", lastname="User", birth_date=timezone.now().date(),
|
||||
email="test@example.com", gender=MALE, user=self.user
|
||||
)
|
||||
|
||||
self.finance_user = User.objects.create_user('finance', 'finance@example.com', 'pass')
|
||||
self.finance_user.groups.add(authmodels.Group.objects.get(name='Finance'),
|
||||
authmodels.Group.objects.get(name='Standard'))
|
||||
|
||||
self.statement = Statement.objects.create(
|
||||
short_description='Submitted Statement',
|
||||
explanation='Test explanation',
|
||||
status=Statement.SUBMITTED,
|
||||
submitted_by=self.member,
|
||||
submitted_date=timezone.now(),
|
||||
night_cost=25
|
||||
)
|
||||
self.statement_unsubmitted = StatementUnSubmitted.objects.create(
|
||||
short_description='Submitted Statement',
|
||||
explanation='Test explanation',
|
||||
night_cost=25
|
||||
)
|
||||
self.transaction = Transaction.objects.create(
|
||||
reference='verylonglong' * 14,
|
||||
amount=3,
|
||||
statement=self.statement,
|
||||
member=self.member,
|
||||
)
|
||||
|
||||
# Create commonly used test objects
|
||||
self.ledger = Ledger.objects.create(name='Test Ledger')
|
||||
self.excursion = Freizeit.objects.create(
|
||||
name='Test Excursion',
|
||||
kilometers_traveled=100,
|
||||
tour_type=GEMEINSCHAFTS_TOUR,
|
||||
tour_approach=MUSKELKRAFT_ANREISE,
|
||||
difficulty=1
|
||||
)
|
||||
self.other_member = Member.objects.create(
|
||||
prename="Other", lastname="Member", birth_date=timezone.now().date(),
|
||||
email="other@example.com", gender=MALE
|
||||
)
|
||||
|
||||
# Create statements for generate transactions tests
|
||||
self.statement_no_trans_success = Statement.objects.create(
|
||||
short_description='No Transactions Success',
|
||||
explanation='Test explanation',
|
||||
status=Statement.SUBMITTED,
|
||||
submitted_by=self.member,
|
||||
submitted_date=timezone.now(),
|
||||
night_cost=25
|
||||
)
|
||||
self.statement_no_trans_error = Statement.objects.create(
|
||||
short_description='No Transactions Error',
|
||||
explanation='Test explanation',
|
||||
status=Statement.SUBMITTED,
|
||||
submitted_by=self.member,
|
||||
submitted_date=timezone.now(),
|
||||
night_cost=25
|
||||
)
|
||||
|
||||
# Create bills for generate transactions tests
|
||||
self.bill_for_success = Bill.objects.create(
|
||||
statement=self.statement_no_trans_success,
|
||||
short_description='Test Bill Success',
|
||||
amount=50,
|
||||
paid_by=self.member,
|
||||
costs_covered=True
|
||||
)
|
||||
self.bill_for_error = Bill.objects.create(
|
||||
statement=self.statement_no_trans_error,
|
||||
short_description='Test Bill Error',
|
||||
amount=50,
|
||||
paid_by=None, # No payer will cause generate_transactions to fail
|
||||
costs_covered=True,
|
||||
)
|
||||
|
||||
def _create_matching_bill(self, statement=None, amount=None):
|
||||
"""Helper method to create a bill that matches transaction amount"""
|
||||
return Bill.objects.create(
|
||||
statement=statement or self.statement,
|
||||
short_description='Test Bill',
|
||||
amount=amount or self.transaction.amount,
|
||||
paid_by=self.member,
|
||||
costs_covered=True
|
||||
)
|
||||
|
||||
def _create_non_matching_bill(self, statement=None, amount=100):
|
||||
"""Helper method to create a bill that doesn't match transaction amount"""
|
||||
return Bill.objects.create(
|
||||
statement=statement or self.statement,
|
||||
short_description='Non-matching Bill',
|
||||
amount=amount,
|
||||
paid_by=self.member
|
||||
)
|
||||
|
||||
def test_has_change_permission_with_permission(self):
|
||||
"""Test change permission with proper permission"""
|
||||
request = self.factory.get('/')
|
||||
request.user = self.finance_user
|
||||
self.assertTrue(self.admin.has_change_permission(request))
|
||||
|
||||
def test_has_change_permission_without_permission(self):
|
||||
"""Test change permission without proper permission"""
|
||||
request = self.factory.get('/')
|
||||
request.user = self.user
|
||||
self.assertFalse(self.admin.has_change_permission(request))
|
||||
|
||||
def test_has_delete_permission(self):
|
||||
"""Test that delete permission is disabled"""
|
||||
request = self.factory.get('/')
|
||||
request.user = self.finance_user
|
||||
self.assertFalse(self.admin.has_delete_permission(request))
|
||||
|
||||
def test_readonly_fields(self):
|
||||
self.assertNotIn('explanation',
|
||||
self.admin.get_readonly_fields(None, self.statement_unsubmitted))
|
||||
|
||||
def test_change(self):
|
||||
url = reverse('admin:finance_statement_change',
|
||||
args=(self.statement.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.get(url)
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
|
||||
def test_overview_view(self):
|
||||
url = reverse('admin:finance_statement_overview',
|
||||
args=(self.statement.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.get(url)
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('View submitted statement'))
|
||||
|
||||
def test_overview_view_statement_not_found(self):
|
||||
"""Test overview_view with statement that can't be found in StatementSubmitted queryset"""
|
||||
# When trying to access an unsubmitted statement via StatementSubmitted admin,
|
||||
# the decorator will fail to find it and show "Statement not found"
|
||||
self.statement.status = Statement.UNSUBMITTED
|
||||
self.statement.save()
|
||||
|
||||
url = reverse('admin:finance_statement_overview', args=(self.statement.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.get(url, follow=True)
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
messages = list(get_messages(response.wsgi_request))
|
||||
expected_text = str(_("Statement not found."))
|
||||
self.assertTrue(any(expected_text in str(msg) for msg in messages))
|
||||
|
||||
def test_overview_view_transaction_execution_confirm(self):
|
||||
"""Test overview_view transaction execution confirm"""
|
||||
# Set up statement to be valid for confirmation
|
||||
self.transaction.ledger = self.ledger
|
||||
self.transaction.save()
|
||||
|
||||
# Create a bill that matches the transaction amount to make it valid
|
||||
self._create_matching_bill()
|
||||
|
||||
url = reverse('admin:finance_statement_overview', args=(self.statement.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.post(url, follow=True, data={'transaction_execution_confirm': ''})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
success_text = _("Successfully confirmed %(name)s. I hope you executed the associated transactions, I wont remind you again.") % {'name': str(self.statement)}
|
||||
self.assertContains(response, success_text)
|
||||
self.statement.refresh_from_db()
|
||||
self.assertTrue(self.statement.confirmed)
|
||||
|
||||
def test_overview_view_transaction_execution_confirm_and_send(self):
|
||||
"""Test overview_view transaction execution confirm and send"""
|
||||
# Set up statement to be valid for confirmation
|
||||
self.transaction.ledger = self.ledger
|
||||
self.transaction.save()
|
||||
|
||||
# Create a bill that matches the transaction amount to make it valid
|
||||
self._create_matching_bill()
|
||||
|
||||
url = reverse('admin:finance_statement_overview', args=(self.statement.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.post(url, follow=True, data={'transaction_execution_confirm_and_send': ''})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
success_text = _("Successfully sent receipt to the office.")
|
||||
self.assertContains(response, success_text)
|
||||
|
||||
def test_overview_view_confirm_valid(self):
|
||||
"""Test overview_view confirm with valid statement"""
|
||||
# Create a statement with valid configuration
|
||||
# Set up transaction with ledger to make it valid
|
||||
self.transaction.ledger = self.ledger
|
||||
self.transaction.save()
|
||||
|
||||
# Create a bill that matches the transaction amount to make total valid
|
||||
self._create_matching_bill()
|
||||
|
||||
url = reverse('admin:finance_statement_overview',
|
||||
args=(self.statement.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.post(url, data={'confirm': ''})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('Statement confirmed'))
|
||||
|
||||
def test_overview_view_confirm_non_matching_transactions(self):
|
||||
"""Test overview_view confirm with non-matching transactions"""
|
||||
# Create a bill that doesn't match the transaction
|
||||
self._create_non_matching_bill()
|
||||
|
||||
url = reverse('admin:finance_statement_overview',
|
||||
args=(self.statement.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.post(url, follow=True, data={'confirm': ''})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
error_text = _("Transactions do not match the covered expenses. Please correct the mistakes listed below.")
|
||||
self.assertContains(response, error_text)
|
||||
|
||||
def test_overview_view_confirm_missing_ledger(self):
|
||||
"""Test overview_view confirm with missing ledger"""
|
||||
# Ensure transaction has no ledger (ledger=None)
|
||||
self.transaction.ledger = None
|
||||
self.transaction.save()
|
||||
|
||||
# Create a bill that matches the transaction amount to pass the first check
|
||||
self._create_matching_bill()
|
||||
|
||||
url = reverse('admin:finance_statement_overview',
|
||||
args=(self.statement.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.post(url, follow=True, data={'confirm': ''})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
# Check the Django messages for the error
|
||||
messages = list(get_messages(response.wsgi_request))
|
||||
expected_text = str(_("Some transactions have no ledger configured. Please fill in the gaps."))
|
||||
self.assertTrue(any(expected_text in str(msg) for msg in messages))
|
||||
|
||||
def test_overview_view_confirm_invalid_allowance_to(self):
|
||||
"""Test overview_view confirm with invalid allowance"""
|
||||
# Create excursion and set up invalid allowance configuration
|
||||
self.statement.excursion = self.excursion
|
||||
self.statement.save()
|
||||
|
||||
# Add allowance recipient who is not a youth leader for this excursion
|
||||
self.statement_no_trans_success.allowance_to.add(self.other_member)
|
||||
|
||||
# Generate required transactions
|
||||
self.statement_no_trans_success.generate_transactions()
|
||||
for trans in self.statement_no_trans_success.transaction_set.all():
|
||||
trans.ledger = self.ledger
|
||||
trans.save()
|
||||
|
||||
# Check validity obstruction is allowances
|
||||
self.assertEqual(self.statement_no_trans_success.validity, Statement.INVALID_ALLOWANCE_TO)
|
||||
|
||||
url = reverse('admin:finance_statement_overview',
|
||||
args=(self.statement_no_trans_success.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.post(url, follow=True, data={'confirm': ''})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
# Check the Django messages for the error
|
||||
messages = list(get_messages(response.wsgi_request))
|
||||
expected_text = str(_("The configured recipients for the allowance don't match the regulations. Please correct this on the excursion."))
|
||||
self.assertTrue(any(expected_text in str(msg) for msg in messages))
|
||||
|
||||
def test_overview_view_reject(self):
|
||||
"""Test overview_view reject statement"""
|
||||
url = reverse('admin:finance_statement_overview', args=(self.statement.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.post(url, follow=True, data={'reject': ''})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
success_text = _("Successfully rejected %(name)s. The requestor can reapply, when needed.") %\
|
||||
{'name': str(self.statement)}
|
||||
self.assertContains(response, success_text)
|
||||
|
||||
# Verify statement was rejected
|
||||
self.statement.refresh_from_db()
|
||||
self.assertFalse(self.statement.submitted)
|
||||
|
||||
def test_overview_view_generate_transactions_existing(self):
|
||||
"""Test overview_view generate transactions with existing transactions"""
|
||||
# Ensure there's already a transaction
|
||||
self.assertTrue(self.statement.transaction_set.count() > 0)
|
||||
|
||||
url = reverse('admin:finance_statement_overview', args=(self.statement.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.post(url, follow=True, data={'generate_transactions': ''})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
error_text = _("%(name)s already has transactions. Please delete them first, if you want to generate new ones") % {'name': str(self.statement)}
|
||||
self.assertContains(response, error_text)
|
||||
|
||||
def test_overview_view_generate_transactions_success(self):
|
||||
"""Test overview_view generate transactions successfully"""
|
||||
url = reverse('admin:finance_statement_overview',
|
||||
args=(self.statement_no_trans_success.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.post(url, follow=True, data={'generate_transactions': ''})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
success_text = _("Successfully generated transactions for %(name)s") %\
|
||||
{'name': str(self.statement_no_trans_success)}
|
||||
self.assertContains(response, success_text)
|
||||
|
||||
def test_overview_view_generate_transactions_error(self):
|
||||
"""Test overview_view generate transactions with error"""
|
||||
url = reverse('admin:finance_statement_overview',
|
||||
args=(self.statement_no_trans_error.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.post(url, follow=True, data={'generate_transactions': ''})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
messages = list(get_messages(response.wsgi_request))
|
||||
expected_text = str(_("Error while generating transactions for %(name)s. Do all bills have a payer and, if this statement is attached to an excursion, was a person selected that receives the subsidies?") %\
|
||||
{'name': str(self.statement_no_trans_error)})
|
||||
self.assertTrue(any(expected_text in str(msg) for msg in messages))
|
||||
|
||||
def test_reduce_transactions_view(self):
|
||||
url = reverse('admin:finance_statement_reduce_transactions',
|
||||
args=(self.statement.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.get(url, data={'redirectTo': reverse('admin:finance_statement_changelist')},
|
||||
follow=True)
|
||||
self.assertContains(response,
|
||||
_("Successfully reduced transactions for %(name)s.") %\
|
||||
{'name': str(self.statement)})
|
||||
|
||||
|
||||
class StatementConfirmedAdminTestCase(AdminTestCase):
|
||||
"""Test cases for StatementAdmin in the case of confirmed statements"""
|
||||
|
||||
def setUp(self):
|
||||
super().setUp(model=Statement, admin=StatementAdmin)
|
||||
|
||||
self.user = User.objects.create_user('testuser', 'test@example.com', 'pass')
|
||||
self.member = Member.objects.create(
|
||||
prename="Test", lastname="User", birth_date=timezone.now().date(),
|
||||
email="test@example.com", gender=MALE, user=self.user
|
||||
)
|
||||
|
||||
self.finance_user = User.objects.create_user('finance', 'finance@example.com', 'pass')
|
||||
self.finance_user.groups.add(authmodels.Group.objects.get(name='Finance'),
|
||||
authmodels.Group.objects.get(name='Standard'))
|
||||
|
||||
# Create a base statement first
|
||||
base_statement = Statement.objects.create(
|
||||
short_description='Confirmed Statement',
|
||||
explanation='Test explanation',
|
||||
status=Statement.CONFIRMED,
|
||||
confirmed_by=self.member,
|
||||
confirmed_date=timezone.now(),
|
||||
night_cost=25
|
||||
)
|
||||
|
||||
# StatementConfirmed is a proxy model, so we can get it from the base statement
|
||||
self.statement = StatementConfirmed.objects.get(pk=base_statement.pk)
|
||||
|
||||
# Create an unconfirmed statement for testing
|
||||
self.unconfirmed_statement = Statement.objects.create(
|
||||
short_description='Unconfirmed Statement',
|
||||
explanation='Test explanation',
|
||||
status=Statement.SUBMITTED,
|
||||
night_cost=25
|
||||
)
|
||||
|
||||
# Create excursion for testing
|
||||
self.excursion = Freizeit.objects.create(
|
||||
name='Test Excursion',
|
||||
kilometers_traveled=100,
|
||||
tour_type=GEMEINSCHAFTS_TOUR,
|
||||
tour_approach=MUSKELKRAFT_ANREISE,
|
||||
difficulty=1
|
||||
)
|
||||
|
||||
# Create confirmed statement with excursion
|
||||
confirmed_with_excursion_base = Statement.objects.create(
|
||||
short_description='Confirmed with Excursion',
|
||||
explanation='Test explanation',
|
||||
status=Statement.CONFIRMED,
|
||||
confirmed_by=self.member,
|
||||
confirmed_date=timezone.now(),
|
||||
excursion=self.excursion,
|
||||
night_cost=25
|
||||
)
|
||||
self.statement_with_excursion = StatementConfirmed.objects.get(pk=confirmed_with_excursion_base.pk)
|
||||
|
||||
def _add_session_to_request(self, request):
|
||||
"""Add session to request"""
|
||||
middleware = SessionMiddleware(lambda req: None)
|
||||
middleware.process_request(request)
|
||||
request.session.save()
|
||||
|
||||
middleware = MessageMiddleware(lambda req: None)
|
||||
middleware.process_request(request)
|
||||
request._messages = FallbackStorage(request)
|
||||
|
||||
def test_has_change_permission(self):
|
||||
"""Test that change permission is disabled"""
|
||||
request = self.factory.get('/')
|
||||
request.user = self.finance_user
|
||||
self.assertFalse(self.admin.has_change_permission(request, self.statement))
|
||||
|
||||
def test_has_delete_permission(self):
|
||||
"""Test that delete permission is disabled"""
|
||||
request = self.factory.get('/')
|
||||
request.user = self.finance_user
|
||||
self.assertFalse(self.admin.has_delete_permission(request, self.statement))
|
||||
|
||||
def test_unconfirm_view_not_confirmed_statement(self):
|
||||
"""Test unconfirm_view with statement that is not confirmed"""
|
||||
# Create request for unconfirmed statement
|
||||
request = self.factory.get('/')
|
||||
request.user = self.finance_user
|
||||
self._add_session_to_request(request)
|
||||
|
||||
# Test with unconfirmed statement (should trigger error path)
|
||||
self.assertFalse(self.unconfirmed_statement.confirmed)
|
||||
|
||||
# Call unconfirm_view - this should go through error path
|
||||
response = self.admin.unconfirm_view(request, self.unconfirmed_statement.pk)
|
||||
|
||||
# Should redirect due to not confirmed error
|
||||
self.assertEqual(response.status_code, 302)
|
||||
|
||||
def test_unconfirm_view_post_unconfirm_action(self):
|
||||
"""Test unconfirm_view POST request with 'unconfirm' action"""
|
||||
# Create POST request with unconfirm action
|
||||
request = self.factory.post('/', {'unconfirm': 'true'})
|
||||
request.user = self.finance_user
|
||||
self._add_session_to_request(request)
|
||||
|
||||
# Ensure statement is confirmed
|
||||
self.assertTrue(self.statement.confirmed)
|
||||
self.assertIsNotNone(self.statement.confirmed_by)
|
||||
self.assertIsNotNone(self.statement.confirmed_date)
|
||||
|
||||
# Call unconfirm_view - this should execute the unconfirm action
|
||||
response = self.admin.unconfirm_view(request, self.statement.pk)
|
||||
|
||||
# Should redirect after successful unconfirm
|
||||
self.assertEqual(response.status_code, 302)
|
||||
|
||||
# Verify statement was unconfirmed (need to reload from DB)
|
||||
self.statement.refresh_from_db()
|
||||
self.assertFalse(self.statement.confirmed)
|
||||
self.assertIsNone(self.statement.confirmed_date)
|
||||
|
||||
def test_unconfirm_view_get_render_template(self):
|
||||
"""Test unconfirm_view GET request rendering template"""
|
||||
# Create GET request (no POST data)
|
||||
request = self.factory.get('/')
|
||||
request.user = self.finance_user
|
||||
self._add_session_to_request(request)
|
||||
|
||||
# Ensure statement is confirmed
|
||||
self.assertTrue(self.statement.confirmed)
|
||||
|
||||
# Call unconfirm_view
|
||||
response = self.admin.unconfirm_view(request, self.statement.pk)
|
||||
|
||||
# Should render template (status 200)
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
# Check response content contains expected template elements
|
||||
self.assertIn(str(_('Unconfirm statement')).encode('utf-8'), response.content)
|
||||
self.assertIn(self.statement.short_description.encode(), response.content)
|
||||
|
||||
def test_statement_summary_view_insufficient_permission(self):
|
||||
url = reverse('admin:finance_statement_summary',
|
||||
args=(self.statement_with_excursion.pk,))
|
||||
c = self._login('standard')
|
||||
response = c.get(url, follow=True)
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('Insufficient permissions.'))
|
||||
|
||||
def test_statement_summary_view_unconfirmed(self):
|
||||
url = reverse('admin:finance_statement_summary',
|
||||
args=(self.unconfirmed_statement.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.get(url, follow=True)
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('Statement not found.'))
|
||||
|
||||
def test_statement_summary_view_confirmed_with_excursion(self):
|
||||
"""Test statement_summary_view when statement is confirmed with excursion"""
|
||||
url = reverse('admin:finance_statement_summary',
|
||||
args=(self.statement_with_excursion.pk,))
|
||||
c = self._login('superuser')
|
||||
response = c.get(url, follow=True)
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertEqual(response.headers['Content-Type'], 'application/pdf')
|
||||
|
||||
|
||||
class TransactionAdminTestCase(TestCase):
|
||||
"""Test cases for TransactionAdmin"""
|
||||
|
||||
def setUp(self):
|
||||
self.site = AdminSite()
|
||||
self.factory = RequestFactory()
|
||||
self.admin = TransactionAdmin(Transaction, self.site)
|
||||
|
||||
self.user = User.objects.create_user('testuser', 'test@example.com', 'pass')
|
||||
self.member = Member.objects.create(
|
||||
prename="Test", lastname="User", birth_date=timezone.now().date(),
|
||||
email="test@example.com", gender=MALE, user=self.user
|
||||
)
|
||||
|
||||
self.ledger = Ledger.objects.create(name='Test Ledger')
|
||||
self.statement = Statement.objects.create(
|
||||
short_description='Test Statement',
|
||||
explanation='Test explanation'
|
||||
)
|
||||
|
||||
self.transaction = Transaction.objects.create(
|
||||
member=self.member,
|
||||
ledger=self.ledger,
|
||||
amount=100,
|
||||
reference='Test transaction',
|
||||
statement=self.statement
|
||||
)
|
||||
|
||||
def test_has_add_permission(self):
|
||||
"""Test that add permission is disabled"""
|
||||
request = self.factory.get('/')
|
||||
request.user = self.user
|
||||
self.assertFalse(self.admin.has_add_permission(request))
|
||||
|
||||
def test_has_change_permission(self):
|
||||
"""Test that change permission is disabled"""
|
||||
request = self.factory.get('/')
|
||||
request.user = self.user
|
||||
self.assertFalse(self.admin.has_change_permission(request))
|
||||
|
||||
def test_has_delete_permission(self):
|
||||
"""Test that delete permission is disabled"""
|
||||
request = self.factory.get('/')
|
||||
request.user = self.user
|
||||
self.assertFalse(self.admin.has_delete_permission(request))
|
||||
|
||||
def test_get_readonly_fields_confirmed(self):
|
||||
"""Test readonly fields when transaction is confirmed"""
|
||||
self.transaction.confirmed = True
|
||||
readonly_fields = self.admin.get_readonly_fields(None, self.transaction)
|
||||
self.assertEqual(readonly_fields, self.admin.fields)
|
||||
|
||||
def test_get_readonly_fields_not_confirmed(self):
|
||||
"""Test readonly fields when transaction is not confirmed"""
|
||||
readonly_fields = self.admin.get_readonly_fields(None, self.transaction)
|
||||
self.assertEqual(readonly_fields, ())
|
||||
@ -1,70 +0,0 @@
|
||||
import django.test
|
||||
from django.apps import apps
|
||||
from django.db import connection
|
||||
from django.db.migrations.executor import MigrationExecutor
|
||||
|
||||
|
||||
class StatusMigrationTestCase(django.test.TransactionTestCase):
|
||||
"""Test the migration from submitted/confirmed fields to status field."""
|
||||
|
||||
app = 'finance'
|
||||
migrate_from = [('finance', '0009_statement_ljp_to')]
|
||||
migrate_to = [('finance', '0010_statement_status')]
|
||||
|
||||
def setUp(self):
|
||||
# Get the state before migration
|
||||
executor = MigrationExecutor(connection)
|
||||
executor.migrate(self.migrate_from)
|
||||
|
||||
# Get the old models (before migration)
|
||||
old_apps = executor.loader.project_state(self.migrate_from).apps
|
||||
self.Statement = old_apps.get_model(self.app, 'Statement')
|
||||
|
||||
# Create statements with different combinations of submitted/confirmed
|
||||
# created_by is nullable, so we don't need to create a Member
|
||||
self.unsubmitted = self.Statement.objects.create(
|
||||
short_description='Unsubmitted Statement',
|
||||
submitted=False,
|
||||
confirmed=False
|
||||
)
|
||||
|
||||
self.submitted = self.Statement.objects.create(
|
||||
short_description='Submitted Statement',
|
||||
submitted=True,
|
||||
confirmed=False
|
||||
)
|
||||
|
||||
self.confirmed = self.Statement.objects.create(
|
||||
short_description='Confirmed Statement',
|
||||
submitted=True,
|
||||
confirmed=True
|
||||
)
|
||||
|
||||
def test_status_field_migration(self):
|
||||
"""Test that status field is correctly set from old submitted/confirmed fields."""
|
||||
# Run the migration
|
||||
executor = MigrationExecutor(connection)
|
||||
executor.loader.build_graph()
|
||||
executor.migrate(self.migrate_to)
|
||||
|
||||
# Get the new models (after migration)
|
||||
new_apps = executor.loader.project_state(self.migrate_to).apps
|
||||
Statement = new_apps.get_model(self.app, 'Statement')
|
||||
|
||||
# Constants from the Statement model
|
||||
UNSUBMITTED = 0
|
||||
SUBMITTED = 1
|
||||
CONFIRMED = 2
|
||||
|
||||
# Verify the migration worked correctly
|
||||
unsubmitted = Statement.objects.get(pk=self.unsubmitted.pk)
|
||||
self.assertEqual(unsubmitted.status, UNSUBMITTED,
|
||||
'Statement with submitted=False, confirmed=False should have status=UNSUBMITTED')
|
||||
|
||||
submitted = Statement.objects.get(pk=self.submitted.pk)
|
||||
self.assertEqual(submitted.status, SUBMITTED,
|
||||
'Statement with submitted=True, confirmed=False should have status=SUBMITTED')
|
||||
|
||||
confirmed = Statement.objects.get(pk=self.confirmed.pk)
|
||||
self.assertEqual(confirmed.status, CONFIRMED,
|
||||
'Statement with submitted=True, confirmed=True should have status=CONFIRMED')
|
||||
@ -1,102 +0,0 @@
|
||||
from django.test import TestCase
|
||||
from django.utils import timezone
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.models import User
|
||||
from unittest.mock import Mock
|
||||
from finance.rules import is_creator, not_submitted, leads_excursion
|
||||
from finance.models import Statement, Ledger
|
||||
from members.models import Member, Group, Freizeit, GEMEINSCHAFTS_TOUR, MUSKELKRAFT_ANREISE, MALE, FEMALE
|
||||
|
||||
|
||||
class FinanceRulesTestCase(TestCase):
|
||||
def setUp(self):
|
||||
self.group = Group.objects.create(name="Test Group")
|
||||
self.ledger = Ledger.objects.create(name="Test Ledger")
|
||||
|
||||
self.user1 = User.objects.create_user(username="alice", password="test123")
|
||||
self.member1 = Member.objects.create(
|
||||
prename="Alice", lastname="Smith", birth_date=timezone.now().date(),
|
||||
email=settings.TEST_MAIL, gender=FEMALE, user=self.user1
|
||||
)
|
||||
self.member1.group.add(self.group)
|
||||
|
||||
self.user2 = User.objects.create_user(username="bob", password="test123")
|
||||
self.member2 = Member.objects.create(
|
||||
prename="Bob", lastname="Jones", birth_date=timezone.now().date(),
|
||||
email=settings.TEST_MAIL, gender=MALE, user=self.user2
|
||||
)
|
||||
self.member2.group.add(self.group)
|
||||
|
||||
self.freizeit = Freizeit.objects.create(
|
||||
name="Test Excursion",
|
||||
kilometers_traveled=100,
|
||||
tour_type=GEMEINSCHAFTS_TOUR,
|
||||
tour_approach=MUSKELKRAFT_ANREISE,
|
||||
difficulty=2
|
||||
)
|
||||
self.freizeit.jugendleiter.add(self.member1)
|
||||
|
||||
self.statement = Statement.objects.create(
|
||||
short_description="Test Statement",
|
||||
explanation="Test explanation",
|
||||
night_cost=27,
|
||||
created_by=self.member1,
|
||||
excursion=self.freizeit
|
||||
)
|
||||
self.statement.allowance_to.add(self.member1)
|
||||
|
||||
def test_is_creator_true(self):
|
||||
"""Test is_creator predicate returns True when user created the statement"""
|
||||
self.assertTrue(is_creator(self.user1, self.statement))
|
||||
self.assertFalse(is_creator(self.user2, self.statement))
|
||||
|
||||
def test_not_submitted_statement(self):
|
||||
"""Test not_submitted predicate returns True when statement is not submitted"""
|
||||
self.statement.status = Statement.UNSUBMITTED
|
||||
self.assertTrue(not_submitted(self.user1, self.statement))
|
||||
self.statement.status = Statement.SUBMITTED
|
||||
self.assertFalse(not_submitted(self.user1, self.statement))
|
||||
|
||||
def test_not_submitted_freizeit_with_statement(self):
|
||||
"""Test not_submitted predicate with Freizeit having unsubmitted statement"""
|
||||
self.freizeit.statement = self.statement
|
||||
self.statement.status = Statement.UNSUBMITTED
|
||||
self.assertTrue(not_submitted(self.user1, self.freizeit))
|
||||
|
||||
def test_not_submitted_freizeit_without_statement(self):
|
||||
"""Test not_submitted predicate with Freizeit having no statement attribute"""
|
||||
# Create a mock Freizeit that truly doesn't have the statement attribute
|
||||
mock_freizeit = Mock(spec=Freizeit)
|
||||
# Remove the statement attribute entirely
|
||||
if hasattr(mock_freizeit, 'statement'):
|
||||
delattr(mock_freizeit, 'statement')
|
||||
self.assertTrue(not_submitted(self.user1, mock_freizeit))
|
||||
|
||||
def test_leads_excursion_freizeit_user_is_leader(self):
|
||||
"""Test leads_excursion predicate returns True when user leads the Freizeit"""
|
||||
self.assertTrue(leads_excursion(self.user1, self.freizeit))
|
||||
self.assertFalse(leads_excursion(self.user2, self.freizeit))
|
||||
|
||||
def test_leads_excursion_statement_with_excursion(self):
|
||||
"""Test leads_excursion predicate with statement having excursion led by user"""
|
||||
result = leads_excursion(self.user1, self.statement)
|
||||
self.assertTrue(result)
|
||||
|
||||
def test_leads_excursion_statement_no_excursion_attribute(self):
|
||||
"""Test leads_excursion predicate with statement having no excursion attribute"""
|
||||
mock_statement = Mock()
|
||||
del mock_statement.excursion
|
||||
result = leads_excursion(self.user1, mock_statement)
|
||||
self.assertFalse(result)
|
||||
|
||||
def test_leads_excursion_statement_excursion_is_none(self):
|
||||
"""Test leads_excursion predicate with statement having None excursion"""
|
||||
statement_no_excursion = Statement.objects.create(
|
||||
short_description="Test Statement No Excursion",
|
||||
explanation="Test explanation",
|
||||
night_cost=27,
|
||||
created_by=self.member1,
|
||||
excursion=None
|
||||
)
|
||||
result = leads_excursion(self.user1, statement_no_excursion)
|
||||
self.assertFalse(result)
|
||||
@ -0,0 +1,3 @@
|
||||
from django.shortcuts import render
|
||||
|
||||
# Create your views here.
|
||||
@ -1,59 +0,0 @@
|
||||
import os
|
||||
|
||||
DJANGO_LOG_LEVEL = get_var('logging', 'django_level', default='INFO')
|
||||
ROOT_LOG_LEVEL = get_var('logging', 'level', default='INFO')
|
||||
LOG_ERROR_TO_EMAIL = get_var('logging', 'email_admins', default=False)
|
||||
LOG_EMAIL_BACKEND = EMAIL_BACKEND if LOG_ERROR_TO_EMAIL else "django.core.mail.backends.console.EmailBackend"
|
||||
LOG_ERROR_INCLUDE_HTML = get_var('logging', 'error_report_include_html', default=False)
|
||||
|
||||
LOGGING = {
|
||||
"version": 1,
|
||||
"disable_existing_loggers": False,
|
||||
"filters": {
|
||||
"require_debug_false": {
|
||||
"()": "django.utils.log.RequireDebugFalse",
|
||||
},
|
||||
"require_debug_true": {
|
||||
"()": "django.utils.log.RequireDebugTrue",
|
||||
},
|
||||
},
|
||||
"formatters": {
|
||||
"simple": {
|
||||
"format": "[{asctime}: {levelname}/{name}] {message}",
|
||||
"style": "{",
|
||||
},
|
||||
"verbose": {
|
||||
"format": "[{asctime}: {levelname}/{name}] {pathname}:{lineno} {message}",
|
||||
"style": "{",
|
||||
},
|
||||
},
|
||||
"handlers": {
|
||||
"console": {
|
||||
"class": "logging.StreamHandler",
|
||||
"formatter": "simple",
|
||||
},
|
||||
"console_verbose": {
|
||||
"class": "logging.StreamHandler",
|
||||
"formatter": "verbose",
|
||||
"level": "ERROR",
|
||||
},
|
||||
"mail_admins": {
|
||||
"level": "ERROR",
|
||||
"class": "django.utils.log.AdminEmailHandler",
|
||||
"email_backend": LOG_EMAIL_BACKEND,
|
||||
"include_html": LOG_ERROR_INCLUDE_HTML,
|
||||
"filters": ["require_debug_false"],
|
||||
},
|
||||
},
|
||||
"root": {
|
||||
"handlers": ["console"],
|
||||
"level": ROOT_LOG_LEVEL,
|
||||
},
|
||||
"loggers": {
|
||||
"django": {
|
||||
"handlers": ["console", "mail_admins"],
|
||||
"level": DJANGO_LOG_LEVEL,
|
||||
"propagate": False,
|
||||
},
|
||||
},
|
||||
}
|
||||
@ -1,30 +0,0 @@
|
||||
from django.test import TestCase, RequestFactory, override_settings
|
||||
from django.contrib.auth.models import User
|
||||
from django.contrib import admin
|
||||
from unittest.mock import Mock, patch
|
||||
from jdav_web.views import media_unprotected, custom_admin_view
|
||||
from startpage.models import Link
|
||||
|
||||
|
||||
class ViewsTestCase(TestCase):
|
||||
def setUp(self):
|
||||
self.factory = RequestFactory()
|
||||
self.user = User.objects.create_user('testuser', 'test@example.com', 'password')
|
||||
Link.objects.create(title='Test Link', url='https://example.com')
|
||||
|
||||
@override_settings(DEBUG=True)
|
||||
def test_media_unprotected_debug_true(self):
|
||||
request = self.factory.get('/media/test.jpg')
|
||||
with patch('jdav_web.views.serve') as mock_serve:
|
||||
mock_serve.return_value = Mock()
|
||||
result = media_unprotected(request, 'test.jpg')
|
||||
mock_serve.assert_called_once()
|
||||
|
||||
def test_custom_admin_view(self):
|
||||
request = self.factory.get('/admin/')
|
||||
request.user = self.user
|
||||
with patch.object(admin.site, 'get_app_list') as mock_get_app_list:
|
||||
mock_get_app_list.return_value = []
|
||||
response = custom_admin_view(request)
|
||||
self.assertEqual(response.status_code, 200)
|
||||
mock_get_app_list.assert_called_once_with(request)
|
||||
@ -0,0 +1,3 @@
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
@ -1,2 +0,0 @@
|
||||
from .views import *
|
||||
from .oauth import *
|
||||
@ -1,47 +0,0 @@
|
||||
from django.test import TestCase
|
||||
from django.contrib.auth.models import User
|
||||
from django.conf import settings
|
||||
from unittest.mock import Mock
|
||||
from logindata.oauth import CustomOAuth2Validator
|
||||
from members.models import Member, MALE
|
||||
|
||||
|
||||
class CustomOAuth2ValidatorTestCase(TestCase):
|
||||
def setUp(self):
|
||||
self.validator = CustomOAuth2Validator()
|
||||
|
||||
# Create user with member
|
||||
self.user_with_member = User.objects.create_user(username="alice", password="test123")
|
||||
self.member = Member.objects.create(
|
||||
prename="Alice", lastname="Smith", birth_date="1990-01-01",
|
||||
email=settings.TEST_MAIL, gender=MALE, user=self.user_with_member
|
||||
)
|
||||
|
||||
# Create user without member
|
||||
self.user_without_member = User.objects.create_user(username="bob", password="test123")
|
||||
|
||||
def test_get_additional_claims_with_member(self):
|
||||
"""Test get_additional_claims when user has a member"""
|
||||
request = Mock()
|
||||
request.user = self.user_with_member
|
||||
|
||||
result = self.validator.get_additional_claims(request)
|
||||
|
||||
self.assertEqual(result['email'], settings.TEST_MAIL)
|
||||
self.assertEqual(result['preferred_username'], 'alice')
|
||||
|
||||
def test_get_additional_claims_without_member(self):
|
||||
"""Test get_additional_claims when user has no member"""
|
||||
# ensure branch coverage, not possible under standard scenarios
|
||||
request = Mock()
|
||||
request.user = Mock()
|
||||
request.user.member = None
|
||||
self.assertEqual(len(self.validator.get_additional_claims(request)), 1)
|
||||
|
||||
request = Mock()
|
||||
request.user = self.user_without_member
|
||||
|
||||
# The method will raise RelatedObjectDoesNotExist, which means the code
|
||||
# should use hasattr or try/except. For now, test that it raises.
|
||||
with self.assertRaises(User.member.RelatedObjectDoesNotExist):
|
||||
self.validator.get_additional_claims(request)
|
||||
@ -1,154 +0,0 @@
|
||||
from http import HTTPStatus
|
||||
from django.test import TestCase, Client
|
||||
from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
from django.utils.translation import gettext as _
|
||||
from django.contrib.auth.models import User, Group
|
||||
|
||||
from members.models import Member, DIVERSE
|
||||
from ..models import RegistrationPassword, initial_user_setup
|
||||
|
||||
|
||||
class RegistrationPasswordTestCase(TestCase):
|
||||
def test_str_method(self):
|
||||
"""Test RegistrationPassword __str__ method returns password"""
|
||||
reg_password = RegistrationPassword.objects.create(password="test123")
|
||||
self.assertEqual(str(reg_password), "test123")
|
||||
|
||||
|
||||
class RegisterViewTestCase(TestCase):
|
||||
def setUp(self):
|
||||
self.client = Client()
|
||||
|
||||
# Create a test member with invite key
|
||||
self.member = Member.objects.create(
|
||||
prename='Test',
|
||||
lastname='User',
|
||||
birth_date=timezone.now().date(),
|
||||
email='test@example.com',
|
||||
gender=DIVERSE,
|
||||
invite_as_user_key='test_key_123'
|
||||
)
|
||||
|
||||
# Create a registration password
|
||||
self.registration_password = RegistrationPassword.objects.create(
|
||||
password='test_password'
|
||||
)
|
||||
|
||||
# Get or create Standard group for user setup
|
||||
self.standard_group, created = Group.objects.get_or_create(name='Standard')
|
||||
|
||||
def test_register_get_without_key_redirects(self):
|
||||
"""Test GET request without key redirects to startpage."""
|
||||
url = reverse('logindata:register')
|
||||
response = self.client.get(url)
|
||||
self.assertEqual(response.status_code, HTTPStatus.FOUND)
|
||||
|
||||
def test_register_post_without_key_redirects(self):
|
||||
"""Test POST request without key redirects to startpage."""
|
||||
url = reverse('logindata:register')
|
||||
response = self.client.post(url)
|
||||
self.assertEqual(response.status_code, HTTPStatus.FOUND)
|
||||
|
||||
def test_register_get_with_empty_key_shows_failed(self):
|
||||
"""Test GET request with empty key shows registration failed page."""
|
||||
url = reverse('logindata:register')
|
||||
response = self.client.get(url, {'key': ''})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('Something went wrong. The registration key is invalid or has expired.'))
|
||||
|
||||
def test_register_get_with_invalid_key_shows_failed(self):
|
||||
"""Test GET request with invalid key shows registration failed page."""
|
||||
url = reverse('logindata:register')
|
||||
response = self.client.get(url, {'key': 'invalid_key'})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('Something went wrong. The registration key is invalid or has expired.'))
|
||||
|
||||
def test_register_get_with_valid_key_shows_password_form(self):
|
||||
"""Test GET request with valid key shows password entry form."""
|
||||
url = reverse('logindata:register')
|
||||
response = self.client.get(url, {'key': self.member.invite_as_user_key})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('Set login data'))
|
||||
self.assertContains(response, _('Welcome, '))
|
||||
self.assertContains(response, self.member.prename)
|
||||
|
||||
def test_register_post_without_password_shows_failed(self):
|
||||
"""Test POST request without password shows registration failed page."""
|
||||
url = reverse('logindata:register')
|
||||
response = self.client.post(url, {'key': self.member.invite_as_user_key})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('Something went wrong. The registration key is invalid or has expired.'))
|
||||
|
||||
def test_register_post_with_wrong_password_shows_error(self):
|
||||
"""Test POST request with wrong password shows error message."""
|
||||
url = reverse('logindata:register')
|
||||
response = self.client.post(url, {
|
||||
'key': self.member.invite_as_user_key,
|
||||
'password': 'wrong_password'
|
||||
})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('You entered a wrong password.'))
|
||||
|
||||
def test_register_post_with_correct_password_shows_form(self):
|
||||
"""Test POST request with correct password shows user creation form."""
|
||||
url = reverse('logindata:register')
|
||||
response = self.client.post(url, {
|
||||
'key': self.member.invite_as_user_key,
|
||||
'password': self.registration_password.password
|
||||
})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('Set login data'))
|
||||
self.assertContains(response, self.member.suggested_username())
|
||||
|
||||
def test_register_post_with_save_and_invalid_form_shows_errors(self):
|
||||
"""Test POST request with save but invalid form shows form errors."""
|
||||
url = reverse('logindata:register')
|
||||
response = self.client.post(url, {
|
||||
'key': self.member.invite_as_user_key,
|
||||
'password': self.registration_password.password,
|
||||
'save': 'true',
|
||||
'username': '', # Invalid - empty username
|
||||
'password1': 'testpass123',
|
||||
'password2': 'different_pass' # Invalid - passwords don't match
|
||||
})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('Set login data'))
|
||||
|
||||
def test_register_post_with_save_and_valid_form_shows_success(self):
|
||||
"""Test POST request with save and valid form shows success page."""
|
||||
url = reverse('logindata:register')
|
||||
response = self.client.post(url, {
|
||||
'key': self.member.invite_as_user_key,
|
||||
'password': self.registration_password.password,
|
||||
'save': 'true',
|
||||
'username': 'testuser',
|
||||
'password1': 'testpass123',
|
||||
'password2': 'testpass123'
|
||||
})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('You successfully set your login data. You can now proceed to'))
|
||||
|
||||
# Verify user was created and associated with member
|
||||
user = User.objects.get(username='testuser')
|
||||
self.assertEqual(user.is_staff, True)
|
||||
self.member.refresh_from_db()
|
||||
self.assertEqual(self.member.user, user)
|
||||
self.assertEqual(self.member.invite_as_user_key, '')
|
||||
|
||||
def test_register_post_with_save_and_no_standard_group_shows_failed(self):
|
||||
"""Test POST request with save but no Standard group shows failed page."""
|
||||
# Delete the Standard group
|
||||
self.standard_group.delete()
|
||||
|
||||
url = reverse('logindata:register')
|
||||
response = self.client.post(url, {
|
||||
'key': self.member.invite_as_user_key,
|
||||
'password': self.registration_password.password,
|
||||
'save': 'true',
|
||||
'username': 'testuser',
|
||||
'password1': 'testpass123',
|
||||
'password2': 'testpass123'
|
||||
})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('Something went wrong. The registration key is invalid or has expired.'))
|
||||
@ -0,0 +1,3 @@
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
@ -1,5 +0,0 @@
|
||||
from .models import *
|
||||
from .admin import *
|
||||
from .views import *
|
||||
from .rules import *
|
||||
from .mailutils import *
|
||||
@ -1,330 +0,0 @@
|
||||
import json
|
||||
import unittest
|
||||
from http import HTTPStatus
|
||||
from django.test import TestCase, override_settings
|
||||
from django.contrib.admin.sites import AdminSite
|
||||
from django.test import RequestFactory, Client
|
||||
from django.contrib.auth.models import User, Permission
|
||||
from django.utils import timezone
|
||||
from django.contrib.sessions.middleware import SessionMiddleware
|
||||
from django.contrib.messages.middleware import MessageMiddleware
|
||||
from django.contrib.messages.storage.fallback import FallbackStorage
|
||||
from django.contrib.messages import get_messages
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.urls import reverse, reverse_lazy
|
||||
from django.http import HttpResponseRedirect, HttpResponse
|
||||
from unittest.mock import Mock, patch
|
||||
from django.test.utils import override_settings
|
||||
from django.urls import path, include
|
||||
from django.contrib import admin as django_admin
|
||||
from django.conf import settings
|
||||
|
||||
from members.tests.utils import create_custom_user
|
||||
from members.models import Member, MALE, DIVERSE, Group
|
||||
from ..models import Message, Attachment, EmailAddress
|
||||
from ..admin import MessageAdmin, submit_message
|
||||
from ..mailutils import SENT, NOT_SENT, PARTLY_SENT
|
||||
|
||||
|
||||
class AdminTestCase(TestCase):
|
||||
def setUp(self, model, admin):
|
||||
self.factory = RequestFactory()
|
||||
self.model = model
|
||||
if model is not None and admin is not None:
|
||||
self.admin = admin(model, AdminSite())
|
||||
superuser = User.objects.create_superuser(
|
||||
username='superuser', password='secret'
|
||||
)
|
||||
standard = create_custom_user('standard', ['Standard'], 'Paul', 'Wulter')
|
||||
trainer = create_custom_user('trainer', ['Standard', 'Trainings'], 'Lise', 'Lotte')
|
||||
|
||||
def _add_middleware(self, request):
|
||||
"""Add required middleware to request."""
|
||||
# Session middleware
|
||||
middleware = SessionMiddleware(lambda x: None)
|
||||
middleware.process_request(request)
|
||||
request.session.save()
|
||||
|
||||
# Messages middleware
|
||||
messages_middleware = MessageMiddleware(lambda x: None)
|
||||
messages_middleware.process_request(request)
|
||||
request._messages = FallbackStorage(request)
|
||||
|
||||
|
||||
class MessageAdminTestCase(AdminTestCase):
|
||||
def setUp(self):
|
||||
super().setUp(Message, MessageAdmin)
|
||||
|
||||
# Create test data
|
||||
self.group = Group.objects.create(name='Test Group')
|
||||
self.email_address = EmailAddress.objects.create(name='testmail')
|
||||
|
||||
# Create test member with internal email
|
||||
self.internal_member = Member.objects.create(
|
||||
prename='Internal',
|
||||
lastname='User',
|
||||
birth_date=timezone.now().date(),
|
||||
email=f'internal@{settings.ALLOWED_EMAIL_DOMAINS_FOR_INVITE_AS_USER[0]}',
|
||||
gender=DIVERSE
|
||||
)
|
||||
|
||||
# Create test member with external email
|
||||
self.external_member = Member.objects.create(
|
||||
prename='External',
|
||||
lastname='User',
|
||||
birth_date=timezone.now().date(),
|
||||
email='external@example.com',
|
||||
gender=DIVERSE
|
||||
)
|
||||
|
||||
# Create users for testing
|
||||
self.user_with_internal_member = User.objects.create_user(username='testuser', password='secret')
|
||||
self.user_with_internal_member.member = self.internal_member
|
||||
self.user_with_internal_member.save()
|
||||
|
||||
self.user_with_external_member = User.objects.create_user(username='external_user', password='secret')
|
||||
self.user_with_external_member.member = self.external_member
|
||||
self.user_with_external_member.save()
|
||||
|
||||
self.user_without_member = User.objects.create_user(username='no_member_user', password='secret')
|
||||
|
||||
# Create test message
|
||||
self.message = Message.objects.create(
|
||||
subject='Test Message',
|
||||
content='Test content'
|
||||
)
|
||||
self.message.to_groups.add(self.group)
|
||||
self.message.to_members.add(self.internal_member)
|
||||
|
||||
def test_save_model_sets_created_by(self):
|
||||
"""Test that save_model sets created_by when creating new message."""
|
||||
request = self.factory.post('/admin/mailer/message/add/')
|
||||
request.user = self.user_with_internal_member
|
||||
|
||||
# Create new message
|
||||
new_message = Message(subject='New Message', content='New content')
|
||||
|
||||
# Test save_model for new object (change=False)
|
||||
self.admin.save_model(request, new_message, None, change=False)
|
||||
|
||||
self.assertEqual(new_message.created_by, self.internal_member)
|
||||
|
||||
def test_save_model_does_not_change_created_by_on_update(self):
|
||||
"""Test that save_model doesn't change created_by when updating."""
|
||||
request = self.factory.post('/admin/mailer/message/1/change/')
|
||||
request.user = self.user_with_internal_member
|
||||
|
||||
# Message already has created_by set
|
||||
self.message.created_by = self.external_member
|
||||
|
||||
# Test save_model for existing object (change=True)
|
||||
self.admin.save_model(request, self.message, None, change=True)
|
||||
|
||||
self.assertEqual(self.message.created_by, self.external_member)
|
||||
|
||||
@patch('mailer.models.Message.submit')
|
||||
def test_submit_message_success(self, mock_submit):
|
||||
"""Test submit_message with successful send."""
|
||||
mock_submit.return_value = SENT
|
||||
|
||||
request = self.factory.post('/admin/mailer/message/')
|
||||
request.user = self.user_with_internal_member
|
||||
self._add_middleware(request)
|
||||
|
||||
# Test submit_message
|
||||
submit_message(self.message, request)
|
||||
|
||||
# Verify submit was called with correct sender
|
||||
mock_submit.assert_called_once_with(self.internal_member)
|
||||
|
||||
# Check success message
|
||||
messages_list = list(get_messages(request))
|
||||
self.assertEqual(len(messages_list), 1)
|
||||
self.assertIn(str(_('Successfully sent message')), str(messages_list[0]))
|
||||
|
||||
@patch('mailer.models.Message.submit')
|
||||
def test_submit_message_not_sent(self, mock_submit):
|
||||
"""Test submit_message when sending fails."""
|
||||
mock_submit.return_value = NOT_SENT
|
||||
|
||||
request = self.factory.post('/admin/mailer/message/')
|
||||
request.user = self.user_with_internal_member
|
||||
self._add_middleware(request)
|
||||
|
||||
# Test submit_message
|
||||
submit_message(self.message, request)
|
||||
|
||||
# Check error message
|
||||
messages_list = list(get_messages(request))
|
||||
self.assertEqual(len(messages_list), 1)
|
||||
self.assertIn(str(_('Failed to send message')), str(messages_list[0]))
|
||||
|
||||
@patch('mailer.models.Message.submit')
|
||||
def test_submit_message_partly_sent(self, mock_submit):
|
||||
"""Test submit_message when partially sent."""
|
||||
mock_submit.return_value = PARTLY_SENT
|
||||
|
||||
request = self.factory.post('/admin/mailer/message/')
|
||||
request.user = self.user_with_internal_member
|
||||
self._add_middleware(request)
|
||||
|
||||
# Test submit_message
|
||||
submit_message(self.message, request)
|
||||
|
||||
# Check warning message
|
||||
messages_list = list(get_messages(request))
|
||||
self.assertEqual(len(messages_list), 1)
|
||||
self.assertIn(str(_('Failed to send some messages')), str(messages_list[0]))
|
||||
|
||||
def test_submit_message_user_has_no_member(self):
|
||||
"""Test submit_message when user has no associated member."""
|
||||
request = self.factory.post('/admin/mailer/message/')
|
||||
request.user = self.user_without_member
|
||||
self._add_middleware(request)
|
||||
|
||||
# Test submit_message
|
||||
submit_message(self.message, request)
|
||||
|
||||
# Check error message
|
||||
messages_list = list(get_messages(request))
|
||||
self.assertEqual(len(messages_list), 1)
|
||||
self.assertIn(str(_('Your account is not connected to a member. Please contact your system administrator.')), str(messages_list[0]))
|
||||
|
||||
def test_submit_message_user_has_external_email(self):
|
||||
"""Test submit_message when user has external email."""
|
||||
request = self.factory.post('/admin/mailer/message/')
|
||||
request.user = self.user_with_external_member
|
||||
self._add_middleware(request)
|
||||
|
||||
# Test submit_message
|
||||
submit_message(self.message, request)
|
||||
|
||||
# Check error message
|
||||
messages_list = list(get_messages(request))
|
||||
self.assertEqual(len(messages_list), 1)
|
||||
self.assertIn(str(_('Your email address is not an internal email address. Please use an email address with one of the following domains: %(domains)s.') % {'domains': ", ".join(settings.ALLOWED_EMAIL_DOMAINS_FOR_INVITE_AS_USER)}), str(messages_list[0]))
|
||||
|
||||
@patch('mailer.admin.submit_message')
|
||||
def test_send_message_action_confirmed(self, mock_submit_message):
|
||||
"""Test send_message action when confirmed."""
|
||||
request = self.factory.post('/admin/mailer/message/', {'confirmed': 'true'})
|
||||
request.user = self.user_with_internal_member
|
||||
self._add_middleware(request)
|
||||
|
||||
queryset = Message.objects.filter(pk=self.message.pk)
|
||||
|
||||
# Test send_message action
|
||||
result = self.admin.send_message(request, queryset)
|
||||
|
||||
# Verify submit_message was called for each message
|
||||
mock_submit_message.assert_called_once_with(self.message, request)
|
||||
|
||||
# Should return None when confirmed (no template response)
|
||||
self.assertIsNone(result)
|
||||
|
||||
def test_send_message_action_not_confirmed(self):
|
||||
"""Test send_message action when not confirmed (shows confirmation page)."""
|
||||
request = self.factory.post('/admin/mailer/message/')
|
||||
request.user = self.user_with_internal_member
|
||||
self._add_middleware(request)
|
||||
|
||||
queryset = Message.objects.filter(pk=self.message.pk)
|
||||
|
||||
# Test send_message action
|
||||
result = self.admin.send_message(request, queryset)
|
||||
|
||||
# Should return HttpResponse with confirmation template
|
||||
self.assertIsNotNone(result)
|
||||
self.assertEqual(result.status_code, HTTPStatus.OK)
|
||||
|
||||
@patch('mailer.admin.submit_message')
|
||||
def test_response_change_with_send(self, mock_submit_message):
|
||||
"""Test response_change when _send is in POST."""
|
||||
request = self.factory.post('/admin/mailer/message/1/change/', {'_send': 'Send'})
|
||||
request.user = self.user_with_internal_member
|
||||
self._add_middleware(request)
|
||||
|
||||
# Test response_change
|
||||
with patch.object(self.admin.__class__.__bases__[2], 'response_change') as mock_super:
|
||||
mock_super.return_value = HttpResponseRedirect('/admin/')
|
||||
result = self.admin.response_change(request, self.message)
|
||||
|
||||
# Verify submit_message was called
|
||||
mock_submit_message.assert_called_once_with(self.message, request)
|
||||
|
||||
# Verify super method was called
|
||||
mock_super.assert_called_once()
|
||||
|
||||
@patch('mailer.admin.submit_message')
|
||||
def test_response_change_without_send(self, mock_submit_message):
|
||||
"""Test response_change when _send is not in POST."""
|
||||
request = self.factory.post('/admin/mailer/message/1/change/', {'_save': 'Save'})
|
||||
request.user = self.user_with_internal_member
|
||||
self._add_middleware(request)
|
||||
|
||||
# Test response_change
|
||||
with patch.object(self.admin.__class__.__bases__[2], 'response_change') as mock_super:
|
||||
mock_super.return_value = HttpResponseRedirect('/admin/')
|
||||
result = self.admin.response_change(request, self.message)
|
||||
|
||||
# Verify submit_message was NOT called
|
||||
mock_submit_message.assert_not_called()
|
||||
|
||||
# Verify super method was called
|
||||
mock_super.assert_called_once()
|
||||
|
||||
@patch('mailer.admin.submit_message')
|
||||
def test_response_add_with_send(self, mock_submit_message):
|
||||
"""Test response_add when _send is in POST."""
|
||||
request = self.factory.post('/admin/mailer/message/add/', {'_send': 'Send'})
|
||||
request.user = self.user_with_internal_member
|
||||
self._add_middleware(request)
|
||||
|
||||
# Test response_add
|
||||
with patch.object(self.admin.__class__.__bases__[2], 'response_add') as mock_super:
|
||||
mock_super.return_value = HttpResponseRedirect('/admin/')
|
||||
result = self.admin.response_add(request, self.message)
|
||||
|
||||
# Verify submit_message was called
|
||||
mock_submit_message.assert_called_once_with(self.message, request)
|
||||
|
||||
# Verify super method was called
|
||||
mock_super.assert_called_once()
|
||||
|
||||
def test_get_form_with_members_param(self):
|
||||
"""Test get_form when members parameter is provided."""
|
||||
# Create request with members parameter
|
||||
members_ids = [self.internal_member.pk, self.external_member.pk]
|
||||
request = self.factory.get(f'/admin/mailer/message/add/?members={json.dumps(members_ids)}')
|
||||
request.user = self.user_with_internal_member
|
||||
|
||||
# Test get_form
|
||||
form_class = self.admin.get_form(request)
|
||||
form = form_class()
|
||||
|
||||
# Verify initial members are set
|
||||
self.assertEqual(list(form.fields['to_members'].initial), [self.internal_member, self.external_member])
|
||||
|
||||
def test_get_form_with_invalid_members_param(self):
|
||||
"""Test get_form when members parameter is not a list."""
|
||||
# Create request with invalid members parameter
|
||||
request = self.factory.get('/admin/mailer/message/add/?members="not_a_list"')
|
||||
request.user = self.user_with_internal_member
|
||||
|
||||
# Test get_form
|
||||
form_class = self.admin.get_form(request)
|
||||
|
||||
# Should return form without modification
|
||||
self.assertIsNotNone(form_class)
|
||||
|
||||
def test_get_form_without_members_param(self):
|
||||
"""Test get_form when no members parameter is provided."""
|
||||
# Create request without members parameter
|
||||
request = self.factory.get('/admin/mailer/message/add/')
|
||||
request.user = self.user_with_internal_member
|
||||
|
||||
# Test get_form
|
||||
form_class = self.admin.get_form(request)
|
||||
|
||||
# Should return form without modification
|
||||
self.assertIsNotNone(form_class)
|
||||
@ -1,34 +0,0 @@
|
||||
from django.test import TestCase, override_settings
|
||||
from unittest.mock import patch, Mock
|
||||
from mailer.mailutils import send, SENT, NOT_SENT
|
||||
|
||||
|
||||
class MailUtilsTest(TestCase):
|
||||
def setUp(self):
|
||||
self.subject = "Test Subject"
|
||||
self.content = "Test Content"
|
||||
self.sender = "sender@example.com"
|
||||
self.recipient = "recipient@example.com"
|
||||
|
||||
def test_send_with_reply_to(self):
|
||||
with patch('mailer.mailutils.mail.get_connection') as mock_connection:
|
||||
mock_conn = Mock()
|
||||
mock_connection.return_value = mock_conn
|
||||
result = send(self.subject, self.content, self.sender, self.recipient, reply_to=["reply@example.com"])
|
||||
self.assertEqual(result, SENT)
|
||||
|
||||
def test_send_with_message_id(self):
|
||||
with patch('mailer.mailutils.mail.get_connection') as mock_connection:
|
||||
mock_conn = Mock()
|
||||
mock_connection.return_value = mock_conn
|
||||
result = send(self.subject, self.content, self.sender, self.recipient, message_id="<test@example.com>")
|
||||
self.assertEqual(result, SENT)
|
||||
|
||||
def test_send_exception_handling(self):
|
||||
with patch('mailer.mailutils.mail.get_connection') as mock_connection:
|
||||
mock_conn = Mock()
|
||||
mock_conn.send_messages.side_effect = Exception("Test exception")
|
||||
mock_connection.return_value = mock_conn
|
||||
with patch('builtins.print'):
|
||||
result = send(self.subject, self.content, self.sender, self.recipient)
|
||||
self.assertEqual(result, NOT_SENT)
|
||||
@ -1,271 +0,0 @@
|
||||
from unittest import skip, mock
|
||||
from django.test import TestCase
|
||||
from django.conf import settings
|
||||
from django.utils import timezone
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.utils.translation import gettext as _
|
||||
from django.core.files.uploadedfile import SimpleUploadedFile
|
||||
from members.models import Member, Group, DIVERSE, Freizeit, MemberNoteList, GEMEINSCHAFTS_TOUR, MUSKELKRAFT_ANREISE
|
||||
from mailer.models import EmailAddress, EmailAddressForm, Message, MessageForm, Attachment
|
||||
from mailer.mailutils import SENT, NOT_SENT, PARTLY_SENT
|
||||
from .utils import BasicMailerTestCase
|
||||
|
||||
|
||||
class EmailAddressTestCase(BasicMailerTestCase):
|
||||
def test_email(self):
|
||||
self.assertEqual(self.em.email, f"foobar@{settings.DOMAIN}")
|
||||
|
||||
def test_str(self):
|
||||
self.assertEqual(self.em.email, str(self.em))
|
||||
|
||||
def test_forwards(self):
|
||||
self.assertEqual(self.em.forwards, {'fritz@foo.com', 'paul@foo.com'})
|
||||
|
||||
|
||||
class EmailAddressFormTestCase(BasicMailerTestCase):
|
||||
def test_clean(self):
|
||||
# instantiate form with only name field set
|
||||
form = EmailAddressForm(data={'name': 'bar'})
|
||||
# validate the form - this should fail due to missing required recipients
|
||||
self.assertFalse(form.is_valid())
|
||||
|
||||
|
||||
class MessageFormTestCase(BasicMailerTestCase):
|
||||
def test_clean(self):
|
||||
# instantiate form with only subject and content fields set
|
||||
form = MessageForm(data={'subject': 'Test Subject', 'content': 'Test content'})
|
||||
# validate the form - this should fail due to missing required recipients
|
||||
self.assertFalse(form.is_valid())
|
||||
|
||||
|
||||
class MessageTestCase(BasicMailerTestCase):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
self.message = Message.objects.create(
|
||||
subject='Test Message',
|
||||
content='This is a test message'
|
||||
)
|
||||
self.freizeit = Freizeit.objects.create(
|
||||
name='Test Freizeit',
|
||||
kilometers_traveled=120,
|
||||
tour_type=GEMEINSCHAFTS_TOUR,
|
||||
tour_approach=MUSKELKRAFT_ANREISE,
|
||||
difficulty=1
|
||||
)
|
||||
self.notelist = MemberNoteList.objects.create(
|
||||
title='Test Note List'
|
||||
)
|
||||
|
||||
# Set up message with multiple recipient types
|
||||
self.message.to_groups.add(self.mygroup)
|
||||
self.message.to_freizeit = self.freizeit
|
||||
self.message.to_notelist = self.notelist
|
||||
self.message.to_members.add(self.fritz)
|
||||
self.message.save()
|
||||
|
||||
# Create a sender member for submit tests
|
||||
self.sender = Member.objects.create(
|
||||
prename='Sender',
|
||||
lastname='Test',
|
||||
birth_date=timezone.now().date(),
|
||||
email='sender@test.com',
|
||||
gender=DIVERSE
|
||||
)
|
||||
|
||||
def test_str(self):
|
||||
self.assertEqual(str(self.message), 'Test Message')
|
||||
|
||||
def test_get_recipients(self):
|
||||
recipients = self.message.get_recipients()
|
||||
self.assertIn('My Group', recipients)
|
||||
self.assertIn('Test Freizeit', recipients)
|
||||
self.assertIn('Test Note List', recipients)
|
||||
self.assertIn('Fritz Wulter', recipients)
|
||||
|
||||
def test_get_recipients_with_many_members(self):
|
||||
# Add additional members to test the "Some other members" case
|
||||
for i in range(3):
|
||||
member = Member.objects.create(
|
||||
prename=f'Member{i}',
|
||||
lastname='Test',
|
||||
birth_date=timezone.now().date(),
|
||||
email=f'member{i}@test.com',
|
||||
gender=DIVERSE
|
||||
)
|
||||
self.message.to_members.add(member)
|
||||
|
||||
recipients = self.message.get_recipients()
|
||||
self.assertIn(_('Some other members'), recipients)
|
||||
|
||||
@mock.patch('mailer.models.send')
|
||||
def test_submit_successful(self, mock_send):
|
||||
# Mock successful email sending
|
||||
mock_send.return_value = SENT
|
||||
|
||||
# Test submit method
|
||||
result = self.message.submit(sender=self.sender)
|
||||
|
||||
# Verify the message was marked as sent
|
||||
self.message.refresh_from_db()
|
||||
self.assertTrue(self.message.sent)
|
||||
self.assertEqual(result, SENT)
|
||||
|
||||
# Verify send was called
|
||||
self.assertTrue(mock_send.called)
|
||||
|
||||
@mock.patch('mailer.models.send')
|
||||
def test_submit_failed(self, mock_send):
|
||||
# Mock failed email sending
|
||||
mock_send.return_value = NOT_SENT
|
||||
|
||||
# Test submit method
|
||||
result = self.message.submit(sender=self.sender)
|
||||
|
||||
# Verify the message was not marked as sent
|
||||
self.message.refresh_from_db()
|
||||
self.assertFalse(self.message.sent)
|
||||
# Note: The submit method always returns SENT when an exception occurs
|
||||
self.assertEqual(result, SENT)
|
||||
|
||||
@mock.patch('mailer.models.send')
|
||||
def test_submit_without_sender(self, mock_send):
|
||||
# Mock successful email sending
|
||||
mock_send.return_value = SENT
|
||||
|
||||
# Test submit method without sender
|
||||
result = self.message.submit()
|
||||
|
||||
# Verify the message was marked as sent
|
||||
self.message.refresh_from_db()
|
||||
self.assertTrue(self.message.sent)
|
||||
self.assertEqual(result, SENT)
|
||||
|
||||
@mock.patch('mailer.models.send')
|
||||
def test_submit_subject_cleaning(self, mock_send):
|
||||
# Mock successful email sending
|
||||
mock_send.return_value = SENT
|
||||
|
||||
# Create message with underscores in subject
|
||||
message_with_underscores = Message.objects.create(
|
||||
subject='Test_Message_With_Underscores',
|
||||
content='Test content'
|
||||
)
|
||||
message_with_underscores.to_members.add(self.fritz)
|
||||
|
||||
# Test submit method
|
||||
result = message_with_underscores.submit()
|
||||
|
||||
# Verify underscores were removed from subject
|
||||
message_with_underscores.refresh_from_db()
|
||||
self.assertEqual(message_with_underscores.subject, 'Test Message With Underscores')
|
||||
|
||||
@mock.patch('mailer.models.send')
|
||||
def test_submit_exception_handling(self, mock_send):
|
||||
# Mock an exception during email sending
|
||||
mock_send.side_effect = Exception("Email sending failed")
|
||||
|
||||
# Test submit method
|
||||
result = self.message.submit(sender=self.sender)
|
||||
|
||||
# Verify the message was not marked as sent
|
||||
self.message.refresh_from_db()
|
||||
self.assertFalse(self.message.sent)
|
||||
# When exception occurs, it should return NOT_SENT
|
||||
self.assertEqual(result, NOT_SENT)
|
||||
|
||||
@mock.patch('mailer.models.send')
|
||||
@mock.patch('django.conf.settings.SEND_FROM_ASSOCIATION_EMAIL', False)
|
||||
def test_submit_with_sender_no_association_email(self, mock_send):
|
||||
# Mock successful email sending
|
||||
mock_send.return_value = PARTLY_SENT
|
||||
|
||||
# Test submit method with sender but SEND_FROM_ASSOCIATION_EMAIL disabled
|
||||
result = self.message.submit(sender=self.sender)
|
||||
|
||||
# Verify the message was marked as sent
|
||||
self.message.refresh_from_db()
|
||||
self.assertTrue(self.message.sent)
|
||||
self.assertEqual(result, SENT)
|
||||
|
||||
@mock.patch('mailer.models.send')
|
||||
@mock.patch('django.conf.settings.SEND_FROM_ASSOCIATION_EMAIL', False)
|
||||
def test_submit_with_reply_to_logic(self, mock_send):
|
||||
# Mock successful email sending
|
||||
mock_send.return_value = SENT
|
||||
|
||||
# Create a sender with internal email capability
|
||||
sender_with_internal = Member.objects.create(
|
||||
prename='Internal',
|
||||
lastname='Sender',
|
||||
birth_date=timezone.now().date(),
|
||||
email='internal@test.com',
|
||||
gender=DIVERSE
|
||||
)
|
||||
|
||||
# Mock has_internal_email to return True
|
||||
with mock.patch.object(sender_with_internal, 'has_internal_email', return_value=True):
|
||||
# Test submit method
|
||||
result = self.message.submit(sender=sender_with_internal)
|
||||
|
||||
# Verify the message was marked as sent
|
||||
self.message.refresh_from_db()
|
||||
self.assertTrue(self.message.sent)
|
||||
self.assertEqual(result, SENT)
|
||||
|
||||
@mock.patch('mailer.models.send')
|
||||
@mock.patch('os.remove')
|
||||
def test_submit_with_attachments(self, mock_os_remove, mock_send):
|
||||
# Mock successful email sending
|
||||
mock_send.return_value = SENT
|
||||
|
||||
# Create an attachment with a file
|
||||
test_file = SimpleUploadedFile("test_file.pdf", b"file_content", content_type="application/pdf")
|
||||
attachment = Attachment.objects.create(msg=self.message, f=test_file)
|
||||
|
||||
# Test submit method
|
||||
result = self.message.submit()
|
||||
|
||||
# Verify the message was marked as sent
|
||||
self.message.refresh_from_db()
|
||||
self.assertTrue(self.message.sent)
|
||||
self.assertEqual(result, SENT)
|
||||
|
||||
# Verify file removal was attempted (the path will be the actual file path)
|
||||
mock_os_remove.assert_called()
|
||||
# Attachment should be deleted
|
||||
with self.assertRaises(Attachment.DoesNotExist):
|
||||
attachment.refresh_from_db()
|
||||
|
||||
@mock.patch('mailer.models.send')
|
||||
def test_submit_with_association_email_enabled(self, mock_send):
|
||||
"""Test submit method when SEND_FROM_ASSOCIATION_EMAIL is True and sender has association_email"""
|
||||
mock_send.return_value = SENT
|
||||
|
||||
# Mock settings to enable association email sending
|
||||
with mock.patch.object(settings, 'SEND_FROM_ASSOCIATION_EMAIL', True):
|
||||
result = self.message.submit(sender=self.sender)
|
||||
|
||||
# Check that send was called with sender's association email
|
||||
self.assertTrue(mock_send.called)
|
||||
call_args = mock_send.call_args
|
||||
from_addr = call_args[0][2] # from_addr is the 3rd positional argument
|
||||
expected_from = f"{self.sender.name} <{self.sender.association_email}>"
|
||||
self.assertEqual(from_addr, expected_from)
|
||||
|
||||
|
||||
class AttachmentTestCase(BasicMailerTestCase):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
self.message = Message.objects.create(
|
||||
subject='Test Message',
|
||||
content='Test content'
|
||||
)
|
||||
self.attachment = Attachment.objects.create(msg=self.message)
|
||||
|
||||
def test_str_with_file(self):
|
||||
# Simulate a file name
|
||||
self.attachment.f.name = 'attachments/test_document.pdf'
|
||||
self.assertEqual(str(self.attachment), 'test_document.pdf')
|
||||
|
||||
def test_str_without_file(self):
|
||||
self.assertEqual(str(self.attachment), _('Empty'))
|
||||
@ -1,31 +0,0 @@
|
||||
from django.test import TestCase
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.models import User
|
||||
from mailer.rules import is_creator
|
||||
from mailer.models import Message
|
||||
from members.models import Member, MALE
|
||||
|
||||
|
||||
class MailerRulesTestCase(TestCase):
|
||||
def setUp(self):
|
||||
self.user1 = User.objects.create_user(username="alice", password="test123")
|
||||
self.member1 = Member.objects.create(
|
||||
prename="Alice", lastname="Smith", birth_date="1990-01-01",
|
||||
email=settings.TEST_MAIL, gender=MALE, user=self.user1
|
||||
)
|
||||
|
||||
self.message = Message.objects.create(
|
||||
subject="Test Message",
|
||||
content="Test content",
|
||||
created_by=self.member1
|
||||
)
|
||||
|
||||
def test_is_creator_returns_true_when_user_created_message(self):
|
||||
"""Test is_creator predicate returns True when user created the message"""
|
||||
result = is_creator(self.user1, self.message)
|
||||
self.assertTrue(result)
|
||||
|
||||
def test_is_creator_returns_false_when_message_is_none(self):
|
||||
"""Test is_creator predicate returns False when message is None"""
|
||||
result = is_creator(self.user1, None)
|
||||
self.assertFalse(result)
|
||||
@ -1,27 +0,0 @@
|
||||
from unittest import skip, mock
|
||||
from django.test import TestCase
|
||||
from django.conf import settings
|
||||
from django.utils import timezone
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.utils.translation import gettext as _
|
||||
from django.core.files.uploadedfile import SimpleUploadedFile
|
||||
from members.models import Member, Group, DIVERSE, Freizeit, MemberNoteList, GEMEINSCHAFTS_TOUR, MUSKELKRAFT_ANREISE
|
||||
from mailer.models import EmailAddress, EmailAddressForm, Message, MessageForm, Attachment
|
||||
from mailer.mailutils import SENT, NOT_SENT, PARTLY_SENT
|
||||
|
||||
|
||||
class BasicMailerTestCase(TestCase):
|
||||
def setUp(self):
|
||||
self.mygroup = Group.objects.create(name="My Group")
|
||||
self.fritz = Member.objects.create(prename="Fritz", lastname="Wulter", birth_date=timezone.now().date(),
|
||||
email='fritz@foo.com', gender=DIVERSE)
|
||||
self.fritz.group.add(self.mygroup)
|
||||
self.fritz.save()
|
||||
self.fritz.generate_key()
|
||||
|
||||
self.paul = Member.objects.create(prename="Paul", lastname="Wulter", birth_date=timezone.now().date(),
|
||||
email='paul@foo.com', gender=DIVERSE)
|
||||
|
||||
self.em = EmailAddress.objects.create(name='foobar')
|
||||
self.em.to_groups.add(self.mygroup)
|
||||
self.em.to_members.add(self.paul)
|
||||
@ -1,65 +0,0 @@
|
||||
from unittest import skip, mock
|
||||
from http import HTTPStatus
|
||||
from django.urls import reverse
|
||||
from django.test import TestCase
|
||||
from django.conf import settings
|
||||
from django.utils import timezone
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.utils.translation import gettext as _
|
||||
from django.core.files.uploadedfile import SimpleUploadedFile
|
||||
from members.models import Member, Group, DIVERSE, Freizeit, MemberNoteList, GEMEINSCHAFTS_TOUR, MUSKELKRAFT_ANREISE
|
||||
from mailer.models import EmailAddress, EmailAddressForm, Message, MessageForm, Attachment
|
||||
from mailer.mailutils import SENT, NOT_SENT, PARTLY_SENT
|
||||
from .utils import BasicMailerTestCase
|
||||
|
||||
|
||||
class IndexTestCase(BasicMailerTestCase):
|
||||
def test_index(self):
|
||||
url = reverse('mailer:index')
|
||||
response = self.client.get(url)
|
||||
self.assertEqual(response.status_code, HTTPStatus.FOUND)
|
||||
|
||||
|
||||
class UnsubscribeTestCase(BasicMailerTestCase):
|
||||
def test_unsubscribe(self):
|
||||
url = reverse('mailer:unsubscribe')
|
||||
response = self.client.get(url)
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _("Here you can unsubscribe from the newsletter"))
|
||||
|
||||
def test_unsubscribe_key_invalid(self):
|
||||
url = reverse('mailer:unsubscribe')
|
||||
|
||||
# invalid key
|
||||
response = self.client.get(url, data={'key': 'invalid'})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _("Can't verify this link. Try again!"))
|
||||
|
||||
# expired key
|
||||
self.fritz.unsubscribe_expire = timezone.now()
|
||||
self.fritz.save()
|
||||
response = self.client.get(url, data={'key': self.fritz.unsubscribe_key})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _("Can't verify this link. Try again!"))
|
||||
|
||||
def test_unsubscribe_key(self):
|
||||
url = reverse('mailer:unsubscribe')
|
||||
response = self.client.get(url, data={'key': self.fritz.unsubscribe_key})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _("Successfully unsubscribed from the newsletter for "))
|
||||
|
||||
def test_unsubscribe_post_incomplete(self):
|
||||
url = reverse('mailer:unsubscribe')
|
||||
response = self.client.post(url, data={'post': True})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _("Please fill in every field"))
|
||||
|
||||
response = self.client.post(url, data={'post': True, 'email': 'foobar@notexisting.com'})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _("Please fill in every field"))
|
||||
|
||||
def test_unsubscribe_post(self):
|
||||
url = reverse('mailer:unsubscribe')
|
||||
response = self.client.post(url, data={'post': True, 'email': self.fritz.email})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _("Sent confirmation mail to"))
|
||||
@ -1,238 +1,3 @@
|
||||
from django.test import TestCase, RequestFactory
|
||||
from django.utils import timezone
|
||||
from datetime import date, datetime
|
||||
from decimal import Decimal
|
||||
from unittest.mock import Mock
|
||||
from material.models import MaterialCategory, MaterialPart, Ownership, yearsago
|
||||
from material.admin import NotTooOldFilter, MaterialAdmin
|
||||
from members.models import Member, MALE, FEMALE, DIVERSE
|
||||
from django.test import TestCase
|
||||
|
||||
|
||||
class MaterialCategoryTestCase(TestCase):
|
||||
def setUp(self):
|
||||
self.category = MaterialCategory.objects.create(name="Climbing Gear")
|
||||
|
||||
def test_str(self):
|
||||
"""Test string representation of MaterialCategory"""
|
||||
self.assertEqual(str(self.category), "Climbing Gear")
|
||||
|
||||
def test_verbose_names(self):
|
||||
"""Test verbose names are set correctly"""
|
||||
meta = MaterialCategory._meta
|
||||
self.assertTrue(hasattr(meta, 'verbose_name'))
|
||||
self.assertTrue(hasattr(meta, 'verbose_name_plural'))
|
||||
|
||||
|
||||
class MaterialPartTestCase(TestCase):
|
||||
def setUp(self):
|
||||
self.category = MaterialCategory.objects.create(name="Ropes")
|
||||
self.material_part = MaterialPart.objects.create(
|
||||
name="Dynamic Rope 10mm",
|
||||
description="60m dynamic climbing rope",
|
||||
quantity=5,
|
||||
buy_date=date(2020, 1, 15),
|
||||
lifetime=Decimal('8')
|
||||
)
|
||||
self.material_part.material_cat.add(self.category)
|
||||
|
||||
self.member = Member.objects.create(
|
||||
prename="John",
|
||||
lastname="Doe",
|
||||
birth_date=date(1990, 1, 1),
|
||||
email="john@example.com",
|
||||
gender=MALE
|
||||
)
|
||||
|
||||
def test_str(self):
|
||||
"""Test string representation of MaterialPart"""
|
||||
self.assertEqual(str(self.material_part), "Dynamic Rope 10mm")
|
||||
|
||||
def test_quantity_real_no_ownership(self):
|
||||
"""Test quantity_real when no ownership exists"""
|
||||
result = self.material_part.quantity_real()
|
||||
self.assertEqual(result, "0/5")
|
||||
|
||||
def test_quantity_real_with_ownership(self):
|
||||
"""Test quantity_real with ownership records"""
|
||||
Ownership.objects.create(
|
||||
material=self.material_part,
|
||||
owner=self.member,
|
||||
count=3
|
||||
)
|
||||
Ownership.objects.create(
|
||||
material=self.material_part,
|
||||
owner=self.member,
|
||||
count=1
|
||||
)
|
||||
result = self.material_part.quantity_real()
|
||||
self.assertEqual(result, "4/5")
|
||||
|
||||
def test_verbose_names(self):
|
||||
"""Test field verbose names"""
|
||||
# Just test that verbose names exist, since they might be translated
|
||||
field_names = ['name', 'description', 'quantity', 'buy_date', 'lifetime', 'photo', 'material_cat']
|
||||
|
||||
for field_name in field_names:
|
||||
field = self.material_part._meta.get_field(field_name)
|
||||
self.assertTrue(hasattr(field, 'verbose_name'))
|
||||
self.assertIsNotNone(field.verbose_name)
|
||||
|
||||
def test_admin_thumbnail_with_photo(self):
|
||||
"""Test admin_thumbnail when photo exists"""
|
||||
mock_photo = Mock()
|
||||
mock_photo.url = "/media/test.jpg"
|
||||
self.material_part.photo = mock_photo
|
||||
result = self.material_part.admin_thumbnail()
|
||||
self.assertIn("/media/test.jpg", result)
|
||||
self.assertIn("<img", result)
|
||||
|
||||
def test_admin_thumbnail_without_photo(self):
|
||||
"""Test admin_thumbnail when no photo exists"""
|
||||
self.material_part.photo = None
|
||||
result = self.material_part.admin_thumbnail()
|
||||
self.assertIn("kein Bild", result)
|
||||
|
||||
def test_ownership_overview(self):
|
||||
"""Test ownership_overview method"""
|
||||
Ownership.objects.create(material=self.material_part, owner=self.member, count=2)
|
||||
result = self.material_part.ownership_overview()
|
||||
self.assertIn(str(self.member), result)
|
||||
self.assertIn("2", result)
|
||||
|
||||
def test_not_too_old(self):
|
||||
"""Test not_too_old method"""
|
||||
# Set a buy_date that makes the material old
|
||||
old_date = date(2000, 1, 1)
|
||||
self.material_part.buy_date = old_date
|
||||
self.material_part.lifetime = Decimal('5')
|
||||
result = self.material_part.not_too_old()
|
||||
self.assertFalse(result)
|
||||
|
||||
|
||||
class OwnershipTestCase(TestCase):
|
||||
def setUp(self):
|
||||
self.category = MaterialCategory.objects.create(name="Hardware")
|
||||
self.material_part = MaterialPart.objects.create(
|
||||
name="Carabiner Set",
|
||||
description="Lightweight aluminum carabiners",
|
||||
quantity=10,
|
||||
buy_date=date(2021, 6, 1),
|
||||
lifetime=Decimal('10')
|
||||
)
|
||||
|
||||
self.member = Member.objects.create(
|
||||
prename="Alice",
|
||||
lastname="Smith",
|
||||
birth_date=date(1985, 3, 15),
|
||||
email="alice@example.com",
|
||||
gender=FEMALE
|
||||
)
|
||||
|
||||
self.ownership = Ownership.objects.create(
|
||||
material=self.material_part,
|
||||
owner=self.member,
|
||||
count=6
|
||||
)
|
||||
|
||||
def test_ownership_creation(self):
|
||||
"""Test ownership record creation"""
|
||||
self.assertEqual(self.ownership.material, self.material_part)
|
||||
self.assertEqual(self.ownership.owner, self.member)
|
||||
self.assertEqual(self.ownership.count, 6)
|
||||
|
||||
def test_material_part_relationship(self):
|
||||
"""Test relationship between MaterialPart and Ownership"""
|
||||
ownerships = Ownership.objects.filter(material=self.material_part)
|
||||
self.assertEqual(ownerships.count(), 1)
|
||||
self.assertEqual(ownerships.first(), self.ownership)
|
||||
|
||||
def test_str(self):
|
||||
"""Test string representation of Ownership"""
|
||||
result = str(self.ownership)
|
||||
self.assertEqual(result, str(self.member))
|
||||
|
||||
|
||||
class UtilityFunctionTestCase(TestCase):
|
||||
def test_yearsago_with_from_date(self):
|
||||
"""Test yearsago function with explicit from_date"""
|
||||
test_date = timezone.make_aware(datetime(2020, 5, 15, 12, 0, 0))
|
||||
result = yearsago(5, from_date=test_date)
|
||||
expected = timezone.make_aware(datetime(2015, 5, 15, 12, 0, 0))
|
||||
self.assertEqual(result, expected)
|
||||
|
||||
def test_yearsago_default_from_date(self):
|
||||
"""Test yearsago function with default from_date (None)"""
|
||||
# This will use timezone.now() internally
|
||||
result = yearsago(1)
|
||||
self.assertIsNotNone(result)
|
||||
self.assertLess(result, timezone.now())
|
||||
|
||||
def test_yearsago_leap_year_edge_case(self):
|
||||
"""Test yearsago function with leap year edge case (Feb 29)"""
|
||||
# Feb 29, 2020 (leap year) minus 1 year should become Feb 28, 2019
|
||||
leap_date = timezone.make_aware(datetime(2020, 2, 29, 12, 0, 0))
|
||||
result = yearsago(1, from_date=leap_date)
|
||||
expected = timezone.make_aware(datetime(2019, 2, 28, 12, 0, 0))
|
||||
self.assertEqual(result, expected)
|
||||
|
||||
|
||||
class NotTooOldFilterTestCase(TestCase):
|
||||
def setUp(self):
|
||||
self.factory = RequestFactory()
|
||||
self.filter = NotTooOldFilter(None, {}, MaterialPart, MaterialAdmin)
|
||||
|
||||
# Create test data
|
||||
self.member = Member.objects.create(
|
||||
prename="Test", lastname="User", birth_date=date(1990, 1, 1),
|
||||
email="test@example.com", gender=MALE
|
||||
)
|
||||
|
||||
# Create old material (should be too old)
|
||||
self.old_material = MaterialPart.objects.create(
|
||||
name="Old Material",
|
||||
description="Old material",
|
||||
quantity=1,
|
||||
buy_date=date(2000, 1, 1), # Very old
|
||||
lifetime=Decimal('5')
|
||||
)
|
||||
|
||||
# Create new material (should not be too old)
|
||||
self.new_material = MaterialPart.objects.create(
|
||||
name="New Material",
|
||||
description="New material",
|
||||
quantity=1,
|
||||
buy_date=date.today(), # Today
|
||||
lifetime=Decimal('10')
|
||||
)
|
||||
|
||||
def test_not_too_old_filter_lookups(self):
|
||||
"""Test NotTooOldFilter lookups method"""
|
||||
request = self.factory.get('/')
|
||||
lookups = self.filter.lookups(request, None)
|
||||
self.assertEqual(len(lookups), 2)
|
||||
self.assertEqual(lookups[0][0], 'too_old')
|
||||
self.assertEqual(lookups[1][0], 'not_too_old')
|
||||
|
||||
def test_not_too_old_filter_queryset_too_old(self):
|
||||
"""Test NotTooOldFilter queryset method with 'too_old' value"""
|
||||
request = self.factory.get('/?age=too_old')
|
||||
self.filter.used_parameters = {'age': 'too_old'}
|
||||
|
||||
queryset = MaterialPart.objects.all()
|
||||
filtered = self.filter.queryset(request, queryset)
|
||||
|
||||
# Should return materials that are not too old (i.e., new materials)
|
||||
self.assertIn(self.new_material, filtered)
|
||||
self.assertNotIn(self.old_material, filtered)
|
||||
|
||||
def test_not_too_old_filter_queryset_not_too_old(self):
|
||||
"""Test NotTooOldFilter queryset method with 'not_too_old' value"""
|
||||
request = self.factory.get('/?age=not_too_old')
|
||||
self.filter.used_parameters = {'age': 'not_too_old'}
|
||||
|
||||
queryset = MaterialPart.objects.all()
|
||||
filtered = self.filter.queryset(request, queryset)
|
||||
|
||||
# Should return materials that are too old
|
||||
self.assertIn(self.old_material, filtered)
|
||||
self.assertNotIn(self.new_material, filtered)
|
||||
# Create your tests here.
|
||||
|
||||
@ -0,0 +1,3 @@
|
||||
from django.shortcuts import render
|
||||
|
||||
# Create your views here.
|
||||
@ -1,18 +0,0 @@
|
||||
# Generated by Django 4.2.20 on 2025-06-22 11:31
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('members', '0041_freizeit_crisis_intervention_list_sent_and_more'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='member',
|
||||
name='ticket_no',
|
||||
field=models.CharField(blank=True, default='', max_length=20, verbose_name='entrance ticket number'),
|
||||
),
|
||||
]
|
||||
@ -1,121 +0,0 @@
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.db import migrations
|
||||
from django.contrib.auth.management import create_permissions
|
||||
|
||||
STANDARD_PERMS = [
|
||||
('members', 'view_member'),
|
||||
('members', 'view_freizeit'),
|
||||
('members', 'add_global_freizeit'),
|
||||
('members', 'view_memberwaitinglist'),
|
||||
('members', 'view_memberunconfirmedproxy'),
|
||||
('mailer', 'view_message'),
|
||||
('mailer', 'add_global_message'),
|
||||
('finance', 'view_statementunsubmitted'),
|
||||
('finance', 'add_global_statementunsubmitted'),
|
||||
]
|
||||
|
||||
FINANCE_PERMS = [
|
||||
('finance', 'view_bill'),
|
||||
('finance', 'view_ledger'),
|
||||
('finance', 'add_ledger'),
|
||||
('finance', 'change_ledger'),
|
||||
('finance', 'delete_ledger'),
|
||||
('finance', 'view_statementsubmitted'),
|
||||
('finance', 'view_global_statementsubmitted'),
|
||||
('finance', 'change_global_statementsubmitted'),
|
||||
('finance', 'view_transaction'),
|
||||
('finance', 'change_transaction'),
|
||||
('finance', 'add_transaction'),
|
||||
('finance', 'delete_transaction'),
|
||||
('finance', 'process_statementsubmitted'),
|
||||
('members', 'list_global_freizeit'),
|
||||
('members', 'view_global_freizeit'),
|
||||
]
|
||||
|
||||
WAITINGLIST_PERMS = [
|
||||
('members', 'view_global_memberwaitinglist'),
|
||||
('members', 'list_global_memberwaitinglist'),
|
||||
('members', 'change_global_memberwaitinglist'),
|
||||
('members', 'delete_global_memberwaitinglist'),
|
||||
]
|
||||
|
||||
TRAINING_PERMS = [
|
||||
('members', 'change_global_member'),
|
||||
('members', 'list_global_member'),
|
||||
('members', 'view_global_member'),
|
||||
('members', 'add_global_membertraining'),
|
||||
('members', 'change_global_membertraining'),
|
||||
('members', 'list_global_membertraining'),
|
||||
('members', 'view_global_membertraining'),
|
||||
('members', 'view_trainingcategory'),
|
||||
('members', 'add_trainingcategory'),
|
||||
('members', 'change_trainingcategory'),
|
||||
('members', 'delete_trainingcategory'),
|
||||
]
|
||||
|
||||
REGISTRATION_PERMS = [
|
||||
('members', 'may_manage_all_registrations'),
|
||||
('members', 'change_memberunconfirmedproxy'),
|
||||
('members', 'delete_memberunconfirmedproxy'),
|
||||
]
|
||||
|
||||
MATERIAL_PERMS = [
|
||||
('members', 'list_global_member'),
|
||||
('material', 'view_materialpart'),
|
||||
('material', 'change_materialpart'),
|
||||
('material', 'add_materialpart'),
|
||||
('material', 'delete_materialpart'),
|
||||
('material', 'view_materialcategory'),
|
||||
('material', 'change_materialcategory'),
|
||||
('material', 'add_materialcategory'),
|
||||
('material', 'delete_materialcategory'),
|
||||
('material', 'view_ownership'),
|
||||
('material', 'change_ownership'),
|
||||
('material', 'add_ownership'),
|
||||
('material', 'delete_ownership'),
|
||||
]
|
||||
|
||||
|
||||
def ensure_group_perms(apps, schema_editor, name, perm_names):
|
||||
"""
|
||||
Ensure the group `name` has the permissions `perm_names`. If the group does not
|
||||
exist, create it with the given permissions, otherwise add the missing ones.
|
||||
|
||||
This only adds permissions, already existing ones that are not listed here are not
|
||||
removed.
|
||||
"""
|
||||
db_alias = schema_editor.connection.alias
|
||||
Group = apps.get_model("auth", "Group")
|
||||
Permission = apps.get_model("auth", "Permission")
|
||||
perms = [ Permission.objects.get(codename=codename, content_type__app_label=app_label) for app_label, codename in perm_names ]
|
||||
try:
|
||||
g = Group.objects.using(db_alias).get(name=name)
|
||||
for perm in perms:
|
||||
g.permissions.add(perm)
|
||||
g.save()
|
||||
# This case is only executed if users have manually removed one of the standard groups.
|
||||
except Group.DoesNotExist: # pragma: no cover
|
||||
g = Group.objects.using(db_alias).create(name=name)
|
||||
g.permissions.set(perms)
|
||||
g.save()
|
||||
|
||||
|
||||
def update_default_permission_groups(apps, schema_editor):
|
||||
ensure_group_perms(apps, schema_editor, "Standard", STANDARD_PERMS)
|
||||
ensure_group_perms(apps, schema_editor, "Finance", FINANCE_PERMS)
|
||||
ensure_group_perms(apps, schema_editor, "Waitinglist", WAITINGLIST_PERMS)
|
||||
ensure_group_perms(apps, schema_editor, "Trainings", TRAINING_PERMS)
|
||||
ensure_group_perms(apps, schema_editor, "Registrations", REGISTRATION_PERMS)
|
||||
ensure_group_perms(apps, schema_editor, "Material", MATERIAL_PERMS)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('members', '0010_create_default_permission_groups'),
|
||||
('members', '0042_member_ticket_no'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RunPython(update_default_permission_groups, migrations.RunPython.noop),
|
||||
]
|
||||
@ -1,42 +0,0 @@
|
||||
# Generated by Django 4.2.20 on 2025-10-10 15:50
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('members', '0043_waitinglist_permissions'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='membertraining',
|
||||
name='activity',
|
||||
field=models.ManyToManyField(to='members.activitycategory', verbose_name='Activity'),
|
||||
),
|
||||
migrations.AlterModelOptions(
|
||||
name='membertraining',
|
||||
options={'default_permissions': ('add_global', 'change_global', 'view_global', 'delete_global', 'list_global', 'view'), 'permissions': (('manage_success_trainings', 'Can edit the success status of trainings.'),), 'verbose_name': 'Training', 'verbose_name_plural': 'Trainings'},
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='membertraining',
|
||||
name='title',
|
||||
field=models.CharField(max_length=150, verbose_name='Title'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='membertraining',
|
||||
name='member',
|
||||
field=models.ForeignKey(on_delete=models.deletion.CASCADE, related_name='traininigs', to='members.member', verbose_name='Member'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='membertraining',
|
||||
name='participated',
|
||||
field=models.BooleanField(null=True, verbose_name='Participated'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='membertraining',
|
||||
name='passed',
|
||||
field=models.BooleanField(null=True, verbose_name='Passed'),
|
||||
),
|
||||
]
|
||||
@ -1,121 +0,0 @@
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.db import migrations
|
||||
from django.contrib.auth.management import create_permissions
|
||||
|
||||
STANDARD_PERMS = [
|
||||
('members', 'view_member'),
|
||||
('members', 'view_freizeit'),
|
||||
('members', 'add_global_freizeit'),
|
||||
('members', 'view_memberwaitinglist'),
|
||||
('members', 'view_memberunconfirmedproxy'),
|
||||
('mailer', 'view_message'),
|
||||
('mailer', 'add_global_message'),
|
||||
('finance', 'view_statement'),
|
||||
('finance', 'add_global_statement'),
|
||||
]
|
||||
|
||||
FINANCE_PERMS = [
|
||||
('finance', 'view_bill'),
|
||||
('finance', 'view_ledger'),
|
||||
('finance', 'add_ledger'),
|
||||
('finance', 'change_ledger'),
|
||||
('finance', 'delete_ledger'),
|
||||
('finance', 'view_global_statement'),
|
||||
('finance', 'change_global_statement'),
|
||||
('finance', 'process_statementsubmitted'),
|
||||
('finance', 'may_manage_confirmed_statements'),
|
||||
('finance', 'view_transaction'),
|
||||
('finance', 'change_transaction'),
|
||||
('finance', 'add_transaction'),
|
||||
('finance', 'delete_transaction'),
|
||||
('members', 'list_global_freizeit'),
|
||||
('members', 'view_global_freizeit'),
|
||||
]
|
||||
|
||||
WAITINGLIST_PERMS = [
|
||||
('members', 'view_global_memberwaitinglist'),
|
||||
('members', 'list_global_memberwaitinglist'),
|
||||
('members', 'change_global_memberwaitinglist'),
|
||||
('members', 'delete_global_memberwaitinglist'),
|
||||
]
|
||||
|
||||
TRAINING_PERMS = [
|
||||
('members', 'change_global_member'),
|
||||
('members', 'list_global_member'),
|
||||
('members', 'view_global_member'),
|
||||
('members', 'add_global_membertraining'),
|
||||
('members', 'change_global_membertraining'),
|
||||
('members', 'list_global_membertraining'),
|
||||
('members', 'view_global_membertraining'),
|
||||
('members', 'view_trainingcategory'),
|
||||
('members', 'add_trainingcategory'),
|
||||
('members', 'change_trainingcategory'),
|
||||
('members', 'delete_trainingcategory'),
|
||||
]
|
||||
|
||||
REGISTRATION_PERMS = [
|
||||
('members', 'may_manage_all_registrations'),
|
||||
('members', 'change_memberunconfirmedproxy'),
|
||||
('members', 'delete_memberunconfirmedproxy'),
|
||||
]
|
||||
|
||||
MATERIAL_PERMS = [
|
||||
('members', 'list_global_member'),
|
||||
('material', 'view_materialpart'),
|
||||
('material', 'change_materialpart'),
|
||||
('material', 'add_materialpart'),
|
||||
('material', 'delete_materialpart'),
|
||||
('material', 'view_materialcategory'),
|
||||
('material', 'change_materialcategory'),
|
||||
('material', 'add_materialcategory'),
|
||||
('material', 'delete_materialcategory'),
|
||||
('material', 'view_ownership'),
|
||||
('material', 'change_ownership'),
|
||||
('material', 'add_ownership'),
|
||||
('material', 'delete_ownership'),
|
||||
]
|
||||
|
||||
|
||||
def ensure_group_perms(apps, schema_editor, name, perm_names):
|
||||
"""
|
||||
Ensure the group `name` has the permissions `perm_names`. If the group does not
|
||||
exist, create it with the given permissions, otherwise add the missing ones.
|
||||
|
||||
This only adds permissions, already existing ones that are not listed here are not
|
||||
removed.
|
||||
"""
|
||||
db_alias = schema_editor.connection.alias
|
||||
Group = apps.get_model("auth", "Group")
|
||||
Permission = apps.get_model("auth", "Permission")
|
||||
perms = [ Permission.objects.get(codename=codename, content_type__app_label=app_label) for app_label, codename in perm_names ]
|
||||
try:
|
||||
g = Group.objects.using(db_alias).get(name=name)
|
||||
for perm in perms:
|
||||
g.permissions.add(perm)
|
||||
g.save()
|
||||
# This case is only executed if users have manually removed one of the standard groups.
|
||||
except Group.DoesNotExist: # pragma: no cover
|
||||
g = Group.objects.using(db_alias).create(name=name)
|
||||
g.permissions.set(perms)
|
||||
g.save()
|
||||
|
||||
|
||||
def update_default_permission_groups(apps, schema_editor):
|
||||
ensure_group_perms(apps, schema_editor, "Standard", STANDARD_PERMS)
|
||||
ensure_group_perms(apps, schema_editor, "Finance", FINANCE_PERMS)
|
||||
ensure_group_perms(apps, schema_editor, "Waitinglist", WAITINGLIST_PERMS)
|
||||
ensure_group_perms(apps, schema_editor, "Trainings", TRAINING_PERMS)
|
||||
ensure_group_perms(apps, schema_editor, "Registrations", REGISTRATION_PERMS)
|
||||
ensure_group_perms(apps, schema_editor, "Material", MATERIAL_PERMS)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('finance', '0012_statementonexcursionproxy'),
|
||||
('members', '0044_membertraining_activity_and_more'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RunPython(update_default_permission_groups, migrations.RunPython.noop),
|
||||
]
|
||||
@ -1,40 +0,0 @@
|
||||
{% extends "admin/base_site.html" %}
|
||||
{% load i18n admin_urls static %}
|
||||
|
||||
{% block extrahead %}
|
||||
{{ block.super }}
|
||||
{{ media }}
|
||||
<script src="{% static 'admin/js/cancel.js' %}" async></script>
|
||||
<script type="text/javascript" src="{% static "admin/js/vendor/jquery/jquery.js" %}"></script>
|
||||
<script type="text/javascript" src="{% static "admin/js/jquery.init.js" %}"></script>
|
||||
{% endblock %}
|
||||
|
||||
{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} invite-waiter
|
||||
{% endblock %}
|
||||
|
||||
{% block breadcrumbs %}
|
||||
<div class="breadcrumbs">
|
||||
<a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>
|
||||
› <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
|
||||
› <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>
|
||||
› {% translate 'Demote to waiter' %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h2>{% translate "Request registration form" %}</h2>
|
||||
<p>
|
||||
{% blocktrans %}Do you want to ask {{ member }} to upload their registration form?{% endblocktrans %}
|
||||
</p>
|
||||
<p>
|
||||
{% if member.registration_form %}
|
||||
{% blocktrans %}Warning: {{ member }} has already uploaded a registration form.{% endblocktrans %}
|
||||
{% endif %}
|
||||
</p>
|
||||
|
||||
<form action="" method="post">
|
||||
{% csrf_token %}
|
||||
<input class="default" style="color: $default-link-color" type="submit" name="apply" value="{% translate 'Request registration form' %}">
|
||||
<a href="#" class="button cancel-link">{% translate "Cancel" %}</a>
|
||||
</form>
|
||||
{% endblock %}
|
||||
@ -1,48 +0,0 @@
|
||||
{% extends "admin/base_site.html" %}
|
||||
{% load i18n admin_urls static %}
|
||||
|
||||
{% block extrahead %}
|
||||
{{ block.super }}
|
||||
{{ media }}
|
||||
<script src="{% static 'admin/js/cancel.js' %}" async></script>
|
||||
<script type="text/javascript" src="{% static "admin/js/vendor/jquery/jquery.js" %}"></script>
|
||||
<script type="text/javascript" src="{% static "admin/js/jquery.init.js" %}"></script>
|
||||
{% endblock %}
|
||||
|
||||
{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} invite-waiter
|
||||
{% endblock %}
|
||||
|
||||
{% block breadcrumbs %}
|
||||
<div class="breadcrumbs">
|
||||
<a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>
|
||||
› <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
|
||||
› <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>
|
||||
› {% translate 'Demote to waiter' %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h2>{% translate "Demote to waiter" %}</h2>
|
||||
<p>
|
||||
{% trans "Do you want to demote the following unconfirmed registrations to waiters?" %}
|
||||
</p>
|
||||
<p>
|
||||
<ul>
|
||||
{% for member in queryset %}
|
||||
<li>
|
||||
<a href="{% url 'admin:members_memberunconfirmedproxy_change' 3 %}">{{ member }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</p>
|
||||
|
||||
<form action="" method="post">
|
||||
{% csrf_token %}
|
||||
{% if form %}
|
||||
{{form}}
|
||||
{% endif %}
|
||||
<input type="hidden" name="action" value="demote_to_waiter_action">
|
||||
<input class="default" style="color: $default-link-color" type="submit" name="apply" value="{% translate 'Demote' %}">
|
||||
<a href="#" class="button cancel-link">{% translate "Cancel" %}</a>
|
||||
</form>
|
||||
{% endblock %}
|
||||
@ -1,65 +0,0 @@
|
||||
{% extends "members/tex_base.tex" %}
|
||||
{% load static common tex_extras %}
|
||||
|
||||
{% block headline %}{% endblock %}
|
||||
{% block contact %}{% endblock %}
|
||||
|
||||
{% block extra-preamble %}
|
||||
\usepackage{rotating}
|
||||
\usepackage[code=Code39,X=.48mm,ratio=3.5,H=0.5cm]{makebarcode}
|
||||
\geometry{reset,margin=1cm, bottom=1.5cm}
|
||||
\renewcommand{\arraystretch}{1}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% settings_value 'DEFAULT_STATIC_PATH' as static_root %}
|
||||
|
||||
{% for group in groups %}
|
||||
\picpos{2.5cm}{16cm}{-0.4cm}{%
|
||||
{{ static_root }}/general/img/dav_logo_sektion.png%
|
||||
}
|
||||
% HEADLINE
|
||||
|
||||
{\noindent\Large{Gruppenliste {{ group.name }} }}\\[1mm]
|
||||
{% if group.has_time_info %} \noindent {{ weekdays|index:group.weekday|esc_all }}, {{ group.start_time }} - {{ group.end_time }} Uhr\\ {% endif %}
|
||||
\noindent {{ header_text }}
|
||||
\begin{table}[H]
|
||||
\centering
|
||||
%\begin{tabularx}{\textwidth}{lYY|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l}
|
||||
\begin{tabularx}{\textwidth}{X{% for i in week_range %}|l{% endfor%}}
|
||||
\toprule
|
||||
\textbf{Name} {% for i in week_range %}
|
||||
& \begin{sideways} {{ dates|index:i|add:group.weekday|date_vs }} \end{sideways}
|
||||
{% endfor %} \\
|
||||
|
||||
{% for j in member_range %}
|
||||
{% with m=group.sorted_members|index:j %}
|
||||
{% with codelength=m.ticket_tag|length %}
|
||||
\midrule
|
||||
\begin{tabular}{@{}l}
|
||||
{% if codelength > 2 %}
|
||||
\barcode[
|
||||
X=\dimexpr 3.5mm / \numexpr {{ codelength }} \relax \relax
|
||||
]{{ m.ticket_tag }}
|
||||
{% else %}
|
||||
\rule{0pt}{5mm}
|
||||
{% endif %}
|
||||
\vspace{-0.8ex} \\
|
||||
{\small {{ j|plus:1 }} {% if m in group.leiters.all %}\textbf{JL}{% endif %}
|
||||
{{ m.name|esc_all }} {% if codelength > 2 %} - {{ m.ticket_tag }}{% endif %}
|
||||
\vspace{-3ex} }
|
||||
\end{tabular}
|
||||
|
||||
{% for i in week_range %} & {% endfor %}\\
|
||||
{% endwith %}
|
||||
{% endwith %}
|
||||
{% endfor %}
|
||||
|
||||
\bottomrule
|
||||
\end{tabularx}
|
||||
\end{table}
|
||||
|
||||
\clearpage
|
||||
{% endfor %}
|
||||
|
||||
{% endblock content %}
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,179 +0,0 @@
|
||||
from django.test import TestCase
|
||||
from django.utils import timezone
|
||||
from django.contrib.auth.models import User
|
||||
|
||||
from ..models import Member, Group, Freizeit, DIVERSE, GEMEINSCHAFTS_TOUR, MemberTraining, TrainingCategory, LJPProposal
|
||||
from ..rules import is_oneself, may_view, may_change, may_delete, is_own_training, is_leader_of_excursion, is_leader, statement_not_submitted, _is_leader
|
||||
from finance.models import Statement
|
||||
from mailer.models import EmailAddress
|
||||
|
||||
|
||||
class RulesTestCase(TestCase):
|
||||
def setUp(self):
|
||||
# Create email address for groups
|
||||
self.email_address = EmailAddress.objects.create(name='test@example.com')
|
||||
|
||||
# Create test users and members
|
||||
self.user1 = User.objects.create_user(username='user1', email='user1@example.com')
|
||||
self.member1 = Member.objects.create(
|
||||
prename='Test',
|
||||
lastname='Member1',
|
||||
birth_date=timezone.now().date(),
|
||||
email='member1@example.com',
|
||||
gender=DIVERSE
|
||||
)
|
||||
self.user1.member = self.member1
|
||||
self.user1.save()
|
||||
|
||||
self.user2 = User.objects.create_user(username='user2', email='user2@example.com')
|
||||
self.member2 = Member.objects.create(
|
||||
prename='Test',
|
||||
lastname='Member2',
|
||||
birth_date=timezone.now().date(),
|
||||
email='member2@example.com',
|
||||
gender=DIVERSE
|
||||
)
|
||||
self.user2.member = self.member2
|
||||
self.user2.save()
|
||||
|
||||
self.user3 = User.objects.create_user(username='user3', email='user3@example.com')
|
||||
self.member3 = Member.objects.create(
|
||||
prename='Test',
|
||||
lastname='Member3',
|
||||
birth_date=timezone.now().date(),
|
||||
email='member3@example.com',
|
||||
gender=DIVERSE
|
||||
)
|
||||
self.user3.member = self.member3
|
||||
self.user3.save()
|
||||
|
||||
# Create test group
|
||||
self.group = Group.objects.create(name='Test Group')
|
||||
self.group.contact_email = self.email_address
|
||||
self.group.leiters.add(self.member2)
|
||||
self.group.save()
|
||||
|
||||
# Create test excursion
|
||||
self.excursion = Freizeit.objects.create(
|
||||
name='Test Excursion',
|
||||
tour_type=GEMEINSCHAFTS_TOUR,
|
||||
kilometers_traveled=10,
|
||||
difficulty=1
|
||||
)
|
||||
self.excursion.jugendleiter.add(self.member1)
|
||||
self.excursion.groups.add(self.group)
|
||||
self.excursion.save()
|
||||
|
||||
# Create training category and training
|
||||
self.training_category = TrainingCategory.objects.create(
|
||||
name='Test Training',
|
||||
permission_needed=False
|
||||
)
|
||||
|
||||
self.training = MemberTraining.objects.create(
|
||||
member=self.member1,
|
||||
title='Test Training',
|
||||
category=self.training_category,
|
||||
participated=True,
|
||||
passed=True
|
||||
)
|
||||
|
||||
# Create LJP proposal
|
||||
self.ljp_proposal = LJPProposal.objects.create(
|
||||
title='Test LJP',
|
||||
excursion=self.excursion
|
||||
)
|
||||
|
||||
# Create statement
|
||||
self.statement_unsubmitted = Statement.objects.create(
|
||||
short_description='Unsubmitted Statement',
|
||||
excursion=self.excursion,
|
||||
status=Statement.UNSUBMITTED
|
||||
)
|
||||
|
||||
self.statement_submitted = Statement.objects.create(
|
||||
short_description='Submitted Statement',
|
||||
status=Statement.SUBMITTED
|
||||
)
|
||||
|
||||
def test_is_oneself(self):
|
||||
"""Test is_oneself rule - member can identify themselves."""
|
||||
# Same member
|
||||
self.assertTrue(is_oneself(self.user1, self.member1))
|
||||
|
||||
# Different members
|
||||
self.assertFalse(is_oneself(self.user1, self.member2))
|
||||
|
||||
def test_may(self):
|
||||
"""Test `may_` rules."""
|
||||
self.assertTrue(may_view(self.user1, self.member1))
|
||||
self.assertTrue(may_change(self.user1, self.member1))
|
||||
self.assertTrue(may_delete(self.user1, self.member1))
|
||||
|
||||
def test_is_own_training(self):
|
||||
"""Test is_own_training rule - member can access their own training."""
|
||||
# Own training
|
||||
self.assertTrue(is_own_training(self.user1, self.training))
|
||||
# Other member's training
|
||||
self.assertFalse(is_own_training(self.user2, self.training))
|
||||
|
||||
def test_is_leader_of_excursion(self):
|
||||
"""Test is_leader_of_excursion rule for LJP proposals."""
|
||||
# LJP proposal with excursion - member3 is not a leader
|
||||
self.assertFalse(is_leader_of_excursion(self.user3, self.ljp_proposal))
|
||||
# Directly pass an excursion
|
||||
self.assertTrue(is_leader_of_excursion(self.user1, self.excursion))
|
||||
|
||||
def test_is_leader(self):
|
||||
"""Test is_leader rule for excursions."""
|
||||
# Direct excursion leader
|
||||
self.assertTrue(is_leader(self.user1, self.excursion))
|
||||
|
||||
# Group leader (member2 is leader of group that is part of excursion)
|
||||
self.assertTrue(is_leader(self.user2, self.excursion))
|
||||
|
||||
# member3 is unrelated
|
||||
self.assertFalse(is_leader(self.user3, self.excursion))
|
||||
|
||||
# Test user without member attribute
|
||||
user_no_member = User.objects.create_user(username='nomember', email='nomember@example.com')
|
||||
self.assertFalse(is_leader(user_no_member, self.excursion))
|
||||
|
||||
# Test member without pk attribute
|
||||
class MemberNoPk:
|
||||
pass
|
||||
member_no_pk = MemberNoPk()
|
||||
self.assertFalse(_is_leader(member_no_pk, self.excursion))
|
||||
|
||||
# Test member with None pk
|
||||
class MemberNonePk:
|
||||
pk = None
|
||||
member_none_pk = MemberNonePk()
|
||||
self.assertFalse(_is_leader(member_none_pk, self.excursion))
|
||||
|
||||
def test_statement_not_submitted(self):
|
||||
"""Test statement_not_submitted rule."""
|
||||
# Unsubmitted statement with excursion
|
||||
self.assertTrue(statement_not_submitted(self.user1, self.excursion))
|
||||
|
||||
# Submitted statement
|
||||
self.excursion.statement = self.statement_submitted
|
||||
self.excursion.save()
|
||||
self.assertFalse(statement_not_submitted(self.user1, self.excursion))
|
||||
|
||||
# Excursion without statement
|
||||
excursion_no_statement = Freizeit.objects.create(
|
||||
name='No Statement Excursion',
|
||||
tour_type=GEMEINSCHAFTS_TOUR,
|
||||
kilometers_traveled=10,
|
||||
difficulty=1
|
||||
)
|
||||
self.assertFalse(statement_not_submitted(self.user1, excursion_no_statement))
|
||||
|
||||
# Test the excursion.statement is None case
|
||||
# Create a special test object to directly trigger
|
||||
class ExcursionWithNoneStatement:
|
||||
def __init__(self):
|
||||
self.statement = None
|
||||
# if excursion.statement is None: return False
|
||||
self.assertFalse(statement_not_submitted(self.user1, ExcursionWithNoneStatement()))
|
||||
@ -1,142 +0,0 @@
|
||||
from unittest.mock import patch, MagicMock
|
||||
from django.test import TestCase
|
||||
from django.utils import timezone
|
||||
from django.conf import settings
|
||||
|
||||
from ..models import MemberWaitingList, Freizeit, Group, DIVERSE, GEMEINSCHAFTS_TOUR
|
||||
from ..tasks import ask_for_waiting_confirmation, send_crisis_intervention_list, send_notification_crisis_intervention_list
|
||||
from mailer.models import EmailAddress
|
||||
|
||||
|
||||
class TasksTestCase(TestCase):
|
||||
def setUp(self):
|
||||
# Create test email address
|
||||
self.email_address = EmailAddress.objects.create(name='test@example.com')
|
||||
|
||||
# Create test group
|
||||
self.group = Group.objects.create(name='Test Group')
|
||||
self.group.contact_email = self.email_address
|
||||
self.group.save()
|
||||
|
||||
# Create test waiters
|
||||
now = timezone.now()
|
||||
old_confirmation = now - timezone.timedelta(days=settings.WAITING_CONFIRMATION_FREQUENCY + 1)
|
||||
old_reminder = now - timezone.timedelta(days=settings.CONFIRMATION_REMINDER_FREQUENCY + 1)
|
||||
|
||||
self.waiter1 = MemberWaitingList.objects.create(
|
||||
prename='Test',
|
||||
lastname='Waiter1',
|
||||
birth_date=now.date(),
|
||||
email='waiter1@example.com',
|
||||
gender=DIVERSE,
|
||||
last_wait_confirmation=old_confirmation,
|
||||
last_reminder=old_reminder,
|
||||
sent_reminders=0
|
||||
)
|
||||
|
||||
self.waiter2 = MemberWaitingList.objects.create(
|
||||
prename='Test',
|
||||
lastname='Waiter2',
|
||||
birth_date=now.date(),
|
||||
email='waiter2@example.com',
|
||||
gender=DIVERSE,
|
||||
last_wait_confirmation=old_confirmation,
|
||||
last_reminder=old_reminder,
|
||||
sent_reminders=settings.MAX_REMINDER_COUNT - 1
|
||||
)
|
||||
|
||||
# Create waiter that shouldn't receive reminder (too recent confirmation)
|
||||
self.waiter3 = MemberWaitingList.objects.create(
|
||||
prename='Test',
|
||||
lastname='Waiter3',
|
||||
birth_date=now.date(),
|
||||
email='waiter3@example.com',
|
||||
gender=DIVERSE,
|
||||
last_wait_confirmation=now,
|
||||
last_reminder=old_reminder,
|
||||
sent_reminders=0
|
||||
)
|
||||
|
||||
# Create waiter that shouldn't receive reminder (max reminders reached)
|
||||
self.waiter4 = MemberWaitingList.objects.create(
|
||||
prename='Test',
|
||||
lastname='Waiter4',
|
||||
birth_date=now.date(),
|
||||
email='waiter4@example.com',
|
||||
gender=DIVERSE,
|
||||
last_wait_confirmation=old_confirmation,
|
||||
last_reminder=old_reminder,
|
||||
sent_reminders=settings.MAX_REMINDER_COUNT
|
||||
)
|
||||
|
||||
# Create test excursions
|
||||
today = timezone.now().date()
|
||||
tomorrow = today + timezone.timedelta(days=1)
|
||||
|
||||
self.excursion_today_not_sent = Freizeit.objects.create(
|
||||
name='Today Excursion 1',
|
||||
date=timezone.now() + timezone.timedelta(hours=4),
|
||||
tour_type=GEMEINSCHAFTS_TOUR,
|
||||
kilometers_traveled=10,
|
||||
difficulty=1,
|
||||
crisis_intervention_list_sent=False,
|
||||
notification_crisis_intervention_list_sent=False
|
||||
)
|
||||
|
||||
self.excursion_today_sent = Freizeit.objects.create(
|
||||
name='Today Excursion 2',
|
||||
date=timezone.now() + timezone.timedelta(hours=4),
|
||||
tour_type=GEMEINSCHAFTS_TOUR,
|
||||
kilometers_traveled=10,
|
||||
difficulty=1,
|
||||
crisis_intervention_list_sent=True,
|
||||
notification_crisis_intervention_list_sent=True
|
||||
)
|
||||
|
||||
self.excursion_tomorrow_not_sent = Freizeit.objects.create(
|
||||
name='Tomorrow Excursion 1',
|
||||
date=timezone.now() + timezone.timedelta(days=1, hours=4),
|
||||
tour_type=GEMEINSCHAFTS_TOUR,
|
||||
kilometers_traveled=10,
|
||||
difficulty=1,
|
||||
crisis_intervention_list_sent=False,
|
||||
notification_crisis_intervention_list_sent=False
|
||||
)
|
||||
|
||||
self.excursion_tomorrow_sent = Freizeit.objects.create(
|
||||
name='Tomorrow Excursion 2',
|
||||
date=timezone.now() + timezone.timedelta(days=1, hours=4),
|
||||
tour_type=GEMEINSCHAFTS_TOUR,
|
||||
kilometers_traveled=10,
|
||||
difficulty=1,
|
||||
crisis_intervention_list_sent=True,
|
||||
notification_crisis_intervention_list_sent=True
|
||||
)
|
||||
|
||||
@patch.object(MemberWaitingList, 'ask_for_wait_confirmation')
|
||||
def test_ask_for_waiting_confirmation(self, mock_ask):
|
||||
"""Test ask_for_waiting_confirmation task calls correct waiters."""
|
||||
result = ask_for_waiting_confirmation()
|
||||
|
||||
# Should call ask_for_wait_confirmation for waiter1 and waiter2 only
|
||||
self.assertEqual(result, 2)
|
||||
self.assertEqual(mock_ask.call_count, 2)
|
||||
|
||||
@patch.object(Freizeit, 'send_crisis_intervention_list')
|
||||
def test_send_crisis_intervention_list(self, mock_send):
|
||||
"""Test send_crisis_intervention_list task calls correct excursions."""
|
||||
result = send_crisis_intervention_list()
|
||||
|
||||
# Should call send_crisis_intervention_list for today's excursions that haven't been sent
|
||||
self.assertEqual(result, 1)
|
||||
self.assertEqual(mock_send.call_count, 1)
|
||||
|
||||
@patch.object(Freizeit, 'notify_leaders_crisis_intervention_list')
|
||||
def test_send_notification_crisis_intervention_list(self, mock_notify):
|
||||
"""Test send_notification_crisis_intervention_list task calls correct excursions."""
|
||||
result = send_notification_crisis_intervention_list()
|
||||
|
||||
# Should call notify_leaders_crisis_intervention_list for tomorrow's and todays excursions
|
||||
# that haven't been sent
|
||||
self.assertEqual(result, 2)
|
||||
self.assertEqual(mock_notify.call_count, 2)
|
||||
@ -1,80 +0,0 @@
|
||||
from django.test import TestCase
|
||||
from django.template import Context, Template
|
||||
from datetime import datetime, date, timedelta
|
||||
from members.templatetags.tex_extras import index, datetime_short, date_short, date_vs, time_short, add, plus
|
||||
from members.templatetags.overview_extras import blToColor, render_bool
|
||||
|
||||
|
||||
class TexExtrasTestCase(TestCase):
|
||||
def setUp(self):
|
||||
self.test_date = date(2024, 3, 15)
|
||||
self.test_datetime = datetime(2024, 3, 15, 14, 30)
|
||||
self.test_list = ['a', 'b', 'c']
|
||||
|
||||
def test_index_valid_position(self):
|
||||
result = index(self.test_list, 1)
|
||||
self.assertEqual(result, 'b')
|
||||
|
||||
def test_index_invalid_position(self):
|
||||
result = index(self.test_list, 5)
|
||||
self.assertEqual(result, '')
|
||||
|
||||
def test_index_type_error(self):
|
||||
result = index(123, 1)
|
||||
self.assertEqual(result, '')
|
||||
|
||||
def test_datetime_short(self):
|
||||
result = datetime_short(self.test_datetime)
|
||||
self.assertEqual(result, '15.03.2024 14:30')
|
||||
|
||||
def test_date_short(self):
|
||||
result = date_short(self.test_date)
|
||||
self.assertEqual(result, '15.03.24')
|
||||
|
||||
def test_date_vs(self):
|
||||
result = date_vs(self.test_date)
|
||||
self.assertEqual(result, '15.03.')
|
||||
|
||||
def test_time_short(self):
|
||||
result = time_short(self.test_datetime)
|
||||
self.assertEqual(result, '14:30')
|
||||
|
||||
def test_add_with_days(self):
|
||||
result = add(self.test_date, 5)
|
||||
self.assertEqual(result, date(2024, 3, 20))
|
||||
|
||||
def test_add_without_days(self):
|
||||
result = add(self.test_date, None)
|
||||
self.assertEqual(result, self.test_date)
|
||||
|
||||
def test_plus_with_second_number(self):
|
||||
result = plus(10, 5)
|
||||
self.assertEqual(result, 15)
|
||||
|
||||
def test_plus_without_second_number(self):
|
||||
result = plus(10, None)
|
||||
self.assertEqual(result, 10)
|
||||
|
||||
|
||||
class OverviewExtrasTestCase(TestCase):
|
||||
def test_blToColor_truthy_value(self):
|
||||
result = blToColor(True)
|
||||
self.assertEqual(result, 'green')
|
||||
|
||||
def test_blToColor_falsy_value(self):
|
||||
result = blToColor(False)
|
||||
self.assertEqual(result, 'red')
|
||||
|
||||
def test_render_bool_non_boolean_value(self):
|
||||
with self.assertRaises(ValueError):
|
||||
render_bool("not_a_boolean")
|
||||
|
||||
def test_render_bool_true(self):
|
||||
result = render_bool(True)
|
||||
self.assertIn('#bcd386', result)
|
||||
self.assertIn('icon-tick', result)
|
||||
|
||||
def test_render_bool_false(self):
|
||||
result = render_bool(False)
|
||||
self.assertIn('#dba4a4', result)
|
||||
self.assertIn('icon-cross', result)
|
||||
@ -1,110 +0,0 @@
|
||||
from unittest import skip
|
||||
from http import HTTPStatus
|
||||
from django.test import TestCase, Client
|
||||
from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
from django.utils.translation import gettext as _
|
||||
|
||||
from mailer.models import EmailAddress
|
||||
from ..models import Member, Group, InvitationToGroup, MemberWaitingList, DIVERSE
|
||||
|
||||
|
||||
class ConfirmInvitationViewTestCase(TestCase):
|
||||
def setUp(self):
|
||||
self.client = Client()
|
||||
|
||||
# Create an email address for the group
|
||||
self.email_address = EmailAddress.objects.create(name='testmail')
|
||||
|
||||
# Create a test group
|
||||
self.group = Group.objects.create(name='Test Group')
|
||||
self.group.contact_email = self.email_address
|
||||
self.group.save()
|
||||
|
||||
# Create a waiting list entry
|
||||
self.waiter = MemberWaitingList.objects.create(
|
||||
prename='Waiter',
|
||||
lastname='User',
|
||||
birth_date=timezone.now().date(),
|
||||
email='waiter@example.com',
|
||||
gender=DIVERSE,
|
||||
wait_confirmation_key='test_wait_key',
|
||||
wait_confirmation_key_expire=timezone.now() + timezone.timedelta(days=1)
|
||||
)
|
||||
|
||||
# Create an invitation
|
||||
self.invitation = InvitationToGroup.objects.create(
|
||||
waiter=self.waiter,
|
||||
group=self.group,
|
||||
key='test_invitation_key',
|
||||
date=timezone.now().date()
|
||||
)
|
||||
|
||||
def test_confirm_invitation_get_valid_key(self):
|
||||
"""Test GET request with valid key shows invitation confirmation page."""
|
||||
url = reverse('members:confirm_invitation')
|
||||
response = self.client.get(url, {'key': 'test_invitation_key'})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('Confirm trial group meeting invitation'))
|
||||
self.assertContains(response, self.group.name)
|
||||
|
||||
def test_confirm_invitation_get_invalid_key(self):
|
||||
"""Test GET request with invalid key shows invalid confirmation page."""
|
||||
url = reverse('members:confirm_invitation')
|
||||
|
||||
# no key
|
||||
response = self.client.get(url)
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('This invitation is invalid or expired.'))
|
||||
|
||||
# invalid key
|
||||
response = self.client.get(url, {'key': 'invalid_key'})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('This invitation is invalid or expired.'))
|
||||
|
||||
def test_confirm_invitation_get_rejected_invitation(self):
|
||||
"""Test GET request with rejected invitation shows invalid confirmation page."""
|
||||
self.invitation.rejected = True
|
||||
self.invitation.save()
|
||||
|
||||
url = reverse('members:confirm_invitation')
|
||||
response = self.client.get(url, {'key': self.invitation.key})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('This invitation is invalid or expired.'))
|
||||
|
||||
def test_confirm_invitation_get_expired_invitation(self):
|
||||
"""Test GET request with expired invitation shows invalid confirmation page."""
|
||||
# Set invitation date to more than 30 days ago to make it expired
|
||||
self.invitation.date = timezone.now().date() - timezone.timedelta(days=31)
|
||||
self.invitation.save()
|
||||
|
||||
url = reverse('members:confirm_invitation')
|
||||
response = self.client.get(url, {'key': self.invitation.key})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('This invitation is invalid or expired.'))
|
||||
|
||||
def test_confirm_invitation_post_invalid_key(self):
|
||||
"""Test POST request with invalid key shows invalid confirmation page."""
|
||||
url = reverse('members:confirm_invitation')
|
||||
|
||||
# no key
|
||||
response = self.client.post(url)
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('This invitation is invalid or expired.'))
|
||||
|
||||
# invalid key
|
||||
response = self.client.post(url, {'key': 'invalid_key'})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('This invitation is invalid or expired.'))
|
||||
|
||||
def test_confirm_invitation_post_valid_key(self):
|
||||
"""Test POST request with valid key confirms invitation and shows success page."""
|
||||
url = reverse('members:confirm_invitation')
|
||||
response = self.client.post(url, {'key': self.invitation.key})
|
||||
self.assertEqual(response.status_code, HTTPStatus.OK)
|
||||
self.assertContains(response, _('Invitation confirmed'))
|
||||
self.assertContains(response, self.group.name)
|
||||
|
||||
# Verify invitation was not marked as rejected (confirm() sets rejected=False)
|
||||
self.invitation.refresh_from_db()
|
||||
self.assertFalse(self.invitation.rejected)
|
||||
@ -1,31 +1,8 @@
|
||||
{% extends "startpage/base_subsite.html" %}
|
||||
{% load static common i18n %}
|
||||
{% load static %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
{% include "startpage/impressum_content.html" %}
|
||||
|
||||
{% block attribution %}
|
||||
<h1>{% trans "Attributions" %}</h1>
|
||||
|
||||
<p>
|
||||
{% trans "The source code of this website is licensed under" %}
|
||||
<a href="https://www.gnu.org/licenses/agpl-3.0.en.html">AGPLv3</a>.
|
||||
{% trans "Copyright © 2025 JDAV Sektion " %} {% settings_value 'SEKTION' %}
|
||||
{% trans "for the content of this website." %}
|
||||
</p>
|
||||
|
||||
<p>
|
||||
{% trans "External assets used on this website:" %}
|
||||
</p>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
{% trans "Background image" %}:
|
||||
<a href="https://commons.wikimedia.org/wiki/File:Alps_Panorama_(4954145205).jpg">Reza</a>, <a href="https://creativecommons.org/licenses/by/2.0">CC BY 2.0</a>, via Wikimedia Commons
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
span.statement-unsubmitted, span.statement-submitted, span.statement-confirmed {
|
||||
color: black;
|
||||
padding: 4px;
|
||||
padding-left: 6px;
|
||||
padding-right: 6px;
|
||||
border-radius: 10px;
|
||||
width: 20px;
|
||||
min-width: 20px;
|
||||
max-width: 20px;
|
||||
}
|
||||
|
||||
span.statement-submitted {
|
||||
background-color: #e8e8bd;
|
||||
color: black;
|
||||
}
|
||||
|
||||
span.statement-unsubmitted {
|
||||
background-color: #f0dada;
|
||||
color: black;
|
||||
}
|
||||
|
||||
span.statement-confirmed {
|
||||
background-color: #e0eec5;
|
||||
color: black;
|
||||
}
|
||||
@ -1,3 +0,0 @@
|
||||
- `climber.png`:
|
||||
Paul Sherman (https://commons.wikimedia.org/wiki/File:Rock_climbing_vector.svg),
|
||||
Public Domain, via Wikimedia Commons
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 48 KiB |
@ -1,40 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 27.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{display:none;}
|
||||
.st1{display:inline;fill:#254D49;}
|
||||
.st2{display:inline;opacity:0.27;fill:url(#SVGID_1_);}
|
||||
.st3{fill:none;stroke:#1B2E2C;stroke-width:3;stroke-miterlimit:10;}
|
||||
.st4{fill:#1B2E2C;}
|
||||
.st5{fill:none;stroke:#508480;stroke-width:3.2;stroke-miterlimit:10;}
|
||||
.st6{fill:#BADDD9;}
|
||||
.st7{fill:#508480;}
|
||||
.st8{opacity:0.36;}
|
||||
.st9{opacity:0.24;fill:#FFFFFF;}
|
||||
</style>
|
||||
<g id="Hintergrund_x5F_Uni" class="st0">
|
||||
<rect class="st1" width="48" height="48"/>
|
||||
</g>
|
||||
<g id="Verlauf" class="st0">
|
||||
<radialGradient id="SVGID_1_" cx="23.348" cy="21.0566" r="25.4002" fx="3.9002" fy="4.7179" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" style="stop-color:#000000;stop-opacity:0"/>
|
||||
<stop offset="1" style="stop-color:#000000"/>
|
||||
</radialGradient>
|
||||
<circle class="st2" cx="23.6" cy="23.6" r="22.9"/>
|
||||
</g>
|
||||
<g id="Logo_x5F_Schatten">
|
||||
<circle class="st3" cx="24.3" cy="24.3" r="21.7"/>
|
||||
<polygon class="st4" points="21.4,22.9 15.8,42.4 27.5,25.7 33.2,6.2 "/>
|
||||
</g>
|
||||
<g id="LogooVordergrund">
|
||||
<circle class="st5" cx="23.7" cy="23.7" r="21.7"/>
|
||||
<g>
|
||||
<polygon class="st6" points="14.9,41.8 26.6,25.1 20.5,22.2 "/>
|
||||
<polygon class="st7" points="32.3,5.5 20.5,22.2 26.6,25.1 "/>
|
||||
<polyline class="st8" points="14.9,41.8 26.6,25.1 32.3,5.5 "/>
|
||||
<circle class="st9" cx="23.6" cy="23.6" r="1.6"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.6 KiB |
@ -1,40 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 27.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{display:none;}
|
||||
.st1{display:inline;fill:#254D49;}
|
||||
.st2{opacity:0.27;fill:url(#SVGID_1_);}
|
||||
.st3{fill:none;stroke:#1B2E2C;stroke-width:3;stroke-miterlimit:10;}
|
||||
.st4{fill:#1B2E2C;}
|
||||
.st5{fill:none;stroke:#508480;stroke-width:3.2;stroke-miterlimit:10;}
|
||||
.st6{fill:#BADDD9;}
|
||||
.st7{fill:#508480;}
|
||||
.st8{opacity:0.36;}
|
||||
.st9{opacity:0.24;fill:#FFFFFF;}
|
||||
</style>
|
||||
<g id="Hintergrund_x5F_Uni" class="st0">
|
||||
<rect class="st1" width="48" height="48"/>
|
||||
</g>
|
||||
<g id="Verlauf">
|
||||
<radialGradient id="SVGID_1_" cx="23.348" cy="21.0566" r="25.4002" fx="3.9002" fy="4.7179" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" style="stop-color:#000000;stop-opacity:0"/>
|
||||
<stop offset="1" style="stop-color:#000000"/>
|
||||
</radialGradient>
|
||||
<circle class="st2" cx="23.6" cy="23.6" r="22.9"/>
|
||||
</g>
|
||||
<g id="Logo_x5F_Schatten">
|
||||
<circle class="st3" cx="24.3" cy="24.3" r="21.7"/>
|
||||
<polygon class="st4" points="21.4,22.9 15.8,42.4 27.5,25.7 33.2,6.2 "/>
|
||||
</g>
|
||||
<g id="LogooVordergrund">
|
||||
<circle class="st5" cx="23.7" cy="23.7" r="21.7"/>
|
||||
<g>
|
||||
<polygon class="st6" points="14.9,41.8 26.6,25.1 20.5,22.2 "/>
|
||||
<polygon class="st7" points="32.3,5.5 20.5,22.2 26.6,25.1 "/>
|
||||
<polyline class="st8" points="14.9,41.8 26.6,25.1 32.3,5.5 "/>
|
||||
<circle class="st9" cx="23.6" cy="23.6" r="1.6"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 251 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 47 KiB |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue