Update dds motd send command

SPRINTLOG.md

@@ -384,3 +384,7 @@ _Empty sprint_
 
 - New version and changelog([#714](https://github.com/ScilifelabDataCentre/dds_cli/pull/714))
 - Added a new option to the motd send command to allow sending to unit personnel only ([#717](https://github.com/ScilifelabDataCentre/dds_cli/pull/717))
+
+# 2024-10-07 - 2024-10-18
+
+- Update MOTD command according to post merge review ([#720](https://github.com/ScilifelabDataCentre/dds_cli/pull/720))

dds_cli/__main__.py

@@ -2071,21 +2071,21 @@ def deactivate_motd(click_ctx, motd_id):
 @motd_group_command.command(name="send")
 @click.argument("motd_id", metavar="[MOTD_ID]", nargs=1, type=int, required=True)
 @click.option(
-    "--unit-personnel-only",
+    "--unit-only",
     is_flag=True,
     required=False,
     default=False,
-    help="Send MOTD to unit personnel only.",
+    help="Only send MOTD to Unit Admins and Unit Personnel.",
 )
 @click.pass_obj
-def send_motd(click_ctx, motd_id, unit_personnel_only):
+def send_motd(click_ctx, motd_id, unit_only):
     """Send motd as email to all users."""
     try:
         with dds_cli.motd_manager.MotdManager(
             no_prompt=click_ctx.get("NO_PROMPT", False),
             token_path=click_ctx.get("TOKEN_PATH"),
         ) as sender:
-            sender.send_motd(motd_id=motd_id, unit_personnel_only=unit_personnel_only)
+            sender.send_motd(motd_id=motd_id, unit_only=unit_only)
     except (
         dds_cli.exceptions.AuthenticationError,
         dds_cli.exceptions.ApiResponseError,

dds_cli/motd_manager.py

@@ -126,13 +126,13 @@ def deactivate_motd(self, motd_id) -> None:
         )
         LOG.info(response_message)
 
-    def send_motd(self, motd_id: int, unit_personnel_only=False) -> None:
+    def send_motd(self, motd_id: int, unit_only=False) -> None:
         """Send specific MOTD to users."""
         response_json, _ = dds_cli.utils.perform_request(
             endpoint=DDSEndpoint.MOTD_SEND,
             headers=self.token,
             method="post",
-            json={"motd_id": motd_id, "unit_personnel_only": unit_personnel_only},
+            json={"motd_id": motd_id, "unit_only": unit_only},
             error_message="Failed sending the MOTD to users",
         )
 

tests/test_motd_manager.py

@@ -242,7 +242,7 @@ def test_send_motd_all(caplog: LogCaptureFixture):
 
             with motd_manager.MotdManager(authenticate=False, no_prompt=True) as mtdm:
                 mtdm.token = {}  # required, otherwise none
-                mtdm.send_motd(motd_id=motd_id, unit_personnel_only=False)  # Send motd
+                mtdm.send_motd(motd_id=motd_id, unit_only=False)  # Send motd
 
             assert (
                 "dds_cli.motd_manager",