@unchainedshop/core-bookmarks 1.2.11 → 1.2.21

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 (9) hide show
  1. package/lib/module/configureBookmarksModule.d.ts +1 -1
  2. package/lib/module/configureBookmarksModule.js +1 -1
  3. package/lib/module/configureBookmarksModule.js.map +1 -1
  4. package/lib/service/migrateBookmarksService.js +3 -3
  5. package/lib/service/migrateBookmarksService.js.map +1 -1
  6. package/package.json +9 -9
  7. package/src/module/configureBookmarksModule.ts +2 -2
  8. package/src/service/migrateBookmarksService.ts +3 -3
  9. package/tests/bookmarks-index.test.ts +0 -24
package/lib/module/configureBookmarksModule.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import { BookmarksModule } from '@unchainedshop/types/bookmarks';
2
- import { ModuleInput } from '@unchainedshop/types/common';
2
+ import { ModuleInput } from '@unchainedshop/types/core';
3
3
  export declare const configureBookmarksModule: ({ db, }: ModuleInput<Record<string, never>>) => Promise<BookmarksModule>;
package/lib/module/configureBookmarksModule.js CHANGED
@@ -38,7 +38,7 @@ export const configureBookmarksModule = async ({ db, }) => {
38
38
  $set: {
39
39
  userId: toUserId,
40
40
  updated: new Date(),
41
- updatedBy: userId,
41
+ updatedBy: userId || toUserId,
42
42
  },
43
43
  });
44
44
  return result.upsertedCount;
