cabloy 5.1.113 → 5.1.115

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 (141) hide show
  1. package/.cabloy-version +1 -1
  2. package/.claude/skills/cabloy-backend-scaffold/references/follow-up-checklist.md +4 -0
  3. package/.github/workflows/vona-test-mysql.yml +12 -0
  4. package/.github/workflows/vona-test-pg.yml +5 -1
  5. package/CHANGELOG.md +20 -0
  6. package/CLAUDE.md +4 -0
  7. package/cabloy-docs/backend/internal-aop-guide.md +35 -0
  8. package/cabloy-docs/backend/unit-testing.md +72 -1
  9. package/package.json +1 -1
  10. package/vona/packages-cli/cli/package.json +1 -1
  11. package/vona/packages-cli/cli-set-api/package.json +1 -1
  12. package/vona/packages-cli/cli-set-api/toolsIsolate/test.ts +26 -13
  13. package/vona/packages-utils/compose/package.json +1 -1
  14. package/vona/packages-utils/compose/src/index.ts +19 -11
  15. package/vona/packages-vona/vona/package.json +1 -1
  16. package/vona/packages-vona/vona-core/package.json +1 -1
  17. package/vona/packages-vona/vona-core/src/lib/bean/beanContainer.ts +15 -3
  18. package/vona/packages-vona/vona-mock/package.json +1 -1
  19. package/vona/pnpm-lock.yaml +143 -12
  20. package/vona/pnpm-workspace.yaml +1 -1
  21. package/vona/src/suite/a-commerce/modules/commerce-catalog/src/.metadata/index.ts +8 -0
  22. package/vona/src/suite/a-commerce/modules/commerce-catalog/src/bean/meta.version.ts +1 -0
  23. package/vona/src/suite/a-commerce/modules/commerce-catalog/src/config/locale/en-us.ts +3 -0
  24. package/vona/src/suite/a-commerce/modules/commerce-catalog/src/config/locale/zh-cn.ts +3 -0
  25. package/vona/src/suite/a-commerce/modules/commerce-catalog/src/dto/skuAttribute.tsx +17 -0
  26. package/vona/src/suite/a-commerce/modules/commerce-catalog/src/entity/sku.tsx +10 -1
  27. package/vona/src/suite/a-commerce/modules/commerce-catalog/test/catalog.test.ts +1 -1
  28. package/vona/src/suite/a-commerce/modules/commerce-member/test/addressOwnership.test.ts +6 -1
  29. package/vona/src/suite/a-commerce/modules/commerce-payment/package.json +2 -1
  30. package/vona/src/suite/a-commerce/modules/commerce-payment/src/.metadata/index.ts +228 -0
  31. package/vona/src/suite/a-commerce/modules/commerce-payment/src/bean/meta.index.ts +15 -0
  32. package/vona/src/suite/a-commerce/modules/commerce-payment/src/bean/meta.version.ts +35 -0
  33. package/vona/src/suite/a-commerce/modules/commerce-payment/src/dto/paymentAttemptView.tsx +26 -0
  34. package/vona/src/suite/a-commerce/modules/commerce-payment/src/entity/paymentAttempt.tsx +34 -0
  35. package/vona/src/suite/a-commerce/modules/commerce-payment/src/model/paymentAttempt.ts +10 -0
  36. package/vona/src/suite/a-commerce/modules/commerce-payment/src/service/paymentAttempt.ts +41 -0
  37. package/vona/src/suite/a-commerce/modules/commerce-payment/test/paymentAttempt.test.ts +33 -0
  38. package/vona/src/suite/a-commerce/modules/commerce-promotion/package.json +4 -2
  39. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/.metadata/index.ts +533 -2
  40. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/.metadata/locales.ts +18 -0
  41. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/bean/meta.index.ts +24 -0
  42. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/bean/meta.version.ts +137 -0
  43. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/bean/ssrMenu.couponTemplate.ts +30 -0
  44. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/config/locale/en-us.ts +37 -0
  45. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/config/locale/zh-cn.ts +37 -0
  46. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/controller/coupon.ts +37 -0
  47. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/controller/couponTemplate.ts +65 -0
  48. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/dto/couponIssue.tsx +22 -0
  49. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/dto/couponMineItem.tsx +32 -0
  50. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/dto/couponTemplateCreate.tsx +43 -0
  51. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/dto/couponTemplateSelectReq.tsx +28 -0
  52. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/dto/couponTemplateSelectRes.tsx +11 -0
  53. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/dto/couponTemplateSelectResItem.tsx +39 -0
  54. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/dto/couponTemplateUpdate.tsx +19 -0
  55. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/dto/couponTemplateView.tsx +25 -0
  56. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/entity/couponAudit.tsx +73 -0
  57. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/entity/couponGrant.tsx +83 -0
  58. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/entity/couponTemplate.tsx +82 -0
  59. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/index.ts +1 -0
  60. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/model/couponAudit.ts +10 -0
  61. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/model/couponGrant.ts +10 -0
  62. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/model/couponTemplate.ts +10 -0
  63. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/service/coupon.ts +397 -0
  64. package/vona/src/suite/a-commerce/modules/commerce-promotion/src/service/couponTemplate.ts +52 -0
  65. package/vona/src/suite/a-commerce/modules/commerce-promotion/test/couponReservation.test.ts +162 -0
  66. package/vona/src/suite/a-commerce/modules/commerce-seed/src/bean/meta.version.ts +8 -10
  67. package/vona/src/suite/a-commerce/modules/commerce-trade/package.json +4 -1
  68. package/vona/src/suite/a-commerce/modules/commerce-trade/src/.metadata/index.ts +277 -0
  69. package/vona/src/suite/a-commerce/modules/commerce-trade/src/bean/bean.scheduleOrderExpiry.ts +26 -0
  70. package/vona/src/suite/a-commerce/modules/commerce-trade/src/bean/meta.index.ts +9 -0
  71. package/vona/src/suite/a-commerce/modules/commerce-trade/src/bean/meta.version.ts +75 -0
  72. package/vona/src/suite/a-commerce/modules/commerce-trade/src/config/locale/en-us.ts +11 -2
  73. package/vona/src/suite/a-commerce/modules/commerce-trade/src/config/locale/zh-cn.ts +11 -2
  74. package/vona/src/suite/a-commerce/modules/commerce-trade/src/controller/checkout.ts +19 -0
  75. package/vona/src/suite/a-commerce/modules/commerce-trade/src/dto/checkoutCreate.tsx +19 -0
  76. package/vona/src/suite/a-commerce/modules/commerce-trade/src/dto/checkoutResult.tsx +32 -0
  77. package/vona/src/suite/a-commerce/modules/commerce-trade/src/dto/orderAddressSnapshot.tsx +33 -0
  78. package/vona/src/suite/a-commerce/modules/commerce-trade/src/dto/orderCouponSnapshot.tsx +35 -0
  79. package/vona/src/suite/a-commerce/modules/commerce-trade/src/dto/orderLineSkuAttributeSnapshot.tsx +15 -0
  80. package/vona/src/suite/a-commerce/modules/commerce-trade/src/entity/order.tsx +90 -0
  81. package/vona/src/suite/a-commerce/modules/commerce-trade/src/entity/orderAudit.tsx +36 -0
  82. package/vona/src/suite/a-commerce/modules/commerce-trade/src/entity/orderLine.tsx +52 -0
  83. package/vona/src/suite/a-commerce/modules/commerce-trade/src/entity/stockReservation.tsx +4 -1
  84. package/vona/src/suite/a-commerce/modules/commerce-trade/src/model/order.ts +15 -0
  85. package/vona/src/suite/a-commerce/modules/commerce-trade/src/model/orderAudit.ts +10 -0
  86. package/vona/src/suite/a-commerce/modules/commerce-trade/src/model/orderLine.ts +10 -0
  87. package/vona/src/suite/a-commerce/modules/commerce-trade/src/service/order.ts +556 -0
  88. package/vona/src/suite/a-commerce/modules/commerce-trade/src/service/stockBalance.ts +15 -20
  89. package/vona/src/suite/a-commerce/modules/commerce-trade/test/cartOwnership.test.ts +8 -3
  90. package/vona/src/suite/a-commerce/modules/commerce-trade/test/checkoutReservation.test.ts +158 -0
  91. package/vona/src/suite/a-commerce/modules/commerce-trade/test/orderSnapshot.test.ts +203 -0
  92. package/vona/src/suite/a-commerce/modules/commerce-trade/test/reservationExpiry.test.ts +163 -0
  93. package/vona/src/suite/a-commerce/modules/commerce-trade/test/stockBalance.test.ts +11 -6
  94. package/vona/src/suite/a-commerce/modules/commerce-trade/test/stockReservation.test.ts +11 -6
  95. package/vona/src/suite-vendor/a-image/modules/image-cloudflare/package.json +1 -1
  96. package/vona/src/suite-vendor/a-image/modules/image-cloudflare/src/service/imageCloudflare.ts +10 -7
  97. package/vona/src/suite-vendor/a-image/package.json +1 -1
  98. package/vona/src/suite-vendor/a-vona/modules/a-aspect/package.json +1 -1
  99. package/vona/src/suite-vendor/a-vona/modules/a-aspect/src/types/aopMethod.ts +16 -3
  100. package/vona/src/suite-vendor/a-vona/modules/a-core/package.json +4 -2
  101. package/vona/src/suite-vendor/a-vona/modules/a-core/src/bean/bean.core.ts +6 -0
  102. package/vona/src/suite-vendor/a-vona/modules/a-core/src/index.ts +1 -0
  103. package/vona/src/suite-vendor/a-vona/modules/a-core/src/lib/core.ts +6 -0
  104. package/vona/src/suite-vendor/a-vona/modules/a-core/src/types/fetch.ts +7 -0
  105. package/vona/src/suite-vendor/a-vona/modules/a-core/src/types/index.ts +1 -0
  106. package/vona/src/suite-vendor/a-vona/modules/a-executor/package.json +1 -1
  107. package/vona/src/suite-vendor/a-vona/modules/a-executor/src/lib/utils.ts +5 -3
  108. package/vona/src/suite-vendor/a-vona/modules/a-retryable/package.json +50 -0
  109. package/vona/src/suite-vendor/a-vona/modules/a-retryable/src/.metadata/index.ts +55 -0
  110. package/vona/src/suite-vendor/a-vona/modules/a-retryable/src/.metadata/this.ts +2 -0
  111. package/vona/src/suite-vendor/a-vona/modules/a-retryable/src/bean/aopMethod.retryable.ts +45 -0
  112. package/vona/src/suite-vendor/a-vona/modules/a-retryable/src/index.ts +1 -0
  113. package/vona/src/suite-vendor/a-vona/modules/a-retryable/tsconfig.build.json +11 -0
  114. package/vona/src/suite-vendor/a-vona/modules/a-retryable/tsconfig.json +7 -0
  115. package/vona/src/suite-vendor/a-vona/modules/a-vona/package.json +2 -1
  116. package/vona/src/suite-vendor/a-vona/package.json +2 -1
  117. package/vona/src/suite-vendor/a-vona/tsconfig.json +3 -0
  118. package/zova/packages-utils/zova-jsx/package.json +3 -3
  119. package/zova/packages-zova/zova/package.json +3 -3
  120. package/zova/packages-zova/zova-core/package.json +2 -2
  121. package/zova/pnpm-lock.yaml +31 -31
  122. package/zova/src/suite/a-commerce/modules/commerce-promotion/cli/openapi.config.ts +9 -0
  123. package/zova/src/suite/a-commerce/modules/commerce-promotion/package.json +2 -1
  124. package/zova/src/suite/a-commerce/modules/commerce-promotion/src/.metadata/index.ts +115 -1
  125. package/zova/src/suite/a-commerce/modules/commerce-promotion/src/api/commercePromotionCoupon.ts +24 -0
  126. package/zova/src/suite/a-commerce/modules/commerce-promotion/src/api/openapi/baseURL.ts +5 -0
  127. package/zova/src/suite/a-commerce/modules/commerce-promotion/src/api/openapi/index.ts +3 -0
  128. package/zova/src/suite/a-commerce/modules/commerce-promotion/src/api/openapi/schemas.ts +478 -0
  129. package/zova/src/suite/a-commerce/modules/commerce-promotion/src/api/openapi/types.ts +8187 -0
  130. package/zova/src/suite/a-commerce/modules/commerce-promotion/src/apiSchema/commercePromotionCoupon.ts +13 -0
  131. package/zova/src/suite/a-commerce/modules/commerce-promotion/src/model/coupon.ts +19 -0
  132. package/zova/src/suite/a-commerce/modules/commerce-trade/cli/openapi.config.ts +1 -0
  133. package/zova/src/suite/a-commerce/modules/commerce-trade/src/.metadata/index.ts +30 -0
  134. package/zova/src/suite/a-commerce/modules/commerce-trade/src/api/commerceTradeCheckout.ts +27 -0
  135. package/zova/src/suite/a-commerce/modules/commerce-trade/src/api/openapi/schemas.ts +92 -52
  136. package/zova/src/suite/a-commerce/modules/commerce-trade/src/api/openapi/types.ts +1389 -848
  137. package/zova/src/suite/a-commerce/modules/commerce-trade/src/apiSchema/commerceTradeCheckout.ts +13 -0
  138. package/zova/src/suite/a-commerce/modules/commerce-trade/src/model/cart.ts +13 -0
  139. package/zova/src/suite-vendor/a-zova/modules/a-zova/package.json +3 -3
  140. package/zova/src/suite-vendor/a-zova/package.json +2 -2
  141. /package/vona/patches/{zova-core@5.1.78.patch → zova-core@5.1.79.patch} +0 -0
