Allow moving tasks across columns

src/acanban/task.py

@@ -30,8 +30,8 @@
 
 __all__ = ['blueprint']
 
-BASE_ROUTE = '/p/<uuid>/tasks/<int:index>'
-blueprint = Blueprint('task', __name__)
+blueprint = Blueprint('task', __name__,
+                      url_prefix='/p/<uuid>/tasks/<int:index>')
 
 
 def task_query(project_id: str, index: int) -> RqlQuery:
@@ -40,7 +40,7 @@ def task_query(project_id: str, index: int) -> RqlQuery:
     return project['tasks'].order_by('created_on')[index]
 
 
-@blueprint.route(BASE_ROUTE)
+@blueprint.route('/')
 @login_required
 async def display(uuid: str, index: int) -> ResponseReturnValue:
     """Display task discussion."""
@@ -51,6 +51,32 @@ async def display(uuid: str, index: int) -> ResponseReturnValue:
                                  route=f'/p/{uuid}/tasks/{index}')
 
 
+@blueprint.route('/dec')
+@login_required
+async def move_backward(uuid: str, index: int) -> ResponseReturnValue:
+    """Move the task to the previous column."""
+    await pluck_project(uuid)  # check authority
+    async with current_app.db_pool.connection() as conn:
+        task = await task_query(uuid, index).run(conn)
+        updated = {'tasks': r.row['tasks'].order_by('created_on').change_at(
+            index, {**task, 'status': max(0, task['status']-1)})}
+        await r.table('projects').get(uuid).update(updated).run(conn)
+    return redirect(request.referrer)
+
+
+@blueprint.route('/inc')
+@login_required
+async def move_forward(uuid: str, index: int) -> ResponseReturnValue:
+    """Move the task to the next column."""
+    await pluck_project(uuid)  # check authority
+    async with current_app.db_pool.connection() as conn:
+        task = await task_query(uuid, index).run(conn)
+        updated = {'tasks': r.row['tasks'].order_by('created_on').change_at(
+            index, {**task, 'status': min(2, task['status']+1)})}
+        await r.table('projects').get(uuid).update(updated).run(conn)
+    return redirect(request.referrer)
+
+
 def flatten_replies(comment: Dict[str, Any]) -> Iterator[Dict[str, Any]]:
     """Recursively walk through the nested replies."""
     yield comment
@@ -59,7 +85,7 @@ def flatten_replies(comment: Dict[str, Any]) -> Iterator[Dict[str, Any]]:
         yield from flatten_replies(reply)
 
 
-@blueprint.route(f'{BASE_ROUTE}/reply/<float:parent>', methods=['POST'])
+@blueprint.route('/reply/<float:parent>', methods=['POST'])
 @login_required
 async def save_reply(uuid: str, index: int,
                      parent: float) -> ResponseReturnValue:

stubs/rethinkdb/ast.pyi

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Dict, Union
 
 from .trio_net.net_trio import Connection
 
@@ -7,7 +7,7 @@ class RqlQuery:
 
     def count(self) -> RqlQuery: ...
     def filter(self, predicate: dict) -> RqlQuery: ...
-    def pluck(self, *selectors: str) -> RqlQuery: ...
+    def pluck(self, *selectors: Union[str, Dict[str, Any]]) -> RqlQuery: ...
     def order_by(self, key: str) -> RqlQuery: ...
     def update(self, obj: dict) -> RqlQuery: ...
 

tests/test_task.py

@@ -36,7 +36,21 @@ async def test_get(username: Optional[str], status_code: int,
                    user: ClientFactory) -> None:
     """Test task access permission."""
     client = await user(username)
-    response = await client.get(BASE_ROUTE)
+    response = await client.get(f'{BASE_ROUTE}/')
+    assert response.status_code == status_code
+
+
+@parametrize(('username', 'status_code'),
+             (param(None, Status.UNAUTHORIZED, id='guest'),
+              param('silasl', Status.FORBIDDEN, id='assistant'),
+              param('adaml', Status.FORBIDDEN, id='nonmember'),
+              param('ronanf', Status.FOUND, id='member')))
+@parametrize('direction', ('dec', 'inc'))
+async def test_move(username: Optional[str], status_code: int,
+                    user: ClientFactory, direction: str) -> None:
+    """Test moving task across columns."""
+    client = await user(username)
+    response = await client.get(f'{BASE_ROUTE}/{direction}')
     assert response.status_code == status_code