Adding --as-default to CLI omero user joingroup

components/tools/OmeroPy/src/omero/cli.py

@@ -2264,6 +2264,12 @@ def find_user(self, admin, id_or_name, fatal=False):
 
         return u.id.val, u
 
+    def set_users_default_group_by_user_id(self, admin, group, users):
+        import omero
+        for user in list(users):
+            admin.setDefaultGroup(omero.model.ExperimenterI(user, False), group)
+            self.ctx.out("Set the default group of user %s to group %s" % (user, group.id.val))
+
     def addusersbyid(self, admin, group, users):
         import omero
         for user in list(users):

components/tools/OmeroPy/src/omero/plugins/user.py

@@ -99,6 +99,9 @@ def _configure(self, parser):
         group.add_argument(
             "--as-owner", action="store_true", default=False,
             help="Join the group(s) as an owner")
+        group.add_argument(
+            "--as-default", action="store_true", default=False,
+            help="Sets the group as the user's default group")
 
         leavegroup = parser.add(
             sub, self.leavegroup, "Leave one or more groups")
@@ -341,13 +344,37 @@ def joingroup(self, args):
 
         uid, username = self.parse_userid(a, args)
         [gid, groups] = self.list_groups(a, args, use_context=False)
+
+        # The list `groups` has members removed by filter_groups if the uid
+        # is already a member, so counting them here.
+        number_of_groups_passed = len(groups)
+
+        # so doing this logic before that group list filtering.
+        if args.as_default:
+            # check if there's only one group defined
+            if number_of_groups_passed == 1:
+                # If that's the case, set that to be the default group
+                # which will happen in the rest of the function.
+                pass
+            else:
+                if number_of_groups_passed > 1:
+                    # Message to user that we can only set the default group if only one group
+                    # is supplied as an argument.
+                    self.ctx.out("--as-default requires a single group ID to be supplied.")
+                    # Exit the function making no changes.
+                    return None
+
+        # Performing the count and funtion exit above, so we don't even hit this
+        # if we don't need to, since it would print statements about group membership.
         groups = self.filter_groups(groups, uid, args.as_owner, True)
 
         for group in groups:
             if args.as_owner:
                 self.addownersbyid(a, group, [uid])
             else:
                 self.addusersbyid(a, group, [uid])
+            if args.as_default:
+                self.set_users_default_group_by_user_id(a, group, [uid])
 
     def leavegroup(self, args):
         c = self.ctx.conn(args)