@eventista/ticketing-common 1.3.38-dev.0 → 1.3.38-dev.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.
- package/dist/database/redis/benefit-stock.d.ts +3 -4
- package/dist/database/redis/benefit-stock.js +8 -8
- package/dist/database/redis/benefit-stock.js.map +1 -1
- package/dist/schemas/benefit/benefit.schema.d.ts +1 -1
- package/dist/schemas/benefit/benefit.schema.js +4 -4
- package/dist/schemas/benefit/benefit.schema.js.map +1 -1
- package/dist/services/benefit-release.d.ts +1 -6
- package/dist/services/benefit-release.js +17 -18
- package/dist/services/benefit-release.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -4,9 +4,9 @@ export declare const BENEFIT_REMAINING_CACHE_TTL_SECONDS = 10;
|
|
|
4
4
|
export declare const BENEFIT_APPLY_MARKER_TTL_SECONDS = 86400;
|
|
5
5
|
export declare const BENEFIT_RELEASE_MARKER_TTL_SECONDS: number;
|
|
6
6
|
export type BenefitOp = 'apply' | 'undo' | 'release';
|
|
7
|
-
export declare function benefitStockKey(eventId: string,
|
|
8
|
-
export declare function benefitOpKey(
|
|
9
|
-
export declare function benefitNoopKey(
|
|
7
|
+
export declare function benefitStockKey(eventId: string, benefitId: string): string;
|
|
8
|
+
export declare function benefitOpKey(eventId: string, op: BenefitOp, id: string): string;
|
|
9
|
+
export declare function benefitNoopKey(eventId: string): string;
|
|
10
10
|
export declare function benefitListCacheKey(ticketClassId: string): string;
|
|
11
11
|
export declare function benefitRemainingCacheKey(ticketClassId: string): string;
|
|
12
12
|
export declare const BENEFIT_MOVE_SCRIPT = "\nif redis.call('EXISTS', KEYS[1]) == 1 then\n return cjson.encode({ success = true, replay = true })\nend\nlocal short = {}\nfor i = 3, #KEYS do\n local d = tonumber(ARGV[i - 2])\n if d > 0 then\n local a = tonumber(redis.call('GET', KEYS[i] .. ':available') or '0')\n if a < d then table.insert(short, { key = KEYS[i], available = a, need = d }) end\n elseif d < 0 then\n local h = tonumber(redis.call('GET', KEYS[i] .. ':hold') or '0')\n if h < -d then table.insert(short, { key = KEYS[i], hold = h, need = -d }) end\n end\nend\nif #short > 0 then\n return cjson.encode({ success = false, short = short })\nend\nfor i = 3, #KEYS do\n local d = tonumber(ARGV[i - 2])\n redis.call('DECRBY', KEYS[i] .. ':available', d)\n redis.call('INCRBY', KEYS[i] .. ':hold', d)\nend\nredis.call('SET', KEYS[1], '1', 'EX', tonumber(ARGV[#ARGV]))\nif KEYS[2] ~= '' then redis.call('DEL', KEYS[2]) end\nreturn cjson.encode({ success = true, replay = false })\n";
|
|
@@ -14,7 +14,6 @@ export declare const BENEFIT_ADJUST_SCRIPT = "\nlocal a = tonumber(redis.call('G
|
|
|
14
14
|
export declare const BENEFIT_RESEED_SCRIPT = "\nredis.call('SET', KEYS[1] .. ':hold', ARGV[2])\nredis.call('SET', KEYS[1] .. ':available', tonumber(ARGV[1]) - tonumber(ARGV[2]))\nreturn 1\n";
|
|
15
15
|
export interface BenefitMoveInput {
|
|
16
16
|
eventId: string;
|
|
17
|
-
ticketClassId: string;
|
|
18
17
|
marker: string;
|
|
19
18
|
deleteMarker?: string;
|
|
20
19
|
deltas: Record<string, number>;
|
|
@@ -13,14 +13,14 @@ exports.BENEFIT_LIST_CACHE_TTL_SECONDS = 3600;
|
|
|
13
13
|
exports.BENEFIT_REMAINING_CACHE_TTL_SECONDS = 10;
|
|
14
14
|
exports.BENEFIT_APPLY_MARKER_TTL_SECONDS = 86400;
|
|
15
15
|
exports.BENEFIT_RELEASE_MARKER_TTL_SECONDS = 7 * 24 * 3600;
|
|
16
|
-
function benefitStockKey(eventId,
|
|
17
|
-
return `benefit
|
|
16
|
+
function benefitStockKey(eventId, benefitId) {
|
|
17
|
+
return `benefit:{${eventId}}:${benefitId}`;
|
|
18
18
|
}
|
|
19
|
-
function benefitOpKey(
|
|
20
|
-
return `benefit:op:{${
|
|
19
|
+
function benefitOpKey(eventId, op, id) {
|
|
20
|
+
return `benefit:op:{${eventId}}:${op}:${id}`;
|
|
21
21
|
}
|
|
22
|
-
function benefitNoopKey(
|
|
23
|
-
return `benefit:op:{${
|
|
22
|
+
function benefitNoopKey(eventId) {
|
|
23
|
+
return `benefit:op:{${eventId}}:noop`;
|
|
24
24
|
}
|
|
25
25
|
function benefitListCacheKey(ticketClassId) {
|
|
26
26
|
return `benefit:{${ticketClassId}}:list`;
|
|
@@ -68,12 +68,12 @@ redis.call('SET', KEYS[1] .. ':available', tonumber(ARGV[1]) - tonumber(ARGV[2])
|
|
|
68
68
|
return 1
|
|
69
69
|
`;
|
|
70
70
|
function buildBenefitMoveCommand(input) {
|
|
71
|
-
const keys = [input.marker, input.deleteMarker ?? benefitNoopKey(input.
|
|
71
|
+
const keys = [input.marker, input.deleteMarker ?? benefitNoopKey(input.eventId)];
|
|
72
72
|
const args = [];
|
|
73
73
|
for (const [benefitId, delta] of Object.entries(input.deltas)) {
|
|
74
74
|
if (delta === 0)
|
|
75
75
|
continue;
|
|
76
|
-
keys.push(benefitStockKey(input.eventId,
|
|
76
|
+
keys.push(benefitStockKey(input.eventId, benefitId));
|
|
77
77
|
args.push(String(delta));
|
|
78
78
|
}
|
|
79
79
|
args.push(String(input.ttlSeconds));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"benefit-stock.js","sourceRoot":"","sources":["../../../src/database/redis/benefit-stock.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"benefit-stock.js","sourceRoot":"","sources":["../../../src/database/redis/benefit-stock.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ export type BenefitDocument = HydratedDocument<Benefit> & BaseDocument;
|
|
|
4
4
|
export declare class Benefit extends BaseSchema {
|
|
5
5
|
eventId: string;
|
|
6
6
|
calendarId: string;
|
|
7
|
-
|
|
7
|
+
ticketClassIds: string[];
|
|
8
8
|
name: string;
|
|
9
9
|
description: string;
|
|
10
10
|
thumbnail: string;
|
|
@@ -24,9 +24,9 @@ __decorate([
|
|
|
24
24
|
__metadata("design:type", String)
|
|
25
25
|
], Benefit.prototype, "calendarId", void 0);
|
|
26
26
|
__decorate([
|
|
27
|
-
(0, mongoose_1.Prop)({ required: true }),
|
|
28
|
-
__metadata("design:type",
|
|
29
|
-
], Benefit.prototype, "
|
|
27
|
+
(0, mongoose_1.Prop)({ type: [String], required: true }),
|
|
28
|
+
__metadata("design:type", Array)
|
|
29
|
+
], Benefit.prototype, "ticketClassIds", void 0);
|
|
30
30
|
__decorate([
|
|
31
31
|
(0, mongoose_1.Prop)({ required: true }),
|
|
32
32
|
__metadata("design:type", String)
|
|
@@ -80,5 +80,5 @@ exports.Benefit = Benefit = __decorate([
|
|
|
80
80
|
exports.BenefitSchema = mongoose_1.SchemaFactory.createForClass(Benefit);
|
|
81
81
|
(0, index_1.addSoftDeleteHooks)(exports.BenefitSchema);
|
|
82
82
|
(0, index_1.addUpdateHooks)(exports.BenefitSchema);
|
|
83
|
-
exports.BenefitSchema.index({ eventId: 1,
|
|
83
|
+
exports.BenefitSchema.index({ eventId: 1, ticketClassIds: 1 });
|
|
84
84
|
//# sourceMappingURL=benefit.schema.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"benefit.schema.js","sourceRoot":"","sources":["../../../src/schemas/benefit/benefit.schema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA+D;AAE/D,oCAA8G;
|
|
1
|
+
{"version":3,"file":"benefit.schema.js","sourceRoot":"","sources":["../../../src/schemas/benefit/benefit.schema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA+D;AAE/D,oCAA8G;AAYvG,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAQ,kBAAU;CA8CtC,CAAA;AA9CY,0BAAO;AAElB;IADC,IAAA,eAAI,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCACT;AAGhB;IADC,IAAA,eAAI,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACN;AAInB;IADC,IAAA,eAAI,EAAC,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAChB;AAGzB;IADC,IAAA,eAAI,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qCACZ;AAIb;IADC,IAAA,eAAI,EAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;;4CACF;AAIpB;IADC,IAAA,eAAI,EAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;;0CACJ;AAGlB;IADC,IAAA,eAAI,EAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;gDACG;AAGxB;IADC,IAAA,eAAI,EAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;iDACI;AAGzB;IADC,IAAA,eAAI,EAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;6CACA;AAGrB;IADC,IAAA,eAAI,EAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;8CACC;AAItB;IADC,IAAA,eAAI,EAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;gDACG;AAGxB;IADC,IAAA,eAAI,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;yCACpB;AAGjB;IADC,IAAA,eAAI,EAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;yCACJ;AAGjB;IADC,IAAA,eAAI,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;yCACN;kBA7CP,OAAO;IAJnB,IAAA,iBAAM,EAAC;QACN,UAAU,EAAE,UAAU;QACtB,GAAG,4BAAoB;KACxB,CAAC;GACW,OAAO,CA8CnB;AAEY,QAAA,aAAa,GAAG,wBAAa,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;AAEnE,IAAA,0BAAkB,EAAC,qBAAa,CAAC,CAAC;AAClC,IAAA,sBAAc,EAAC,qBAAa,CAAC,CAAC;AAE9B,qBAAa,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC"}
|
|
@@ -10,7 +10,6 @@ export declare const BENEFIT_RELEASE_MAX_ATTEMPTS = 3;
|
|
|
10
10
|
export interface ReleaseTicketInput {
|
|
11
11
|
_id: string | Types.ObjectId;
|
|
12
12
|
eventId: string;
|
|
13
|
-
ticketClassId: string;
|
|
14
13
|
benefits: ITicketBenefit[];
|
|
15
14
|
benefitReleaseSeq?: number;
|
|
16
15
|
}
|
|
@@ -18,14 +17,10 @@ export type ReleaseTicketClaimInput = Pick<ReleaseTicketInput, '_id'> & Partial<
|
|
|
18
17
|
export interface ResumeOrderInput {
|
|
19
18
|
_id: string | Types.ObjectId;
|
|
20
19
|
eventId: string;
|
|
21
|
-
ticketClassId?: string;
|
|
22
|
-
tickets?: Array<{
|
|
23
|
-
ticketClassId?: string;
|
|
24
|
-
}>;
|
|
25
20
|
benefitSelections?: IBenefitSelection[];
|
|
26
21
|
}
|
|
27
22
|
export declare const TICKET_CLAIMABLE_STOCK: ReadonlyArray<ITicketBenefitStock | null>;
|
|
28
|
-
export declare function ticketReleaseMarker(
|
|
23
|
+
export declare function ticketReleaseMarker(eventId: string, ticketId: string, seq?: number): string;
|
|
29
24
|
export declare class BenefitReleaseService {
|
|
30
25
|
private readonly orderModel;
|
|
31
26
|
private readonly ticketModel;
|
|
@@ -6,8 +6,8 @@ const benefit_stock_1 = require("../database/redis/benefit-stock");
|
|
|
6
6
|
exports.BENEFIT_RELEASE_MAX_ATTEMPTS = 3;
|
|
7
7
|
const CTX = 'BenefitReleaseService';
|
|
8
8
|
exports.TICKET_CLAIMABLE_STOCK = ['none', 'held', null];
|
|
9
|
-
function ticketReleaseMarker(
|
|
10
|
-
return (0, benefit_stock_1.benefitOpKey)(
|
|
9
|
+
function ticketReleaseMarker(eventId, ticketId, seq) {
|
|
10
|
+
return (0, benefit_stock_1.benefitOpKey)(eventId, 'release', seq ? `t:${ticketId}:${seq}` : `t:${ticketId}`);
|
|
11
11
|
}
|
|
12
12
|
const AMBIGUOUS = { outcome: 'ambiguous', replay: false, short: [] };
|
|
13
13
|
const negate = (counts) => Object.fromEntries(Object.entries(counts).map(([id, n]) => [id, -n]));
|
|
@@ -30,15 +30,14 @@ class BenefitReleaseService {
|
|
|
30
30
|
return this.releaseClaimedOrder(String(order._id), order);
|
|
31
31
|
}
|
|
32
32
|
async releaseClaimedOrder(orderId, doc) {
|
|
33
|
-
const ticketClassId = doc.ticketClassId || doc.tickets?.[0]?.ticketClassId || '';
|
|
34
33
|
const deltas = negate((0, benefit_stock_1.countBenefitSelections)(doc.benefitSelections || []));
|
|
35
|
-
const marker = (0, benefit_stock_1.benefitOpKey)(
|
|
36
|
-
const tag = `orderId=${orderId}
|
|
37
|
-
const move = await this.runMove(doc.eventId,
|
|
34
|
+
const marker = (0, benefit_stock_1.benefitOpKey)(doc.eventId, 'release', orderId);
|
|
35
|
+
const tag = `orderId=${orderId} eventId=${doc.eventId} deltas=${formatDeltas(deltas)} marker=${marker}`;
|
|
36
|
+
const move = await this.runMove(doc.eventId, marker, deltas);
|
|
38
37
|
if (move.outcome === 'ok')
|
|
39
38
|
return this.markOrderReleased(orderId, tag);
|
|
40
39
|
if (move.outcome === 'refused')
|
|
41
|
-
return this.countOrderRefusal(orderId,
|
|
40
|
+
return this.countOrderRefusal(orderId, deltas, tag, move);
|
|
42
41
|
this.logger.warn(`[BENEFIT_STOCK][RELEASE_AMBIGUOUS] ${tag} err=${move.err}`, CTX);
|
|
43
42
|
return 'releasing';
|
|
44
43
|
}
|
|
@@ -49,19 +48,19 @@ class BenefitReleaseService {
|
|
|
49
48
|
return 'skipped';
|
|
50
49
|
const benefits = claimed.benefits || [];
|
|
51
50
|
if (benefits.length === 0) {
|
|
52
|
-
return this.markTicketReleased(ticketId, `ticketId=${ticketId}
|
|
51
|
+
return this.markTicketReleased(ticketId, `ticketId=${ticketId} eventId=${claimed.eventId} deltas=- marker=none`);
|
|
53
52
|
}
|
|
54
53
|
const benefitReleaseSeq = (claimed.benefitReleaseSeq ?? 0) + 1;
|
|
55
|
-
return this.resumeTicketBenefitRelease({ _id: ticketId, eventId: claimed.eventId,
|
|
54
|
+
return this.resumeTicketBenefitRelease({ _id: ticketId, eventId: claimed.eventId, benefits, benefitReleaseSeq });
|
|
56
55
|
}
|
|
57
56
|
async resumeTicketBenefitRelease(ticket) {
|
|
58
57
|
const ticketId = String(ticket._id);
|
|
59
58
|
const deltas = {};
|
|
60
59
|
for (const b of ticket.benefits || [])
|
|
61
60
|
deltas[b.benefitId] = (deltas[b.benefitId] || 0) - 1;
|
|
62
|
-
const marker = ticketReleaseMarker(ticket.
|
|
63
|
-
const tag = `ticketId=${ticketId}
|
|
64
|
-
const move = await this.runMove(ticket.eventId,
|
|
61
|
+
const marker = ticketReleaseMarker(ticket.eventId, ticketId, ticket.benefitReleaseSeq);
|
|
62
|
+
const tag = `ticketId=${ticketId} eventId=${ticket.eventId} deltas=${formatDeltas(deltas)} marker=${marker}`;
|
|
63
|
+
const move = await this.runMove(ticket.eventId, marker, deltas);
|
|
65
64
|
if (move.outcome === 'ok')
|
|
66
65
|
return this.markTicketReleased(ticketId, tag);
|
|
67
66
|
if (move.outcome === 'refused') {
|
|
@@ -73,7 +72,7 @@ class BenefitReleaseService {
|
|
|
73
72
|
}
|
|
74
73
|
async claimTicket(ticketId) {
|
|
75
74
|
try {
|
|
76
|
-
return await this.ticketModel.findOneAndUpdate({ _id: ticketId, benefitStock: { $in: [...exports.TICKET_CLAIMABLE_STOCK] } }, { $set: { benefitStock: 'releasing' }, $inc: { benefitReleaseSeq: 1 } }, { new: false, projection: { benefits: 1,
|
|
75
|
+
return await this.ticketModel.findOneAndUpdate({ _id: ticketId, benefitStock: { $in: [...exports.TICKET_CLAIMABLE_STOCK] } }, { $set: { benefitStock: 'releasing' }, $inc: { benefitReleaseSeq: 1 } }, { new: false, projection: { benefits: 1, eventId: 1, benefitReleaseSeq: 1 } });
|
|
77
76
|
}
|
|
78
77
|
catch (err) {
|
|
79
78
|
this.logger.warn(`[BENEFIT_STOCK][RELEASE_CLAIM_FAILED] ticketId=${ticketId} err=${errMsg(err)}`, CTX);
|
|
@@ -91,15 +90,15 @@ class BenefitReleaseService {
|
|
|
91
90
|
}
|
|
92
91
|
async claimOrder(orderId) {
|
|
93
92
|
try {
|
|
94
|
-
return await this.orderModel.findOneAndUpdate({ _id: orderId, benefitStock: 'held' }, { $set: { benefitStock: 'releasing' } }, { new: false, projection: { benefitSelections: 1,
|
|
93
|
+
return await this.orderModel.findOneAndUpdate({ _id: orderId, benefitStock: 'held' }, { $set: { benefitStock: 'releasing' } }, { new: false, projection: { benefitSelections: 1, eventId: 1 } });
|
|
95
94
|
}
|
|
96
95
|
catch (err) {
|
|
97
96
|
this.logger.warn(`[BENEFIT_STOCK][RELEASE_CLAIM_FAILED] orderId=${orderId} err=${errMsg(err)}`, CTX);
|
|
98
97
|
return null;
|
|
99
98
|
}
|
|
100
99
|
}
|
|
101
|
-
async runMove(eventId,
|
|
102
|
-
const cmd = (0, benefit_stock_1.buildBenefitMoveCommand)({ eventId,
|
|
100
|
+
async runMove(eventId, marker, deltas) {
|
|
101
|
+
const cmd = (0, benefit_stock_1.buildBenefitMoveCommand)({ eventId, marker, deltas, ttlSeconds: benefit_stock_1.BENEFIT_RELEASE_MARKER_TTL_SECONDS });
|
|
103
102
|
let raw;
|
|
104
103
|
try {
|
|
105
104
|
raw = await this.redis.executeScript(benefit_stock_1.BENEFIT_MOVE_SCRIPT, cmd.keys, cmd.args);
|
|
@@ -119,7 +118,7 @@ class BenefitReleaseService {
|
|
|
119
118
|
}
|
|
120
119
|
return 'released';
|
|
121
120
|
}
|
|
122
|
-
async countOrderRefusal(orderId,
|
|
121
|
+
async countOrderRefusal(orderId, deltas, tag, move) {
|
|
123
122
|
let attempts = 0;
|
|
124
123
|
try {
|
|
125
124
|
const updated = await this.orderModel.findOneAndUpdate({ _id: orderId, benefitStock: 'releasing' }, { $inc: { benefitReleaseAttempts: 1 } }, { new: true, projection: { benefitReleaseAttempts: 1 } });
|
|
@@ -140,7 +139,7 @@ class BenefitReleaseService {
|
|
|
140
139
|
this.logger.warn(`[BENEFIT_STOCK][RELEASE_ATTEMPT_FAILED] ${tag} err=${errMsg(err)}`, CTX);
|
|
141
140
|
return 'releasing';
|
|
142
141
|
}
|
|
143
|
-
this.logger.error(`[BENEFIT_STOCK][RELEASE_REFUSED] ${tag} attempts=${attempts}`, { orderId,
|
|
142
|
+
this.logger.error(`[BENEFIT_STOCK][RELEASE_REFUSED] ${tag} attempts=${attempts}`, { orderId, deltas, short: move.short });
|
|
144
143
|
return 'refused';
|
|
145
144
|
}
|
|
146
145
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"benefit-release.js","sourceRoot":"","sources":["../../src/services/benefit-release.ts"],"names":[],"mappings":";;;AAgDA,kDAEC;AA3CD,mEAGyC;AAG5B,QAAA,4BAA4B,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"benefit-release.js","sourceRoot":"","sources":["../../src/services/benefit-release.ts"],"names":[],"mappings":"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"}
|