@darraghor/nest-backend-libs 4.0.7 → 4.0.8

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.
@@ -17,10 +17,22 @@ let SubscriptionRecordMapper = SubscriptionRecordMapper_1 = class SubscriptionRe
17
17
  for (const lineItem of fullSession.line_items.data) {
18
18
  const subscriptionFulfilmentDto = this.createFulfilmentDto(lineItem.price?.product, fullSession.customer, fullSession.customer_email, fullSession.customer_details?.email);
19
19
  subscriptionFulfilmentDto.paymentSystemMode = this.mapPaymentType(lineItem.price?.type, fullSession.mode);
20
- const typedSubscription = fullSession.subscription;
21
- subscriptionFulfilmentDto.validUntil = this.mapNewValidUntil(subscriptionFulfilmentDto.paymentSystemMode, true, typedSubscription.cancel_at_period_end
22
- ? typedSubscription.cancel_at
23
- : undefined);
20
+ // For one-time payments, subscription is null - validUntil will be set to ~500 years
21
+ // For subscriptions, use cancel_at if cancellation is scheduled, otherwise use current_period_end from first item
22
+ let subscriptionPeriodEnd;
23
+ if (fullSession.subscription) {
24
+ const typedSubscription = fullSession.subscription;
25
+ if (typedSubscription.cancel_at_period_end &&
26
+ typedSubscription.cancel_at) {
27
+ subscriptionPeriodEnd = typedSubscription.cancel_at;
28
+ }
29
+ else {
30
+ // Get current_period_end from the first subscription item
31
+ const firstItem = typedSubscription.items?.data?.[0];
32
+ subscriptionPeriodEnd = firstItem?.current_period_end;
33
+ }
34
+ }
35
+ subscriptionFulfilmentDto.validUntil = this.mapNewValidUntil(subscriptionFulfilmentDto.paymentSystemMode, true, subscriptionPeriodEnd);
24
36
  subscriptionFulfilmentDto.paymentSystemTransactionId =
25
37
  fullSession.mode === "subscription" ||
26
38
  lineItem.price?.type === "recurring"
@@ -82,9 +94,12 @@ let SubscriptionRecordMapper = SubscriptionRecordMapper_1 = class SubscriptionRe
82
94
  subscriptionFulfilmentDto.paymentSystemMode = "subscription";
83
95
  subscriptionFulfilmentDto.paymentSystemTransactionId =
84
96
  fullSubscription.id;
85
- subscriptionFulfilmentDto.validUntil = this.mapNewValidUntil(subscriptionFulfilmentDto.paymentSystemMode, additionalMeta.isActive, fullSubscription.cancel_at_period_end
97
+ // Use cancel_at if cancellation is scheduled, otherwise use current_period_end from the item
98
+ const periodEnd = fullSubscription.cancel_at_period_end &&
99
+ fullSubscription.cancel_at
86
100
  ? fullSubscription.cancel_at
87
- : undefined);
101
+ : lineItem.current_period_end;
102
+ subscriptionFulfilmentDto.validUntil = this.mapNewValidUntil(subscriptionFulfilmentDto.paymentSystemMode, additionalMeta.isActive, periodEnd);
88
103
  subs.push(subscriptionFulfilmentDto);
89
104
  }
90
105
  return subs;
@@ -1 +1 @@
1
- {"version":3,"file":"subscriptionRecord.mapper.js","sourceRoot":"","sources":["../../../src/stripe-client/services/subscriptionRecord.mapper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"subscriptionRecord.mapper.js","sourceRoot":"","sources":["../../../src/stripe-client/services/subscriptionRecord.mapper.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@darraghor/nest-backend-libs",
3
- "version": "4.0.7",
3
+ "version": "4.0.8",
4
4
  "license": "SEE LICENSE IN LICENSE.md",
5
5
  "description": "Some helpers for personal projects in nestjs",
6
6
  "homepage": "https://github.com/darraghoriordan/nest-backend-libs",