Enhances outlook calendargroup get command with additional test cases and improved handling of calendar group retrieval by name and user. Includes error handling for non-existent calendar groups. Closes #7111

Author: AlejandroGispert

src/m365/outlook/commands/calendargroup/calendargroup-get.spec.ts

@@ -234,5 +234,80 @@ describe(commands.CALENDARGROUP_GET, () => {
     await command.action(logger, { options: commandOptionsSchema.parse({ id: calendarGroupId, userId: otherUserId }) });
     assert(loggerLogSpy.calledOnceWith(calendarGroupResponse));
   });
+
+  it('retrieves calendar group for a user specified by name using delegated permissions with shared scope', async () => {
+    sinonUtil.restore(accessToken.getScopesFromAccessToken);
+    sinon.stub(accessToken, 'getScopesFromAccessToken').returns(['Calendars.Read.Shared']);
+
+    const expectedFilterUrl = `https://graph.microsoft.com/v1.0/users('${otherUserId}')/calendarGroups?$select=id,name&$filter=name eq 'Personal%20Events'`;
+    sinon.stub(request, 'get').callsFake(async (opts) => {
+      if (opts.url === expectedFilterUrl) {
+        return calendarGroupsResponseForFilter;
+      }
+
+      if (opts.url === `https://graph.microsoft.com/v1.0/users('${otherUserId}')/calendarGroups/${resolvedCalendarGroupId}`) {
+        return calendarGroupResponse;
+      }
+
+      throw 'Invalid request';
+    });
+
+    await command.action(logger, { options: commandOptionsSchema.parse({ name: calendarGroupName, userId: otherUserId }) });
+    assert(loggerLogSpy.calledOnceWith(calendarGroupResponse));
+  });
+
+  it('retrieves calendar group for the signed-in user with verbose output', async () => {
+    const logToStderrSpy = sinon.spy(logger, 'logToStderr');
+
+    sinon.stub(request, 'get').callsFake(async (opts) => {
+      if (opts.url === `https://graph.microsoft.com/v1.0/me/calendarGroups/${calendarGroupId}`) {
+        return calendarGroupResponse;
+      }
+
+      throw 'Invalid request';
+    });
+
+    await command.action(logger, { options: commandOptionsSchema.parse({ id: calendarGroupId, verbose: true }) });
+
+    assert(loggerLogSpy.calledOnceWith(calendarGroupResponse));
+    assert(logToStderrSpy.calledOnce);
+  });
+
+  it('throws an error when calendar group name does not match any results', async () => {
+    const expectedFilterUrl = `https://graph.microsoft.com/v1.0/me/calendarGroups?$select=id,name&$filter=name eq 'Personal%20Events'`;
+    sinon.stub(request, 'get').callsFake(async (opts) => {
+      if (opts.url === expectedFilterUrl) {
+        return { value: [] };
+      }
+
+      throw 'Invalid request';
+    });
+
+    await assert.rejects(
+      command.action(logger, { options: commandOptionsSchema.parse({ name: calendarGroupName }) }),
+      new CommandError(`The specified calendar group '${calendarGroupName}' does not exist.`)
+    );
+  });
+
+  it('retrieves calendar group for a user specified by userName using delegated permissions with shared scope (ReadWrite.Shared)', async () => {
+    sinonUtil.restore(accessToken.getScopesFromAccessToken);
+    sinon.stub(accessToken, 'getScopesFromAccessToken').returns(['Calendars.ReadWrite.Shared']);
+
+    const expectedFilterUrl = `https://graph.microsoft.com/v1.0/users('${userName}')/calendarGroups?$select=id,name&$filter=name eq 'Personal%20Events'`;
+    sinon.stub(request, 'get').callsFake(async (opts) => {
+      if (opts.url === expectedFilterUrl) {
+        return calendarGroupsResponseForFilter;
+      }
+
+      if (opts.url === `https://graph.microsoft.com/v1.0/users('${userName}')/calendarGroups/${resolvedCalendarGroupId}`) {
+        return calendarGroupResponse;
+      }
+
+      throw 'Invalid request';
+    });
+
+    await command.action(logger, { options: commandOptionsSchema.parse({ name: calendarGroupName, userName }) });
+    assert(loggerLogSpy.calledOnceWith(calendarGroupResponse));
+  });
 });
 

src/m365/outlook/commands/calendargroup/calendargroup-get.ts

@@ -107,9 +107,15 @@ class OutlookCalendarGroupGetCommand extends GraphCommand {
         return calendarGroups[0].id!;
       };
 
-      const calendarGroupId = args.options.id ?? (
-        args.options.name ? await getCalendarGroupId(args.options.name) : undefined
-      );
+      // Schema guarantees exactly one of `id` or `name` is present,
+      // so avoid ternaries/undefined paths to keep coverage deterministic.
+      let calendarGroupId: string;
+      if (args.options.id) {
+        calendarGroupId = args.options.id;
+      }
+      else {
+        calendarGroupId = await getCalendarGroupId(args.options.name!);
+      }
 
       // For delegated access without userId/userName: use /me.
       const userPath = userIdentifier ? `users('${userIdentifier}')` : 'me';