@volontariapp/domain-event 2.8.1-snap-d399e67 → 3.0.0-snap-e2f98fe
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.
- package/CHANGELOG.md +1 -1
- package/dist/entities/requirement.entity.d.ts +1 -0
- package/dist/entities/requirement.entity.d.ts.map +1 -1
- package/dist/entities/requirement.entity.js +1 -0
- package/dist/entities/requirement.entity.js.map +1 -1
- package/dist/entities/tag.entity.d.ts +1 -0
- package/dist/entities/tag.entity.d.ts.map +1 -1
- package/dist/entities/tag.entity.js +1 -0
- package/dist/entities/tag.entity.js.map +1 -1
- package/dist/models/requirement.model.d.ts +1 -0
- package/dist/models/requirement.model.d.ts.map +1 -1
- package/dist/models/requirement.model.js +5 -0
- package/dist/models/requirement.model.js.map +1 -1
- package/dist/models/tag.model.d.ts +1 -0
- package/dist/models/tag.model.d.ts.map +1 -1
- package/dist/models/tag.model.js +5 -0
- package/dist/models/tag.model.js.map +1 -1
- package/dist/repositories/postgres-event.repository.js +2 -2
- package/dist/repositories/postgres-event.repository.js.map +1 -1
- package/dist/test/data-source.d.ts.map +1 -1
- package/dist/test/data-source.js +4 -0
- package/dist/test/data-source.js.map +1 -1
- package/dist/test/integration/triggers.int.spec.js +11 -2
- package/dist/test/integration/triggers.int.spec.js.map +1 -1
- package/dist/test/migrations/1777985367963-AddTargetServicesToEventQueue.d.ts.map +1 -1
- package/dist/test/migrations/1777985367963-AddTargetServicesToEventQueue.js +3 -1
- package/dist/test/migrations/1777985367963-AddTargetServicesToEventQueue.js.map +1 -1
- package/dist/test/migrations/1779555000000-AddUpdatedByToTags.d.ts +7 -0
- package/dist/test/migrations/1779555000000-AddUpdatedByToTags.d.ts.map +1 -0
- package/dist/test/migrations/1779555000000-AddUpdatedByToTags.js +10 -0
- package/dist/test/migrations/1779555000000-AddUpdatedByToTags.js.map +1 -0
- package/dist/test/migrations/1779555000001-AddUpdatedByToRequirements.d.ts +7 -0
- package/dist/test/migrations/1779555000001-AddUpdatedByToRequirements.d.ts.map +1 -0
- package/dist/test/migrations/1779555000001-AddUpdatedByToRequirements.js +10 -0
- package/dist/test/migrations/1779555000001-AddUpdatedByToRequirements.js.map +1 -0
- package/package.json +3 -3
- package/src/database/triggers/event-queue.trigger.sql +3 -1
package/CHANGELOG.md
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requirement.entity.d.ts","sourceRoot":"","sources":["../../src/entities/requirement.entity.ts"],"names":[],"mappings":"AAAA,qBAAa,iBAAiB;IAC5B,EAAE,EAAG,MAAM,CAAC;IACZ,IAAI,EAAG,MAAM,CAAC;IACd,WAAW,EAAG,MAAM,CAAC;IACrB,QAAQ,EAAG,MAAM,CAAC;IAClB,eAAe,EAAG,MAAM,CAAC;IACzB,QAAQ,EAAG,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"requirement.entity.d.ts","sourceRoot":"","sources":["../../src/entities/requirement.entity.ts"],"names":[],"mappings":"AAAA,qBAAa,iBAAiB;IAC5B,EAAE,EAAG,MAAM,CAAC;IACZ,IAAI,EAAG,MAAM,CAAC;IACd,WAAW,EAAG,MAAM,CAAC;IACrB,QAAQ,EAAG,MAAM,CAAC;IAClB,eAAe,EAAG,MAAM,CAAC;IACzB,QAAQ,EAAG,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAa;CAChC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requirement.entity.js","sourceRoot":"","sources":["../../src/entities/requirement.entity.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,iBAAiB;IAC5B,EAAE,CAAU;IACZ,IAAI,CAAU;IACd,WAAW,CAAU;IACrB,QAAQ,CAAU;IAClB,eAAe,CAAU;IACzB,QAAQ,CAAW;IACnB,SAAS,CAAU;
|
|
1
|
+
{"version":3,"file":"requirement.entity.js","sourceRoot":"","sources":["../../src/entities/requirement.entity.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,iBAAiB;IAC5B,EAAE,CAAU;IACZ,IAAI,CAAU;IACd,WAAW,CAAU;IACrB,QAAQ,CAAU;IAClB,eAAe,CAAU;IACzB,QAAQ,CAAW;IACnB,SAAS,CAAU;IACnB,SAAS,GAAY,SAAS,CAAC;CAChC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tag.entity.d.ts","sourceRoot":"","sources":["../../src/entities/tag.entity.ts"],"names":[],"mappings":"AAAA,qBAAa,SAAS;IACpB,EAAE,EAAG,MAAM,CAAC;IACZ,IAAI,EAAG,MAAM,CAAC;IACd,IAAI,EAAG,MAAM,CAAC;IACd,MAAM,EAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"tag.entity.d.ts","sourceRoot":"","sources":["../../src/entities/tag.entity.ts"],"names":[],"mappings":"AAAA,qBAAa,SAAS;IACpB,EAAE,EAAG,MAAM,CAAC;IACZ,IAAI,EAAG,MAAM,CAAC;IACd,IAAI,EAAG,MAAM,CAAC;IACd,MAAM,EAAG,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAa;CAChC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tag.entity.js","sourceRoot":"","sources":["../../src/entities/tag.entity.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,SAAS;IACpB,EAAE,CAAU;IACZ,IAAI,CAAU;IACd,IAAI,CAAU;IACd,MAAM,CAAU;
|
|
1
|
+
{"version":3,"file":"tag.entity.js","sourceRoot":"","sources":["../../src/entities/tag.entity.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,SAAS;IACpB,EAAE,CAAU;IACZ,IAAI,CAAU;IACd,IAAI,CAAU;IACd,MAAM,CAAU;IAChB,SAAS,GAAY,SAAS,CAAC;CAChC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requirement.model.d.ts","sourceRoot":"","sources":["../../src/models/requirement.model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,qBACa,gBAAgB;IAE3B,EAAE,EAAG,MAAM,CAAC;IAGZ,IAAI,EAAG,MAAM,CAAC;IAGd,WAAW,CAAC,EAAE,MAAM,CAAC;IAGrB,QAAQ,EAAG,MAAM,CAAC;IAGlB,eAAe,EAAG,MAAM,CAAC;IAGzB,QAAQ,EAAG,OAAO,CAAC;IAGnB,SAAS,CAAC,EAAE,MAAM,CAAC;IAGnB,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;CACvB"}
|
|
1
|
+
{"version":3,"file":"requirement.model.d.ts","sourceRoot":"","sources":["../../src/models/requirement.model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,qBACa,gBAAgB;IAE3B,EAAE,EAAG,MAAM,CAAC;IAGZ,IAAI,EAAG,MAAM,CAAC;IAGd,WAAW,CAAC,EAAE,MAAM,CAAC;IAGrB,QAAQ,EAAG,MAAM,CAAC;IAGlB,eAAe,EAAG,MAAM,CAAC;IAGzB,QAAQ,EAAG,OAAO,CAAC;IAGnB,SAAS,CAAC,EAAE,MAAM,CAAC;IAGnB,SAAS,CAAC,EAAE,MAAM,CAAa;IAG/B,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;CACvB"}
|
|
@@ -17,6 +17,7 @@ let RequirementModel = class RequirementModel {
|
|
|
17
17
|
currentQuantity;
|
|
18
18
|
isSystem;
|
|
19
19
|
createdBy;
|
|
20
|
+
updatedBy = undefined;
|
|
20
21
|
events;
|
|
21
22
|
};
|
|
22
23
|
__decorate([
|
|
@@ -47,6 +48,10 @@ __decorate([
|
|
|
47
48
|
Column({ type: 'uuid', nullable: true }),
|
|
48
49
|
__metadata("design:type", String)
|
|
49
50
|
], RequirementModel.prototype, "createdBy", void 0);
|
|
51
|
+
__decorate([
|
|
52
|
+
Column({ type: 'uuid', nullable: true }),
|
|
53
|
+
__metadata("design:type", String)
|
|
54
|
+
], RequirementModel.prototype, "updatedBy", void 0);
|
|
50
55
|
__decorate([
|
|
51
56
|
ManyToMany(() => EventModel, (event) => event.requirements),
|
|
52
57
|
__metadata("design:type", Array)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requirement.model.js","sourceRoot":"","sources":["../../src/models/requirement.model.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGvC,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAE3B,EAAE,CAAU;IAGZ,IAAI,CAAU;IAGd,WAAW,CAAU;IAGrB,QAAQ,CAAU;IAGlB,eAAe,CAAU;IAGzB,QAAQ,CAAW;IAGnB,SAAS,CAAU;IAGnB,MAAM,CAAgB;CACvB,CAAA;
|
|
1
|
+
{"version":3,"file":"requirement.model.js","sourceRoot":"","sources":["../../src/models/requirement.model.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGvC,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAE3B,EAAE,CAAU;IAGZ,IAAI,CAAU;IAGd,WAAW,CAAU;IAGrB,QAAQ,CAAU;IAGlB,eAAe,CAAU;IAGzB,QAAQ,CAAW;IAGnB,SAAS,CAAU;IAGnB,SAAS,GAAY,SAAS,CAAC;IAG/B,MAAM,CAAgB;CACvB,CAAA;AAzBC;IADC,sBAAsB,CAAC,MAAM,CAAC;;4CACnB;AAGZ;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;;8CAC3B;AAGd;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACpB;AAGrB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;kDACN;AAGlB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;yDACX;AAGzB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;kDACzB;AAGnB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACtB;AAGnB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACV;AAG/B;IADC,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC;;gDACtC;AA1BX,gBAAgB;IAD5B,MAAM,CAAC,cAAc,CAAC;GACV,gBAAgB,CA2B5B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tag.model.d.ts","sourceRoot":"","sources":["../../src/models/tag.model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,qBACa,QAAQ;IAEnB,EAAE,EAAG,MAAM,CAAC;IAGZ,IAAI,EAAG,MAAM,CAAC;IAGd,IAAI,EAAG,MAAM,CAAC;IAGd,MAAM,EAAG,MAAM,CAAC;IAGhB,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;CACvB"}
|
|
1
|
+
{"version":3,"file":"tag.model.d.ts","sourceRoot":"","sources":["../../src/models/tag.model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,qBACa,QAAQ;IAEnB,EAAE,EAAG,MAAM,CAAC;IAGZ,IAAI,EAAG,MAAM,CAAC;IAGd,IAAI,EAAG,MAAM,CAAC;IAGd,MAAM,EAAG,MAAM,CAAC;IAGhB,SAAS,CAAC,EAAE,MAAM,CAAa;IAG/B,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;CACvB"}
|
package/dist/models/tag.model.js
CHANGED
|
@@ -14,6 +14,7 @@ let TagModel = class TagModel {
|
|
|
14
14
|
name;
|
|
15
15
|
slug;
|
|
16
16
|
balise;
|
|
17
|
+
updatedBy = undefined;
|
|
17
18
|
events;
|
|
18
19
|
};
|
|
19
20
|
__decorate([
|
|
@@ -32,6 +33,10 @@ __decorate([
|
|
|
32
33
|
Column({ type: 'varchar', length: 100 }),
|
|
33
34
|
__metadata("design:type", String)
|
|
34
35
|
], TagModel.prototype, "balise", void 0);
|
|
36
|
+
__decorate([
|
|
37
|
+
Column({ type: 'uuid', nullable: true }),
|
|
38
|
+
__metadata("design:type", String)
|
|
39
|
+
], TagModel.prototype, "updatedBy", void 0);
|
|
35
40
|
__decorate([
|
|
36
41
|
ManyToMany(() => EventModel, (event) => event.tags),
|
|
37
42
|
__metadata("design:type", Array)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tag.model.js","sourceRoot":"","sources":["../../src/models/tag.model.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGvC,IAAM,QAAQ,GAAd,MAAM,QAAQ;IAEnB,EAAE,CAAU;IAGZ,IAAI,CAAU;IAGd,IAAI,CAAU;IAGd,MAAM,CAAU;IAGhB,MAAM,CAAgB;CACvB,CAAA;
|
|
1
|
+
{"version":3,"file":"tag.model.js","sourceRoot":"","sources":["../../src/models/tag.model.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGvC,IAAM,QAAQ,GAAd,MAAM,QAAQ;IAEnB,EAAE,CAAU;IAGZ,IAAI,CAAU;IAGd,IAAI,CAAU;IAGd,MAAM,CAAU;IAGhB,SAAS,GAAY,SAAS,CAAC;IAG/B,MAAM,CAAgB;CACvB,CAAA;AAhBC;IADC,sBAAsB,CAAC,MAAM,CAAC;;oCACnB;AAGZ;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;;sCAC3B;AAGd;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;;sCACzC;AAGd;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;;wCACzB;AAGhB;IADC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACV;AAG/B;IADC,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;;wCAC9B;AAjBX,QAAQ;IADpB,MAAM,CAAC,MAAM,CAAC;GACF,QAAQ,CAkBpB"}
|
|
@@ -41,8 +41,8 @@ let PostgresEventRepository = class PostgresEventRepository extends BaseReposito
|
|
|
41
41
|
const savedEventModel = await queryRunner.manager.save(this.modelClass, eventModel);
|
|
42
42
|
const savedEventEntity = this.toEntity(savedEventModel);
|
|
43
43
|
const payload = { before: null, after: savedEventEntity };
|
|
44
|
-
await queryRunner.manager.query(`INSERT INTO event_queue (type, emitter, payload, target_services, version, status, attempts, updated_at, created_at)
|
|
45
|
-
VALUES ($1, $2, $3, $4, 1, 'PENDING', 0, now(), now())`, ['event.created', 'ms-event', payload, ['
|
|
44
|
+
await queryRunner.manager.query(`INSERT INTO event_queue (type, emitter, "emitterId", payload, target_services, version, status, attempts, updated_at, created_at)
|
|
45
|
+
VALUES ($1, $2, $3, $4, $5, 1, 'PENDING', 0, now(), now())`, ['event.created', 'ms-event', savedEventEntity.organizerId, payload, ['social']]);
|
|
46
46
|
return savedEventEntity;
|
|
47
47
|
});
|
|
48
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgres-event.repository.js","sourceRoot":"","sources":["../../src/repositories/postgres-event.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAInD,IAAM,uBAAuB,GAA7B,MAAM,uBACX,SAAQ,cAAuC;IAG/C,YAEE,UAAkC;QAElC,KAAK,CAAC,UAAU,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,EAAU,EAAE,YAAsB,EAAE;QACjD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,YAAsB,EAAE;QACpC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,UAAkB;QAC7B,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,UAAU,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,IAA0B;QACrD,OAAO,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;YACrD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACrC,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YAC1E,MAAM,eAAe,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YACpF,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;YAExD,MAAM,OAAO,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;YAC1D,MAAM,WAAW,CAAC,OAAO,CAAC,KAAK,CAC7B;
|
|
1
|
+
{"version":3,"file":"postgres-event.repository.js","sourceRoot":"","sources":["../../src/repositories/postgres-event.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAInD,IAAM,uBAAuB,GAA7B,MAAM,uBACX,SAAQ,cAAuC;IAG/C,YAEE,UAAkC;QAElC,KAAK,CAAC,UAAU,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,EAAU,EAAE,YAAsB,EAAE;QACjD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,YAAsB,EAAE;QACpC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,UAAkB;QAC7B,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,UAAU,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,IAA0B;QACrD,OAAO,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;YACrD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACrC,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YAC1E,MAAM,eAAe,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YACpF,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;YAExD,MAAM,OAAO,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;YAC1D,MAAM,WAAW,CAAC,OAAO,CAAC,KAAK,CAC7B;oEAC4D,EAC5D,CAAC,eAAe,EAAE,UAAU,EAAE,gBAAgB,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC,QAAQ,CAAC,CAAC,CACjF,CAAC;YAEF,OAAO,gBAAgB,CAAC;QAC1B,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA9CY,uBAAuB;IADnC,UAAU,EAAE;IAMR,WAAA,gBAAgB,CAAC,UAAU,CAAC,CAAA;;GALpB,uBAAuB,CA8CnC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-source.d.ts","sourceRoot":"","sources":["../../src/test/data-source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"data-source.d.ts","sourceRoot":"","sources":["../../src/test/data-source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAwBzD,eAAO,MAAM,cAAc,YA6BzB,CAAC;AAEH,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,MAAM,eAAe,UAAU,CAAC,KAAG,UAAU,CAAC,CAAC,CACpB,CAAC;AAExE,eAAO,MAAM,gBAAgB,QAAa,OAAO,CAAC,IAAI,CAMrD,CAAC;AAEF,eAAO,MAAM,WAAW,QAAa,OAAO,CAAC,IAAI,CAIhD,CAAC;AAEF,eAAO,MAAM,WAAW,QAAa,OAAO,CAAC,IAAI,CAIhD,CAAC"}
|
package/dist/test/data-source.js
CHANGED
|
@@ -18,6 +18,8 @@ import { AddJobAuditStatusTrigger1779115100001 } from './migrations/177911510000
|
|
|
18
18
|
import { AddJobAudit1779114963391 } from './migrations/1779114963391-AddJobAudit.js';
|
|
19
19
|
import { AddEmitterToJobAudit1779353596425 } from './migrations/1779353596425-AddEmitterToJobAudit.js';
|
|
20
20
|
import { FixEventQueueStatusDefault1779360000000 } from './migrations/1779360000000-FixEventQueueStatusDefault.js';
|
|
21
|
+
import { AddUpdatedByToTags1779555000000 } from './migrations/1779555000000-AddUpdatedByToTags.js';
|
|
22
|
+
import { AddUpdatedByToRequirements1779555000001 } from './migrations/1779555000001-AddUpdatedByToRequirements.js';
|
|
21
23
|
export const testDataSource = new DataSource({
|
|
22
24
|
type: 'postgres',
|
|
23
25
|
host: 'localhost',
|
|
@@ -41,6 +43,8 @@ export const testDataSource = new DataSource({
|
|
|
41
43
|
AddEmitterToJobAudit1779353596425,
|
|
42
44
|
FixEventQueueStatusDefault1779360000000,
|
|
43
45
|
MakeOrganizerIdMandatoryAndAddEmitterId1779542033290,
|
|
46
|
+
AddUpdatedByToTags1779555000000,
|
|
47
|
+
AddUpdatedByToRequirements1779555000001,
|
|
44
48
|
],
|
|
45
49
|
synchronize: false,
|
|
46
50
|
logging: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-source.js","sourceRoot":"","sources":["../../src/test/data-source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE1E,OAAO,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAC;AACzF,OAAO,EAAE,oCAAoC,EAAE,MAAM,uDAAuD,CAAC;AAC7G,OAAO,EAAE,+DAA+D,EAAE,MAAM,kFAAkF,CAAC;AACnK,OAAO,EAAE,mDAAmD,EAAE,MAAM,sEAAsE,CAAC;AAC3I,OAAO,EAAE,oCAAoC,EAAE,MAAM,uDAAuD,CAAC;AAC7G,OAAO,EAAE,+CAA+C,EAAE,MAAM,kEAAkE,CAAC;AACnI,OAAO,EAAE,+BAA+B,EAAE,MAAM,kDAAkD,CAAC;AACnG,OAAO,EAAE,+BAA+B,EAAE,MAAM,kDAAkD,CAAC;AACnG,OAAO,EAAE,0CAA0C,EAAE,MAAM,6DAA6D,CAAC;AACzH,OAAO,EAAE,oDAAoD,EAAE,MAAM,uEAAuE,CAAC;AAC7I,OAAO,EAAE,qCAAqC,EAAE,MAAM,wDAAwD,CAAC;AAC/G,OAAO,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAE,iCAAiC,EAAE,MAAM,oDAAoD,CAAC;AACvG,OAAO,EAAE,uCAAuC,EAAE,MAAM,0DAA0D,CAAC;AAEnH,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,UAAU,CAAC;IAC3C,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,WAAW;IACjB,IAAI,EAAE,IAAI;IACV,QAAQ,EAAE,MAAM;IAChB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,gBAAgB,EAAE,eAAe,EAAE,eAAe,CAAC;IAEpF,UAAU,EAAE;QACV,0BAA0B;QAC1B,oCAAoC;QACpC,+DAA+D;QAC/D,mDAAmD;QACnD,oCAAoC;QACpC,+BAA+B;QAC/B,+CAA+C;QAC/C,+BAA+B;QAC/B,0CAA0C;QAC1C,wBAAwB;QACxB,qCAAqC;QACrC,iCAAiC;QACjC,uCAAuC;QACvC,oDAAoD;
|
|
1
|
+
{"version":3,"file":"data-source.js","sourceRoot":"","sources":["../../src/test/data-source.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,7 +49,11 @@ describe('SQL Triggers (Integration)', () => {
|
|
|
49
49
|
});
|
|
50
50
|
it('should create an event_queue record when a requirement is updated', async () => {
|
|
51
51
|
const req = await requirementRepository.create(RequirementFactory.buildInput({ currentQuantity: 0 }));
|
|
52
|
-
await requirementRepository.update(req.id, {
|
|
52
|
+
await requirementRepository.update(req.id, {
|
|
53
|
+
currentQuantity: 5,
|
|
54
|
+
updatedBy: '11111111-1111-1111-1111-111111111111',
|
|
55
|
+
});
|
|
56
|
+
console.log('DB State Requirements:', await testDataSource.query('SELECT * FROM requirements WHERE id = $1', [req.id]));
|
|
53
57
|
const records = await testDataSource
|
|
54
58
|
.getRepository((EventQueueModel))
|
|
55
59
|
.find({ where: { type: EventMessagingType.REQUIREMENT_CHANGED } });
|
|
@@ -60,10 +64,14 @@ describe('SQL Triggers (Integration)', () => {
|
|
|
60
64
|
expect(updateRecord.payload.before?.currentQuantity).toBe(0);
|
|
61
65
|
expect(updateRecord.payload.after.currentQuantity).toBe(5);
|
|
62
66
|
expect(updateRecord.emitter).toBe('ms-event-db');
|
|
67
|
+
expect(updateRecord.emitterId).toBe('11111111-1111-1111-1111-111111111111');
|
|
63
68
|
}
|
|
64
69
|
});
|
|
65
70
|
it('should create an event_queue record when a tag is deleted', async () => {
|
|
66
|
-
const tag = await tagRepository.create(TagFactory.buildInput({
|
|
71
|
+
const tag = await tagRepository.create(TagFactory.buildInput({
|
|
72
|
+
name: 'To Delete',
|
|
73
|
+
updatedBy: '22222222-2222-2222-2222-222222222222',
|
|
74
|
+
}));
|
|
67
75
|
await tagRepository.delete(tag.id);
|
|
68
76
|
const records = await testDataSource
|
|
69
77
|
.getRepository((EventQueueModel))
|
|
@@ -73,6 +81,7 @@ describe('SQL Triggers (Integration)', () => {
|
|
|
73
81
|
if (deleteRecord) {
|
|
74
82
|
expect(deleteRecord.payload.after).toBeFalsy();
|
|
75
83
|
expect(deleteRecord.payload.before?.name).toBe('To Delete');
|
|
84
|
+
expect(deleteRecord.emitterId).toBe('22222222-2222-2222-2222-222222222222');
|
|
76
85
|
}
|
|
77
86
|
});
|
|
78
87
|
it('should handle ManyToMany relation updates', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"triggers.int.spec.js","sourceRoot":"","sources":["../../../src/test/integration/triggers.int.spec.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"triggers.int.spec.js","sourceRoot":"","sources":["../../../src/test/integration/triggers.int.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"1777985367963-AddTargetServicesToEventQueue.d.ts","sourceRoot":"","sources":["../../../src/test/migrations/1777985367963-AddTargetServicesToEventQueue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE/D,qBAAa,0CAA2C,YAAW,kBAAkB;IACtE,EAAE,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"1777985367963-AddTargetServicesToEventQueue.d.ts","sourceRoot":"","sources":["../../../src/test/migrations/1777985367963-AddTargetServicesToEventQueue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE/D,qBAAa,0CAA2C,YAAW,kBAAkB;IACtE,EAAE,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IA8D3C,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;CAoB3D"}
|
|
@@ -22,9 +22,11 @@ export class AddTargetServicesToEventQueue1777985367963 {
|
|
|
22
22
|
END IF;
|
|
23
23
|
|
|
24
24
|
v_emitter_id := COALESCE(
|
|
25
|
+
(payload_data->'after'->>'updatedBy')::UUID,
|
|
25
26
|
(payload_data->'after'->>'organizerId')::UUID,
|
|
26
|
-
(payload_data->'before'->>'organizerId')::UUID,
|
|
27
27
|
(payload_data->'after'->>'createdBy')::UUID,
|
|
28
|
+
(payload_data->'before'->>'updatedBy')::UUID,
|
|
29
|
+
(payload_data->'before'->>'organizerId')::UUID,
|
|
28
30
|
(payload_data->'before'->>'createdBy')::UUID
|
|
29
31
|
);
|
|
30
32
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"1777985367963-AddTargetServicesToEventQueue.js","sourceRoot":"","sources":["../../../src/test/migrations/1777985367963-AddTargetServicesToEventQueue.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,0CAA0C;IAC9C,KAAK,CAAC,EAAE,CAAC,WAAwB;QAEtC,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QACxD,MAAM,iBAAiB,GAAG,KAAK,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;QAErE,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,WAAW,CAAC,KAAK,CACrB,qFAAqF,CACtF,CAAC;QACJ,CAAC;QAED,MAAM,WAAW,CAAC,KAAK,CAAC
|
|
1
|
+
{"version":3,"file":"1777985367963-AddTargetServicesToEventQueue.js","sourceRoot":"","sources":["../../../src/test/migrations/1777985367963-AddTargetServicesToEventQueue.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,0CAA0C;IAC9C,KAAK,CAAC,EAAE,CAAC,WAAwB;QAEtC,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QACxD,MAAM,iBAAiB,GAAG,KAAK,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;QAErE,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,WAAW,CAAC,KAAK,CACrB,qFAAqF,CACtF,CAAC;QACJ,CAAC;QAED,MAAM,WAAW,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAgDvB,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,WAAwB;QAExC,MAAM,WAAW,CAAC,KAAK,CAAC;;;;;;;;;KASvB,CAAC,CAAC;QAGH,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QACxD,MAAM,iBAAiB,GAAG,KAAK,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;QACrE,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,WAAW,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;QACrF,CAAC;IACH,CAAC;CACF"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { MigrationInterface, QueryRunner } from 'typeorm';
|
|
2
|
+
export declare class AddUpdatedByToTags1779555000000 implements MigrationInterface {
|
|
3
|
+
name: string;
|
|
4
|
+
up(queryRunner: QueryRunner): Promise<void>;
|
|
5
|
+
down(queryRunner: QueryRunner): Promise<void>;
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=1779555000000-AddUpdatedByToTags.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"1779555000000-AddUpdatedByToTags.d.ts","sourceRoot":"","sources":["../../../src/test/migrations/1779555000000-AddUpdatedByToTags.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE/D,qBAAa,+BAAgC,YAAW,kBAAkB;IACxE,IAAI,SAAqC;IAE5B,EAAE,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3C,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;CAG3D"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export class AddUpdatedByToTags1779555000000 {
|
|
2
|
+
name = 'AddUpdatedByToTags1779555000000';
|
|
3
|
+
async up(queryRunner) {
|
|
4
|
+
await queryRunner.query(`ALTER TABLE "tags" ADD "updatedBy" uuid`);
|
|
5
|
+
}
|
|
6
|
+
async down(queryRunner) {
|
|
7
|
+
await queryRunner.query(`ALTER TABLE "tags" DROP COLUMN "updatedBy"`);
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=1779555000000-AddUpdatedByToTags.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"1779555000000-AddUpdatedByToTags.js","sourceRoot":"","sources":["../../../src/test/migrations/1779555000000-AddUpdatedByToTags.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,+BAA+B;IAC1C,IAAI,GAAG,iCAAiC,CAAC;IAElC,KAAK,CAAC,EAAE,CAAC,WAAwB;QACtC,MAAM,WAAW,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;IACrE,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,WAAwB;QACxC,MAAM,WAAW,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;IACxE,CAAC;CACF"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { MigrationInterface, QueryRunner } from 'typeorm';
|
|
2
|
+
export declare class AddUpdatedByToRequirements1779555000001 implements MigrationInterface {
|
|
3
|
+
name: string;
|
|
4
|
+
up(queryRunner: QueryRunner): Promise<void>;
|
|
5
|
+
down(queryRunner: QueryRunner): Promise<void>;
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=1779555000001-AddUpdatedByToRequirements.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"1779555000001-AddUpdatedByToRequirements.d.ts","sourceRoot":"","sources":["../../../src/test/migrations/1779555000001-AddUpdatedByToRequirements.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE/D,qBAAa,uCAAwC,YAAW,kBAAkB;IAChF,IAAI,SAA6C;IAEpC,EAAE,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3C,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;CAG3D"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export class AddUpdatedByToRequirements1779555000001 {
|
|
2
|
+
name = 'AddUpdatedByToRequirements1779555000001';
|
|
3
|
+
async up(queryRunner) {
|
|
4
|
+
await queryRunner.query(`ALTER TABLE "requirements" ADD "updatedBy" uuid`);
|
|
5
|
+
}
|
|
6
|
+
async down(queryRunner) {
|
|
7
|
+
await queryRunner.query(`ALTER TABLE "requirements" DROP COLUMN "updatedBy"`);
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=1779555000001-AddUpdatedByToRequirements.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"1779555000001-AddUpdatedByToRequirements.js","sourceRoot":"","sources":["../../../src/test/migrations/1779555000001-AddUpdatedByToRequirements.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,uCAAuC;IAClD,IAAI,GAAG,yCAAyC,CAAC;IAE1C,KAAK,CAAC,EAAE,CAAC,WAAwB;QACtC,MAAM,WAAW,CAAC,KAAK,CAAC,iDAAiD,CAAC,CAAC;IAC7E,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,WAAwB;QACxC,MAAM,WAAW,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;IAChF,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@volontariapp/domain-event",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.0-snap-e2f98fe",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public",
|
|
6
6
|
"provenance": true
|
|
@@ -56,11 +56,11 @@
|
|
|
56
56
|
"dependencies": {
|
|
57
57
|
"@nestjs/common": "^11.0.1",
|
|
58
58
|
"@volontariapp/contracts": "4.0.11",
|
|
59
|
-
"@volontariapp/database": "3.0.0-snap-
|
|
59
|
+
"@volontariapp/database": "3.0.0-snap-e2f98fe",
|
|
60
60
|
"@volontariapp/errors": "0.5.2",
|
|
61
61
|
"@volontariapp/errors-nest": "0.11.2",
|
|
62
62
|
"@volontariapp/logger": "0.2.5",
|
|
63
|
-
"@volontariapp/messaging": "2.1.1-snap-
|
|
63
|
+
"@volontariapp/messaging": "2.1.1-snap-e2f98fe",
|
|
64
64
|
"class-transformer": "^0.5.1"
|
|
65
65
|
}
|
|
66
66
|
}
|
|
@@ -15,9 +15,11 @@ BEGIN
|
|
|
15
15
|
END IF;
|
|
16
16
|
|
|
17
17
|
v_emitter_id := COALESCE(
|
|
18
|
+
(payload_data->'after'->>'updatedBy')::UUID,
|
|
18
19
|
(payload_data->'after'->>'organizerId')::UUID,
|
|
19
|
-
(payload_data->'before'->>'organizerId')::UUID,
|
|
20
20
|
(payload_data->'after'->>'createdBy')::UUID,
|
|
21
|
+
(payload_data->'before'->>'updatedBy')::UUID,
|
|
22
|
+
(payload_data->'before'->>'organizerId')::UUID,
|
|
21
23
|
(payload_data->'before'->>'createdBy')::UUID
|
|
22
24
|
);
|
|
23
25
|
|