packages/rest-typings/src/v1/omnichannel.ts (1)

3392-3433: Schema/validators added—align naming and TS type with existing conventions.

• Naming: most validators use the is* prefix (e.g., isPOSTLivechatRoomsCloseAllSuccessResponse). Consider renaming the success validator for consistency.
• Typing: include success: true in the compile generic for better TS accuracy.

Proposed tweak:

- export const POSTLivechatInquiriesReturnAsInquirySuccessResponse = ajv.compile<{ result: boolean }>(
+ export const isPOSTLivechatInquiriesReturnAsInquirySuccessResponse = ajv.compile<{ result: boolean; success: true }>(
   POSTLivechatInquiriesReturnAsInquirySuccessResponseSchema,
 );

apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/hooks/useReturnChatToQueueMutation.ts (1)

11-18: Return the boolean result so UIs can react (optional).

Endpoint returns { result: boolean }. Exposing it lets consumers notify when nothing was returned to queue (result=false).

-export const useReturnChatToQueueMutation = (
-  options?: Omit<UseMutationOptions<void, Error, IRoom['_id']>, 'mutationFn'>,
-): UseMutationResult<void, Error, IRoom['_id']> => {
+export const useReturnChatToQueueMutation = (
+  options?: Omit<UseMutationOptions<boolean, Error, IRoom['_id']>, 'mutationFn'>,
+): UseMutationResult<boolean, Error, IRoom['_id']> => {
   const returnChatToQueue = useEndpoint('POST', '/v1/livechat/inquiries.returnAsInquiry');
   …
   return useMutation({
     mutationFn: async (rid) => {
-      await returnChatToQueue({ roomId: rid });
+      const { result } = await returnChatToQueue({ roomId: rid });
+      return result;
     },

apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useReturnChatToQueueMutation.ts (1)

11-18: Mirror V2: surface the boolean result (optional).

Same rationale as V2 hook—bubble up the outcome for UX feedback.

- options?: Omit<UseMutationOptions<void, Error, IRoom['_id']>, 'mutationFn'>,
-): UseMutationResult<void, Error, IRoom['_id']> => {
+ options?: Omit<UseMutationOptions<boolean, Error, IRoom['_id']>, 'mutationFn'>,
+): UseMutationResult<boolean, Error, IRoom['_id']> => {
 …
-  await returnChatToQueue({ roomId: rid });
+  const { result } = await returnChatToQueue({ roomId: rid });
+  return result;

apps/meteor/tests/end-to-end/api/livechat/05-inquiries.ts (1)

327-437: Good migration to REST; consider adding a couple of edge-case assertions.

• Add tests for MAC limit and on-hold rooms to cover the explicit failure branches (mac-limit-reached, error-room-onHold via service).
• Optional: also assert that the endpoint preserves HTTP 400 with those error keys.

I can draft these tests if helpful.

apps/meteor/app/livechat/imports/server/rest/inquiries.ts (1)

13-14: Validator import name consistency (if you adopt the rename).

Update the imported success validator to isPOSTLivechatInquiriesReturnAsInquirySuccessResponse for consistency with other routes.

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

• Jira integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

.changeset/calm-hounds-look.md (1)

6-6: Clarify replacement path and add removal timeline.

Recommend referencing the full REST path with version prefix and stating the deprecation/removal plan to guide integrators.

Proposed wording tweak:

• “Adds deprecation warning for Meteor method livechat:returnAsInquiry. Use REST endpoint /v1/livechat/inquiries.returnAsInquiry instead. Deprecated in 8.0.0; planned removal in next major.”

apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/hooks/useReturnChatToQueueMutation.ts (1)

11-18: Switch to REST endpoint looks good; consider surfacing the boolean result.

Calling POST /v1/livechat/inquiries.returnAsInquiry with { roomId } is correct. Today the hook discards the endpoint’s { result: boolean }; if useful for UX (e.g., “no one serving” returns false), consider returning/forwarding it without changing the external signature (e.g., keep void but optionally let callers pass an onSuccess that inspects the response).

Also ensure the REST typings map includes this path (see comment on packages/rest-typings: add '/v1/livechat/inquiries.returnAsInquiry' to OmnichannelEndpoints).

apps/meteor/app/livechat/server/methods/returnAsInquiry.ts (1)

20-20: Deprecation logger placement is correct; align parameter naming for consistency.

Positional args work, but the declared method type uses departmentID while the impl uses departmentId. Consider aligning to departmentId across types for consistency with REST.

Suggested type tweak (outside this hunk):

interface ServerMethods {
  'livechat:returnAsInquiry'(rid: IRoom['_id'], departmentId?: ILivechatDepartment['_id']): boolean;
}

apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useReturnChatToQueueMutation.ts (1)

11-18: LGTM; keep both hook variants consistent and consider a shared constant for the path.

Both Header and HeaderV2 now hit the same endpoint with the same payload—great. To avoid drift, consider a small constants module for '/v1/livechat/inquiries.returnAsInquiry'.

As above, verify the REST typings expose this path to preserve type safety.

packages/rest-typings/src/v1/omnichannel.ts (1)

3430-3432: Nit: align validator export naming with existing “is…” convention.

Many validators use the is* prefix (e.g., isPOSTLivechatRoomsCloseAllSuccessResponse). Consider renaming to isPOSTLivechatInquiriesReturnAsInquirySuccessResponse for consistency. Non‑blocking.

-export const POSTLivechatInquiriesReturnAsInquirySuccessResponse = ajv.compile<{ result: boolean }>(
+export const isPOSTLivechatInquiriesReturnAsInquirySuccessResponse = ajv.compile<{ result: boolean }>(
   POSTLivechatInquiriesReturnAsInquirySuccessResponseSchema,
 );

apps/meteor/tests/end-to-end/api/livechat/05-inquiries.ts (2)

347-355: Avoid brittle assertion on full error message string.

Asserting the exact i18n’d message can be flaky. Prefer checking status (403), success === false, and that error contains 'error-unauthorized'.

- expect(body.error).to.have.equal('User does not have the permissions required for this action [error-unauthorized]');
+ expect(body).to.have.property('success', false);
+ expect(String(body.error)).to.include('error-unauthorized');

---

372-380: Minor: avoid relying on 'GENERAL' channel existence.

In some environments 'GENERAL' may be renamed/absent. Consider creating a temp non‑livechat room for this check.

apps/meteor/app/livechat/imports/server/rest/inquiries.ts (5)

145-147: Use 403 for MAC/plan policy denial.

Returning 400 for MAC limit muddies semantics. Prefer Forbidden (policy) to distinguish from client input errors.

-    if (!(await Omnichannel.isWithinMACLimit(room))) {
-      return API.v1.failure('mac-limit-reached');
-    }
+    if (!(await Omnichannel.isWithinMACLimit(room))) {
+      return API.v1.forbidden();
+    }

---

134-135: Validate departmentId if provided.

If departmentId is present, ensure it exists; otherwise callers get a “successful” 200 with later failures/side-effects.

   const { roomId, departmentId } = this.bodyParams;
 
+  if (departmentId) {
+    const dep = await LivechatDepartment.findOneById(departmentId, { projection: { _id: 1 } });
+    if (!dep) {
+      return API.v1.failure('invalid-department');
+    }
+  }

---

149-152: Return deterministic errors instead of { result: false }.

False conflates “no inquiry”, “already unassigned”, etc. Prefer explicit error for client handling.

-    const result = await returnRoomAsInquiry(room, departmentId);
-
-    return API.v1.success({ result });
+    const result = await returnRoomAsInquiry(room, departmentId);
+    if (!result) {
+      return API.v1.failure('inquiry-not-found-or-already-unassigned');
+    }
+    return API.v1.success({ result: true });

---

120-132: Align declared response schemas with actual error paths.

returnRoomAsInquiry can throw (e.g., error-room-onHold, error-returning-inquiry). Ensure these map to 400/403/401 or declare 5xx in response, or catch and translate.

Would you like a patch that wraps returnRoomAsInquiry with try/catch and maps known Meteor.Error codes to the declared responses?

Also applies to: 149-152

---

155-160: Type augmentation placement: avoid duplicate interface merging.

Placing the Endpoints augmentation here risks multiple merges if this file is imported in different server bundles. Consider centralizing augmentations (e.g., a single rest-typings augmentation module).

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

• Jira integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

apps/meteor/app/livechat/imports/server/rest/inquiries.ts (3)

152-159: Harden Meteor error mapping.

Use error.error || error.reason || error.message to avoid empty messages when reason isn’t set.

-    } catch (error) {
-      if (error instanceof Meteor.Error) {
-        return API.v1.failure(error.reason);
-      }
-
-      return API.v1.failure('error-returning-inquiry');
-    }
+    } catch (error) {
+      if (error instanceof Meteor.Error) {
+        const reason = (error as any).error || (error as any).reason || (error as any).message;
+        return API.v1.failure(reason);
+      }
+      return API.v1.failure('error-returning-inquiry');
+    }

---

153-159: Fix: Missing Meteor import (breaks error handling).

Meteor.Error is referenced but Meteor isn’t imported; this will crash the endpoint on error paths.

+import { Meteor } from 'meteor/meteor';

Also applies to: 1-4

---

141-147: Authorize who can return a room to the queue (assignee or manager only).

Any agent with view-l-room can return another agent’s chat; restrict to current assignee or privileged users.

+import { hasPermissionAsync } from '../../../../authorization/server/functions/hasPermission';
@@
   if (!room.open) {
     return API.v1.failure('room-closed');
   }
 
+  const isAssignee = room.servedBy?._id === this.userId;
+  const canManageQueue = await hasPermissionAsync(this.userId, 'view-livechat-manager');
+  if (!isAssignee && !canManageQueue) {
+    return API.v1.forbidden();
+  }
+
   if (!(await Omnichannel.isWithinMACLimit(room))) {
     return API.v1.failure('mac-limit-reached');
   }

apps/meteor/app/livechat/imports/server/rest/inquiries.ts (1)

134-139: Validate departmentId when provided.

Early-check the department to fail fast with a clear 400, avoiding generic backend errors.

   const { roomId, departmentId } = this.bodyParams;
 
+  if (departmentId) {
+    const dep = await LivechatDepartment.findOneById(departmentId, { projection: { _id: 1 } });
+    if (!dep) {
+      return API.v1.failure('invalid-department');
+    }
+  }
+
   const room = await LivechatRooms.findOneById(roomId);
   if (!room || room.t !== 'l') {
     return API.v1.failure('invalid-room');
   }

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

• Jira integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.