packages/api/src/models/db.ts (1)

44-45: Nit: keep import list sorted for readability.

The new import breaks the existing alpha sort in the medical-model block (DocRefMapping → MAPIAccess → Patient …). Consider moving it to keep the list ordered.

packages/api/src/routes/index.ts (1)

40-43: New dash router means feature only available via dashboard path.

medicalDash supersedes medical only on the /dash-oss prefix, leaving the original /medical/v1 path without TCM encounter endpoints. Is that intentional, or should the base medical router also include them?

packages/api/src/routes/medical/dash.ts (1)

7-9: Potential double-mount if medical later imports the same route.

Right now medical does not include tcmEncounter, so this is fine.
If somebody later adds it there, it will be mounted twice under different prefixes.
Add a comment explaining why it lives separately to prevent future duplication.

packages/api/src/routes/internal/__tests__/tcm-encounter.test.ts (1)

40-43: jest.restoreAllMocks() is redundant here

You aren’t using jest.spyOn anywhere in this suite, only top-level jest.mock.
restoreAllMocks() buys nothing and adds minor cognitive overhead. Consider dropping it and keeping just clearAllMocks().

-    jest.clearAllMocks();
-    jest.restoreAllMocks();
+    jest.clearAllMocks();

packages/api/src/domain/medical/__tests__/tcm-encounter.ts (1)

10-12: Field name class collides with reserved keyword – prefer a safer alias

While valid, using class as a property forces awkward escapes (encounter["class"]) in many linters/TS configs and hurts readability.

If the DB & API contract permits, rename to something like encounterClass / visitClass. Otherwise, wrap it in a /** eslint-disable-line @typescript-eslint/no-unsafe-member-access */ comment wherever accessed to avoid future friction.

packages/api/src/routes/internal/medical/tcm-encounter.ts (1)

20-24: Return a Location header for the newly-created resource

REST best-practice: after 201 Created, include the canonical URL of the new resource.
Easy win for client discoverability and HTTP tooling support.

-  return res.status(httpStatus.CREATED).json(encounter);
+  return res
+    .status(httpStatus.CREATED)
+    .location(`/internal/tcm/encounter/${encounter.id}`)
+    .json(encounter);

packages/api/src/domain/medical/tcm-encounter.ts (1)

5-14: Reconsider class field name and date representation

1. class collides with the TypeScript reserved keyword. Access is allowed but regularly bites consumers doing object-deconstruction ({ class } = x is invalid). Consider encounterClass for clarity.
2. admitTime / dischargeTime are typed as Date, yet project guidelines prescribe dayjs with buildDayjs(). Persisting JS Date objects and dayjs interchangeably quickly becomes messy. Define them as Dayjs or plain string (ISO) and convert at the boundary.

Refactoring here also propagates to the Sequelize model & Zod schemas.

packages/api/src/models/medical/tcm-encounter.ts (1)

32-33: Persist enum as constant – avoid magic strings in multiple places

The literal list "Admitted" | "Transferred" | "Discharged" is hard-coded here and in the domain file. Extract a single TcmEncounterLatestEvent enum/const and reuse to minimise drift.

export const TCM_ENCOUNTER_EVENTS = ["Admitted", "Transferred", "Discharged"] as const;
export type TcmEncounterLatestEvent = typeof TCM_ENCOUNTER_EVENTS[number];
…
latestEvent: { type: DataTypes.ENUM(...TCM_ENCOUNTER_EVENTS) }

packages/api/src/command/medical/tcm-encounter/list-tcm-encounters.ts (1)

21-33: after filter overrides default but keeps stale value in memory object

You mutate where.admitTime by spreading the existing object and then adding a new [Op.gt]. Since the key is identical, the first entry is silently overwritten – ok, but unnecessary.

-    where.admitTime = {
-      ...(where.admitTime as Record<string, unknown>),
-      [Op.gt]: new Date(after),
-    };
+    where.admitTime = { [Op.gt]: new Date(after) };

Also, convert with buildDayjs(after).toDate() to respect the project’s date-handling rule set.

