[WIP] Union Membership

.github/CONTRIBUTING.md

@@ -21,6 +21,11 @@ You are more than welcome to contribute to the system. This guide documents how
 -   To create a super user for the admin interface you can run
     `docker-compose run web ./manage.py createsuperuser`
 
+-   The see the emails we send (Payment confirmation etc.) run
+    `docker-compose run web ./manage.py render_emails`
+    This will create a `generated_emails` folder with the html and text version
+    of the emails. 
+
 ## Primary Frameworks/Systems used
 
 -   [Django][django]: The base web framework used. The link is to their great

.github/workflows/test.yml

@@ -39,3 +39,10 @@ jobs:
         with:
           name: UML_diagram.png
           path: UML
+
+      - name: Create and render emails
+        run: docker-compose run web ./manage.py render_emails
+      - uses: actions/upload-artifact@v1
+        with:
+          name: rendered_emails
+          path: ./generated_emails

.gitignore

@@ -1,20 +1,11 @@
 *.pyc
 __pycache__
 .env
-/db.sqlite3*
 staticfiles
-*~
-.idea/
-experiments.py
-*_old
-/backup-*
-.DS_Store
-.vs/
-notes.txt
-gamle_db/
 test-results
 .coverage
 members/static/members/css
 .sass-cache/
 public_data.zip
 test-screens
+generated_emails

forenings_medlemmer/settings.py

@@ -62,9 +62,9 @@
 # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-
 SECRET_KEY = env.str("SECRET_KEY")
 
+
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = env.bool("DEBUG")
 if DEBUG:
@@ -186,6 +186,7 @@
 # Dont keep job logs more than 7 days old
 DJANGO_CRON_DELETE_LOGS_OLDER_THAN = 7
 
+QUICKPAY_URL = "https://api.quickpay.net/payments"
 QUICKPAY_API_KEY = os.environ["QUICKPAY_API_KEY"]
 QUICKPAY_PRIVATE_KEY = os.environ["QUICKPAY_PRIVATE_KEY"]
 PAYMENT_ID_PREFIX = env.str("PAYMENT_ID_PREFIX")
@@ -200,5 +201,6 @@
 SECURE_SSL_REDIRECT = env.bool("FORCE_HTTPS")
 SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
 
+
 LOGIN_URL = "/account/login/"
 LOGIN_REDIRECT_URL = "/"

members/admin/__init__.py

@@ -19,12 +19,14 @@
     Union,
     Volunteer,
     Member,
+    Membership,
     Activity,
     ActivityInvite,
     ActivityParticipant,
     Family,
     EmailItem,
     Payment,
+    PayableItem,
     Equipment,
     EquipmentLoan,
     EmailTemplate,
@@ -38,6 +40,8 @@
 from .member_admin import MemberAdmin
 from .payment_admin import PaymentAdmin
 from .activity_admin import ActivityAdmin
+from .membership_admin import MembershipAdmin
+from .payable_item_admin import PayableItemAdmin
 
 admin.site.site_header = "Coding Pirates Medlemsdatabase"
 admin.site.index_title = "Afdelings admin"
@@ -47,8 +51,10 @@
 admin.site.register(Union, UnionAdmin)
 admin.site.unregister(User)
 admin.site.register(User, UserAdmin)
+admin.site.register(PayableItem, PayableItemAdmin)
 admin.site.register(Person, PersonAdmin)
 admin.site.register(Member, MemberAdmin)
+admin.site.register(Membership, MembershipAdmin)
 admin.site.register(Payment, PaymentAdmin)
 admin.site.register(Activity, ActivityAdmin)
 admin.site.register(EmailTemplate)

members/admin/membership_admin.py

@@ -0,0 +1,16 @@
+from django.contrib import admin
+
+
+class MembershipAdmin(admin.ModelAdmin):
+    list_display = ("person", "union", "sign_up_date")
+    list_filter = ("union", "sign_up_date", "sign_up_date")
+    readonly_fields = ["person", "union", "sign_up_date"]
+    fieldsets = [
+        ("Medlemskab", {"fields": ("person", "union", "sign_up_date")}),
+    ]
+
+    def has_delete_permission(self, request, obj=None):
+        return False
+
+    def has_add_permission(self, request, obj=None):
+        return False

members/admin/payable_item_admin.py

@@ -0,0 +1,31 @@
+from django.contrib import admin
+
+
+class PayableItemAdmin(admin.ModelAdmin):
+    list_display = (
+        "added",
+        "person",
+        "refunded",
+        "quick_pay_id",
+        "accepted",
+        "amount_ore",
+    )
+    list_filter = ("refunded", "accepted")
+    readonly_fields = [
+        "added",
+        "person",
+        "refunded",
+        "quick_pay_id",
+        "accepted",
+        "amount_ore",
+    ]
+    fieldsets = [
+        ("Data", {"fields": ("person", "added", "amount_ore", "quick_pay_id")}),
+        ("Status", {"fields": ("refunded", "accepted",)}),
+    ]
+
+    def has_delete_permission(self, request, obj=None):
+        return False
+
+    def has_add_permission(self, request, obj=None):
+        return False

