Rename ReservationDeleteMutation endpoint in the GraphQL API

Deprecated `deleteReservation` endpoint in favour of the more descriptive `deleteTentativeReservation`

tests/test_graphql_api/test_reservation/helpers.py

@@ -18,7 +18,7 @@
 
 CREATE_MUTATION = build_mutation("createReservation", "ReservationCreateMutation")
 UPDATE_MUTATION = build_mutation("updateReservation", "ReservationUpdateMutation")
-DELETE_MUTATION = build_mutation("deleteReservation", "ReservationDeleteMutation", fields="deleted")
+DELETE_MUTATION = build_mutation("deleteTentativeReservation", "ReservationDeleteTentativeMutation", fields="deleted")
 ADJUST_MUTATION = build_mutation("adjustReservationTime", "ReservationAdjustTimeMutation")
 APPROVE_MUTATION = build_mutation("approveReservation", "ReservationApproveMutation")
 DENY_MUTATION = build_mutation("denyReservation", "ReservationDenyMutation")

tilavarauspalvelu/api/graphql/mutations.py

@@ -58,6 +58,7 @@
     ReservationConfirmMutation,
     ReservationCreateMutation,
     ReservationDeleteMutation,
+    ReservationDeleteTentativeMutation,
     ReservationDenyMutation,
     ReservationRefundMutation,
     ReservationRequiresHandlingMutation,
@@ -111,6 +112,7 @@
     "ReservationConfirmMutation",
     "ReservationCreateMutation",
     "ReservationDeleteMutation",
+    "ReservationDeleteTentativeMutation",
     "ReservationDenyMutation",
     "ReservationRefundMutation",
     "ReservationRequiresHandlingMutation",

tilavarauspalvelu/api/graphql/schema.py

@@ -50,6 +50,7 @@
     ReservationConfirmMutation,
     ReservationCreateMutation,
     ReservationDeleteMutation,
+    ReservationDeleteTentativeMutation,
     ReservationDenyMutation,
     ReservationRefundMutation,
     ReservationRequiresHandlingMutation,
@@ -343,7 +344,10 @@ class Mutation(graphene.ObjectType):
     confirm_reservation = ReservationConfirmMutation.Field()
     cancel_reservation = ReservationCancellationMutation.Field()
     deny_reservation = ReservationDenyMutation.Field()
-    delete_reservation = ReservationDeleteMutation.Field()
+    delete_reservation = ReservationDeleteMutation.Field(  # TODO: Remove this after frontend is updated.
+        deprecation_reason="Renamed to 'deleteTentativeReservation'."
+    )
+    delete_tentative_reservation = ReservationDeleteTentativeMutation.Field()
     approve_reservation = ReservationApproveMutation.Field()
     refund_reservation = ReservationRefundMutation.Field()
     require_handling_for_reservation = ReservationRequiresHandlingMutation.Field()

tilavarauspalvelu/api/graphql/types/reservation/mutations.py

@@ -133,17 +133,19 @@ class Meta:
         permission_classes = [StaffReservationModifyPermission]
 
 
-class ReservationDeleteMutation(DeleteMutation):
+class ReservationDeleteTentativeMutation(DeleteMutation):
+    """Used only for deleting a reservation before it is confirmed."""
+
     class Meta:
         model = Reservation
         permission_classes = [ReservationPermission]
 
     @classmethod
     def validate_deletion(cls, reservation: Reservation, user: AnyUser) -> None:
         # Check Reservation state
-        if reservation.state not in ReservationStateChoice.states_that_can_be_cancelled:
+        if reservation.state not in ReservationStateChoice.states_that_can_be_deleted:
             msg = (
-                f"Reservation which is not in {ReservationStateChoice.states_that_can_be_cancelled} "
+                f"Reservation which is not in {ReservationStateChoice.states_that_can_be_deleted} "
                 f"state cannot be deleted."
             )
             raise ValidationError(msg)
@@ -175,3 +177,10 @@ def validate_deletion(cls, reservation: Reservation, user: AnyUser) -> None:
                     pass
 
                 payment_order.actions.set_order_as_cancelled()
+
+
+class ReservationDeleteMutation(ReservationDeleteTentativeMutation):
+    # TODO: Remove after frontend is updated to use ReservationDeleteTentativeMutation
+    class Meta:
+        model = Reservation
+        permission_classes = [ReservationPermission]

tilavarauspalvelu/enums.py

@@ -400,7 +400,8 @@ def states_that_can_change_to_deny(self) -> list[str]:
         ]
 
     @classproperty
-    def states_that_can_be_cancelled(self) -> list[str]:
+    def states_that_can_be_deleted(self) -> list[str]:
+        # "Alustava varaus" / "tentative reservation"
         return [  # type: ignore[return-type]
             ReservationStateChoice.CREATED.value,
             ReservationStateChoice.WAITING_FOR_PAYMENT.value,