packages/api/src/command/medical/tcm-encounter/update-tcm-encounter.ts (1)

38-44: Use optimistic-locking (eTag) and update timestamp

After update(), updatedEncounter is fetched again but the code does not bump updatedAt nor rotate eTag, defeating cache invalidation / concurrency control. Consider using a model hook or include:

await encounter.update({ ...data, updatedAt: buildDayjs(), eTag: uuidv4() });

packages/api/src/routes/medical/__tests__/tcm-encounter.test.ts (1)

80-104: Hard-coded Symbol.for("gt") risks false positives

expectedQuery.where.admitTime uses Symbol.for("gt") directly.
If the implementation later switches to Sequelize.Op.gt (a different symbol instance in some dialects/tests) the expectation will silently pass even though the call shape changed.

Prefer asserting on business semantics instead of raw symbols, e.g.:

expect(TcmEncounterModel.findAndCountAll).toHaveBeenCalledWith(
  expect.objectContaining({
    where: expect.objectContaining({
      admitTime: expect.any(Object),
    }),
  }),
);

Or inject Op from Sequelize into the test.

packages/api/src/routes/medical/schemas/tcm-encounter.ts (2)

47-55: Duplicate cxId definition in response schema

cxId is already present in tcmEncounterCreateSchema; redefining it in .extend() is redundant and may cause maintenance churn if the type ever changes.

-export const tcmEncounterResponseSchema = tcmEncounterCreateSchema
-  .extend({
-    id: z.string().uuid(),
-    cxId: z.string().uuid(),   // duplicate
+export const tcmEncounterResponseSchema = tcmEncounterCreateSchema
+  .extend({
+    id: z.string().uuid(),

---

11-20: Consider delaying ISO-string → Date conversion

Transforming strings to Date at the API boundary mixes transport-layer and runtime representations.
Downstream layers that need the raw ISO string (e.g., logging, caching) must re-serialize.
You can keep the schema as z.string().datetime() and perform conversion deeper in the domain/DB layer where a Date is truly required.

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

Learnt from: leite08
PR: metriport/metriport#3814
File: packages/api/src/routes/internal/medical/patient-consolidated.ts:141-174
Timestamp: 2025-05-20T21:26:26.804Z
Learning: The functionality introduced in packages/api/src/routes/internal/medical/patient-consolidated.ts is planned to be refactored in downstream PR #3857, including improvements to error handling and validation.

packages/api/src/command/medical/tcm-encounter/list-tcm-encounters.ts (3)

7-7: Address the context for the fixed date as previously requested.

This fixed date still lacks explanation. Please provide context for why encounters are filtered from 2020-01-01 onwards.

---

11-11: Improve type safety for the after parameter.

The after parameter should be typed as Date instead of string for better type safety, as previously suggested.

export type ListTcmEncountersCmd = {
  cxId: string;
-  after?: string;
+  after?: Date;
  pagination: Pagination;
};

---

27-39: Simplify the where clause logic and use buildDayjs().

The current where clause logic is unnecessarily complex. Please implement the simpler approach suggested in previous reviews and use buildDayjs() for consistent timezone handling.

+import { buildDayjs } from "../../../shared/date";

-const DEFAULT_FILTER_DATE = new Date("2020-01-01T00:00:00.000Z");
+const DEFAULT_FILTER_DATE = buildDayjs("2020-01-01T00:00:00.000Z").toDate();

-  const where: Record<string, unknown> = {
-    cxId,
-    admitTime: {
-      [Op.gt]: DEFAULT_FILTER_DATE,
-    },
-  };
-
-  if (after) {
-    where.admitTime = {
-      ...(where.admitTime as Record<string, unknown>),
-      [Op.gt]: new Date(after),
-    };
-  }
+  const admitTimeFilter = after ?? DEFAULT_FILTER_DATE;
+  const where: WhereOptions<TcmEncounterModel> = {
+    cxId,
+    admitTime: {
+      [Op.gt]: admitTimeFilter,
+    },
+  };

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro