Merge branch 'main' into tobias/add-logging-to-payment-logic

Author: bveldkamp

.github/workflows/deploy.yml

@@ -0,0 +1,55 @@
+---
+name: Deploy
+
+on:
+  push:
+    branches:
+      - main
+      - tobias/create-github-actions-for-deployment
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch to deploy'
+        required: true
+        default: 'main'
+        type: string
+
+permissions:
+  contents: read
+
+jobs:
+  deploy-test:
+    name: Deploy to test environment
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
+    steps:
+      - name: Deploy to test server
+        uses: appleboy/[email protected]
+        with:
+          key: ${{ secrets.SSH_KEY }}
+          username: voko_acc
+          host: leden.vokoutrecht.nl
+          script: |
+            # Run the deploy script with the specified branch
+            if [ "${{ github.event_name }}" = "push" ]; then
+              # Auto-deploy to test environment on push to main
+              $HOME/scripts/deploy.sh -b 'tobias/create-github-actions-for-deployment'
+            else
+              # Manual deploy with specified branch
+              $HOME/scripts/deploy.sh -b ${{ github.event.inputs.branch }}
+            fi
+
+  # deploy-production:
+  #   name: Deploy to production environment
+  #   runs-on: ubuntu-latest
+  #   environment: production
+  #   if: github.event_name == 'push'
+    
+  #   steps:
+  #     - name: Deploy to production server
+  #       uses: appleboy/[email protected]
+  #       with:
+  #         key: ${{ secrets.SSH_KEY }}
+  #         script: |
+  #           # Run the deploy script with the specified branch
+  #           $HOME/scripts/deploy.sh -b ${{ github.event.inputs.branch }}

README.md

@@ -3,6 +3,14 @@ Django based custom web application for food collective www.vokoutrecht.nl.
 
 ![example workflow](https://github.com/VOKO-Utrecht/voko/actions/workflows/ci.yml/badge.svg)
 
+## Deployment
+
+This project includes automated deployment workflows:
+- **Test environment**: Automatically deploys when pushing to `main` branch
+- **Production environment**: Manual deployment via GitHub Actions workflow dispatch
+
+For complete deployment setup instructions, see [docs/DEPLOYMENT.md](docs/DEPLOYMENT.md).
+
 ## Some notes
 1. The code base needs cleaning up and adding of tests.
 2. License: GNU GPLv3

uv.lock

@@ -275,23 +275,21 @@ def create_orderround_batch():
     last_round = get_last_order_round()
     current_date = datetime.now(pytz.UTC).date()
 
-    # If there's no last round, we start from next week and end at the last day of the current quarter
+    # Determine start date based on whether there's a last round
     if last_round is None:
         start_date = current_date + timedelta(days=7)
-        end_date = last_day_current_quarter
-    # If the last round is not just before the next quarter, create a batch to fill the current quarter
-    elif (
-        last_round.open_for_orders.date() + timedelta(weeks=config.ORDERROUND_INTERVAL_WEEKS)
-        <= last_day_current_quarter
-    ):
-        start_date = last_round.open_for_orders.date() + timedelta(weeks=config.ORDERROUND_INTERVAL_WEEKS)
-        end_date = last_day_current_quarter
-    # If the next quarter is less than ORDERROUND_CREATE_DAYS_AHEAD away, create a new batch for the next quarter
-    elif last_day_current_quarter < current_date + timedelta(days=config.ORDERROUND_CREATE_DAYS_AHEAD):
+    else:
         start_date = last_round.open_for_orders.date() + timedelta(weeks=config.ORDERROUND_INTERVAL_WEEKS)
+
+    # Determine end date based on proximity to next quarter
+    if last_day_current_quarter < current_date + timedelta(days=config.ORDERROUND_CREATE_DAYS_AHEAD):
+        # Next quarter is close, create batch for next quarter
         end_date = last_day_next_quarter
-    # If none of these match, we don't need a new order round batch.
+    elif last_round is None or start_date <= last_day_current_quarter:
+        # Fill current quarter
+        end_date = last_day_current_quarter
     else:
+        # No new order round batch needed
         return []
 
     # Adjust start date to the configured open day of the week

webapp/ordering/core.py

@@ -7,8 +7,6 @@
     get_latest_order_round,
     update_totals_for_products_with_max_order_amounts,
     create_orderround_batch,
-    get_quarter_end_dates,
-    get_last_order_round,
 )
 from ordering.models import OrderProduct
 from ordering.tests.factories import (
@@ -268,35 +266,21 @@ def test_latest_order_round_is_returned(self):
 
 
 class TestAutomaticOrderRoundCreation(VokoTestCase):
-    @freeze_time("2025-09-18")
+    @freeze_time("2025-08-25")
     def test_create_orderround_batch_no_order_rounds_yet(self):
         """Test creating order rounds when no order rounds exist yet"""
-        # When there are no order rounds, should create from next week to end of current quarter
+        # When there are no order rounds, should create from next week to end of next quarter
         result = create_orderround_batch()
 
-        self.assertEqual(len(result), 1)  # Only one order round should fit in this period
-
-    def test_create_orderround_batch_one_order_round_no_more_in_quarter(self):
-        """Test when there's one order round but no more planned for rest of current quarter"""
-        # Create an existing order round early in the quarter
-        _ = OrderRoundFactory(
-            open_for_orders=datetime(2024, 1, 8, 8, 0, tzinfo=UTC),  # Early January
-            closed_for_orders=datetime(2024, 1, 12, 8, 0, tzinfo=UTC),
-            collect_datetime=datetime(2024, 1, 17, 18, 0, tzinfo=UTC),
-        )
+        self.assertEqual(len(result), 2)  # Two order rounds should be created
 
+    @freeze_time("2025-09-18")
+    def test_create_orderround_batch_no_order_rounds_yet_next_quarter_close(self):
+        """Test creating order rounds when no order rounds exist yet but next quarter is close"""
+        # When there are no order rounds and next quarter is close, should create from next week to end of next quarter
         result = create_orderround_batch()
 
-        # Should create order rounds from January 22 (2 weeks after Jan 8) to end of Q1
-        # This should create multiple order rounds to fill the gap
-        self.assertGreater(len(result), 0)
-
-        # Get last ourder round
-        last_round = get_last_order_round()
-
-        # Last order round should be before next quarter
-        last_day_current_quarter, _ = get_quarter_end_dates()
-        self.assertGreater(last_day_current_quarter, last_round.closed_for_orders.date())
+        self.assertEqual(len(result), 7)  # Seven order rounds should be created
 
     @freeze_time("2024-02-01")
     def test_create_orderround_batch_next_quarter_far_away(self):