Bumped Emmett to 0.11.0 and adjusted

Author: oskardudycz

package-lock.json

@@ -38,9 +38,9 @@
   },
   "homepage": "https://github.com/oskardudycz/EventSourcing.NodeJS#readme",
   "dependencies": {
-    "@event-driven-io/emmett-esdb": "0.10.0",
-    "@event-driven-io/emmett-expressjs": "0.10.0",
-    "@event-driven-io/emmett-testcontainers": "0.10.0"
+    "@event-driven-io/emmett-esdb": "0.11.0",
+    "@event-driven-io/emmett-expressjs": "0.11.0",
+    "@event-driven-io/emmett-testcontainers": "0.11.0"
   },
   "devDependencies": {
     "@types/node": "20.11.30",

package.json

@@ -220,6 +220,6 @@ describe('guestStayAccount E2E', () => {
     void it(`doesn't checkout`, () =>
       given(...checkedOutAccount)
         .when(checkOut)
-        .then([expectError(403, { detail: `NotOpened` })]));
+        .then([expectError(403, { detail: `NotCheckedIn` })]));
   });
 });

src/guestStayAccounts/api/api.e2e.spec.ts

@@ -2,6 +2,7 @@ import {
   formatDateToUtcYYYYMMDD,
   getInMemoryEventStore,
   type EventStore,
+  type TestEventStream,
 } from '@event-driven-io/emmett';
 import {
   ApiSpecification,
@@ -12,7 +13,6 @@ import {
   getApplication,
   type TestRequest,
 } from '@event-driven-io/emmett-expressjs';
-import type { TestEventStream } from '@event-driven-io/emmett-expressjs/dist/testing/utils';
 import { randomUUID } from 'node:crypto';
 import { beforeEach, describe, it } from 'node:test';
 import {
@@ -426,14 +426,14 @@ void describe('Guest stay account', () => {
       given(checkedOutAccount)
         .when(checkOut)
         .then([
-          expectError(403, { detail: `NotOpened` }),
+          expectError(403, { detail: `NotCheckedIn` }),
           expectNewEvents(guestStayAccountId, [
             {
               type: 'GuestCheckoutFailed',
               data: {
                 guestStayAccountId,
                 groupCheckoutId: undefined,
-                reason: 'NotOpened',
+                reason: 'NotCheckedIn',
                 failedAt: now,
               },
             },

src/guestStayAccounts/api/api.int.spec.ts

@@ -55,7 +55,7 @@ type CheckOutRequest = Request<
   unknown
 >;
 
-type GetShoppingCartRequest = Request<
+type GetGuestStayAccountDetailsRequest = Request<
   Partial<{ guestId: string; roomId: string; checkInDate: string }>,
   unknown,
   unknown
@@ -153,7 +153,7 @@ export const guestStayAccountsApi =
       }),
     );
 
-    // CheckOut Shopping Cart
+    // CheckOut Guest
     router.delete(
       '/guests/:guestId/stays/:roomId/periods/:checkInDate',
       on(async (request: CheckOutRequest) => {
@@ -179,10 +179,10 @@ export const guestStayAccountsApi =
       }),
     );
 
-    // Get Shopping Cart
+    // Get Guest Stay Account Details
     router.get(
       '/guests/:guestId/stays/:roomId/periods/:checkInDate',
-      on(async (request: GetShoppingCartRequest) => {
+      on(async (request: GetGuestStayAccountDetailsRequest) => {
         const guestStayAccountId = parseGuestStayAccountId(request.params);
 
         const result = await getGuestStayDetails(
@@ -192,7 +192,7 @@ export const guestStayAccountsApi =
 
         if (result === null) return NotFound();
 
-        if (result.state.status !== 'Opened') return NotFound();
+        if (result.state.status !== 'CheckedIn') return NotFound();
 
         return OK({
           body: result.state,

src/guestStayAccounts/api/api.ts

@@ -2,12 +2,12 @@ import { IllegalStateError, type Command } from '@event-driven-io/emmett';
 import {
   toGuestStayAccountId,
   type ChargeRecorded,
+  type CheckedIn,
   type GuestCheckedIn,
   type GuestCheckedOut,
   type GuestCheckoutFailed,
   type GuestStayAccount,
   type GuestStayAccountEvent,
-  type Opened,
   type PaymentRecorded,
 } from './guestStayAccount';
 
@@ -74,7 +74,7 @@ export const recordCharge = (
   { data: { guestStayAccountId, chargeId, amount }, metadata }: RecordCharge,
   state: GuestStayAccount,
 ): ChargeRecorded => {
-  assertIsOpened(state);
+  assertIsCheckedIn(state);
 
   return {
     type: 'ChargeRecorded',
@@ -91,7 +91,7 @@ export const recordPayment = (
   { data: { guestStayAccountId, paymentId, amount }, metadata }: RecordPayment,
   state: GuestStayAccount,
 ): PaymentRecorded => {
-  assertIsOpened(state);
+  assertIsCheckedIn(state);
 
   return {
     type: 'PaymentRecorded',
@@ -110,13 +110,13 @@ export const checkOut = (
 ): GuestCheckedOut | GuestCheckoutFailed => {
   const now = metadata?.now ?? new Date();
 
-  if (state.status !== 'Opened')
+  if (state.status !== 'CheckedIn')
     return {
       type: 'GuestCheckoutFailed',
       data: {
         guestStayAccountId,
         groupCheckoutId,
-        reason: 'NotOpened',
+        reason: 'NotCheckedIn',
         failedAt: now,
       },
     };
@@ -165,8 +165,8 @@ export const decide = (
   }
 };
 
-const assertDoesNotExist = (state: GuestStayAccount): state is Opened => {
-  if (state.status === 'Opened')
+const assertDoesNotExist = (state: GuestStayAccount): state is CheckedIn => {
+  if (state.status === 'CheckedIn')
     throw new IllegalStateError(`Guest is already checked-in!`);
 
   if (state.status === 'CheckedOut')
@@ -175,7 +175,7 @@ const assertDoesNotExist = (state: GuestStayAccount): state is Opened => {
   return true;
 };
 
-const assertIsOpened = (state: GuestStayAccount): state is Opened => {
+const assertIsCheckedIn = (state: GuestStayAccount): state is CheckedIn => {
   if (state.status === 'NotExisting')
     throw new IllegalStateError(`Guest account doesn't exist!`);
 

src/guestStayAccounts/businessLogic.ts

@@ -101,7 +101,7 @@ void describe('Guest Stay Account', () => {
             data: {
               guestStayAccountId,
               groupCheckoutId: undefined,
-              reason: 'NotOpened',
+              reason: 'NotCheckedIn',
               failedAt: now,
             },
           },
@@ -491,7 +491,7 @@ void describe('Guest Stay Account', () => {
             data: {
               guestStayAccountId,
               groupCheckoutId: undefined,
-              reason: 'NotOpened',
+              reason: 'NotCheckedIn',
               failedAt: now,
             },
           },

src/guestStayAccounts/businessLogic.unit.spec.ts

@@ -47,7 +47,7 @@ export type GuestCheckoutFailed = Event<
   'GuestCheckoutFailed',
   {
     guestStayAccountId: string;
-    reason: 'NotOpened' | 'BalanceNotSettled';
+    reason: 'NotCheckedIn' | 'BalanceNotSettled';
     failedAt: Date;
     groupCheckoutId?: string;
   }
@@ -66,11 +66,11 @@ export type GuestStayAccountEvent =
 
 export type NotExisting = { status: 'NotExisting' };
 
-export type Opened = { status: 'Opened'; balance: number };
+export type CheckedIn = { status: 'CheckedIn'; balance: number };
 
 export type CheckedOut = { status: 'CheckedOut' };
 
-export type GuestStayAccount = NotExisting | Opened | CheckedOut;
+export type GuestStayAccount = NotExisting | CheckedIn | CheckedOut;
 
 export const initialState = (): GuestStayAccount => ({
   status: 'NotExisting',
@@ -93,27 +93,27 @@ export const evolve = (
   switch (type) {
     case 'GuestCheckedIn': {
       return state.status === 'NotExisting'
-        ? { status: 'Opened', balance: 0 }
+        ? { status: 'CheckedIn', balance: 0 }
         : state;
     }
     case 'ChargeRecorded': {
-      return state.status === 'Opened'
+      return state.status === 'CheckedIn'
         ? {
             ...state,
             balance: state.balance - event.amount,
           }
         : state;
     }
     case 'PaymentRecorded': {
-      return state.status === 'Opened'
+      return state.status === 'CheckedIn'
         ? {
             ...state,
             balance: state.balance + event.amount,
           }
         : state;
     }
     case 'GuestCheckedOut': {
-      return state.status === 'Opened' ? { status: 'CheckedOut' } : state;
+      return state.status === 'CheckedIn' ? { status: 'CheckedOut' } : state;
     }
     case 'GuestCheckoutFailed': {
       return state;

src/guestStayAccounts/guestStayAccount.ts

@@ -3,19 +3,19 @@ import type { GuestStayAccountEvent } from './guestStayAccount';
 
 export type NotExisting = { status: 'NotExisting' };
 
-export type Opened = {
+export type CheckedIn = {
   id: string;
   guestId: string;
   roomId: string;
-  status: 'Opened' | 'CheckedOut';
+  status: 'CheckedIn' | 'CheckedOut';
   balance: number;
   transactionsCount: number;
   transactions: { id: string; amount: number }[];
   checkedInAt: Date;
   checkedOutAt?: Date;
 };
 
-export type GuestStayDetails = NotExisting | Opened;
+export type GuestStayDetails = NotExisting | CheckedIn;
 
 export const initialState = (): GuestStayDetails => ({
   status: 'NotExisting',
@@ -32,7 +32,7 @@ export const evolve = (
             id: event.guestStayAccountId,
             guestId: event.guestId,
             roomId: event.roomId,
-            status: 'Opened',
+            status: 'CheckedIn',
             balance: 0,
             transactionsCount: 0,
             transactions: [],
@@ -41,7 +41,7 @@ export const evolve = (
         : state;
     }
     case 'ChargeRecorded': {
-      return state.status === 'Opened'
+      return state.status === 'CheckedIn'
         ? {
             ...state,
             balance: state.balance - event.amount,
@@ -54,7 +54,7 @@ export const evolve = (
         : state;
     }
     case 'PaymentRecorded': {
-      return state.status === 'Opened'
+      return state.status === 'CheckedIn'
         ? {
             ...state,
             balance: state.balance + event.amount,
@@ -67,7 +67,7 @@ export const evolve = (
         : state;
     }
     case 'GuestCheckedOut': {
-      return state.status === 'Opened'
+      return state.status === 'CheckedIn'
         ? {
             ...state,
             status: 'CheckedOut',

src/guestStayAccounts/guestStayDetails.ts

@@ -13,15 +13,15 @@ const eventStore = getEventStoreDBEventStore(eventStoreDBClient);
 const doesGuestStayExist = (_guestId: string, _roomId: string, _day: Date) =>
   Promise.resolve(true);
 
-const shoppingCarts = guestStayAccountsApi(
+const guestStayAccounts = guestStayAccountsApi(
   eventStore,
   doesGuestStayExist,
   (prefix) => `${prefix}-${randomUUID()}`,
   () => new Date(),
 );
 
 const application: Application = getApplication({
-  apis: [shoppingCarts],
+  apis: [guestStayAccounts],
 });
 
 startAPI(application);