@stamhoofd/models 2.30.2 → 2.30.3

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 (5) hide show
  1. package/dist/src/helpers/MemberMerger.d.ts.map +1 -1
  2. package/dist/src/helpers/MemberMerger.js +8 -0
  3. package/dist/src/helpers/MemberMerger.js.map +1 -1
  4. package/package.json +2 -2
  5. package/src/helpers/MemberMerger.ts +12 -0
package/dist/src/helpers/MemberMerger.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MemberMerger.d.ts","sourceRoot":"","sources":["../../../src/helpers/MemberMerger.ts"],"names":[],"mappings":"AAYA,OAAO,EAGH,MAAM,EAMT,MAAM,WAAW,CAAC;AAEnB,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,iBAU3D;AAED,wBAAsB,gBAAgB,CAAC,EACnC,SAAS,EACT,QAAQ,EACR,QAAQ,GACX,EAAE;IACC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAMpB;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBhF;AA6HD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAyFpE;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,EAAE,CAAC;CACpB,CASA"}
1
+ {"version":3,"file":"MemberMerger.d.ts","sourceRoot":"","sources":["../../../src/helpers/MemberMerger.ts"],"names":[],"mappings":"AAYA,OAAO,EAGH,MAAM,EAMT,MAAM,WAAW,CAAC;AAEnB,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,iBAU3D;AAED,wBAAsB,gBAAgB,CAAC,EACnC,SAAS,EACT,QAAQ,EACR,QAAQ,GACX,EAAE;IACC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAMpB;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BhF;AA6HD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAyFpE;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,EAAE,CAAC;CACpB,CASA"}
package/dist/src/helpers/MemberMerger.js CHANGED
@@ -27,6 +27,13 @@ async function findEqualMembers({ firstName, lastName, birthDay, }) {
27
27
  });
28
28
  }
29
29
  async function mergeTwoMembers(base, other) {
30
+ console.log('Merging two member', base.id, other.id, base.details.name, other.details.name);
31
+ if (base.id === other.id) {
32
+ throw new Error('Cannot merge the same member');
33
+ }
34
+ if (!base.existsInDatabase) {
35
+ throw new Error('Cannot merge to base member that does not exist in database');
36
+ }
30
37
  mergeMemberDetails(base, other);
31
38
  await mergeRegistrations(base, other);
32
39
  await mergeUsers(base, other);
@@ -36,6 +43,7 @@ async function mergeTwoMembers(base, other) {
36
43
  await mergeMemberPlatformMemberships(base, other);
37
44
  await base.save();
38
45
  if (other.existsInDatabase) {
46
+ console.log('Deleting duplicate member', other.id, other.details.name);
39
47
  // store other member in merged_member table
40
48
  const mergedMember = models_1.MergedMember.fromMember(other, base.id);
41
49
  await mergedMember.save();
package/dist/src/helpers/MemberMerger.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MemberMerger.js","sourceRoot":"","sources":["../../../src/helpers/MemberMerger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MemberMerger.js","sourceRoot":"","sources":["../../../src/helpers/MemberMerger.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@stamhoofd/models",
3
- "version": "2.30.2",
3
+ "version": "2.30.3",
4
4
  "main": "./dist/src/index.js",
5
5
  "types": "./dist/src/index.d.ts",
6
6
  "license": "UNLICENCED",
@@ -29,5 +29,5 @@
29
29
  "publishConfig": {
30
30
  "access": "public"
31
31
  },
32
- "gitHead": "cc0f6cfcf4febc6976aaad14359283f36df2d46f"
32
+ "gitHead": "1c2d9449b991aad4d358c913650c83156ebf2b31"
33
33
  }
package/src/helpers/MemberMerger.ts CHANGED
@@ -50,6 +50,16 @@ export async function findEqualMembers({
50
50
  }
51
51
 
52
52
  export async function mergeTwoMembers(base: Member, other: Member): Promise<void> {
53
+ console.log('Merging two member', base.id, other.id, base.details.name, other.details.name)
54
+
55
+ if (base.id === other.id) {
56
+ throw new Error('Cannot merge the same member')
57
+ }
58
+
59
+ if (!base.existsInDatabase) {
60
+ throw new Error('Cannot merge to base member that does not exist in database')
61
+ }
62
+
53
63
  mergeMemberDetails(base, other);
54
64
 
55
65
  await mergeRegistrations(base, other);
@@ -62,6 +72,8 @@ export async function mergeTwoMembers(base: Member, other: Member): Promise<void
62
72
  await base.save();
63
73
 
64
74
  if (other.existsInDatabase) {
75
+ console.log('Deleting duplicate member', other.id, other.details.name)
76
+
65
77
  // store other member in merged_member table
66
78
  const mergedMember = MergedMember.fromMember(other, base.id);
67
79
  await mergedMember.save();