Skip to content

Commit f267bb6

Browse files
committed
chore: reorganize and clean up directory structure
fix: create corvee list in one transaction
1 parent d4f4245 commit f267bb6

40 files changed

+18
-16
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ COPY nginx.conf /etc/nginx/nginx.conf
1818
# Port to expose
1919
EXPOSE 80
2020

21-
COPY django/corvee/ /srv/corvee/
21+
COPY corvee /srv/corvee/corvee
22+
COPY manage.py /srv/corvee
2223

2324
# Copy entrypoint script into the image
2425
WORKDIR /srv/corvee
File renamed without changes.
File renamed without changes.

django/corvee/corvee/src/admin.py renamed to corvee/src/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from django.contrib import admin
2-
from .models import Persoon, AuditLog, LastSync
2+
from corvee.src.models import Persoon, AuditLog, LastSync
33

44
# Register your models here.
55

django/corvee/corvee/src/api.py renamed to corvee/src/api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from django.http.response import JsonResponse
22
from django.views import View
33

4-
from .models import Persoon
4+
from corvee.src.models import Persoon
55

66

77
class SelectedV1(View):
File renamed without changes.

django/corvee/corvee/src/corvee.py renamed to corvee/src/corvee.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
import requests
44
from django.conf import settings
5+
from django.db import transaction
56
from django.utils import timezone
67

7-
from .models import Persoon, LastSync
8-
from .presence_api_client import PresenceApiClient
8+
from corvee.src.models import Persoon, LastSync
9+
from corvee.src.presence_api_client import PresenceApiClient
910

1011

1112
class Corvee:
@@ -85,7 +86,8 @@ def renew_list():
8586
queryset = queryset.order_by('latest')
8687

8788
# Select oldest 3 members based on 'latest' date
88-
selected = queryset[:3]
89-
for person in selected:
90-
person.selected = True
91-
person.save()
89+
with transaction.atomic():
90+
selected = queryset[:3]
91+
for persoon in selected:
92+
persoon.selected = True
93+
persoon.save()

0 commit comments

Comments
 (0)