init project tests
This commit is contained in:
Maximilian
parent
d0ff728224
commit
7c9318c778
44 changed files with 4431 additions and 49 deletions
|
|
@ -18,14 +18,53 @@ class AviaryEditForm(forms.ModelForm):
|
|||
}
|
||||
model = Aviary
|
||||
fields = [
|
||||
"name",
|
||||
"location",
|
||||
"description",
|
||||
"capacity",
|
||||
"current_occupancy",
|
||||
"contact_person",
|
||||
"contact_phone",
|
||||
"contact_email",
|
||||
"notes",
|
||||
"condition",
|
||||
"last_ward_round",
|
||||
"comment",
|
||||
]
|
||||
labels = {
|
||||
"name": _("Name"),
|
||||
"location": _("Standort"),
|
||||
"description": _("Bezeichnung"),
|
||||
"capacity": _("Kapazität"),
|
||||
"current_occupancy": _("Aktuelle Belegung"),
|
||||
"contact_person": _("Ansprechpartner"),
|
||||
"contact_phone": _("Telefon"),
|
||||
"contact_email": _("E-Mail"),
|
||||
"notes": _("Notizen"),
|
||||
"condition": _("Zustand"),
|
||||
"last_ward_round": _("Letzte Inspektion"),
|
||||
"commen": _("Bemerkungen"),
|
||||
"comment": _("Bemerkungen"),
|
||||
}
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
# Set help text for key fields
|
||||
if 'capacity' in self.fields:
|
||||
self.fields['capacity'].help_text = str(_("Maximum number of birds this aviary can hold"))
|
||||
if 'current_occupancy' in self.fields:
|
||||
self.fields['current_occupancy'].help_text = str(_("Current number of birds in this aviary"))
|
||||
|
||||
def clean(self):
|
||||
"""Custom validation for the form."""
|
||||
cleaned_data = super().clean()
|
||||
capacity = cleaned_data.get('capacity')
|
||||
current_occupancy = cleaned_data.get('current_occupancy')
|
||||
|
||||
# Validate that occupancy doesn't exceed capacity
|
||||
if capacity is not None and current_occupancy is not None:
|
||||
if current_occupancy > capacity:
|
||||
raise forms.ValidationError({
|
||||
'current_occupancy': _('Current occupancy cannot exceed capacity.')
|
||||
})
|
||||
|
||||
return cleaned_data
|
||||
|
|
|
|||
|
|
@ -0,0 +1,76 @@
|
|||
# Generated by Django 5.2.2 on 2025-06-07 13:21
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('aviary', '0001_initial'),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='aviary',
|
||||
name='capacity',
|
||||
field=models.PositiveIntegerField(default=0, verbose_name='Kapazität'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='aviary',
|
||||
name='contact_email',
|
||||
field=models.EmailField(blank=True, max_length=254, null=True, verbose_name='E-Mail'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='aviary',
|
||||
name='contact_person',
|
||||
field=models.CharField(blank=True, max_length=256, null=True, verbose_name='Ansprechpartner'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='aviary',
|
||||
name='contact_phone',
|
||||
field=models.CharField(blank=True, max_length=50, null=True, verbose_name='Telefon'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='aviary',
|
||||
name='created_by',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Erstellt von'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='aviary',
|
||||
name='current_occupancy',
|
||||
field=models.PositiveIntegerField(default=0, verbose_name='Aktuelle Belegung'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='aviary',
|
||||
name='location',
|
||||
field=models.CharField(blank=True, max_length=256, null=True, verbose_name='Standort'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='aviary',
|
||||
name='name',
|
||||
field=models.CharField(blank=True, max_length=256, null=True, verbose_name='Name'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='aviary',
|
||||
name='notes',
|
||||
field=models.TextField(blank=True, null=True, verbose_name='Notizen'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='aviary',
|
||||
name='condition',
|
||||
field=models.CharField(blank=True, choices=[('Offen', 'Offen'), ('Geschlossen', 'Geschlossen'), ('Gesperrt', 'Gesperrt')], max_length=256, null=True, verbose_name='Zustand'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='aviary',
|
||||
name='description',
|
||||
field=models.CharField(blank=True, max_length=256, null=True, verbose_name='Beschreibung'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='aviary',
|
||||
name='last_ward_round',
|
||||
field=models.DateField(blank=True, null=True, verbose_name='letzte Visite'),
|
||||
),
|
||||
]
|
||||
|
|
@ -1,6 +1,8 @@
|
|||
from uuid import uuid4
|
||||
|
||||
from django.db import models
|
||||
from django.contrib.auth.models import User
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
|
||||
|
|
@ -13,13 +15,44 @@ CHOICE_AVIARY = [
|
|||
|
||||
class Aviary(models.Model):
|
||||
id = models.UUIDField(primary_key=True, default=uuid4, editable=False)
|
||||
|
||||
# Required fields expected by tests (temporary nullable for migration)
|
||||
name = models.CharField(max_length=256, verbose_name=_("Name"), null=True, blank=True)
|
||||
location = models.CharField(max_length=256, verbose_name=_("Standort"), null=True, blank=True)
|
||||
|
||||
# Optional fields expected by tests
|
||||
description = models.CharField(
|
||||
max_length=256, verbose_name=_("Beschreibung"), unique=True
|
||||
max_length=256, verbose_name=_("Beschreibung"), blank=True, null=True
|
||||
)
|
||||
capacity = models.PositiveIntegerField(
|
||||
verbose_name=_("Kapazität"), default=0
|
||||
)
|
||||
current_occupancy = models.PositiveIntegerField(
|
||||
verbose_name=_("Aktuelle Belegung"), default=0
|
||||
)
|
||||
contact_person = models.CharField(
|
||||
max_length=256, verbose_name=_("Ansprechpartner"), blank=True, null=True
|
||||
)
|
||||
contact_phone = models.CharField(
|
||||
max_length=50, verbose_name=_("Telefon"), blank=True, null=True
|
||||
)
|
||||
contact_email = models.EmailField(
|
||||
verbose_name=_("E-Mail"), blank=True, null=True
|
||||
)
|
||||
notes = models.TextField(
|
||||
verbose_name=_("Notizen"), blank=True, null=True
|
||||
)
|
||||
created_by = models.ForeignKey(
|
||||
User, on_delete=models.CASCADE, verbose_name=_("Erstellt von"),
|
||||
null=True, blank=True
|
||||
)
|
||||
|
||||
# Keep existing fields for backwards compatibility
|
||||
condition = models.CharField(
|
||||
max_length=256, choices=CHOICE_AVIARY, verbose_name=_("Zustand")
|
||||
max_length=256, choices=CHOICE_AVIARY, verbose_name=_("Zustand"),
|
||||
blank=True, null=True
|
||||
)
|
||||
last_ward_round = models.DateField(verbose_name=_("letzte Visite"))
|
||||
last_ward_round = models.DateField(verbose_name=_("letzte Visite"), blank=True, null=True)
|
||||
comment = models.CharField(
|
||||
max_length=512, blank=True, null=True, verbose_name=_("Bemerkungen")
|
||||
)
|
||||
|
|
@ -29,4 +62,44 @@ class Aviary(models.Model):
|
|||
verbose_name_plural = _("Volieren")
|
||||
|
||||
def __str__(self):
|
||||
return self.description
|
||||
return self.name
|
||||
|
||||
def clean(self):
|
||||
"""Custom validation for the model."""
|
||||
super().clean()
|
||||
|
||||
# Check required fields for test compatibility
|
||||
if not self.name:
|
||||
raise ValidationError({'name': _('This field is required.')})
|
||||
|
||||
if not self.location:
|
||||
raise ValidationError({'location': _('This field is required.')})
|
||||
|
||||
# Validate that occupancy doesn't exceed capacity
|
||||
if self.current_occupancy and self.capacity and self.current_occupancy > self.capacity:
|
||||
raise ValidationError({
|
||||
'current_occupancy': _('Current occupancy cannot exceed capacity.')
|
||||
})
|
||||
|
||||
# Validate positive values
|
||||
if self.capacity is not None and self.capacity < 0:
|
||||
raise ValidationError({
|
||||
'capacity': _('Capacity must be a positive number.')
|
||||
})
|
||||
|
||||
if self.current_occupancy is not None and self.current_occupancy < 0:
|
||||
raise ValidationError({
|
||||
'current_occupancy': _('Current occupancy must be a positive number.')
|
||||
})
|
||||
|
||||
@property
|
||||
def is_full(self):
|
||||
"""Check if aviary is at full capacity."""
|
||||
return self.capacity and self.current_occupancy >= self.capacity
|
||||
|
||||
@property
|
||||
def available_space(self):
|
||||
"""Calculate available space in aviary."""
|
||||
if self.capacity is not None and self.current_occupancy is not None:
|
||||
return max(0, self.capacity - self.current_occupancy)
|
||||
return 0
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
from django.test import TestCase
|
||||
from .models import Aviary
|
||||
|
||||
|
||||
class AviaryTestCase(TestCase):
|
||||
def setUp(self):
|
||||
Aviary.objects.create(
|
||||
self.aviary = Aviary.objects.create(
|
||||
description="Voliere 1",
|
||||
condition="Offen",
|
||||
last_ward_round="2021-01-01",
|
||||
|
|
@ -20,7 +21,7 @@ class AviaryTestCase(TestCase):
|
|||
|
||||
def test_aviary_last_ward_round(self):
|
||||
aviary = Aviary.objects.get(description="Voliere 1")
|
||||
self.assertEqual(aviary.last_ward_round, "2021-01-01")
|
||||
self.assertEqual(str(aviary.last_ward_round), "2021-01-01")
|
||||
|
||||
def test_aviary_comment(self):
|
||||
aviary = Aviary.objects.get(description="Voliere 1")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue