Merge pull request #73 from luftdaten-at/71-oranization-management

71 oranization management

Author: n11ik

app/accounts/urls.py

@@ -1,7 +1,10 @@
-from django.urls import path
+from django.urls import path, include
+
+#from .views import SignupPageView
+from accounts.views import SignupPageView
 
-from .views import SignupPageView
 
 urlpatterns = [
     path("signup/", SignupPageView.as_view(), name="signup"),
+    path("", include("allauth.urls")),
 ]

app/accounts/views.py

@@ -1,10 +1,23 @@
+import datetime
 from django.urls import reverse_lazy
 from django.views import generic
 
 from .forms import CustomUserCreationForm
+from campaign.models import OrganizationInvitation
 
 
 class SignupPageView(generic.CreateView):
     form_class = CustomUserCreationForm
-    success_url = reverse_lazy("login")
-    template_name = "registration/signup.html"
+    success_url = reverse_lazy("account_login")
+    template_name = "account/signup.html"
+
+    def form_valid(self, form):
+        user = form.instance
+        invitations = OrganizationInvitation.objects.filter(email=user.email).all()
+        time_now = datetime.datetime.now(datetime.timezone.utc)
+        user.save()
+        for invitation in invitations:
+            if not invitation.expiring_date or time_now < invitation.expiring_date:
+                invitation.organization.users.add(user)
+            invitation.delete()
+        return super().form_valid(form)

app/campaign/forms.py

@@ -91,3 +91,12 @@ def __init__(self, *args, **kwargs):
         # Initialize form helper
         self.helper = FormHelper(self)
         self.helper.add_input(Submit('submit', 'Save'))
+
+
+class OrganizationForm(forms.ModelForm):
+    class Meta:
+        model = Organization
+        fields = ['name', 'description']
+        widgets = {
+            'description': forms.Textarea(attrs={'rows': 3}),
+        }

app/campaign/migrations/0007_organizationinvitation.py

@@ -0,0 +1,26 @@
+# Generated by Django 5.1.2 on 2024-12-18 09:32
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('campaign', '0006_alter_campaign_users_alter_organization_users'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='OrganizationInvitation',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('expiring_date', models.DateField()),
+                ('email', models.EmailField(max_length=254)),
+                ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='invitations', to='campaign.organization')),
+            ],
+            options={
+                'unique_together': {('email', 'organization')},
+            },
+        ),
+    ]

app/campaign/migrations/0008_alter_organizationinvitation_expiring_date.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.2 on 2024-12-18 10:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('campaign', '0007_organizationinvitation'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='organizationinvitation',
+            name='expiring_date',
+            field=models.DateField(null=True),
+        ),
+    ]

app/campaign/models.py

@@ -63,3 +63,24 @@ class Organization(models.Model):
 
     def __str__(self):
         return self.name
+
+
+class OrganizationInvitation(models.Model):
+    """
+    if email e gets invited to a campaign
+    but there is no usesr with email e
+    an invitation is created.
+
+    as soon as users u with email e registers
+    user u gets added to all organizations where there
+    exists an invitation. -> invitations get deleted
+    """
+    expiring_date = models.DateField(null=True)
+    email = models.EmailField() 
+    organization = models.ForeignKey('Organization', on_delete=models.CASCADE, related_name='invitations')
+    
+    class Meta:
+        unique_together = ('email', 'organization')
+
+    def __str__(self):
+        return f'{self.email} {self.organization.name} {self.expiring_date}'

app/campaign/urls.py

@@ -1,5 +1,5 @@
 from django.urls import path
-from .views import CampaignsHomeView, CampaignsMyView, CampaignsCreateView, CampaignsDetailView, CampaignsUpdateView, CampaignsDeleteView, RoomDetailView, CampaignAddUserView, RoomDeleteView, RoomCreateView
+from .views import *
 
 urlpatterns = [
     path('', CampaignsHomeView.as_view(), name='campaigns-home'),
@@ -13,4 +13,9 @@
     path('campaigns/<int:pk>/add-user/', CampaignAddUserView.as_view(), name='campaign-add-user'),
     path('rooms/<int:pk>/delete/', RoomDeleteView.as_view(), name='room-delete'),
     path('room/create/<int:campaign_pk>/', RoomCreateView.as_view(), name='room-create'),
+    path('organizations/my', OrganizationsView.as_view(), name='organizations-my'),
+    path('organization/create', OrganizationCreateView.as_view(), name='organization-create'),
+    path('organizations/<int:pk>', OrganizationDetailView.as_view(), name='organization-detail'),
+    path('organizations/<int:org_id>/remove-user/<int:user_id>', remove_user_from_organization, name='remove-user-from-organization'),
+    path('organizations/<int:org_id>/invite-user', invite_user_to_organization, name='invite-user-to-organization'),
 ]

app/campaign/views.py

@@ -4,9 +4,15 @@
 from django.views.generic.list import ListView
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.urls import reverse_lazy, reverse
+from django.contrib.auth.decorators import login_required
+from django.shortcuts import get_object_or_404, redirect
+from django.contrib import messages
+from django.core.mail import send_mail
 
-from .models import Campaign, Room
-from .forms import CampaignForm, CampaignUserForm
+from main import settings
+from .models import Campaign, Room, Organization, OrganizationInvitation
+from .forms import CampaignForm, CampaignUserForm, OrganizationForm
+from accounts.models import CustomUser
 
 
 class CampaignsHomeView(ListView):
@@ -159,20 +165,98 @@ def form_valid(self, form):
     def get_success_url(self):
         return reverse_lazy('campaigns-detail', kwargs={'pk': self.campaign_pk})
 
- 
-'''
-class CampaignsCreateView(CreateView):
-    model = Campaign
-    form_class = CampaignForm
-    template_name = 'campaigns/form.html'
-    success_url = reverse_lazy('campaigns-my')  # Redirect after a successful creation
 
-    def get_initial(self):
-        initial = super().get_initial()
-        initial['user'] = self.request.user  # Pass the logged-in user to the form's initial data
-        return initial
+class OrganizationsView(LoginRequiredMixin, ListView):
+    model = Organization
+    template_name = 'campaigns/my_organizations.html'
+    context_object_name = 'owned_organizations'
+
+    def get_queryset(self):
+        # Return organizations where the user is the owner
+        return Organization.objects.filter(owner=self.request.user)
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        # Add organizations where the user is a member
+        context['member_organizations'] = Organization.objects.filter(users=self.request.user)
+        return context
+
+
+class OrganizationCreateView(LoginRequiredMixin, CreateView):
+    model = Organization
+    form_class = OrganizationForm
+    template_name = 'campaigns/create_organization.html'
+    success_url = reverse_lazy('organizations-my')  # Redirect to a list view or another page
 
     def form_valid(self, form):
-        form.instance.owner = self.request.user  # Set the owner to the current user
+        organization = form.save(commit=False)
+        organization.owner = self.request.user  # Set the current user as the owner
+        organization.save()
+        organization.users.add(self.request.user)
+        form.save_m2m()  # Save the many-to-many relationships
         return super().form_valid(form)
-'''
+
+
+class OrganizationDetailView(DetailView):
+    model = Organization
+    template_name = 'campaigns/organization_detail.html'
+    context_object_name = 'organization'
+
+    def get_success_url(self):
+        # and 'self.object.pk' with the primary key of the newly created object
+        return reverse_lazy('organizations-my', kwargs={'pk': self.object.pk})
+
+
+@login_required
+def remove_user_from_organization(request, org_id, user_id):
+    organization = get_object_or_404(Organization, id=org_id)
+    user = get_object_or_404(CustomUser, id=user_id)
+
+    # Ensure the user performing the action has permission
+    if request.user != organization.owner:
+        messages.error(request, "You do not have permission to remove users from this organization.")
+        return redirect('organization-detail', pk=org_id)
+
+    organization.users.remove(user)
+    messages.success(request, f"User {user.username} has been removed.")
+    return redirect('organization-detail', pk=org_id)
+
+
+@login_required
+def invite_user_to_organization(request, org_id):
+    if request.method != 'POST':
+        return redirect(f"organization-detail", pk=org_id)
+
+    organization = get_object_or_404(Organization, id=org_id)
+    email = request.POST.get('email')
+    
+    if request.user != organization.owner:
+        messages.error(request, "You do not have permission to invite users to this organization.")
+        return redirect(f"organization-detail", pk=org_id)
+
+    user = CustomUser.objects.filter(email = email).first()
+
+    if user:
+        organization.users.add(user)
+    else:
+        # check if invitation already exists
+        invitation = OrganizationInvitation.objects.filter(email=email, organization__pk = organization.pk).first()
+        if invitation == None:
+            # create invitation
+            invitation = OrganizationInvitation(
+                expiring_date = None,
+                email = email,
+                organization = organization,
+            )
+        invitation.save()
+        # send invitation email
+        # TODO add link to register
+        send_mail(
+            subject=f"You've been invited to join {organization.name}",
+            message=f"Visit this link to register and join {organization.name}: <registration_link>",
+            from_email=settings.EMAIL_HOST_USER,
+            recipient_list=[email],
+        )
+        messages.success(request, f"An invitation has been sent to {email}.")
+
+    return redirect(f"organization-detail", pk=org_id)

