Management command to delete batch of users

.circleci/config.yml

@@ -12,7 +12,7 @@ generate-version-file: &generate-version-file
         "$CIRCLE_PROJECT_REPONAME" \
         "$CIRCLE_BUILD_URL" > src/backend/joanie/version.json
 
-version: 2
+version: 2.1
 jobs:
   # Git jobs
   # Check that the git history is clean and complies with our expectations
@@ -158,9 +158,21 @@ jobs:
       - run:
           name: Lint code with ruff
           command: ~/.local/bin/ruff check joanie
-      - run:
-          name: Lint code with pylint
-          command: ~/.local/bin/pylint joanie
+      - when:
+          condition:
+            not:
+                matches: { pattern: "^dev_/.+$", value: << pipeline.git.branch >> }
+          steps:
+            - run:
+                name: Lint code with pylint
+                command: ~/.local/bin/pylint joanie
+      - when:
+          condition:
+            matches: { pattern: "^dev_/.+$", value: << pipeline.git.branch >> }
+          steps:
+            - run:
+                name: Lint code with pylint, ignoring TODOs
+                command: ~/.local/bin/pylint joanie --disable=fixme
 
   test-back:
     docker:
@@ -175,12 +187,14 @@ jobs:
           DB_USER: fun
           DB_PASSWORD: pass
           DB_PORT: 5432
+          DJANGO_CACHE_REDIS_LOCATION: redis://localhost:6379/0
       # services
       - image: cimg/postgres:12.10
         environment:
           POSTGRES_DB: test_joanie
           POSTGRES_USER: fun
           POSTGRES_PASSWORD: pass
+      - image: cimg/redis:6.2
     working_directory: ~/joanie/src/backend
     environment:
         DJANGO_CONFIGURATION: Test

CHANGELOG.md

@@ -8,10 +8,35 @@ and this project adheres to
 
 ## [Unreleased]
 
+### Added
+
+- Send an email to the user when an installment debit has been
+  refused
+- Send an email to the user when an installment is successfully
+  paid
+- Support of payment_schedule for certificate products
+
+### Changed
+
+- Bind payment_schedule into `OrderLightSerializer`
+- Generate payment schedule for any kind of product
+- Sort credit card list by is_main then descending creation date
+- Rework order statuses
+- Update the task `debit_pending_installment` to catch up on late
+  payments of installments that are in the past
+- Deprecated field `has_consent_to_terms` for `Order` model
+
 ### Fixed
 
+- Prevent duplicate Address objects for a user or an organization
 - Allow to cancel an enrollment order linked to an archived course run
 
+### Removed
+
+- Remove the `has_consent_to_terms` field from the `Order` edit view
+  in the back office application
+
+
 ## [2.6.1] - 2024-07-25
 
 ### Fixed
@@ -44,7 +69,6 @@ and this project adheres to
 
 - Do not update OpenEdX enrollment if this one is already
   up-to-date on the remote lms
-- 
 
 ## [2.4.0] - 2024-06-21
 

Makefile

@@ -175,11 +175,21 @@ lint-pylint: ## lint back-end python sources with pylint only on changed files f
 	bin/pylint --diff-only=origin/main
 .PHONY: lint-pylint
 
+lint-pylint-todo: ## lint back-end python sources with pylint only on changed files from main without fixme warnings
+	@echo 'lint:pylint started…'
+	bin/pylint --diff-only=origin/main --disable=fixme
+.PHONY: lint-pylint-todo
+
 lint-pylint-all: ## lint back-end python sources with pylint
 	@echo 'lint:pylint-all started…'
 	bin/pylint joanie
 .PHONY: lint-pylint-all
 
+lint-pylint-all-todo: ## lint back-end python sources with pylint without fixme warnings
+	@echo 'lint:pylint-all started…'
+	bin/pylint joanie --disable=fixme
+.PHONY: lint-pylint-all-todo
+
 test: ## run project tests
 	@$(MAKE) test-back-parallel
 	@$(MAKE) admin-test

env.d/development/common.dist

@@ -57,7 +57,7 @@ DJANGO_EMAIL_PORT=1025
 # Richie
 JOANIE_CATALOG_BASE_URL=http://richie:8070
 JOANIE_CATALOG_NAME=richie
-JOANIE_CONTRACT_CONTEXT_PROCESSORS = 
+JOANIE_CONTRACT_CONTEXT_PROCESSORS =
 
 # Backoffice
 JOANIE_BACKOFFICE_BASE_URL="http://localhost:8072"
@@ -75,3 +75,6 @@ DEVELOPER_EMAIL="[email protected]"
 
 # Security for remote endpoints API
 JOANIE_AUTHORIZED_API_TOKENS = "secretTokenForRemoteAPIConsumer"
