From 01eb685b94298483ce9453ee098ee1433c1f68a3 Mon Sep 17 00:00:00 2001 From: Oskar Dudycz Date: Wed, 3 Jan 2024 13:20:34 +0100 Subject: [PATCH 1/3] Bumped Node version in CI, Updated ESDB version --- .github/workflows/samples_decider.yml | 6 +++--- .github/workflows/samples_eventsVersioning.yml | 6 +++--- .github/workflows/samples_foundations.yml | 6 +++--- .github/workflows/samples_from_crud_to_event_sourcing.yml | 6 +++--- .github/workflows/samples_hotelManagement.yml | 6 +++--- .github/workflows/samples_optimisticConcurrency.yml | 6 +++--- .github/workflows/samples_simple.yml | 8 ++++---- .github/workflows/samples_snapshots.yml | 6 +++--- .github/workflows/samples_unpeelingOnion.yml | 6 +++--- .github/workflows/samples_webinar.yml | 6 +++--- .../workshops_introduction_to_event_sourcing.yml | 6 +++--- samples/decider/docker-compose.yml | 2 +- samples/eventsVersioning/docker-compose.yml | 4 ++-- samples/hotelManagement/docker-compose.yml | 4 ++-- .../introduction_to_event_sourcing/.vscode/settings.json | 3 +-- .../introduction_to_event_sourcing/docker-compose.yml | 4 ++-- 16 files changed, 42 insertions(+), 43 deletions(-) diff --git a/.github/workflows/samples_decider.yml b/.github/workflows/samples_decider.yml index d23bd1f1..e30b0b1e 100644 --- a/.github/workflows/samples_decider.yml +++ b/.github/workflows/samples_decider.yml @@ -28,12 +28,12 @@ jobs: # selected operation systems to run CI os: [ubuntu-latest] #, windows-latest, macos-latest] # selected node version to run CI - node-version: [18.x] + node-version: [20.10.x] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: # use the node version defined in matrix above node-version: ${{ matrix.node-version }} diff --git a/.github/workflows/samples_eventsVersioning.yml b/.github/workflows/samples_eventsVersioning.yml index 01e630f3..4f4cf94f 100644 --- a/.github/workflows/samples_eventsVersioning.yml +++ b/.github/workflows/samples_eventsVersioning.yml @@ -28,12 +28,12 @@ jobs: # selected operation systems to run CI os: [ubuntu-latest] #, windows-latest, macos-latest] # selected node version to run CI - node-version: [18.x] + node-version: [20.10.x] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: # use the node version defined in matrix above node-version: ${{ matrix.node-version }} diff --git a/.github/workflows/samples_foundations.yml b/.github/workflows/samples_foundations.yml index 2d149567..59fc78dd 100644 --- a/.github/workflows/samples_foundations.yml +++ b/.github/workflows/samples_foundations.yml @@ -28,12 +28,12 @@ jobs: # selected operation systems to run CI os: [ubuntu-latest] # selected node version to run CI - node-version: [16.x, 18.x] + node-version: [20.10.x] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: # use the node version defined in matrix above node-version: ${{ matrix.node-version }} diff --git a/.github/workflows/samples_from_crud_to_event_sourcing.yml b/.github/workflows/samples_from_crud_to_event_sourcing.yml index 99156b42..e9137fed 100644 --- a/.github/workflows/samples_from_crud_to_event_sourcing.yml +++ b/.github/workflows/samples_from_crud_to_event_sourcing.yml @@ -28,12 +28,12 @@ jobs: # selected operation systems to run CI os: [ubuntu-latest] # selected node version to run CI - node-version: [16.x, 18.x] + node-version: [20.10.x] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: # use the node version defined in matrix above node-version: ${{ matrix.node-version }} diff --git a/.github/workflows/samples_hotelManagement.yml b/.github/workflows/samples_hotelManagement.yml index 3be1b7c3..452c29cd 100644 --- a/.github/workflows/samples_hotelManagement.yml +++ b/.github/workflows/samples_hotelManagement.yml @@ -28,12 +28,12 @@ jobs: # selected operation systems to run CI os: [ubuntu-latest] #, windows-latest, macos-latest] # selected node version to run CI - node-version: [18.x] + node-version: [20.10.x] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: # use the node version defined in matrix above node-version: ${{ matrix.node-version }} diff --git a/.github/workflows/samples_optimisticConcurrency.yml b/.github/workflows/samples_optimisticConcurrency.yml index cf8d4c04..6e338cae 100644 --- a/.github/workflows/samples_optimisticConcurrency.yml +++ b/.github/workflows/samples_optimisticConcurrency.yml @@ -28,12 +28,12 @@ jobs: # selected operation systems to run CI os: [ubuntu-latest] #, windows-latest, macos-latest] # selected node version to run CI - node-version: [16.x, 18.x] + node-version: [20.10.x] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: # use the node version defined in matrix above node-version: ${{ matrix.node-version }} diff --git a/.github/workflows/samples_simple.yml b/.github/workflows/samples_simple.yml index 5322ad72..737d03d8 100644 --- a/.github/workflows/samples_simple.yml +++ b/.github/workflows/samples_simple.yml @@ -28,12 +28,12 @@ jobs: # selected operation systems to run CI os: [ubuntu-latest] # selected node version to run CI - node-version: [16.x, 18.x] + node-version: [20.10.x] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: # use the node version defined in matrix above node-version: ${{ matrix.node-version }} @@ -53,7 +53,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # setup Docker buld action - name: Set up Docker Buildx diff --git a/.github/workflows/samples_snapshots.yml b/.github/workflows/samples_snapshots.yml index 13238b56..a8f92df2 100644 --- a/.github/workflows/samples_snapshots.yml +++ b/.github/workflows/samples_snapshots.yml @@ -28,12 +28,12 @@ jobs: # selected operation systems to run CI os: [ubuntu-latest] #, windows-latest, macos-latest] # selected node version to run CI - node-version: [16.x, 18.x] + node-version: [20.10.x] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: # use the node version defined in matrix above node-version: ${{ matrix.node-version }} diff --git a/.github/workflows/samples_unpeelingOnion.yml b/.github/workflows/samples_unpeelingOnion.yml index 1eca5dc8..0ab8f57e 100644 --- a/.github/workflows/samples_unpeelingOnion.yml +++ b/.github/workflows/samples_unpeelingOnion.yml @@ -28,12 +28,12 @@ jobs: # selected operation systems to run CI os: [ubuntu-latest] #, windows-latest, macos-latest] # selected node version to run CI - node-version: [16.x, 18.x] + node-version: [20.10.x] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: # use the node version defined in matrix above node-version: ${{ matrix.node-version }} diff --git a/.github/workflows/samples_webinar.yml b/.github/workflows/samples_webinar.yml index a91b3dd7..94207122 100644 --- a/.github/workflows/samples_webinar.yml +++ b/.github/workflows/samples_webinar.yml @@ -28,12 +28,12 @@ jobs: # selected operation systems to run CI os: [ubuntu-latest] #, windows-latest, macos-latest] # selected node version to run CI - node-version: [16.x, 18.x] + node-version: [20.10.x] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: # use the node version defined in matrix above node-version: ${{ matrix.node-version }} diff --git a/.github/workflows/workshops_introduction_to_event_sourcing.yml b/.github/workflows/workshops_introduction_to_event_sourcing.yml index b82d07b7..aa167fc8 100644 --- a/.github/workflows/workshops_introduction_to_event_sourcing.yml +++ b/.github/workflows/workshops_introduction_to_event_sourcing.yml @@ -28,17 +28,17 @@ jobs: # selected operation systems to run CI os: [ubuntu-latest] #, windows-latest, macos-latest] # selected node version to run CI - node-version: [18.x] + node-version: [20.10.x] steps: - name: Check Out Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Start containers run: docker-compose -f "docker-compose.yml" up -d - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: # use the node version defined in matrix above node-version: ${{ matrix.node-version }} diff --git a/samples/decider/docker-compose.yml b/samples/decider/docker-compose.yml index f1dbc470..af465c4d 100644 --- a/samples/decider/docker-compose.yml +++ b/samples/decider/docker-compose.yml @@ -7,7 +7,7 @@ services: eventstoredb: image: eventstore/eventstore:22.10.0-buster-slim # use this image if you're running ARM-based proc like Apple M1 - # image: eventstore/eventstore:22.10.0-alpha-arm64v8 + # image: eventstore/eventstore:23.10.0-alpha-arm64v8 environment: - EVENTSTORE_CLUSTER_SIZE=1 - EVENTSTORE_RUN_PROJECTIONS=All diff --git a/samples/eventsVersioning/docker-compose.yml b/samples/eventsVersioning/docker-compose.yml index 4aaf43f2..4ea0c057 100644 --- a/samples/eventsVersioning/docker-compose.yml +++ b/samples/eventsVersioning/docker-compose.yml @@ -5,9 +5,9 @@ services: # EventStoreDB ####################################################### eventstoredb: - image: eventstore/eventstore:22.10.1-buster-slim + image: eventstore/eventstore:23.10.0-bookworm-slim # use this image if you're running ARM-based proc like Apple M1 - # image: eventstore/eventstore:22.10.0-alpha-arm64v8 + # image: eventstore/eventstore:23.10.0-alpha-arm64v8 environment: - EVENTSTORE_CLUSTER_SIZE=1 - EVENTSTORE_RUN_PROJECTIONS=All diff --git a/samples/hotelManagement/docker-compose.yml b/samples/hotelManagement/docker-compose.yml index 4aaf43f2..4ea0c057 100644 --- a/samples/hotelManagement/docker-compose.yml +++ b/samples/hotelManagement/docker-compose.yml @@ -5,9 +5,9 @@ services: # EventStoreDB ####################################################### eventstoredb: - image: eventstore/eventstore:22.10.1-buster-slim + image: eventstore/eventstore:23.10.0-bookworm-slim # use this image if you're running ARM-based proc like Apple M1 - # image: eventstore/eventstore:22.10.0-alpha-arm64v8 + # image: eventstore/eventstore:23.10.0-alpha-arm64v8 environment: - EVENTSTORE_CLUSTER_SIZE=1 - EVENTSTORE_RUN_PROJECTIONS=All diff --git a/workshops/introduction_to_event_sourcing/.vscode/settings.json b/workshops/introduction_to_event_sourcing/.vscode/settings.json index 4f63e4fc..8f94129f 100644 --- a/workshops/introduction_to_event_sourcing/.vscode/settings.json +++ b/workshops/introduction_to_event_sourcing/.vscode/settings.json @@ -4,8 +4,7 @@ "editor.formatOnSave": true, "editor.codeActionsOnSave": { - // For ESLint - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit" }, "editor.tabSize": 2, diff --git a/workshops/introduction_to_event_sourcing/docker-compose.yml b/workshops/introduction_to_event_sourcing/docker-compose.yml index 4aaf43f2..4ea0c057 100644 --- a/workshops/introduction_to_event_sourcing/docker-compose.yml +++ b/workshops/introduction_to_event_sourcing/docker-compose.yml @@ -5,9 +5,9 @@ services: # EventStoreDB ####################################################### eventstoredb: - image: eventstore/eventstore:22.10.1-buster-slim + image: eventstore/eventstore:23.10.0-bookworm-slim # use this image if you're running ARM-based proc like Apple M1 - # image: eventstore/eventstore:22.10.0-alpha-arm64v8 + # image: eventstore/eventstore:23.10.0-alpha-arm64v8 environment: - EVENTSTORE_CLUSTER_SIZE=1 - EVENTSTORE_RUN_PROJECTIONS=All From aa83f37ede0be632dbb82b297c0323982c1297c2 Mon Sep 17 00:00:00 2001 From: Oskar Dudycz Date: Wed, 3 Jan 2024 13:43:50 +0100 Subject: [PATCH 2/3] Added .nvmrc files --- samples/closingTheBooks/.nvmrc | 1 + samples/closingTheBooks/package.json | 1 + samples/decider/.nvmrc | 1 + samples/decider/package.json | 1 + samples/eventsVersioning/.nvmrc | 1 + samples/eventsVersioning/package.json | 1 + samples/foundations/.nvmrc | 1 + samples/foundations/package.json | 1 + samples/from_crud_to_eventsourcing/.nvmrc | 1 + samples/from_crud_to_eventsourcing/package.json | 1 + samples/hotelManagement/.nvmrc | 1 + samples/hotelManagement/package.json | 1 + samples/optimisticConcurrency/.nvmrc | 1 + samples/optimisticConcurrency/package.json | 1 + samples/simple/.nvmrc | 1 + samples/simple/package.json | 1 + samples/snapshots/.nvmrc | 1 + samples/snapshots/package.json | 1 + samples/unpeelingOnion/.nvmrc | 1 + samples/webinar/.nvmrc | 1 + samples/webinar/package.json | 1 + workshops/introduction_to_event_sourcing/.nvmrc | 1 + workshops/introduction_to_event_sourcing/package.json | 1 + 23 files changed, 23 insertions(+) create mode 100644 samples/closingTheBooks/.nvmrc create mode 100644 samples/decider/.nvmrc create mode 100644 samples/eventsVersioning/.nvmrc create mode 100644 samples/foundations/.nvmrc create mode 100644 samples/from_crud_to_eventsourcing/.nvmrc create mode 100644 samples/hotelManagement/.nvmrc create mode 100644 samples/optimisticConcurrency/.nvmrc create mode 100644 samples/simple/.nvmrc create mode 100644 samples/snapshots/.nvmrc create mode 100644 samples/unpeelingOnion/.nvmrc create mode 100644 samples/webinar/.nvmrc create mode 100644 workshops/introduction_to_event_sourcing/.nvmrc diff --git a/samples/closingTheBooks/.nvmrc b/samples/closingTheBooks/.nvmrc new file mode 100644 index 00000000..790e1105 --- /dev/null +++ b/samples/closingTheBooks/.nvmrc @@ -0,0 +1 @@ +v20.10.0 diff --git a/samples/closingTheBooks/package.json b/samples/closingTheBooks/package.json index ee1572cb..ff710efb 100644 --- a/samples/closingTheBooks/package.json +++ b/samples/closingTheBooks/package.json @@ -3,6 +3,7 @@ "version": "6.0.0", "description": "Samples of Event Sourcing in JavaScript and TypeScript", "scripts": { + "setup": "cat .nvmrc | nvm install; nvm use", "build": "npm run build:ts", "build:ts": "tsc", "build:ts:watch": "tsc --watch", diff --git a/samples/decider/.nvmrc b/samples/decider/.nvmrc new file mode 100644 index 00000000..790e1105 --- /dev/null +++ b/samples/decider/.nvmrc @@ -0,0 +1 @@ +v20.10.0 diff --git a/samples/decider/package.json b/samples/decider/package.json index 72761ee1..690dc1f7 100644 --- a/samples/decider/package.json +++ b/samples/decider/package.json @@ -3,6 +3,7 @@ "version": "1.0.0", "description": "Samples of Event Sourcing in JavaScript and TypeScript", "scripts": { + "setup": "cat .nvmrc | nvm install; nvm use", "build": "run-s lint build:ts", "build:ts": "tsc", "build:ts:watch": "tsc --watch", diff --git a/samples/eventsVersioning/.nvmrc b/samples/eventsVersioning/.nvmrc new file mode 100644 index 00000000..790e1105 --- /dev/null +++ b/samples/eventsVersioning/.nvmrc @@ -0,0 +1 @@ +v20.10.0 diff --git a/samples/eventsVersioning/package.json b/samples/eventsVersioning/package.json index e9e7b695..f16bd31e 100644 --- a/samples/eventsVersioning/package.json +++ b/samples/eventsVersioning/package.json @@ -3,6 +3,7 @@ "version": "1.0.0", "description": "Samples of Event Sourcing in JavaScript and TypeScript", "scripts": { + "setup": "cat .nvmrc | nvm install; nvm use", "build": "run-s lint build:ts", "build:ts": "tsc", "build:ts:watch": "tsc --watch", diff --git a/samples/foundations/.nvmrc b/samples/foundations/.nvmrc new file mode 100644 index 00000000..790e1105 --- /dev/null +++ b/samples/foundations/.nvmrc @@ -0,0 +1 @@ +v20.10.0 diff --git a/samples/foundations/package.json b/samples/foundations/package.json index f880902e..f031ac45 100644 --- a/samples/foundations/package.json +++ b/samples/foundations/package.json @@ -4,6 +4,7 @@ "description": "Samples of Event Sourcing in JavaScript and TypeScript", "main": "index.js", "scripts": { + "setup": "cat .nvmrc | nvm install; nvm use", "build:ts": "tsc", "dev:start": "nodemon src/index.ts", "test": "npm run test:unit", diff --git a/samples/from_crud_to_eventsourcing/.nvmrc b/samples/from_crud_to_eventsourcing/.nvmrc new file mode 100644 index 00000000..790e1105 --- /dev/null +++ b/samples/from_crud_to_eventsourcing/.nvmrc @@ -0,0 +1 @@ +v20.10.0 diff --git a/samples/from_crud_to_eventsourcing/package.json b/samples/from_crud_to_eventsourcing/package.json index a889d451..c383e53e 100644 --- a/samples/from_crud_to_eventsourcing/package.json +++ b/samples/from_crud_to_eventsourcing/package.json @@ -3,6 +3,7 @@ "version": "1.0.0", "description": "Samples of migrating from CRUD to Event Sourcing", "scripts": { + "setup": "cat .nvmrc | nvm install; nvm use", "build": "run-s lint build:ts", "build:ts": "tsc", "build:ts:watch": "tsc --watch", diff --git a/samples/hotelManagement/.nvmrc b/samples/hotelManagement/.nvmrc new file mode 100644 index 00000000..790e1105 --- /dev/null +++ b/samples/hotelManagement/.nvmrc @@ -0,0 +1 @@ +v20.10.0 diff --git a/samples/hotelManagement/package.json b/samples/hotelManagement/package.json index e9e7b695..f16bd31e 100644 --- a/samples/hotelManagement/package.json +++ b/samples/hotelManagement/package.json @@ -3,6 +3,7 @@ "version": "1.0.0", "description": "Samples of Event Sourcing in JavaScript and TypeScript", "scripts": { + "setup": "cat .nvmrc | nvm install; nvm use", "build": "run-s lint build:ts", "build:ts": "tsc", "build:ts:watch": "tsc --watch", diff --git a/samples/optimisticConcurrency/.nvmrc b/samples/optimisticConcurrency/.nvmrc new file mode 100644 index 00000000..790e1105 --- /dev/null +++ b/samples/optimisticConcurrency/.nvmrc @@ -0,0 +1 @@ +v20.10.0 diff --git a/samples/optimisticConcurrency/package.json b/samples/optimisticConcurrency/package.json index 8e6c9e66..e3b94810 100644 --- a/samples/optimisticConcurrency/package.json +++ b/samples/optimisticConcurrency/package.json @@ -3,6 +3,7 @@ "version": "6.0.0", "description": "Samples of Event Sourcing in JavaScript and TypeScript", "scripts": { + "setup": "cat .nvmrc | nvm install; nvm use", "build": "run-s lint build:ts", "build:ts": "tsc", "build:ts:watch": "tsc --watch", diff --git a/samples/simple/.nvmrc b/samples/simple/.nvmrc new file mode 100644 index 00000000..790e1105 --- /dev/null +++ b/samples/simple/.nvmrc @@ -0,0 +1 @@ +v20.10.0 diff --git a/samples/simple/package.json b/samples/simple/package.json index e1a4bd97..91f4261a 100644 --- a/samples/simple/package.json +++ b/samples/simple/package.json @@ -4,6 +4,7 @@ "description": "Samples of Event Sourcing in JavaScript and TypeScript", "main": "index.js", "scripts": { + "setup": "cat .nvmrc | nvm install; nvm use", "build:ts": "tsc", "dev:start": "nodemon src/index.ts", "test": "npm run test:unit && npm run test:api", diff --git a/samples/snapshots/.nvmrc b/samples/snapshots/.nvmrc new file mode 100644 index 00000000..790e1105 --- /dev/null +++ b/samples/snapshots/.nvmrc @@ -0,0 +1 @@ +v20.10.0 diff --git a/samples/snapshots/package.json b/samples/snapshots/package.json index 127013b0..68c1a5fe 100644 --- a/samples/snapshots/package.json +++ b/samples/snapshots/package.json @@ -4,6 +4,7 @@ "description": "Samples of Event Sourcing in JavaScript and TypeScript", "main": "index.js", "scripts": { + "setup": "cat .nvmrc | nvm install; nvm use", "build": "npm run build:ts", "build:ts": "tsc", "build:ts:watch": "tsc --watch", diff --git a/samples/unpeelingOnion/.nvmrc b/samples/unpeelingOnion/.nvmrc new file mode 100644 index 00000000..790e1105 --- /dev/null +++ b/samples/unpeelingOnion/.nvmrc @@ -0,0 +1 @@ +v20.10.0 diff --git a/samples/webinar/.nvmrc b/samples/webinar/.nvmrc new file mode 100644 index 00000000..790e1105 --- /dev/null +++ b/samples/webinar/.nvmrc @@ -0,0 +1 @@ +v20.10.0 diff --git a/samples/webinar/package.json b/samples/webinar/package.json index 2d71399c..f274f34f 100644 --- a/samples/webinar/package.json +++ b/samples/webinar/package.json @@ -3,6 +3,7 @@ "version": "6.0.0", "description": "Samples of Event Sourcing in JavaScript and TypeScript", "scripts": { + "setup": "cat .nvmrc | nvm install; nvm use", "build": "run-s lint build:ts", "build:ts": "tsc", "build:ts:watch": "tsc --watch", diff --git a/workshops/introduction_to_event_sourcing/.nvmrc b/workshops/introduction_to_event_sourcing/.nvmrc new file mode 100644 index 00000000..790e1105 --- /dev/null +++ b/workshops/introduction_to_event_sourcing/.nvmrc @@ -0,0 +1 @@ +v20.10.0 diff --git a/workshops/introduction_to_event_sourcing/package.json b/workshops/introduction_to_event_sourcing/package.json index d039a069..d2a7ef78 100644 --- a/workshops/introduction_to_event_sourcing/package.json +++ b/workshops/introduction_to_event_sourcing/package.json @@ -3,6 +3,7 @@ "version": "1.0.0", "description": "Samples of Event Sourcing in JavaScript and TypeScript", "scripts": { + "setup": "cat .nvmrc | nvm install; nvm use", "build": "run-s lint build:ts", "build:ts": "tsc", "build:ts:watch": "tsc --watch", From 5f945dabf2f7417f92fcecfe3b00d2438ab10146 Mon Sep 17 00:00:00 2001 From: Oskar Dudycz Date: Wed, 3 Jan 2024 14:11:00 +0100 Subject: [PATCH 3/3] Changed absolute paths to relative paths in Unpeeling Onion sample to resolve test failure issues --- samples/unpeelingOnion/.vscode/settings.json | 3 +-- .../addProductToShoppingCartHandler.ts | 2 +- .../commandHandlers/confirmShoppingCart.ts | 2 +- .../commandHandlers/openShoppingCartHandler.ts | 4 ++-- .../removeProductFromShoppingCartHandler.ts | 2 +- .../addProductItemToShoppingCart.ts | 2 +- .../removeProductItemFromShoppingCart.ts | 2 +- .../application/shoppingCarts/index.ts | 8 ++++---- .../mappers/customerShoppingHistoryMapper.ts | 2 +- .../mappers/shoppingCartMapper.ts | 2 +- .../getCustomerShoppingHistoryHandler.ts | 4 ++-- .../getShoppingCartByIdQueryHandler.ts | 6 +++--- .../controllers/shoppingCartController.ts | 18 +++++++++--------- .../events/productItemAddedToShoppingCart.ts | 2 +- .../productItemRemovedFromShoppingCart.ts | 2 +- .../ecommerce/domain/shoppingCarts/index.ts | 2 +- .../shoppingCarts/shoppingCartRepository.ts | 2 +- .../models/shoppingCarts/shoppingCart.ts | 2 +- .../src/onion/tests/e2e/fullFlow.e2e.test.ts | 4 ++-- .../unpeeled/tests/e2e/fullFlow.e2e.test.ts | 4 ++-- 20 files changed, 37 insertions(+), 38 deletions(-) diff --git a/samples/unpeelingOnion/.vscode/settings.json b/samples/unpeelingOnion/.vscode/settings.json index a1bd0b66..839b238b 100644 --- a/samples/unpeelingOnion/.vscode/settings.json +++ b/samples/unpeelingOnion/.vscode/settings.json @@ -4,8 +4,7 @@ "editor.formatOnSave": true, "editor.codeActionsOnSave": { - // For ESLint - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit" }, "editor.tabSize": 2, diff --git a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commandHandlers/addProductToShoppingCartHandler.ts b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commandHandlers/addProductToShoppingCartHandler.ts index b999c214..56d1efd0 100644 --- a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commandHandlers/addProductToShoppingCartHandler.ts +++ b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commandHandlers/addProductToShoppingCartHandler.ts @@ -1,6 +1,6 @@ import { CommandHandler } from '#core/commands'; import { EventBus } from '#core/events'; -import { ShoppingCartRepository } from 'src/onion/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository'; +import { ShoppingCartRepository } from '../../../infrastructure/shoppingCarts/shoppingCartRepository'; import { AddProductItemToShoppingCart } from '../commands/shoppingCarts/addProductItemToShoppingCart'; import { ShoppingCartMapper } from '../mappers/shoppingCartMapper'; diff --git a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commandHandlers/confirmShoppingCart.ts b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commandHandlers/confirmShoppingCart.ts index a5026651..8f910963 100644 --- a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commandHandlers/confirmShoppingCart.ts +++ b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commandHandlers/confirmShoppingCart.ts @@ -1,6 +1,6 @@ import { CommandHandler } from '#core/commands'; import { EventBus } from '#core/events'; -import { ShoppingCartRepository } from 'src/onion/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository'; +import { ShoppingCartRepository } from '../../../infrastructure/shoppingCarts/shoppingCartRepository'; import { ConfirmShoppingCart } from '../commands/shoppingCarts/confirmShoppingCart'; import { ShoppingCartMapper } from '../mappers/shoppingCartMapper'; diff --git a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commandHandlers/openShoppingCartHandler.ts b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commandHandlers/openShoppingCartHandler.ts index 9d05ae06..e3a7954b 100644 --- a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commandHandlers/openShoppingCartHandler.ts +++ b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commandHandlers/openShoppingCartHandler.ts @@ -1,7 +1,7 @@ import { CommandHandler } from '#core/commands'; import { OpenShoppingCart } from '../commands/shoppingCarts/openShoppingCart'; -import { ShoppingCart } from 'src/onion/ecommerce/domain/shoppingCarts'; -import { ShoppingCartRepository } from 'src/onion/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository'; +import { ShoppingCart } from '../../../domain/shoppingCarts'; +import { ShoppingCartRepository } from '../../../infrastructure/shoppingCarts/shoppingCartRepository'; import { ShoppingCartMapper } from '../mappers/shoppingCartMapper'; import { EventBus } from '#core/events'; diff --git a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commandHandlers/removeProductFromShoppingCartHandler.ts b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commandHandlers/removeProductFromShoppingCartHandler.ts index 254f4684..9bad2ca4 100644 --- a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commandHandlers/removeProductFromShoppingCartHandler.ts +++ b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commandHandlers/removeProductFromShoppingCartHandler.ts @@ -1,6 +1,6 @@ import { CommandHandler } from '#core/commands'; import { EventBus } from '#core/events'; -import { ShoppingCartRepository } from 'src/onion/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository'; +import { ShoppingCartRepository } from '../../../infrastructure/shoppingCarts/shoppingCartRepository'; import { RemoveProductItemFromShoppingCart } from '../commands/shoppingCarts/removeProductItemFromShoppingCart'; import { ShoppingCartMapper } from '../mappers/shoppingCartMapper'; diff --git a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commands/shoppingCarts/addProductItemToShoppingCart.ts b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commands/shoppingCarts/addProductItemToShoppingCart.ts index 7c4e9b41..6c7b8345 100644 --- a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commands/shoppingCarts/addProductItemToShoppingCart.ts +++ b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commands/shoppingCarts/addProductItemToShoppingCart.ts @@ -1,5 +1,5 @@ import { Command } from '#core/commands'; -import { ProductItem } from 'src/onion/ecommerce/common/shoppingCarts/productItem'; +import { ProductItem } from '../../../../common/shoppingCarts/productItem'; export class AddProductItemToShoppingCart extends Command { constructor( diff --git a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commands/shoppingCarts/removeProductItemFromShoppingCart.ts b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commands/shoppingCarts/removeProductItemFromShoppingCart.ts index 8322b085..1eb7b465 100644 --- a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commands/shoppingCarts/removeProductItemFromShoppingCart.ts +++ b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/commands/shoppingCarts/removeProductItemFromShoppingCart.ts @@ -1,5 +1,5 @@ import { Command } from '#core/commands'; -import { ProductItem } from 'src/onion/ecommerce/common/shoppingCarts/productItem'; +import { ProductItem } from '../../../../common/shoppingCarts/productItem'; export class RemoveProductItemFromShoppingCart extends Command { constructor( diff --git a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/index.ts b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/index.ts index 0a76dc3e..232a2a4e 100644 --- a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/index.ts +++ b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/index.ts @@ -1,16 +1,16 @@ import { MongoClient } from 'mongodb'; import { registerCommandHandler } from '#core/commands'; import { registerQueryHandler } from '#core/queries'; -import { OpenShoppingCart } from 'src/onion/ecommerce/application/shoppingCarts/commands/shoppingCarts/openShoppingCart'; -import { GetShoppingCartById } from 'src/onion/ecommerce/application/shoppingCarts/queries/getShoppingCartById'; -import { AddProductItemToShoppingCart } from 'src/onion/ecommerce/application/shoppingCarts/commands/shoppingCarts/addProductItemToShoppingCart'; +import { OpenShoppingCart } from '../shoppingCarts/commands/shoppingCarts/openShoppingCart'; +import { GetShoppingCartById } from '../shoppingCarts/queries/getShoppingCartById'; +import { AddProductItemToShoppingCart } from '../shoppingCarts/commands/shoppingCarts/addProductItemToShoppingCart'; import { RemoveProductItemFromShoppingCart } from './commands/shoppingCarts/removeProductItemFromShoppingCart'; import { ShoppingCartMapper } from './mappers/shoppingCartMapper'; import { OpenShoppingCartHandler } from './commandHandlers/openShoppingCartHandler'; import { AddProductItemToShoppingCartHandler } from './commandHandlers/addProductToShoppingCartHandler'; import { RemoveProductItemFromShoppingCartHandler } from './commandHandlers/removeProductFromShoppingCartHandler'; import { GetShoppingCartByIdHandler } from './queryHandlers/getShoppingCartByIdQueryHandler'; -import { MongoDBShoppingCartRepository } from 'src/onion/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository'; +import { MongoDBShoppingCartRepository } from '../../infrastructure/shoppingCarts/shoppingCartRepository'; import { ConfirmShoppingCart } from './commands/shoppingCarts/confirmShoppingCart'; import { ConfirmShoppingCartHandler } from './commandHandlers/confirmShoppingCart'; import { GetCustomerShoppingHistory } from './queries/getCustomerShoppingHistory'; diff --git a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/mappers/customerShoppingHistoryMapper.ts b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/mappers/customerShoppingHistoryMapper.ts index e692da30..fa2eb8a5 100644 --- a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/mappers/customerShoppingHistoryMapper.ts +++ b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/mappers/customerShoppingHistoryMapper.ts @@ -1,5 +1,5 @@ import { Mapper } from '#core/mapping'; -import { ShoppingCartModel } from 'src/onion/ecommerce/models/shoppingCarts/shoppingCart'; +import { ShoppingCartModel } from '../../../models/shoppingCarts/shoppingCart'; import { CustomerShoppingHistoryItem } from '../queries/customerShoppingHistoryItem'; export class CustomerShoppingHistoryMapper diff --git a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/mappers/shoppingCartMapper.ts b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/mappers/shoppingCartMapper.ts index 873dd615..b2d98271 100644 --- a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/mappers/shoppingCartMapper.ts +++ b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/mappers/shoppingCartMapper.ts @@ -1,6 +1,6 @@ import { Mapper } from '#core/mapping'; import { ObjectId } from 'mongodb'; -import { ShoppingCart } from 'src/onion/ecommerce/domain/shoppingCarts'; +import { ShoppingCart } from '../../../domain/shoppingCarts'; import { ShoppingCartModel } from '../../../models/shoppingCarts/shoppingCart'; export class ShoppingCartMapper diff --git a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/queryHandlers/getCustomerShoppingHistoryHandler.ts b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/queryHandlers/getCustomerShoppingHistoryHandler.ts index 9f41cb90..6fd544f2 100644 --- a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/queryHandlers/getCustomerShoppingHistoryHandler.ts +++ b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/queryHandlers/getCustomerShoppingHistoryHandler.ts @@ -1,7 +1,7 @@ import { Mapper } from '#core/mapping'; import { QueryHandler } from '#core/queries'; -import { ShoppingCartRepository } from 'src/onion/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository'; -import { ShoppingCartModel } from 'src/onion/ecommerce/models/shoppingCarts/shoppingCart'; +import { ShoppingCartRepository } from '../../../infrastructure/shoppingCarts/shoppingCartRepository'; +import { ShoppingCartModel } from '../../../models/shoppingCarts/shoppingCart'; import { CustomerShoppingHistoryItem } from '../queries/customerShoppingHistoryItem'; import { GetCustomerShoppingHistory } from '../queries/getCustomerShoppingHistory'; diff --git a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/queryHandlers/getShoppingCartByIdQueryHandler.ts b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/queryHandlers/getShoppingCartByIdQueryHandler.ts index 4f092f09..1671e22f 100644 --- a/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/queryHandlers/getShoppingCartByIdQueryHandler.ts +++ b/samples/unpeelingOnion/src/onion/ecommerce/application/shoppingCarts/queryHandlers/getShoppingCartByIdQueryHandler.ts @@ -1,7 +1,7 @@ import { QueryHandler } from '#core/queries'; -import { GetShoppingCartById } from 'src/onion/ecommerce/application/shoppingCarts/queries/getShoppingCartById'; -import { ShoppingCartRepository } from 'src/onion/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository'; -import { ShoppingCartModel } from 'src/onion/ecommerce/models/shoppingCarts/shoppingCart'; +import { GetShoppingCartById } from '../../shoppingCarts/queries/getShoppingCartById'; +import { ShoppingCartRepository } from '../../../infrastructure/shoppingCarts/shoppingCartRepository'; +import { ShoppingCartModel } from '../../../models/shoppingCarts/shoppingCart'; export class GetShoppingCartByIdHandler implements QueryHandler diff --git a/samples/unpeelingOnion/src/onion/ecommerce/controllers/shoppingCartController.ts b/samples/unpeelingOnion/src/onion/ecommerce/controllers/shoppingCartController.ts index 1ab11846..d0a8aef7 100644 --- a/samples/unpeelingOnion/src/onion/ecommerce/controllers/shoppingCartController.ts +++ b/samples/unpeelingOnion/src/onion/ecommerce/controllers/shoppingCartController.ts @@ -3,16 +3,16 @@ import { CommandBus } from '#core/commands'; import { sendCreated } from '#core/http'; import { mongoObjectId } from '#core/mongodb'; import { QueryBus } from '#core/queries'; -import { OpenShoppingCart } from 'src/onion/ecommerce/application/shoppingCarts/commands/shoppingCarts/openShoppingCart'; -import { GetShoppingCartById } from 'src/onion/ecommerce/application/shoppingCarts/queries/getShoppingCartById'; +import { OpenShoppingCart } from '../application/shoppingCarts/commands/shoppingCarts/openShoppingCart'; +import { GetShoppingCartById } from '../application/shoppingCarts/queries/getShoppingCartById'; import { assertNotEmptyString, assertPositiveNumber } from '#core/validation'; -import { AddProductItemToShoppingCartRequest } from 'src/onion/ecommerce/requests/shoppingCarts/addProductItemToShoppingCartRequest'; -import { AddProductItemToShoppingCart } from 'src/onion/ecommerce/application/shoppingCarts/commands/shoppingCarts/addProductItemToShoppingCart'; -import { ProductItem } from 'src/onion/ecommerce/common/shoppingCarts/productItem'; -import { RemoveProductItemFromShoppingCart } from 'src/onion/ecommerce/application/shoppingCarts/commands/shoppingCarts/removeProductItemFromShoppingCart'; -import { RemoveProductItemFromShoppingCartRequest } from 'src/onion/ecommerce/requests/shoppingCarts/removeProductItemFromShoppingCartRequest.ts'; -import { ConfirmShoppingCart } from 'src/onion/ecommerce/application/shoppingCarts/commands/shoppingCarts/confirmShoppingCart'; -import { GetCustomerShoppingHistory } from 'src/onion/ecommerce/application/shoppingCarts/queries/getCustomerShoppingHistory'; +import { AddProductItemToShoppingCartRequest } from '../requests/shoppingCarts/addProductItemToShoppingCartRequest'; +import { AddProductItemToShoppingCart } from '../application/shoppingCarts/commands/shoppingCarts/addProductItemToShoppingCart'; +import { ProductItem } from '../common/shoppingCarts/productItem'; +import { RemoveProductItemFromShoppingCart } from '../application/shoppingCarts/commands/shoppingCarts/removeProductItemFromShoppingCart'; +import { RemoveProductItemFromShoppingCartRequest } from '../requests/shoppingCarts/removeProductItemFromShoppingCartRequest.ts'; +import { ConfirmShoppingCart } from '../application/shoppingCarts/commands/shoppingCarts/confirmShoppingCart'; +import { GetCustomerShoppingHistory } from '../application/shoppingCarts/queries/getCustomerShoppingHistory'; export class ShoppingCartController { public router = Router(); diff --git a/samples/unpeelingOnion/src/onion/ecommerce/domain/shoppingCarts/events/productItemAddedToShoppingCart.ts b/samples/unpeelingOnion/src/onion/ecommerce/domain/shoppingCarts/events/productItemAddedToShoppingCart.ts index dca66927..b568c549 100644 --- a/samples/unpeelingOnion/src/onion/ecommerce/domain/shoppingCarts/events/productItemAddedToShoppingCart.ts +++ b/samples/unpeelingOnion/src/onion/ecommerce/domain/shoppingCarts/events/productItemAddedToShoppingCart.ts @@ -1,5 +1,5 @@ import { Event } from '#core/events'; -import { ProductItem } from 'src/onion/ecommerce/common/shoppingCarts/productItem'; +import { ProductItem } from '../../../common/shoppingCarts/productItem'; export class ProductItemAddedToShoppingCart extends Event { constructor( diff --git a/samples/unpeelingOnion/src/onion/ecommerce/domain/shoppingCarts/events/productItemRemovedFromShoppingCart.ts b/samples/unpeelingOnion/src/onion/ecommerce/domain/shoppingCarts/events/productItemRemovedFromShoppingCart.ts index 90b7a1c3..7f332f6a 100644 --- a/samples/unpeelingOnion/src/onion/ecommerce/domain/shoppingCarts/events/productItemRemovedFromShoppingCart.ts +++ b/samples/unpeelingOnion/src/onion/ecommerce/domain/shoppingCarts/events/productItemRemovedFromShoppingCart.ts @@ -1,5 +1,5 @@ import { Event } from '#core/events'; -import { ProductItem } from 'src/onion/ecommerce/common/shoppingCarts/productItem'; +import { ProductItem } from '../../../common/shoppingCarts/productItem'; export class ProductItemRemovedFromShoppingCart extends Event { constructor( diff --git a/samples/unpeelingOnion/src/onion/ecommerce/domain/shoppingCarts/index.ts b/samples/unpeelingOnion/src/onion/ecommerce/domain/shoppingCarts/index.ts index 2709093a..e928d310 100644 --- a/samples/unpeelingOnion/src/onion/ecommerce/domain/shoppingCarts/index.ts +++ b/samples/unpeelingOnion/src/onion/ecommerce/domain/shoppingCarts/index.ts @@ -1,5 +1,5 @@ import { Aggregate } from '#core/aggregates'; -import { ProductItem } from 'src/onion/ecommerce/common/shoppingCarts/productItem'; +import { ProductItem } from '../../common/shoppingCarts/productItem'; import { ProductItemAddedToShoppingCart } from './events/productItemAddedToShoppingCart'; import { ProductItemRemovedFromShoppingCart } from './events/productItemRemovedFromShoppingCart'; import { ShoppingCartConfirmed } from './events/shoppingCartConfirmed'; diff --git a/samples/unpeelingOnion/src/onion/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository.ts b/samples/unpeelingOnion/src/onion/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository.ts index d5d2b54b..38c4d84f 100644 --- a/samples/unpeelingOnion/src/onion/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository.ts +++ b/samples/unpeelingOnion/src/onion/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository.ts @@ -1,6 +1,6 @@ import { MongoDbRepository, Repository } from '#core/mongo/repository'; import { MongoClient } from 'mongodb'; -import { ShoppingCartModel } from 'src/onion/ecommerce/models/shoppingCarts/shoppingCart'; +import { ShoppingCartModel } from '../../models/shoppingCarts/shoppingCart'; export interface ShoppingCartRepository extends Repository { findAllByCustomerId(customerId: string): Promise; diff --git a/samples/unpeelingOnion/src/onion/ecommerce/models/shoppingCarts/shoppingCart.ts b/samples/unpeelingOnion/src/onion/ecommerce/models/shoppingCarts/shoppingCart.ts index a95a4077..72ca3803 100644 --- a/samples/unpeelingOnion/src/onion/ecommerce/models/shoppingCarts/shoppingCart.ts +++ b/samples/unpeelingOnion/src/onion/ecommerce/models/shoppingCarts/shoppingCart.ts @@ -1,5 +1,5 @@ import { ObjectId } from 'mongodb'; -import { ProductItem } from 'src/onion/ecommerce/common/shoppingCarts/productItem'; +import { ProductItem } from '../../common/shoppingCarts/productItem'; export class ShoppingCartModel { constructor( diff --git a/samples/unpeelingOnion/src/onion/tests/e2e/fullFlow.e2e.test.ts b/samples/unpeelingOnion/src/onion/tests/e2e/fullFlow.e2e.test.ts index a2a6b152..72a454a7 100644 --- a/samples/unpeelingOnion/src/onion/tests/e2e/fullFlow.e2e.test.ts +++ b/samples/unpeelingOnion/src/onion/tests/e2e/fullFlow.e2e.test.ts @@ -3,14 +3,14 @@ import { v4 as uuid } from 'uuid'; import { config } from '#config'; // import { greaterOrEqual } from '#core/validation'; import { TestResponse } from '#testing/api/testResponse'; -import initApp from 'src/onion/ecommerce/app'; import { MongoDBContainer, StartedMongoDBContainer, } from '#testing/api/mongoDB/mongoDBContainer'; import { disconnectFromMongoDB } from '#core/mongodb'; import { Application } from 'express'; -import { ShoppingCartStatus } from 'src/onion/ecommerce/domain/shoppingCarts/shoppingCartStatus'; +import initApp from '../../ecommerce/app'; +import { ShoppingCartStatus } from '../../ecommerce/domain/shoppingCarts/shoppingCartStatus'; describe('Full flow', () => { let app: Application; diff --git a/samples/unpeelingOnion/src/unpeeled/tests/e2e/fullFlow.e2e.test.ts b/samples/unpeelingOnion/src/unpeeled/tests/e2e/fullFlow.e2e.test.ts index e24a0bc9..a227210a 100644 --- a/samples/unpeelingOnion/src/unpeeled/tests/e2e/fullFlow.e2e.test.ts +++ b/samples/unpeelingOnion/src/unpeeled/tests/e2e/fullFlow.e2e.test.ts @@ -3,14 +3,14 @@ import { v4 as uuid } from 'uuid'; import { config } from '#config'; // import { greaterOrEqual } from '#core/validation'; import { TestResponse } from '#testing/api/testResponse'; -import initApp from 'src/unpeeled/ecommerce/app'; import { MongoDBContainer, StartedMongoDBContainer, } from '#testing/api/mongoDB/mongoDBContainer'; import { disconnectFromMongoDB } from '#core/mongodb'; import { Application } from 'express'; -import { ShoppingCartStatus } from 'src/unpeeled/ecommerce/shoppingCarts/shoppingCart'; +import initApp from '../../ecommerce/app'; +import { ShoppingCartStatus } from '../../ecommerce/shoppingCarts/shoppingCart'; describe('Full flow', () => { let app: Application;