From 34235dd3fa56ace6fff15f41fda4741c4102475c Mon Sep 17 00:00:00 2001
From: sinisaos <sinisaos@gmail.com>
Date: Tue, 9 May 2023 15:25:31 +0200
Subject: [PATCH 1/2] add post event hooks

---
 docs/source/crud/hooks.rst        | 89 +++++++++++++++++++++++++++++--
 piccolo_api/crud/endpoints.py     | 23 +++++++-
 piccolo_api/crud/hooks.py         |  3 ++
 tests/crud/test_crud_endpoints.py |  4 --
 tests/crud/test_hooks.py          | 69 ++++++++++++++++++++++++
 5 files changed, 179 insertions(+), 9 deletions(-)

diff --git a/docs/source/crud/hooks.rst b/docs/source/crud/hooks.rst
index 423fb2b7..b227a61b 100644
--- a/docs/source/crud/hooks.rst
+++ b/docs/source/crud/hooks.rst
@@ -16,6 +16,7 @@ Define a method, and register it with :class:`PiccoloCRUD <piccolo_api.crud.endp
 
     # app.py
     from piccolo_api.crud.endpoints import PiccoloCRUD
+    from piccolo_api.crud.hooks import Hook, HookType
 
     from movies.tables import Movie
 
@@ -27,7 +28,7 @@ Define a method, and register it with :class:`PiccoloCRUD <piccolo_api.crud.endp
 
 
     # set movie rating to 20 before saving
-    async def set_movie_rating_10(row: Movie):
+    async def set_movie_rating_20(row: Movie):
         row.rating = 20
         return row
 
@@ -73,11 +74,38 @@ It takes a single parameter, ``row``, and should return the row:
         return row
 
 
-    app = PiccoloCRUD(table=Movie, read_only=False, hooks=[
-        Hook(hook_type=HookType.pre_save, callable=set_movie_rating_10)
+    app = PiccoloCRUD(
+        table=Movie,
+        read_only=False,
+        hooks=[
+            Hook(hook_type=HookType.pre_save, callable=set_movie_rating_10)
+        ]
+    )
+
+
+post_save
+~~~~~~~~~
+
+This hook runs during POST requests, after inserting data into the database.
+It takes a single parameter, ``row``.
+
+``post_save`` hooks should not return data.
+
+.. code-block:: python
+
+    async def print_movie(row: Movie):
+        print(f'Movie {row.id} added to db.')
+
+
+    app = PiccoloCRUD(
+        table=Movie,
+        read_only=False,
+        hooks=[
+            Hook(hook_type=HookType.post_save, callable=print_movie)
         ]
     )
 
+
 pre_patch
 ~~~~~~~~~
 
@@ -107,6 +135,33 @@ Each function must return a dictionary which represent the data to be modified.
     )
 
 
+post_patch
+~~~~~~~~~~
+
+This hook runs during PATCH requests, after changing the specified row in
+the database.
+
+It takes two parameters, ``row_id`` which is the id of the row to be changed,
+and ``values`` which is a dictionary of incoming values.
+
+``post_patch`` hooks should not return data.
+
+.. code-block:: python
+
+    async def print_movie_changes(row_id: int, values: dict):
+        current_db_row = await Movie.objects().get(Movie.id==row_id)
+        print(f'Movie {row_id} updated with values {values}')
+
+
+    app = PiccoloCRUD(
+        table=Movie,
+        read_only=False,
+        hooks=[
+            Hook(hook_type=HookType.post_patch, callable=print_movie_changes)
+        ]
+    )
+
+
 pre_delete
 ~~~~~~~~~~
 
@@ -131,6 +186,32 @@ It takes one parameter, ``row_id`` which is the id of the row to be deleted.
         ]
     )
 
