Update state on backend instead

Author: emanuelen5

admin/src/Membership/MemberBoxSpans.tsx

@@ -1,7 +1,7 @@
 import { useJson } from "Hooks/useJson";
 import useModel from "Hooks/useModel";
 import Member from "Models/Member";
-import TransactionAction, { Status } from "Models/TransactionAction";
+import TransactionAction from "Models/TransactionAction";
 import React, { useMemo } from "react";
 import "react-day-picker/style.css";
 import { Link, useParams } from "react-router-dom";
@@ -54,10 +54,9 @@ function PendingAction({ id, member_id }: { id: number; member_id: string }) {
                 </ol>
             </>,
         ).then(
-            () => {
-                action.status = Status.cancelled;
-                action.completed_at = new Date();
-                action.save();
+            async () => {
+                await action.del();
+                action.refresh();
             },
             () => {},
         );

api/src/shop/entities.py

@@ -1,5 +1,9 @@
+from datetime import datetime, timezone
+
 from membership.models import Member
+from service.db import db_session
 from service.entity import ASC, DESC, Entity, ExpandField
+from service.error import BadRequest, NotFound
 
 from shop.models import (
     GiftCard,
@@ -43,6 +47,23 @@
 )
 
 
+class TransactionActionEntity(Entity):
+    def delete(self, entity_id, commit=True):
+        entity = db_session.get(self.model, entity_id)
+        if not entity:
+            raise NotFound("Could not find any entity with specified parameters.")
+
+        if entity.status is not TransactionAction.Status.pending:
+            raise BadRequest("Cannot delete a transaction action that is not pending.")
+
+        entity.status = TransactionAction.Status.cancelled
+        entity.completed_at = datetime.now(timezone.utc).replace(tzinfo=None)
+
+        db_session.commit()
+
+        return self.to_obj(entity)
+
+
 product_action_entity = Entity(ProductAction)
 
 
@@ -68,7 +89,7 @@
 )
 
 
-transaction_action_entity = Entity(
+transaction_action_entity = TransactionActionEntity(
     TransactionAction,
     default_sort_column=None,
 )

api/src/shop/views.py

@@ -102,7 +102,7 @@
     path="/transaction_action",
     entity=transaction_action_entity,
     permission_read=WEBSHOP,
-    permission_update=WEBSHOP_EDIT,
+    permission_delete=WEBSHOP_EDIT,
 )
 
 service.related_entity_routes(