@reorderjs/reorder 1.0.7 → 1.1.0

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 (70) hide show
  1. package/.medusa/server/e2e/auth.setup.js +26 -0
  2. package/.medusa/server/e2e/cancellation-retention.spec.js +133 -0
  3. package/.medusa/server/e2e/pages/CancellationCaseDetailPage.js +69 -0
  4. package/.medusa/server/e2e/pages/CancellationsListPage.js +34 -0
  5. package/.medusa/server/e2e/pages/PlanFormPage.js +89 -0
  6. package/.medusa/server/e2e/pages/RenewalDetailPage.js +101 -0
  7. package/.medusa/server/e2e/pages/SubscriptionDetailPage.js +102 -0
  8. package/.medusa/server/e2e/plans-offers.spec.js +96 -0
  9. package/.medusa/server/e2e/renewal-force.spec.js +154 -0
  10. package/.medusa/server/e2e/seed.setup.js +80 -0
  11. package/.medusa/server/e2e/subscription-status.spec.js +109 -0
  12. package/.medusa/server/e2e/subscriptions-list.spec.js +84 -0
  13. package/.medusa/server/playwright.config.js +37 -0
  14. package/.medusa/server/scripts/reset-subscriptions-test-data.js +279 -0
  15. package/.medusa/server/scripts/seed-subscriptions-test-data.js +2425 -0
  16. package/.medusa/server/scripts/wipe-test-data.js +44 -0
  17. package/.medusa/server/src/admin/index.js +13142 -11709
  18. package/.medusa/server/src/admin/index.mjs +13136 -11703
  19. package/.medusa/server/src/admin/types/activity-log.js +2 -1
  20. package/.medusa/server/src/admin/types/analytics.js +2 -1
  21. package/.medusa/server/src/api/admin/cancellations/validators.js +2 -2
  22. package/.medusa/server/src/api/admin/dunning/validators.js +2 -2
  23. package/.medusa/server/src/api/admin/renewals/validators.js +2 -2
  24. package/.medusa/server/src/api/admin/subscription-analytics/validators.js +2 -2
  25. package/.medusa/server/src/api/admin/subscription-logs/validators.js +2 -2
  26. package/.medusa/server/src/api/admin/subscription-offers/validators.js +2 -2
  27. package/.medusa/server/src/api/admin/subscription-settings/validators.js +2 -2
  28. package/.medusa/server/src/api/admin/subscriptions/[id]/payment-method/route.js +19 -0
  29. package/.medusa/server/src/api/admin/subscriptions/[id]/payment-methods/route.js +10 -0
  30. package/.medusa/server/src/api/admin/subscriptions/middlewares.js +8 -1
  31. package/.medusa/server/src/api/admin/subscriptions/utils.js +5 -1
  32. package/.medusa/server/src/api/admin/subscriptions/validators.js +7 -3
  33. package/.medusa/server/src/api/store/customers/me/subscriptions/[id]/payment-method/route.js +26 -0
  34. package/.medusa/server/src/api/store/customers/me/subscriptions/[id]/payment-methods/route.js +15 -0
  35. package/.medusa/server/src/api/store/customers/me/subscriptions/middlewares.js +8 -1
  36. package/.medusa/server/src/api/store/customers/me/subscriptions/utils.js +72 -1
  37. package/.medusa/server/src/api/store/customers/me/subscriptions/validators.js +7 -3
  38. package/.medusa/server/src/api/store/products/validators.js +2 -2
  39. package/.medusa/server/src/modules/activity-log/__tests__/create-subscription-log-event.spec.js +257 -0
  40. package/.medusa/server/src/modules/activity-log/__tests__/normalize-log-event.spec.js +231 -0
  41. package/.medusa/server/src/modules/activity-log/migrations/Migration20260524220933.js +16 -0
  42. package/.medusa/server/src/modules/activity-log/migrations/Migration20260524225625.js +16 -0
  43. package/.medusa/server/src/modules/activity-log/migrations/Migration20260818120000.js +16 -0
  44. package/.medusa/server/src/modules/activity-log/types/index.js +4 -1
  45. package/.medusa/server/src/modules/activity-log/utils/admin-query.js +15 -1
  46. package/.medusa/server/src/modules/analytics/__tests__/admin-query.spec.js +560 -0
  47. package/.medusa/server/src/modules/analytics/index.js +2 -2
  48. package/.medusa/server/src/modules/analytics/utils/admin-query.js +157 -5
  49. package/.medusa/server/src/modules/plan-offer/__tests__/service.spec.js +94 -0
  50. package/.medusa/server/src/modules/renewal/__tests__/service.spec.js +89 -0
  51. package/.medusa/server/src/modules/settings/__tests__/normalize-settings.spec.js +86 -0
  52. package/.medusa/server/src/modules/settings/__tests__/service.spec.js +124 -0
  53. package/.medusa/server/src/modules/subscription/__tests__/payment-methods.spec.js +186 -0
  54. package/.medusa/server/src/modules/subscription/__tests__/service.spec.js +124 -0
  55. package/.medusa/server/src/modules/subscription/utils/admin-query.js +196 -14
  56. package/.medusa/server/src/modules/subscription/utils/payment-methods.js +146 -0
  57. package/.medusa/server/src/subscription-flows/create-subscription-from-cart.js +55 -2
  58. package/.medusa/server/src/workflows/__tests__/cancel-subscription.spec.js +20 -0
  59. package/.medusa/server/src/workflows/__tests__/pause-subscription.spec.js +20 -0
  60. package/.medusa/server/src/workflows/__tests__/update-subscription-shipping-address.spec.js +49 -0
  61. package/.medusa/server/src/workflows/cancel-subscription.js +21 -1
  62. package/.medusa/server/src/workflows/index.js +6 -2
  63. package/.medusa/server/src/workflows/pause-subscription.js +21 -1
  64. package/.medusa/server/src/workflows/steps/rebuild-analytics-daily-snapshots.js +33 -10
  65. package/.medusa/server/src/workflows/steps/update-subscription-payment-method.js +110 -0
  66. package/.medusa/server/src/workflows/steps/validate-subscription-cart.js +7 -22
  67. package/.medusa/server/src/workflows/update-subscription-payment-method.js +65 -0
  68. package/.medusa/server/src/workflows/utils/analytics-incremental.js +1 -1
  69. package/README.md +89 -36
  70. package/package.json +25 -23