+
+post_delete
+~~~~~~~~~~~
+
+This hook runs during DELETE requests, after deleting the specified row in
+the database.
+
+It takes one parameter, ``row_id`` which is the id of the row to be deleted.
+
+``post_delete`` hooks should not return data.
+
+.. code-block:: python
+
+    async def post_delete(row_id: int):
+        pass
+
+
+    app = PiccoloCRUD(
+        table=Movie,
+        read_only=False,
+        hooks=[
+            Hook(hook_type=HookType.post_delete, callable=post_delete)
+        ]
+    )
+
+
 Dependency injection
 ~~~~~~~~~~~~~~~~~~~~
 
@@ -159,4 +240,4 @@ HookType
 Hook
 ~~~~
 
-.. autoclass:: Hook
+.. autoclass:: Hook
\ No newline at end of file
diff --git a/piccolo_api/crud/endpoints.py b/piccolo_api/crud/endpoints.py
index bb0832b0..4eab5416 100644
--- a/piccolo_api/crud/endpoints.py
+++ b/piccolo_api/crud/endpoints.py
@@ -919,6 +919,13 @@ async def post_single(
                         request=request,
                     )
                 response = await row.save().run()
+                if self._hook_map:
+                    await execute_post_hooks(
+                        hooks=self._hook_map,
+                        hook_type=HookType.post_save,
+                        row=row,
+                        request=request,
+                    )
                 json = dump_json(response)
                 # Returns the id of the inserted row.
                 return CustomJSONResponse(json, status_code=201)
@@ -1127,7 +1134,6 @@ async def put_single(
         }
 
         try:
-
             await cls.update(values).where(
                 cls._meta.primary_key == row_id
             ).run()
@@ -1198,6 +1204,14 @@ async def patch_single(
                     .run()
                 )
                 assert new_row
+                if self._hook_map:
+                    await execute_patch_hooks(
+                        hooks=self._hook_map,
+                        hook_type=HookType.post_patch,
+                        row_id=row_id,
+                        values=values,
+                        request=request,
+                    )
                 return CustomJSONResponse(
                     self.pydantic_model(**new_row).json()
                 )