members/admin/union_admin.py

@@ -40,6 +40,13 @@ def get_queryset(self, request):
                 )
             },
         ),
+        (
+            "Kontingent",
+            {
+                "fields": ("membership_price_ore",),
+                "description": "Sæt kontingent for at blive medlem af jeres forening",
+            },
+        ),
         (
             "Info",
             {

members/forms/__init__.py

@@ -4,12 +4,14 @@
 from .admin_signup_form import adminSignupForm
 from .activity_signup_form import ActivitySignupForm
 from .activity_invite_decline_form import ActivivtyInviteDeclineForm
+from .membership_form import MembershipForm
 
 __all__ = [
     ActivivtyInviteDeclineForm,
     ActivitySignupForm,
     PersonForm,
     signupForm,
+    MembershipForm,
     vol_signupForm,
     adminSignupForm,
 ]

members/forms/membership_form.py

@@ -0,0 +1,22 @@
+from django import forms
+from members.models import Person, Union
+from members.models import Membership
+
+
+class MembershipForm(forms.Form):
+    def __init__(self, family_members, *args, **kwargs):
+        super(MembershipForm, self).__init__(*args, **kwargs)
+        self.family_members = family_members
+        self.fields["person"].queryset = Person.objects.filter(pk__in=family_members)
+        self.fields["person"].initial = 1
+
+        # TODO exclude closed unions and union where is member
+        self.fields["union"].queryset = Union.objects.all()
+
+    person = forms.ModelChoiceField(Person.objects.none())
+    union = forms.ModelChoiceField(Union.objects.none(), label="Forening")
+
+    def clean(self):
+        Membership.can_be_member_validator(
+            self.cleaned_data["person"], self.cleaned_data["union"]
+        )

members/jobs.py

@@ -11,7 +11,6 @@
     EmailTemplate,
     ActivityParticipant,
     Payment,
-    Person,
     Family,
 )
 
@@ -59,23 +58,6 @@ def do(self):
             curEmail.send()
 
 
-class UpdateDawaData(CronJobBase):
-    RUN_EVERY_MINS = 1
-
-    schedule = Schedule(run_every_mins=RUN_EVERY_MINS)
-    code = "members.update_dawa_data"
-
-    def do(self):
-        persons = (
-            Person.objects.filter(municipality__isnull=True)
-            .exclude(streetname__exact="")
-            .exclude(address_invalid__exact=True)[:50]
-        )
-
-        for person in persons:
-            person.update_dawa_data()
-
-
 # If it's the first day of the year, make sure to capture all payments that year
 class CaptureOutstandingPayments(CronJobBase):
     RUN_AT_TIMES = ["01:00"]

members/management/commands/dump_public_data.py

@@ -5,7 +5,7 @@
 from django.core.management.base import BaseCommand
 from django.core.management import call_command
 
-MODELS_TO_DUMP = ["department", "union", "address", "emailtemplate", "activity"]
+MODELS_TO_DUMP = ["address", "union", "department", "emailtemplate", "activity"]
 
 
 class Command(BaseCommand):

members/management/commands/get_live_data.py

@@ -7,7 +7,7 @@
 import requests
 import shutil
 
-from dump_public_data import MODELS_TO_DUMP as MODELS_TO_LOAD
+from .dump_public_data import MODELS_TO_DUMP as MODELS_TO_LOAD
 
 
 class Command(BaseCommand):

members/management/commands/render_emails.py

@@ -0,0 +1,28 @@
+import os
+
+from django.core.management.base import BaseCommand
+
+from members.tests.factories import PayableItemFactory
+from members.models import PayableItem
+
+
+email_dir = "generated_emails"
+
+
+class Command(BaseCommand):
+    help = "Renders emails with test data"
+
+    def handle(self, *args, **options):
+        if not os.path.exists(email_dir):
+            os.makedirs(email_dir)
+
+        _write_payment_confirmation()
+
+
+def _write_payment_confirmation():
+    payment = PayableItemFactory.build()
+    html, text = PayableItem._render_payment_confirmation(payment)
+    with open(f"{email_dir}/payment_confirmed_email.html", "w+") as htmlFile:
+        htmlFile.write(html)
+    with open(f"{email_dir}/payment_confirmed_email.txt", "w+") as txtFile:
+        txtFile.write(text)

members/management/commands/send_emails.py

@@ -0,0 +1,10 @@
+from django.core.management.base import BaseCommand
+
+from members.models import PayableItem
+
+
+class Command(BaseCommand):
+    help = "Send emails in queue"
+
+    def handle(self, *args, **options):
+        PayableItem.send_all_payment_confirmations()

members/migrations/0011_adminuserinformation_unions.py

@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("members", "0010_move_address_to_union"),
+        ("members", "0009_union_address"),
     ]
 
     operations = [