app/main/settings.py

@@ -146,11 +146,10 @@
 
 from django.utils.translation import gettext_lazy as _
 
-LANGUAGE_CODE = 'en-us'  # Default language
+LANGUAGE_CODE = 'en'  # Default language
 
 LANGUAGES = [
-    ('en', _('English')),
-    ('de', _('German')),
+    ('en', 'English'),
     # Add more languages here
 ]
 
@@ -189,7 +188,14 @@
     "django.contrib.auth.backends.ModelBackend",
     "allauth.account.auth_backends.AuthenticationBackend",
 )
+
 EMAIL_BACKEND = env.str("DJANGO_EMAIL_BACKEND", default="django.core.mail.backends.console.EmailBackend")
+EMAIL_HOST=env.str('EMAIL_HOST')
+EMAIL_HOST_USER=env.str('EMAIL_HOST_USER')
+EMAIL_HOST_PASSWORD=env.str('EMAIL_HOST_PASSWORD')
+EMAIL_PORT=env.str('EMAIL_PORT')
+EMAIL_USE_TLS=env.str('EMAIL_USE_TLS')
+
 ACCOUNT_SESSION_REMEMBER = True
 ACCOUNT_SIGNUP_PASSWORD_ENTER_TWICE = False
 

app/main/urls.py

@@ -23,7 +23,7 @@
     # Django admin
     path("backend/", admin.site.urls),
     # User management
-    path("accounts/", include("allauth.urls")),
+    path("accounts/", include("accounts.urls")),
     # Local apps
     path("", include("pages.urls")),
     path("api/", include("api.urls")),
@@ -36,4 +36,4 @@
     # Your URLs that require localization
     # Include set_language URL
     path('i18n/', include('django.conf.urls.i18n')),
-)
+)

app/templates/_base.html

@@ -40,6 +40,7 @@
                         {{ user.username }}
                       </a>
                       <ul class="dropdown-menu dropdown-menu-end">
+                        <li><a class="dropdown-item" href="{% url 'organizations-my' %}">{% trans "My orgnizations" %}</a></li>
                         <li><a class="dropdown-item" href="{% url 'campaigns-my' %}">{% trans "My campaigns" %}</a></li>
                         <li><a class="dropdown-item" href="{% url 'devices-my' %}">{% trans "My devices" %}</a></li>
                         {% if host != "arbeitsplatz.luftdaten.at" %}

app/templates/campaigns/create_organization.html

@@ -0,0 +1,16 @@
+{% extends '_base.html' %}
+{% load i18n %}
+{% load static %}
+{% load crispy_forms_tags %}
+
+{% block styles %}
+{% endblock styles %}
+
+{% block content %}
+<h2>{% trans "Create Organization" %}</h2>
+<form method="post">
+    {% csrf_token %}
+    {{ form|crispy }}
+    <button class="btn btn-success" type="submit">{% trans "Save" %}</button>
+</form>
+{% endblock %}