@@ -0,0 +1,279 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.default = resetSubscriptionsTestData;
4
+ const utils_1 = require("@medusajs/framework/utils");
5
+ const renewal_1 = require("../src/modules/renewal");
6
+ const subscription_1 = require("../src/modules/subscription");
7
+ const SEED_NAMESPACE = "subscriptions-test-data";
8
+ const IDS = {
9
+ settings: [
10
+ "set_seed_subscriptions_global",
11
+ ],
12
+ planOffers: [
13
+ "po_seed_subscriptions_success",
14
+ "po_seed_subscriptions_blocked",
15
+ ],
16
+ subscriptions: [
17
+ "sub_seed_subscriptions_success",
18
+ "sub_seed_subscriptions_paused",
19
+ "sub_seed_subscriptions_cancel_effective",
20
+ "sub_seed_subscriptions_approval_pending",
21
+ "sub_seed_subscriptions_policy_blocked",
22
+ "sub_seed_subscriptions_failed_history",
23
+ "sub_seed_dunning_retry_scheduled",
24
+ "sub_seed_dunning_awaiting_manual",
25
+ "sub_seed_dunning_recovered",
26
+ "sub_seed_dunning_unrecovered",
27
+ "sub_seed_dunning_manual_override",
28
+ "sub_seed_analytics_bimonthly",
29
+ ],
30
+ renewalCycles: [
31
+ "re_seed_subscriptions_success",
32
+ "re_seed_subscriptions_paused",
33
+ "re_seed_subscriptions_cancel_effective",
34
+ "re_seed_subscriptions_approval_pending",
35
+ "re_seed_subscriptions_policy_blocked",
36
+ "re_seed_subscriptions_failed_history",
37
+ "re_seed_dunning_retry_scheduled",
38
+ "re_seed_dunning_awaiting_manual",
39
+ "re_seed_dunning_recovered",
40
+ "re_seed_dunning_unrecovered",
41
+ "re_seed_dunning_manual_override",
42
+ ],
43
+ renewalAttempts: [
44
+ "rea_seed_subscriptions_failed_history",
45
+ ],
46
+ dunningCases: [
47
+ "dc_seed_dunning_retry_scheduled",
48
+ "dc_seed_dunning_awaiting_manual",
49
+ "dc_seed_dunning_recovered",
50
+ "dc_seed_dunning_unrecovered",
51
+ "dc_seed_dunning_manual_override",
52
+ ],
53
+ dunningAttempts: [
54
+ "da_seed_dunning_awaiting_manual_1",
55
+ "da_seed_dunning_recovered_1",
56
+ "da_seed_dunning_recovered_2",
57
+ "da_seed_dunning_unrecovered_1",
58
+ "da_seed_dunning_unrecovered_2",
59
+ "da_seed_dunning_unrecovered_3",
60
+ "da_seed_dunning_manual_override_1",
61
+ ],
62
+ cancellationCases: [
63
+ "cc_seed_cancellation_open_billing",
64
+ "cc_seed_cancellation_retained_discount",
65
+ "cc_seed_cancellation_paused",
66
+ "cc_seed_cancellation_canceled_immediate",
67
+ "cc_seed_cancellation_canceled_end_cycle",
68
+ "cc_seed_cancellation_open_price",
69
+ "cc_seed_cancellation_open_paused",
70
+ ],
71
+ retentionOfferEvents: [
72
+ "roe_seed_cancellation_discount_retained",
73
+ "roe_seed_cancellation_pause_applied",
74
+ ],
75
+ subscriptionLogs: [
76
+ "slog_seed_subscription_paused",
77
+ "slog_seed_renewal_succeeded",
78
+ "slog_seed_dunning_recovered",
79
+ ],
80
+ customerReferences: [
81
+ "SUB-QA-REN-SUCCESS",
82
+ "SUB-QA-REN-PAUSED",
83
+ "SUB-QA-REN-CANCEL-EFFECTIVE",
84
+ "SUB-QA-REN-APPROVAL-PENDING",
85
+ "SUB-QA-REN-POLICY-BLOCKED",
86
+ "SUB-QA-REN-FAILED-HISTORY",
87
+ "SUB-QA-DUN-RETRY-SCHEDULED",
88
+ "SUB-QA-DUN-AWAITING-MANUAL",
89
+ "SUB-QA-DUN-RECOVERED",
90
+ "SUB-QA-DUN-UNRECOVERED",
91
+ "SUB-QA-DUN-MANUAL-OVERRIDE",
92
+ "SUB-QA-CAN-OPEN-BILLING",
93
+ "SUB-QA-CAN-RETAINED-DISCOUNT",
94
+ "SUB-QA-CAN-PAUSED",
95
+ "SUB-QA-CAN-CANCELED-IMMEDIATE",
96
+ "SUB-QA-CAN-CANCELED-END-CYCLE",
97
+ "SUB-QA-CAN-OPEN-PRICE",
98
+ "SUB-QA-CAN-OPEN-PAUSED-SUB",
99
+ "SUB-QA-ANL-BI-MONTHLY",
100
+ ],
101
+ };
102
+ function hasSeedNamespace(record) {
103
+ return record.metadata?.seed_namespace === SEED_NAMESPACE;
104
+ }
105
+ async function listSeedRecordIds(query, entity, ids) {
106
+ if (!ids.length) {
107
+ return [];
108
+ }
109
+ const { data } = await query.graph({
110
+ entity,
111
+ fields: ["id", "metadata"],
112
+ filters: {
113
+ id: ids,
114
+ },
115
+ });
116
+ return (data ?? [])
117
+ .filter((record) => ids.includes(record.id))
118
+ .filter(hasSeedNamespace)
119
+ .map((record) => record.id);
120
+ }
121
+ async function deleteFromTable(pgConnection, tableName, ids) {
122
+ if (!ids.length) {
123
+ return 0;
124
+ }
125
+ return await pgConnection(tableName).whereIn("id", ids).del();
126
+ }
127
+ async function deleteFromTableByColumn(pgConnection, tableName, column, ids) {
128
+ if (!ids.length) {
129
+ return 0;
130
+ }
131
+ return await pgConnection(tableName).whereIn(column, ids).del();
132
+ }
133
+ async function resetSubscriptionsTestData({ container, }) {
134
+ const logger = container.resolve(utils_1.ContainerRegistrationKeys.LOGGER);
135
+ const query = container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
136
+ const pgConnection = container.resolve(utils_1.ContainerRegistrationKeys.PG_CONNECTION);
137
+ const link = container.resolve(utils_1.ContainerRegistrationKeys.LINK);
138
+ const customerModule = container.resolve(utils_1.Modules.CUSTOMER);
139
+ const orderModule = container.resolve(utils_1.Modules.ORDER);
140
+ logger.info("[subscriptions-test-data-reset] Resolving seeded records");
141
+ const settingsIds = await listSeedRecordIds(query, "subscription_settings", [
142
+ ...IDS.settings,
143
+ ]);
144
+ const planOfferIds = await listSeedRecordIds(query, "plan_offer", [
145
+ ...IDS.planOffers,
146
+ ]);
147
+ const subscriptionIds = await listSeedRecordIds(query, "subscription", [
148
+ ...IDS.subscriptions,
149
+ ]);
150
+ const renewalCycleIds = await listSeedRecordIds(query, "renewal_cycle", [
151
+ ...IDS.renewalCycles,
152
+ ]);
153
+ const renewalAttemptIds = await listSeedRecordIds(query, "renewal_attempt", [
154
+ ...IDS.renewalAttempts,
155
+ ]);
156
+ const dunningCaseIds = await listSeedRecordIds(query, "dunning_case", [
157
+ ...IDS.dunningCases,
158
+ ]);
159
+ const dunningAttemptIds = await listSeedRecordIds(query, "dunning_attempt", [
160
+ ...IDS.dunningAttempts,
161
+ ]);
162
+ const cancellationCaseIds = await listSeedRecordIds(query, "cancellation_case", [
163
+ ...IDS.cancellationCases,
164
+ ]);
165
+ const retentionOfferEventIds = await listSeedRecordIds(query, "retention_offer_event", [...IDS.retentionOfferEvents]);
166
+ const subscriptionLogIds = await listSeedRecordIds(query, "subscription_log", [
167
+ ...IDS.subscriptionLogs,
168
+ ]);
169
+ const analyticsSnapshotIds = subscriptionIds.length
170
+ ? (await query.graph({
171
+ entity: "subscription_metrics_daily",
172
+ fields: ["id", "metadata"],
173
+ filters: {
174
+ subscription_id: subscriptionIds,
175
+ },
176
+ })).data
177
+ ?.filter((record) => hasSeedNamespace(record))
178
+ .map((record) => record.id) ?? []
179
+ : [];
180
+ const seededCustomerEmails = IDS.customerReferences.map((reference) => `${reference.toLowerCase()}@example.com`);
181
+ const seededCustomerIds = (await query.graph({
182
+ entity: "customer",
183
+ fields: ["id", "metadata", "email"],
184
+ filters: {
185
+ email: seededCustomerEmails,
186
+ },
187
+ })).data
188
+ ?.filter((record) => hasSeedNamespace(record))
189
+ .map((record) => record.id) ?? [];
190
+ const subscriptionOrderLinks = subscriptionIds.length
191
+ ? (await query.graph({
192
+ entity: "subscription_order",
193
+ fields: ["subscription.id", "order.id", "order.metadata"],
194
+ filters: {
195
+ subscription_id: subscriptionIds,
196
+ },
197
+ })).data ?? []
198
+ : [];
199
+ const renewalCycles = renewalCycleIds.length
200
+ ? (await query.graph({
201
+ entity: "renewal_cycle",
202
+ fields: ["id", "generated_order_id"],
203
+ filters: {
204
+ id: renewalCycleIds,
205
+ },
206
+ })).data ?? []
207
+ : [];
208
+ const renewalOrderIds = renewalCycles
209
+ .map((record) => record.generated_order_id)
210
+ .filter((id) => !!id);
211
+ const renewalOrders = renewalOrderIds.length
212
+ ? (await query.graph({
213
+ entity: "order",
214
+ fields: ["id", "metadata"],
215
+ filters: {
216
+ id: renewalOrderIds,
217
+ },
218
+ })).data ?? []
219
+ : [];
220
+ const subscriptionOrderLinkDefinitions = subscriptionOrderLinks
221
+ .filter((record) => record.subscription?.id && record.order?.id)
222
+ .map((record) => ({
223
+ [subscription_1.SUBSCRIPTION_MODULE]: {
224
+ subscription_id: record.subscription.id,
225
+ },
226
+ [utils_1.Modules.ORDER]: {
227
+ order_id: record.order.id,
228
+ },
229
+ }));
230
+ const renewalOrderLinkDefinitions = renewalCycles
231
+ .filter((record) => record.id && record.generated_order_id)
232
+ .map((record) => ({
233
+ [renewal_1.RENEWAL_MODULE]: {
234
+ renewal_cycle_id: record.id,
235
+ },
236
+ [utils_1.Modules.ORDER]: {
237
+ order_id: record.generated_order_id,
238
+ },
239
+ }));
240
+ const seededOrderIds = [
241
+ ...new Set([
242
+ ...subscriptionOrderLinks.map((record) => record.order),
243
+ ...renewalOrders,
244
+ ]
245
+ .filter((order) => !!order)
246
+ .filter((order) => order.metadata?.seed_namespace === SEED_NAMESPACE)
247
+ .map((order) => order.id)
248
+ .filter((id) => !!id)),
249
+ ];
250
+ if (renewalOrderLinkDefinitions.length) {
251
+ await link.dismiss(renewalOrderLinkDefinitions);
252
+ }
253
+ if (subscriptionOrderLinkDefinitions.length) {
254
+ await link.dismiss(subscriptionOrderLinkDefinitions);
255
+ }
256
+ if (seededOrderIds.length) {
257
+ await orderModule.deleteOrders(seededOrderIds);
258
+ }
259
+ const deletedSubscriptionLogs = await deleteFromTable(pgConnection, "subscription_log", subscriptionLogIds);
260
+ const deletedSettings = await deleteFromTable(pgConnection, "subscription_settings", settingsIds);
261
+ const deletedAnalyticsSnapshots = await deleteFromTable(pgConnection, "subscription_metrics_daily", analyticsSnapshotIds);
262
+ const deletedRetentionOfferEvents = await deleteFromTable(pgConnection, "retention_offer_event", retentionOfferEventIds);
263
+ const deletedRetentionOfferEventsByCase = await deleteFromTableByColumn(pgConnection, "retention_offer_event", "cancellation_case_id", cancellationCaseIds);
264
+ const deletedCancellationCases = await deleteFromTable(pgConnection, "cancellation_case", cancellationCaseIds);
265
+ const deletedDunningAttempts = await deleteFromTable(pgConnection, "dunning_attempt", dunningAttemptIds);
266
+ const deletedDunningAttemptsByCase = await deleteFromTableByColumn(pgConnection, "dunning_attempt", "dunning_case_id", dunningCaseIds);
267
+ const deletedDunningCases = await deleteFromTable(pgConnection, "dunning_case", dunningCaseIds);
268
+ const deletedRenewalAttempts = await deleteFromTable(pgConnection, "renewal_attempt", renewalAttemptIds);
269
+ const deletedRenewalAttemptsByCycle = await deleteFromTableByColumn(pgConnection, "renewal_attempt", "renewal_cycle_id", renewalCycleIds);
270
+ const deletedRenewalCycles = await deleteFromTable(pgConnection, "renewal_cycle", renewalCycleIds);
271
+ const deletedSubscriptions = await deleteFromTable(pgConnection, "subscription", subscriptionIds);
272
+ const deletedPlanOffers = await deleteFromTable(pgConnection, "plan_offer", planOfferIds);
273
+ if (seededCustomerIds.length) {
274
+ await customerModule.deleteCustomers(seededCustomerIds);
275
+ }
276
+ logger.info("[subscriptions-test-data-reset] Reset completed.");
277
+ logger.info(`[subscriptions-test-data-reset] Removed settings=${deletedSettings} plan_offers=${deletedPlanOffers} subscriptions=${deletedSubscriptions} renewal_cycles=${deletedRenewalCycles} renewal_attempts=${deletedRenewalAttempts + deletedRenewalAttemptsByCycle} dunning_cases=${deletedDunningCases} dunning_attempts=${deletedDunningAttempts + deletedDunningAttemptsByCase} cancellation_cases=${deletedCancellationCases} retention_offer_events=${deletedRetentionOfferEvents + deletedRetentionOfferEventsByCase} subscription_logs=${deletedSubscriptionLogs} analytics_snapshots=${deletedAnalyticsSnapshots} orders=${seededOrderIds.length} customers=${seededCustomerIds.length}`);
278
+ }
279
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"reset-subscriptions-test-data.js","sourceRoot":"","sources":["../../../scripts/reset-subscriptions-test-data.ts"],"names":[],"mappings":"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"}