+
+# Add here the dashboard link of orders for email sent when an installment is paid
+JOANIE_DASHBOARD_ORDER_LINK = "http://localhost:8070/dashboard/courses/orders/:orderId/"

src/backend/joanie/badges/models.py

@@ -4,12 +4,13 @@
 
 from functools import lru_cache
 
+from django.conf import settings
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
 from parler import models as parler_models
 
-from joanie.core.models import BaseModel, User
+from joanie.core.models import BaseModel
 
 
 @lru_cache
@@ -105,7 +106,7 @@ class IssuedBadge(BaseModel):
     )
 
     user = models.ForeignKey(
-        to=User,
+        to=settings.AUTH_USER_MODEL,
         verbose_name=_("User"),
         related_name="issued_badges",
         on_delete=models.CASCADE,

src/backend/joanie/core/admin.py

@@ -583,7 +583,6 @@ class OrderAdmin(DjangoObjectActions, admin.ModelAdmin):
     readonly_fields = (
         "state",
         "total",
-        "has_consent_to_terms",
         "invoice",
         "certificate",
     )

src/backend/joanie/core/api/client/__init__.py

@@ -2,7 +2,8 @@
 Client API endpoints
 """
 
-# pylint: disable=too-many-ancestors, too-many-lines
+# pylint: disable=too-many-ancestors, too-many-lines, too-many-branches
+# ruff: noqa: PLR0911,PLR0912
 import io
 import uuid
 from http import HTTPStatus
@@ -28,6 +29,7 @@
 from joanie.core import enums, filters, models, permissions, serializers
 from joanie.core.api.base import NestedGenericViewSet
 from joanie.core.exceptions import NoContractToSignError
+from joanie.core.models import Address
 from joanie.core.tasks import generate_zip_archive_task
 from joanie.core.utils import contract as contract_utility
 from joanie.core.utils import contract_definition, issuers
@@ -200,9 +202,13 @@ def payment_schedule(self, *args, **kwargs):
         Return the payment schedule for a course product relation.
         """
         course_product_relation = self.get_object()
-        course_run_dates = (
-            course_product_relation.product.get_equivalent_course_run_dates()
-        )
+
+        if course_product_relation.product.type == enums.PRODUCT_TYPE_CERTIFICATE:
+            instance = course_product_relation.course
+        else:
+            instance = course_product_relation.product
+        course_run_dates = instance.get_equivalent_course_run_dates()
+
         payment_schedule = generate_payment_schedule(
             course_product_relation.product.price,
             timezone.now(),
@@ -397,6 +403,19 @@ def create(self, request, *args, **kwargs):
                 )
             course = enrollment.course_run.course
 
+        if not serializer.initial_data.get("organization_id"):
+            organization = self._get_organization_with_least_active_orders(
+                product, course, enrollment
+            )
+            if organization:
+                serializer.initial_data["organization_id"] = organization.id
+
+        if product.price != 0 and not request.data.get("billing_address"):
+            return Response(
+                {"billing_address": "This field is required."},
+                status=HTTPStatus.BAD_REQUEST,
+            )
+
         # - Validate data then create an order
         try:
             self.perform_create(serializer)
@@ -409,58 +428,21 @@ def create(self, request, *args, **kwargs):
                 status=HTTPStatus.BAD_REQUEST,
             )
 
