@unchainedshop/platform 2.9.4 → 2.10.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/lib/setup/setupAccounts.js +7 -7
  2. package/lib/setup/setupAccounts.js.map +1 -1
  3. package/lib/setup/setupCarts.js +4 -1
  4. package/lib/setup/setupCarts.js.map +1 -1
  5. package/package.json +12 -12
  6. package/src/setup/setupAccounts.ts +9 -7
  7. package/src/setup/setupCarts.ts +5 -3
package/lib/setup/setupAccounts.js CHANGED
@@ -134,19 +134,19 @@ export const setupAccounts = (unchainedAPI) => {
134
134
  if (userIdBeforeLogin) {
135
135
  const userBeforeLogin = await unchainedAPI.modules.users.findUserById(userIdBeforeLogin);
136
136
  await unchainedAPI.services.orders.migrateOrderCarts({
137
- fromUser: userBeforeLogin,
138
- toUser: user,
137
+ fromUserId: userBeforeLogin._id,
138
+ toUserId: user._id,
139
139
  shouldMerge: accountsSettings.mergeUserCartsOnLogin,
140
- countryContext,
140
+ countryContext: countryContext || userBeforeLogin.lastLogin?.countryCode || user.lastLogin?.countryCode,
141
141
  }, unchainedAPI);
142
142
  await unchainedAPI.services.bookmarks.migrateBookmarks({
143
- fromUser: userBeforeLogin,
144
- toUser: user,
143
+ fromUserId: userBeforeLogin._id,
144
+ toUserId: user._id,
145
145
  shouldMerge: accountsSettings.mergeUserCartsOnLogin,
146
- countryContext,
146
+ countryContext: countryContext || userBeforeLogin.lastLogin?.countryCode || user.lastLogin?.countryCode,
147
147
  }, unchainedAPI);
148
148
  }
149
- await unchainedAPI.modules.orders.ensureCartForUser({
149
+ return unchainedAPI.services.orders.nextUserCart({
150
150
  user,
151
151
  countryCode: countryContext,
152
152
  }, unchainedAPI);
package/lib/setup/setupAccounts.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"setupAccounts.js","sourceRoot":"","sources":["../../src/setup/setupAccounts.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"setupAccounts.js","sourceRoot":"","sources":["../../src/setup/setupAccounts.ts"],"names":[],"mappings":"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"}
package/lib/setup/setupCarts.js CHANGED
@@ -7,7 +7,10 @@ export const setupCarts = async (unchainedAPI, options = {}) => {
7
7
  const users = await unchainedAPI.modules.users.findUsers({});
8
8
  await Promise.all(users.map((user) => {
9
9
  const locale = unchainedAPI.modules.users.userLocale(user);
10
- return unchainedAPI.modules.orders.ensureCartForUser({ user, countryCode: locale.country }, unchainedAPI);
10
+ return unchainedAPI.services.orders.nextUserCart({
11
+ user,
12
+ countryCode: locale.country,
13
+ }, unchainedAPI);
11
14
  }));
12
15
  }
13
16
  };
package/lib/setup/setupCarts.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"setupCarts.js","sourceRoot":"","sources":["../../src/setup/setupCarts.ts"],"names":[],"mappings":"AAOA,MAAM,EAAE,uCAAuC,EAAE,+BAA+B,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEjG,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,YAA2B,EAAE,UAA6B,EAAE,EAAE,EAAE;IAC/F,IAAI,OAAO,CAAC,mBAAmB,IAAI,CAAC,uCAAuC,EAAE,CAAC;QAC5E,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,mBAAmB,CACnD,YAAY,EACZ,OAAO,CAAC,8BAA8B,CACvC,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,kBAAkB,IAAI,OAAO,CAAC,+BAA+B,CAAC,EAAE,CAAC;QAC3E,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAE7D,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACjB,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAE3D,OAAO,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAClD,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,EACrC,YAAY,CACb,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;AACH,CAAC,CAAC"}
1
+ {"version":3,"file":"setupCarts.js","sourceRoot":"","sources":["../../src/setup/setupCarts.ts"],"names":[],"mappings":"AAOA,MAAM,EAAE,uCAAuC,EAAE,+BAA+B,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEjG,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,YAA2B,EAAE,UAA6B,EAAE,EAAE,EAAE;IAC/F,IAAI,OAAO,CAAC,mBAAmB,IAAI,CAAC,uCAAuC,EAAE,CAAC;QAC5E,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,mBAAmB,CACnD,YAAY,EACZ,OAAO,CAAC,8BAA8B,CACvC,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,kBAAkB,IAAI,OAAO,CAAC,+BAA+B,CAAC,EAAE,CAAC;QAC3E,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAE7D,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACjB,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAC3D,OAAO,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAC9C;gBACE,IAAI;gBACJ,WAAW,EAAE,MAAM,CAAC,OAAO;aAC5B,EACD,YAAY,CACb,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;AACH,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unchainedshop/platform",
3
- "version": "2.9.4",
3
+ "version": "2.10.1",
4
4
  "main": "lib/platform-index.js",
5
5
  "exports": {
6
6
  ".": "./lib/platform-index.js",
@@ -31,22 +31,22 @@
31
31
  },
32
32
  "homepage": "https://github.com/unchainedshop/unchained#readme",
33
33
  "dependencies": {
34
- "@unchainedshop/api": "^2.9.4",
35
- "@unchainedshop/core": "^2.9.4",
36
- "@unchainedshop/events": "^2.9.4",
37
- "@unchainedshop/file-upload": "^2.9.4",
38
- "@unchainedshop/logger": "^2.9.4",
39
- "@unchainedshop/mongodb": "^2.9.4",
40
- "@unchainedshop/plugins": "^2.9.4",
41
- "@unchainedshop/roles": "^2.9.4",
42
- "@unchainedshop/utils": "^2.9.4",
34
+ "@unchainedshop/api": "^2.10.1",
35
+ "@unchainedshop/core": "^2.10.1",
36
+ "@unchainedshop/events": "^2.10.1",
37
+ "@unchainedshop/file-upload": "^2.10.1",
38
+ "@unchainedshop/logger": "^2.10.1",
39
+ "@unchainedshop/mongodb": "^2.10.1",
40
+ "@unchainedshop/plugins": "^2.10.1",
41
+ "@unchainedshop/roles": "^2.10.1",
42
+ "@unchainedshop/utils": "^2.10.1",
43
43
  "event-iterator": "^2.0.0",
44
44
  "JSONStream": "^1.3.5",
45
45
  "moniker": "0.1.2"
46
46
  },
47
47
  "devDependencies": {
48
- "@types/node": "^20.12.13",
49
- "@unchainedshop/types": "^2.9.4",
48
+ "@types/node": "^20.14.1",
49
+ "@unchainedshop/types": "^2.10.1",
50
50
  "cross-env": "^7.0.3",
51
51
  "jest": "^29.7.0",
52
52
  "ts-jest": "^29.1.4",
package/src/setup/setupAccounts.ts CHANGED
@@ -197,26 +197,28 @@ export const setupAccounts = (unchainedAPI: UnchainedCore) => {
197
197
 
198
198
  await unchainedAPI.services.orders.migrateOrderCarts(
199
199
  {
200
- fromUser: userBeforeLogin,
201
- toUser: user,
200
+ fromUserId: userBeforeLogin._id,
201
+ toUserId: user._id,
202
202
  shouldMerge: accountsSettings.mergeUserCartsOnLogin,
203
- countryContext,
203
+ countryContext:
204
+ countryContext || userBeforeLogin.lastLogin?.countryCode || user.lastLogin?.countryCode,
204
205
  },
205
206
  unchainedAPI,
206
207
  );
207
208
 
208
209
  await unchainedAPI.services.bookmarks.migrateBookmarks(
209
210
  {
210
- fromUser: userBeforeLogin,
211
- toUser: user,
211
+ fromUserId: userBeforeLogin._id,
212
+ toUserId: user._id,
212
213
  shouldMerge: accountsSettings.mergeUserCartsOnLogin,
213
- countryContext,
214
+ countryContext:
215
+ countryContext || userBeforeLogin.lastLogin?.countryCode || user.lastLogin?.countryCode,
214
216
  },
215
217
  unchainedAPI,
216
218
  );
217
219
  }
218
220
 
219
- await unchainedAPI.modules.orders.ensureCartForUser(
221
+ return unchainedAPI.services.orders.nextUserCart(
220
222
  {
221
223
  user,
222
224
  countryCode: countryContext,
package/src/setup/setupCarts.ts CHANGED
@@ -21,9 +21,11 @@ export const setupCarts = async (unchainedAPI: UnchainedCore, options: SetupCart
21
21
  await Promise.all(
22
22
  users.map((user) => {
23
23
  const locale = unchainedAPI.modules.users.userLocale(user);
24
-
25
- return unchainedAPI.modules.orders.ensureCartForUser(
26
- { user, countryCode: locale.country },
24
+ return unchainedAPI.services.orders.nextUserCart(
25
+ {
26
+ user,
27
+ countryCode: locale.country,
28
+ },
27
29
  unchainedAPI,
28
30
  );
29
31
  }),