@@ -0,0 +1,162 @@
1
+ import { catchError } from '@cabloy/utils';
2
+ import assert from 'node:assert';
3
+ import { randomUUID } from 'node:crypto';
4
+ import { describe, it } from 'node:test';
5
+ import { app } from 'vona-mock';
6
+
7
+ interface IFixture {
8
+ templateId?: number;
9
+ grantId?: number;
10
+ }
11
+
12
+ async function cleanup(fixture: IFixture) {
13
+ const promotion = app.scope('commerce-promotion');
14
+ if (fixture.grantId !== undefined) {
15
+ await promotion.model.couponAudit.delete({ couponGrantId: fixture.grantId });
16
+ await promotion.model.couponGrant.delete({ id: fixture.grantId });
17
+ }
18
+ if (fixture.templateId !== undefined) {
19
+ await promotion.model.couponTemplate.delete({ id: fixture.templateId });
20
+ }
21
+ }
22
+
23
+ describe('couponReservation.test.ts', { concurrency: false }, () => {
24
+ it('enforces fixed-discount eligibility and exact-once transitions', async () => {
25
+ await app.bean.executor.mockCtx(async () => {
26
+ const fixture: IFixture = {};
27
+ const suffix = randomUUID().slice(0, 12);
28
+ try {
29
+ const customerName = `coupon-customer-${suffix}`;
30
+ await app.bean.user.register({ name: customerName }, true);
31
+ await app.bean.passport.signinMock(customerName as any);
32
+ const customer = app.bean.passport.currentUser!;
33
+ fixture.templateId = (
34
+ await app.scope('commerce-promotion').model.couponTemplate.insert({
35
+ name: `Coupon ${suffix}`,
36
+ state: 'active',
37
+ currency: 'USD',
38
+ discountCents: 500,
39
+ minSpendCents: 1000,
40
+ validFrom: new Date(Date.now() - 1_000),
41
+ validUntil: new Date(Date.now() + 60_000),
42
+ totalIssueLimit: 1,
43
+ totalUsageLimit: 1,
44
+ perCustomerIssueLimit: 1,
45
+ issuedCount: 0,
46
+ redeemedCount: 0,
47
+ })
48
+ ).id as number;
49
+ const coupon = app.scope('commerce-promotion').service.coupon;
50
+ const grant = await coupon.issue({
51
+ templateId: fixture.templateId,
52
+ userId: customer.id,
53
+ correlationId: `issue-${suffix}`,
54
+ reason: 'test issue',
55
+ });
56
+ fixture.grantId = grant.id as number;
57
+ assert.equal(grant.state, 'available');
58
+ assert.equal(grant.discountCentsSnapshot, 500);
59
+
60
+ const [_, belowMinimumError] = await catchError(() =>
61
+ coupon.reserve({
62
+ couponGrantId: grant.id,
63
+ userId: customer.id,
64
+ orderId: 100_001,
65
+ eligibleSubtotalCents: 999,
66
+ currency: 'USD',
67
+ correlationId: `reserve-too-small-${suffix}`,
68
+ reason: 'test reserve',
69
+ }),
70
+ );
71
+ assert.equal(belowMinimumError?.code, 409);
72
+ assert.equal(
73
+ (await app.scope('commerce-promotion').model.couponGrant.getById(grant.id))?.state,
74
+ 'available',
75
+ );
76
+
77
+ const reserved = await coupon.reserve({
78
+ couponGrantId: grant.id,
79
+ userId: customer.id,
80
+ orderId: 100_001,
81
+ eligibleSubtotalCents: 1_200,
82
+ currency: 'USD',
83
+ correlationId: `reserve-${suffix}`,
84
+ reason: 'test reserve',
85
+ });
86
+ assert.equal(reserved.discountCents, 500);
87
+ assert.equal(reserved.couponGrant.state, 'reserved');
88
+ const replay = await coupon.reserve({
89
+ couponGrantId: grant.id,
90
+ userId: customer.id,
91
+ orderId: 100_001,
92
+ eligibleSubtotalCents: 1_200,
93
+ currency: 'USD',
94
+ correlationId: `reserve-${suffix}`,
95
+ reason: 'test reserve',
96
+ });
97
+ assert.equal(replay.couponGrant.id, grant.id);
98
+
99
+ const released = await coupon.release({
100
+ couponGrantId: grant.id,
101
+ orderId: 100_001,
102
+ correlationId: `release-${suffix}`,
103
+ reason: 'test release',
104
+ });
105
+ assert.equal(released.state, 'available');
106
+ const releaseReplay = await coupon.release({
107
+ couponGrantId: grant.id,
108
+ orderId: 100_001,
109
+ correlationId: `release-${suffix}`,
110
+ reason: 'test release',
111
+ });
112
+ assert.equal(releaseReplay.state, 'available');
113
+ const releaseAudits = await app.scope('commerce-promotion').model.couponAudit.select({
114
+ where: { couponGrantId: grant.id, operation: 'release' },
115
+ });
116
+ assert.equal(releaseAudits.length, 1);
117
+ const reservedAgain = await coupon.reserve({
118
+ couponGrantId: grant.id,
119
+ userId: customer.id,
120
+ orderId: 100_002,
121
+ eligibleSubtotalCents: 1_000,
122
+ currency: 'USD',
123
+ correlationId: `reserve-again-${suffix}`,
124
+ reason: 'test reserve again',
125
+ });
126
+ assert.equal(reservedAgain.discountCents, 500);
127
+ const redeemed = await coupon.redeem({
128
+ couponGrantId: grant.id,
129
+ orderId: 100_002,
130
+ correlationId: `redeem-${suffix}`,
131
+ reason: 'test redeem',
132
+ });
133
+ assert.equal(redeemed.state, 'redeemed');
134
+ const [__, releaseError] = await catchError(() =>
135
+ coupon.release({
136
+ couponGrantId: grant.id,
137
+ orderId: 100_002,
138
+ correlationId: `release-after-redeem-${suffix}`,
139
+ reason: 'must fail',
140
+ }),
141
+ );
142
+ assert.equal(releaseError?.code, 409);
143
+ const template = await app
144
+ .scope('commerce-promotion')
145
+ .model.couponTemplate.getById(fixture.templateId);
146
+ assert.equal(template?.issuedCount, 1);
147
+ assert.equal(template?.redeemedCount, 1);
148
+ const audit = await app.scope('commerce-promotion').model.couponAudit.select({
149
+ where: { couponGrantId: grant.id },
150
+ orders: [['id', 'asc']],
151
+ });
152
+ assert.deepEqual(
153
+ audit.map(item => item.operation),
154
+ ['issue', 'reserve', 'release', 'reserve', 'redeem'],
155
+ );
156
+ } finally {
157
+ await cleanup(fixture);
158
+ await app.bean.passport.signout();
159
+ }
160
+ });
161
+ });
162
+ });
@@ -66,15 +66,13 @@ export class MetaVersion extends BeanBase implements IMetaVersionSeed {
66
66
  }),
67
67
  ]);
68
68
 
69
- await Promise.all(
70
- [24, 15, 8, 30].map((delta, index) =>
71
- scopeTrade.service.stockBalance.adjustStock({
72
- skuId: skus[index].id,
73
- delta,
74
- reason: 'Initial commerce seed inventory',
75
- correlationId: `commerce-seed-initial-${skus[index].id}`,
76
- }),
77
- ),
78
- );
69
+ for (const [index, delta] of [24, 15, 8, 30].entries()) {
70
+ await scopeTrade.service.stockBalance.adjustStock({
71
+ skuId: skus[index].id,
72
+ delta,
73
+ reason: 'Initial commerce seed inventory',
74
+ correlationId: `commerce-seed-initial-${skus[index].id}`,
75
+ });
76
+ }
79
77
  }
80
78
  }
@@ -46,7 +46,10 @@
46
46
  "title": "commerce-trade",
47
47
  "vonaModule": {
48
48
  "dependencies": {
49
- "a-vona": "5.0.0"
49
+ "a-vona": "5.0.0",
50
+ "commerce-member": "5.0.0",
51
+ "commerce-payment": "5.0.0",
52
+ "commerce-promotion": "5.0.0"
50
53
  },
51
54
  "fileVersion": 1
52
55
  }