@@ -1226,6 +1240,13 @@ async def delete_single(
             await self.table.delete().where(
                 self.table._meta.primary_key == row_id
             ).run()
+            if self._hook_map:
+                await execute_delete_hooks(
+                    hooks=self._hook_map,
+                    hook_type=HookType.post_delete,
+                    row_id=row_id,
+                    request=request,
+                )
             return Response(status_code=204)
         except ValueError:
             return Response("Unable to delete the resource.", status_code=500)
diff --git a/piccolo_api/crud/hooks.py b/piccolo_api/crud/hooks.py
index e071f66a..6f01c2e9 100644
--- a/piccolo_api/crud/hooks.py
+++ b/piccolo_api/crud/hooks.py
@@ -14,6 +14,9 @@ class HookType(Enum):
     pre_save = "pre_save"
     pre_patch = "pre_patch"
     pre_delete = "pre_delete"
+    post_save = "post_save"
+    post_patch = "post_patch"
+    post_delete = "post_delete"
 
 
 class Hook:
diff --git a/tests/crud/test_crud_endpoints.py b/tests/crud/test_crud_endpoints.py
index bcc5d0b5..be07c51f 100644
--- a/tests/crud/test_crud_endpoints.py
+++ b/tests/crud/test_crud_endpoints.py
@@ -182,7 +182,6 @@ def test_patch_succeeds(self):
         self.assertEqual(movies[0]["name"], new_name)
 
     def test_patch_user_new_password(self):
-
         client = TestClient(PiccoloCRUD(table=BaseUser, read_only=False))
 
         json = {
@@ -211,7 +210,6 @@ def test_patch_user_new_password(self):
         self.assertEqual(response.status_code, 200)
 
     def test_patch_user_old_password(self):
-
         client = TestClient(PiccoloCRUD(table=BaseUser, read_only=False))
 
         json = {
@@ -240,7 +238,6 @@ def test_patch_user_old_password(self):
         self.assertEqual(response.status_code, 200)
 
     def test_patch_user_fails(self):
-
         client = TestClient(PiccoloCRUD(table=BaseUser, read_only=False))
 
         json = {
@@ -1163,7 +1160,6 @@ def test_post_user_fails(self):
         self.assertEqual(response.status_code, 400)
 
     def test_validation_error(self):
-
         """
         Make sure a post returns a validation error with incorrect or missing
         data.
diff --git a/tests/crud/test_hooks.py b/tests/crud/test_hooks.py
index b9229089..67bb3a2d 100644
--- a/tests/crud/test_hooks.py
+++ b/tests/crud/test_hooks.py
@@ -293,3 +293,72 @@ def test_delete_hook_fails(self):
 
         with self.assertRaises(Exception):
             _ = client.delete(f"/{movie.id}/")
+
+    def test_post_save_hook_failed(self):
+        """
+        Make sure failing post_save hook bubbles up
+        (this implicitly also tests that post_save hooks execute)
+        """
+        client = TestClient(
+            PiccoloCRUD(
+                table=Movie,
+                read_only=False,
+                hooks=[
+                    Hook(
+                        hook_type=HookType.post_save,
+                        callable=failing_hook,
+                    )
+                ],
+            )
+        )
+        json_req = {"name": "Star Wars", "rating": 93}
+
+        with self.assertRaises(Exception):
+            _ = client.post("/", json=json_req)
+
+    def test_post_patch_hook_failed(self):
+        """
+        Make sure failing post_patch hook bubbles up
+        (this implicitly also tests that post_patch hooks execute)
+        """
+        client = TestClient(
+            PiccoloCRUD(
+                table=Movie,
+                read_only=False,
+                hooks=[
+                    Hook(
+                        hook_type=HookType.post_patch,
+                        callable=failing_hook,
+                    )
+                ],
+            )
+        )
+
+        movie = Movie(name="Star Wars", rating=93)
+        movie.save().run_sync()
+
+        new_name = "Star Wars: A New Hope"
+
+        with self.assertRaises(Exception):
+            _ = client.patch(f"/{movie.id}/", json={"name": new_name})
+
+    def test_post_delete_hook_fails(self):
+        """
+        Make sure failing post_delete hook bubbles up
+        (this implicitly also tests that pre_delete hooks execute)
+        """
+        client = TestClient(
+            PiccoloCRUD(
+                table=Movie,
+                read_only=False,
+                hooks=[
+                    Hook(hook_type=HookType.post_delete, callable=failing_hook)
+                ],
+            )
+        )
+
+        movie = Movie(name="Star Wars", rating=10)
+        movie.save().run_sync()
+
+        with self.assertRaises(Exception):
+            _ = client.delete(f"/{movie.id}/")

From b8e6e9a031731deec2643fc352ed6198473f360b Mon Sep 17 00:00:00 2001
From: sinisaos <sinisaos@gmail.com>
Date: Wed, 10 May 2023 06:51:19 +0200
Subject: [PATCH 2/2] change post endpoint response from list to dict

---
 piccolo_api/crud/endpoints.py           | 2 +-
 tests/fastapi/test_fastapi_endpoints.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/piccolo_api/crud/endpoints.py b/piccolo_api/crud/endpoints.py
index 4eab5416..49015907 100644
--- a/piccolo_api/crud/endpoints.py
+++ b/piccolo_api/crud/endpoints.py
@@ -918,7 +918,7 @@ async def post_single(
                         row=row,
                         request=request,
                     )
-                response = await row.save().run()
+                response = (await row.save().run())[0]
                 if self._hook_map:
                     await execute_post_hooks(
                         hooks=self._hook_map,
diff --git a/tests/fastapi/test_fastapi_endpoints.py b/tests/fastapi/test_fastapi_endpoints.py
index 1284a163..6e0c2871 100644
--- a/tests/fastapi/test_fastapi_endpoints.py
+++ b/tests/fastapi/test_fastapi_endpoints.py
@@ -207,7 +207,7 @@ def test_post(self):
             "/movies/", json={"name": "Star Wars", "rating": 93}
         )
         self.assertEqual(response.status_code, 201)
-        self.assertEqual(response.json(), [{"id": 2}])
+        self.assertEqual(response.json(), {"id": 2})
 
     def test_put(self):
         client = TestClient(app)