package/lib/module/configureBookmarksModule.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"configureBookmarksModule.js","sourceRoot":"","sources":["../../src/module/configureBookmarksModule.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"configureBookmarksModule.js","sourceRoot":"","sources":["../../src/module/configureBookmarksModule.ts"],"names":[],"mappings":"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"}
package/lib/service/migrateBookmarksService.js CHANGED
@@ -1,13 +1,13 @@
1
- export const migrateBookmarksService = async ({ fromUser, toUser, shouldMerge }, { modules, userId }) => {
1
+ export const migrateBookmarksService = async ({ fromUser, toUser, shouldMerge }, { modules }) => {
2
2
  const fromBookmarks = await modules.bookmarks.find({ userId: fromUser._id });
3
3
  if (!fromBookmarks) {
4
4
  // No bookmarks no copy needed
5
5
  return null;
6
6
  }
7
7
  if (!shouldMerge) {
8
- await modules.bookmarks.deleteByUserId(toUser._id, userId);
8
+ await modules.bookmarks.deleteByUserId(toUser._id);
9
9
  }
10
- await modules.bookmarks.replaceUserId(fromUser._id, toUser._id, userId);
10
+ await modules.bookmarks.replaceUserId(fromUser._id, toUser._id);
11
11
  return null;
12
12
  };
13
13
  //# sourceMappingURL=migrateBookmarksService.js.map
package/lib/service/migrateBookmarksService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"migrateBookmarksService.js","sourceRoot":"","sources":["../../src/service/migrateBookmarksService.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,uBAAuB,GAA4B,KAAK,EACnE,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,EACjC,EAAE,OAAO,EAAE,MAAM,EAAE,EACnB,EAAE;IACF,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;IAC7E,IAAI,CAAC,aAAa,EAAE;QAClB,8BAA8B;QAC9B,OAAO,IAAI,CAAC;KACb;IACD,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;KAC5D;IACD,MAAM,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAExE,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
1
+ {"version":3,"file":"migrateBookmarksService.js","sourceRoot":"","sources":["../../src/service/migrateBookmarksService.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,uBAAuB,GAA4B,KAAK,EACnE,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,EACjC,EAAE,OAAO,EAAE,EACX,EAAE;IACF,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;IAC7E,IAAI,CAAC,aAAa,EAAE;QAClB,8BAA8B;QAC9B,OAAO,IAAI,CAAC;KACb;IACD,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;KACpD;IACD,MAAM,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAEhE,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unchainedshop/core-bookmarks",
3
- "version": "1.2.11",
3
+ "version": "1.2.21",
4
4
  "main": "lib/bookmarks-index.js",
5
5
  "exports": {
6
6
  ".": "./lib/bookmarks-index.js",
@@ -30,15 +30,15 @@
30
30
  },
31
31
  "homepage": "https://github.com/unchainedshop/unchained#readme",
32
32
  "dependencies": {
33
- "@unchainedshop/events": "1.x",
34
- "@unchainedshop/utils": "1.x",
35
- "simpl-schema": "^1.12.2"
33
+ "@unchainedshop/events": "^1.2.21",
34
+ "@unchainedshop/utils": "^1.2.21",
35
+ "simpl-schema": "^1.12.3"
36
36
  },
37
37
  "devDependencies": {
38
- "@types/node": "^16.11.44",
39
- "@unchainedshop/types": "1.x",
40
- "jest": "^28.1.2",
41
- "ts-jest": "^28.0.5",
42
- "typescript": "^4.7.4"
38
+ "@types/node": "^16.11.57",
39
+ "@unchainedshop/types": "^1.2.21",
40
+ "jest": "^29.0.2",
41
+ "ts-jest": "^28.0.8",
42
+ "typescript": "^4.8.2"
43
43
  }
44
44
  }
package/src/module/configureBookmarksModule.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { emit, registerEvents } from '@unchainedshop/events';
2
2
  import { Bookmark, BookmarksModule } from '@unchainedshop/types/bookmarks';
3
- import { ModuleInput, ModuleMutations } from '@unchainedshop/types/common';
3
+ import { ModuleInput, ModuleMutations } from '@unchainedshop/types/core';
4
4
  import { generateDbFilterById, generateDbMutations } from '@unchainedshop/utils';
5
5
  import { BookmarksCollection } from '../db/BookmarksCollection';
6
6
  import { BookmarkSchema } from '../db/BookmarksSchema';
@@ -52,7 +52,7 @@ export const configureBookmarksModule = async ({
52
52
  $set: {
53
53
  userId: toUserId,
54
54
  updated: new Date(),
55
- updatedBy: userId,
55
+ updatedBy: userId || toUserId,
56
56
  },
57
57
  },
58
58
  );
package/src/service/migrateBookmarksService.ts CHANGED
@@ -2,7 +2,7 @@ import { MigrateBookmarksService } from '@unchainedshop/types/bookmarks';
2
2
 
3
3
  export const migrateBookmarksService: MigrateBookmarksService = async (
4
4
  { fromUser, toUser, shouldMerge },
5
- { modules, userId },
5
+ { modules },
6
6
  ) => {
7
7
  const fromBookmarks = await modules.bookmarks.find({ userId: fromUser._id });
8
8
  if (!fromBookmarks) {
@@ -10,9 +10,9 @@ export const migrateBookmarksService: MigrateBookmarksService = async (
10
10
  return null;
11
11
  }
12
12
  if (!shouldMerge) {
13
- await modules.bookmarks.deleteByUserId(toUser._id, userId);
13
+ await modules.bookmarks.deleteByUserId(toUser._id);
14
14
  }
15
- await modules.bookmarks.replaceUserId(fromUser._id, toUser._id, userId);
15
+ await modules.bookmarks.replaceUserId(fromUser._id, toUser._id);
16
16
 
17
17
  return null;
18
18
  };
package/tests/bookmarks-index.test.ts CHANGED
@@ -43,28 +43,4 @@ describe('Test exports', () => {
43
43
  const deletedCount = await module.delete(bookmarkId);
44
44
  assert.equal(deletedCount, 1);
45
45
  });
46
-
47
- it('Check backwards compatibility', async () => {
48
- const Bookmarks = new Mongo.Collection<any>('bookmarks');
49
-
50
- const meteorBookmarkId = Bookmarks.insertOne({
51
- userId: 'Legacy-Test-User-1',
52
- productId: 'Legacy-Product-22',
53
- created: new Date(),
54
- });
55
-
56
- assert.ok(meteorBookmarkId);
57
- const bookmark = await module.findById(meteorBookmarkId);
58
- assert.ok(bookmark);
59
- assert.equal(bookmark._id, meteorBookmarkId);
60
- assert.equal(bookmark.userId, 'Legacy-Test-User-1');
61
- assert.equal(bookmark.productId, 'Legacy-Product-22');
62
- assert.isDefined(bookmark.created);
63
- assert.isUndefined(bookmark.updated);
64
- assert.isUndefined(bookmark.updatedBy);
65
- assert.isUndefined(bookmark.createdBy);
66
-
67
- const deletedCount = await module.delete(meteorBookmarkId);
68
- assert.equal(deletedCount, 1);
69
- });
70
46
  });