🔀 Move command does not swap (#118)

* ✨ Create new move; rename old move to swap

* 💬: Ensure printing swap instead of move.

* ✅ Add passing test for new move.

* 📝 Update documentation for move and add for swap.

Author: zntheory

docs/commands.md

@@ -25,9 +25,10 @@ pls --help
 │ del          Delete a Task                                                   │
 │ delete       Delete a Task                                    (deprecated)   │
 │ done         Mark a task as done ✓                                           │
-│ edit         Edit a task by id ✏️  (Add task name inside quotes)              │
-│ move         Change task order 🔀                                            │
+│ edit         Edit a task by id ✏️  (Add task name inside quotes)             │
+│ move         Insert a task in a new position                                 │
 │ showtasks    Show all Tasks 📖                                (deprecated)   │
+| swap         Swap a task's position with another 🔀                          │
 │ tasks        Show all Tasks 📖                                               │
 │ undone       Mark a task as undone ○                                         │
 ╰──────────────────────────────────────────────────────────────────────────────╯

pls_cli/please.py

@@ -322,12 +322,87 @@ def delete(task_id: int) -> None:
 
 @app.command()
 def move(old_id: int, new_id: int) -> None:
-    """Change task order 🔀"""
+    """Change task position by floating 🎈 or sinking ⚓"""
     settings = Settings().get_settings()
     if not settings['tasks']:
         center_print(
             Rule(
-                'Sorry, cannot move tasks as the Task list is empty',
+                'Sorry, cannot move task as the Task list is empty',
+                style=error_line_style,
+            ),
+            style=error_text_style,
+        )
+        return
+
+    if old_id == new_id:
+        center_print(
+            Rule('No Updates Made', style=warning_line_style),
+            style=warning_text_style,
+        )
+        return
+
+    try:
+        (not 0 <= old_id - 1 < len(settings['tasks'])) or (
+            not 0 <= new_id - 1 < len(settings['tasks'])
+        )
+    except IndexError:
+        center_print(
+            Rule(
+                'Are you sure you gave me the correct ID to move?',
+                style=error_line_style,
+            ),
+            style=error_text_style,
+            wrap=True,
+        )
+        return
+
+    try:
+        if len(settings['tasks']) == 2 and (
+            old_id - 1 == len(settings['tasks'])
+            or new_id - 1 == len(settings['tasks'])
+        ):
+            settings['tasks'][old_id - 1], settings['tasks'][new_id - 1] = (
+                settings['tasks'][new_id - 1],
+                settings['tasks'][old_id - 1],
+            )
+        elif old_id < new_id:
+            for x in range(new_id - 1, old_id - 1, -1):
+                settings['tasks'][old_id - 1], settings['tasks'][x] = (
+                    settings['tasks'][x],
+                    settings['tasks'][old_id - 1],
+                )
+        else:
+            for x in range(new_id - 1, old_id):
+                settings['tasks'][old_id - 1], settings['tasks'][x] = (
+                    settings['tasks'][x],
+                    settings['tasks'][old_id - 1],
+            )
+
+
+        Settings().write_settings(settings)
+        center_print(
+            Rule('Updated Task List', style=update_line_style),
+            style=update_text_style,
+        )
+        print_tasks(settings['tasks'])
+    except Exception:
+        center_print(
+            Rule(
+                "Please check the entered ID's values", style=error_line_style
+            ),
+            style=error_text_style,
+        )
+        print_tasks()
+
+
+@app.command()
+def swap(old_id: int, new_id: int) -> None:
+    """Swap the positions of two tasks 🔀"""
+    settings = Settings().get_settings()
+    if not settings['tasks']:
+        center_print(
+            Rule(
+                'Sorry, cannot swap tasks as the Task list is empty',
                 style=error_line_style,
             ),
             style=error_text_style,
@@ -346,7 +421,7 @@ def move(old_id: int, new_id: int) -> None:
     ):
         center_print(
             Rule(
-                'Are you sure you gave me the correct ID to delete?',
+                'Are you sure you gave me the correct ID to swap?',
                 style=error_line_style,
             ),
             style=error_text_style,

tests/test_pls_cli.py

@@ -219,3 +219,39 @@ def test_edit_empty_tasks(mock_write_settings, mock_get_settings):
     output = result.stdout
     assert result.exit_code == 0
     assert 'Currently, you have no tasks to edit 📝' in output
+
+
+@patch(
+    'pls_cli.utils.settings.Settings.get_settings',
+    return_value={
+        'user_name': 'Test name',
+        'initial_setup_done': True,
+        'tasks': [
+            {'name': 'Task 1', 'done': False},
+            {'name': 'Task 2', 'done': False},
+            {'name': 'Task 3', 'done': False},
+            {'name': 'Task 4', 'done': False}
+        ],
+    },
+)
+@patch('pls_cli.utils.settings.Settings.write_settings')
+def test_move_task_success(mock_write_settings, mock_get_settings):
+    result = runner.invoke(app, ['move', '1', '3'])
+    output = result.stdout
+    assert result.exit_code == 0
+    assert 'Updated Task List' in output
+    single_spaces = ' '.join(output.split())
+    assert '1 Task 2 ○' in single_spaces
+    assert '2 Task 3 ○' in single_spaces
+    assert '3 Task 1 ○' in single_spaces
+    assert '4 Task 4 ○' in single_spaces
+
+    result = runner.invoke(app, ['move', '4', '2'])
+    output = result.stdout
+    assert result.exit_code == 0
+    assert 'Updated Task List' in output
+    single_spaces = ' '.join(output.split())
+    assert '1 Task 2 ○' in single_spaces
+    assert '2 Task 4 ○' in single_spaces
+    assert '3 Task 3 ○' in single_spaces
+    assert '4 Task 1 ○' in single_spaces