-        # Else return the fresh new order
-        return Response(serializer.data, status=HTTPStatus.CREATED)
-
-    @action(detail=True, methods=["PATCH"])
-    def submit(self, request, pk=None):  # pylint: disable=no-self-use, invalid-name, unused-argument
-        """
-        Submit a draft order if the conditions are filled
-        """
-        billing_address = (
-            models.Address(**request.data.get("billing_address"))
-            if request.data.get("billing_address")
-            else None
+        serializer.instance.init_flow(
+            billing_address=request.data.get("billing_address")
         )
-        credit_card_id = request.data.get("credit_card_id")
-        order = self.get_object()
 
-        if order.organization is None:
-            order.organization = self._get_organization_with_least_active_orders(
-                order.product, order.course, order.enrollment
-            )
-            order.save()
-
-        return Response(
-            {"payment_info": order.submit(billing_address, credit_card_id)},
-            status=HTTPStatus.CREATED,
-        )
-
-    @action(detail=True, methods=["POST"])
-    def abort(self, request, pk=None):  # pylint: disable=no-self-use, invalid-name, unused-argument
-        """Change the state of the order to pending"""
-        payment_id = request.data.get("payment_id")
-
-        order = self.get_object()
-
-        if order.state == enums.ORDER_STATE_VALIDATED:
-            return Response(
-                "Cannot abort a validated order.",
-                status=HTTPStatus.UNPROCESSABLE_ENTITY,
-            )
-
-        order.flow.pending(payment_id)
-
-        return Response(status=HTTPStatus.NO_CONTENT)
+        # Else return the fresh new order
+        return Response(serializer.data, status=HTTPStatus.CREATED)
 
     @action(detail=True, methods=["POST"])
     def cancel(self, request, pk=None):  # pylint: disable=no-self-use, invalid-name, unused-argument
         """Change the state of the order to cancelled"""
         order = self.get_object()
 
-        if order.state == enums.ORDER_STATE_VALIDATED:
+        if order.state == enums.ORDER_STATE_COMPLETED:
             return Response(
-                "Cannot cancel a validated order.",
+                "Cannot cancel a completed order.",
                 status=HTTPStatus.UNPROCESSABLE_ENTITY,
             )
 
@@ -508,15 +490,6 @@ def invoice(self, request, pk=None):  # pylint: disable=no-self-use, invalid-nam
 
         return response
 
-    @action(detail=True, methods=["PUT"])
-    def validate(self, request, pk=None):  # pylint: disable=no-self-use, invalid-name, unused-argument
-        """
-        Validate the order
-        """
-        order = self.get_object()
-        order.flow.validate()
-        return Response(status=HTTPStatus.OK)
-
     @extend_schema(request=None)
     @action(detail=True, methods=["POST"])
     def submit_for_signature(self, request, pk=None):  # pylint: disable=no-self-use, unused-argument, invalid-name
@@ -612,6 +585,45 @@ def submit_installment_payment(self, request, pk=None):  # pylint: disable=unuse
 
         return Response(payment_infos, status=HTTPStatus.OK)
 
+    @extend_schema(
+        request={"credit_card_id": OpenApiTypes.UUID},
+        responses={
+            (200, "application/json"): OpenApiTypes.OBJECT,
+            400: serializers.ErrorResponseSerializer,
+            404: serializers.ErrorResponseSerializer,
+        },
+    )
+    @action(detail=True, methods=["POST"], url_path="payment-method")
+    def payment_method(self, request, *args, **kwargs):
+        """
+        Set the payment method for an order.
+        """
+        order = self.get_object()
+
+        credit_card_id = request.data.get("credit_card_id")
+        if not credit_card_id:
+            return Response(
+                {"credit_card_id": "This field is required."},
+                status=HTTPStatus.BAD_REQUEST,
+            )
+
+        try:
+            credit_card = CreditCard.objects.get_card_for_owner(
+                pk=credit_card_id,
+                username=order.owner.username,
+            )
+        except CreditCard.DoesNotExist:
+            return Response(
+                {"detail": "Credit card does not exist."},
+                status=HTTPStatus.NOT_FOUND,
+            )
+
+        order.credit_card = credit_card
+        order.save()
+        order.flow.update()
+
+        return Response(status=HTTPStatus.CREATED)
+
 
 class AddressViewSet(
     mixins.ListModelMixin,
@@ -1175,8 +1187,8 @@ class GenericContractViewSet(
     serializer_class = serializers.ContractSerializer
     filterset_class = filters.ContractViewSetFilter
     ordering = ["-student_signed_on", "-created_on"]
-    queryset = models.Contract.objects.filter(
-        order__state=enums.ORDER_STATE_VALIDATED
+    queryset = models.Contract.objects.exclude(
+        order__state=enums.ORDER_STATE_CANCELED
     ).select_related(
         "definition",
         "order__organization",
@@ -1236,10 +1248,8 @@ def download(self, request, pk=None):  # pylint: disable=unused-argument, invali
         """
         contract = self.get_object()
 
-        if contract.order.state != enums.ORDER_STATE_VALIDATED:
-            raise ValidationError(
-                "Cannot get contract when an order is not yet validated."
-            )
+        if contract.order.state == enums.ORDER_STATE_CANCELED:
+            raise ValidationError("Cannot get contract when an order is cancelled.")
 
         if not contract.is_fully_signed:
             raise ValidationError(
@@ -1526,7 +1536,9 @@ class NestedOrderCourseViewSet(NestedGenericViewSet, mixins.ListModelMixin):
     filterset_class = filters.NestedOrderCourseViewSetFilter
     ordering = ["-created_on"]
     queryset = (
-        models.Order.objects.filter(state=enums.ORDER_STATE_VALIDATED)
+        models.Order.objects.filter(
+            state__in=enums.ORDER_STATES_BINDING,
+        )
         .select_related(
             "contract",
             "certificate",