chore: reorganize and clean up directory structure

fix: create corvee list in one transaction

Author: rmoesbergen

Diff for: Dockerfile

@@ -18,7 +18,8 @@ COPY nginx.conf /etc/nginx/nginx.conf
 # Port to expose
 EXPOSE 80
 
-COPY django/corvee/ /srv/corvee/
+COPY corvee /srv/corvee/corvee
+COPY manage.py /srv/corvee
 
 # Copy entrypoint script into the image
 WORKDIR /srv/corvee

Diff for: django/corvee/corvee/__init__.py renamed to corvee/__init__.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from .models import Persoon, AuditLog, LastSync
+from corvee.src.models import Persoon, AuditLog, LastSync
 
 # Register your models here.
 

Diff for: django/corvee/corvee/src/__init__.py renamed to corvee/src/__init__.py

@@ -1,7 +1,7 @@
 from django.http.response import JsonResponse
 from django.views import View
 
-from .models import Persoon
+from corvee.src.models import Persoon
 
 
 class SelectedV1(View):

Diff for: django/corvee/corvee/src/admin.py renamed to corvee/src/admin.py

@@ -2,10 +2,11 @@
 
 import requests
 from django.conf import settings
+from django.db import transaction
 from django.utils import timezone
 
-from .models import Persoon, LastSync
-from .presence_api_client import PresenceApiClient
+from corvee.src.models import Persoon, LastSync
+from corvee.src.presence_api_client import PresenceApiClient
 
 
 class Corvee:
@@ -85,7 +86,8 @@ def renew_list():
         queryset = queryset.order_by('latest')
 
         # Select oldest 3 members based on 'latest' date
-        selected = queryset[:3]
-        for person in selected:
-            person.selected = True
-            person.save()
+        with transaction.atomic():
+            selected = queryset[:3]
+            for persoon in selected:
+                persoon.selected = True
+                persoon.save()

Diff for: django/corvee/corvee/src/api.py renamed to corvee/src/api.py

@@ -1,5 +1,4 @@
 from django.contrib.auth.mixins import UserPassesTestMixin
-import requests
 
 
 class PermissionRequiredMixin(UserPassesTestMixin):

Diff for: django/corvee/corvee/src/apps.py renamed to corvee/src/apps.py

@@ -4,7 +4,7 @@
 from oauthlib.oauth2 import BackendApplicationClient
 from requests_oauthlib import OAuth2Session
 
-from .models import Persoon
+from corvee.src.models import Persoon
 
 
 class PresenceApiClient:

Diff for: django/corvee/corvee/src/corvee.py renamed to corvee/src/corvee.py

@@ -11,9 +11,9 @@
 from django.views.generic.list import ListView
 from requests_oauthlib import OAuth2Session
 
-from .corvee import Corvee
-from .mixins import PermissionRequiredMixin
-from .models import Persoon, AuditLog
+from corvee.src.corvee import Corvee
+from corvee.src.mixins import PermissionRequiredMixin
+from corvee.src.models import Persoon, AuditLog
 
 
 class Auditor:

Diff for: django/corvee/corvee/src/migrations/0001_initial.py renamed to corvee/src/migrations/0001_initial.py

@@ -15,8 +15,8 @@
 """
 from django.contrib import admin
 from django.urls import path, re_path
-from .src import views
-from .src import api
+from corvee.src import views
+from corvee.src import api
 
 urlpatterns = [
     path('admin/', admin.site.urls),