@chevre/domain 20.7.0-alpha.8 → 20.7.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.
|
@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.validateAcceptedOffers = void 0;
|
|
13
13
|
const factory = require("../../../factory");
|
|
14
|
-
const MENBERSHIP_COUPON_PAYMENT_METHOD_TYPE = 'MembershipCoupon'; // ひとまず固定
|
|
15
14
|
function createAppliesToMovieTicket(params) {
|
|
16
15
|
const isMvtkOrMG = typeof params.ticketInfo.mvtkNum === 'string' && params.ticketInfo.mvtkNum.length > 0;
|
|
17
16
|
let movieTicketTypeChargePriceSpec;
|
|
@@ -28,7 +27,6 @@ function createAppliesToMovieTicket(params) {
|
|
|
28
27
|
}
|
|
29
28
|
const availablePaymentMethod = availablePaymentMethodType.codeValue;
|
|
30
29
|
movieTicketTypeChargePriceSpec = {
|
|
31
|
-
project: { typeOf: factory.organizationType.Project, id: params.project.id },
|
|
32
30
|
typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification,
|
|
33
31
|
name: { ja: params.ticketInfo.ticketName, en: params.ticketInfo.ticketNameEng },
|
|
34
32
|
price: Number(params.ticketInfo.addPrice),
|
|
@@ -50,11 +48,89 @@ function createAppliesToMovieTicket(params) {
|
|
|
50
48
|
}
|
|
51
49
|
return { movieTicketTypeChargePriceSpec, appliesToMovieTicket };
|
|
52
50
|
}
|
|
51
|
+
function createPriceComponent(params) {
|
|
52
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
53
|
+
const acceptedOffer = params.acceptedOffer;
|
|
54
|
+
const availableUnitPriceOffer = params.availableUnitPriceOffer;
|
|
55
|
+
const { name, ticketInfo } = acceptedOffer;
|
|
56
|
+
// appliesToMovieTicket.serviceOutput.typeOfを自動補完(2023-03-13~)
|
|
57
|
+
const { appliesToMovieTicket, movieTicketTypeChargePriceSpec } = createAppliesToMovieTicket({
|
|
58
|
+
ticketInfo,
|
|
59
|
+
availablePaymentMethodTypes: params.availablePaymentMethodTypes
|
|
60
|
+
});
|
|
61
|
+
let surfrockChargePriceSpec;
|
|
62
|
+
let appliesToMovieTicket4surfrock;
|
|
63
|
+
// appliesToSurfrockの指定があれば強制的にMovieTicket決済
|
|
64
|
+
let eligibleMonetaryAmount;
|
|
65
|
+
const surfrockIdentifier = (_b = (_a = acceptedOffer.priceSpecification) === null || _a === void 0 ? void 0 : _a.appliesToSurfrock) === null || _b === void 0 ? void 0 : _b.identifier;
|
|
66
|
+
const surfrockPaymentMethodType = (_e = (_d = (_c = acceptedOffer.priceSpecification) === null || _c === void 0 ? void 0 : _c.appliesToSurfrock) === null || _d === void 0 ? void 0 : _d.serviceOutput) === null || _e === void 0 ? void 0 : _e.typeOf;
|
|
67
|
+
if (typeof surfrockIdentifier === 'string' && surfrockIdentifier.length > 0
|
|
68
|
+
&& typeof surfrockPaymentMethodType === 'string' && surfrockPaymentMethodType.length > 0) {
|
|
69
|
+
// serviceTypeはticketCode
|
|
70
|
+
const serviceType = (_g = (_f = availableUnitPriceOffer.additionalProperty) === null || _f === void 0 ? void 0 : _f.find((p) => p.name === 'ticketCode')) === null || _g === void 0 ? void 0 : _g.value;
|
|
71
|
+
if (typeof serviceType !== 'string') {
|
|
72
|
+
throw new factory.errors.NotFound('ticketCode of unitPriceOffer');
|
|
73
|
+
}
|
|
74
|
+
surfrockChargePriceSpec = {
|
|
75
|
+
appliesToMovieTicket: {
|
|
76
|
+
typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
|
|
77
|
+
serviceOutput: { typeOf: surfrockPaymentMethodType },
|
|
78
|
+
serviceType
|
|
79
|
+
},
|
|
80
|
+
appliesToVideoFormat: 'Default',
|
|
81
|
+
name,
|
|
82
|
+
price: 0,
|
|
83
|
+
priceCurrency: factory.priceCurrency.JPY,
|
|
84
|
+
typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification,
|
|
85
|
+
valueAddedTaxIncluded: true
|
|
86
|
+
};
|
|
87
|
+
appliesToMovieTicket4surfrock = {
|
|
88
|
+
typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
|
|
89
|
+
identifier: surfrockIdentifier,
|
|
90
|
+
serviceOutput: { typeOf: surfrockPaymentMethodType },
|
|
91
|
+
serviceType
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
else {
|
|
95
|
+
// appliesToSurfrockの指定がなければ単価オファーの適用通貨条件を強制適用
|
|
96
|
+
if (Array.isArray(availableUnitPriceOffer.eligibleMonetaryAmount)) {
|
|
97
|
+
eligibleMonetaryAmount = availableUnitPriceOffer.eligibleMonetaryAmount;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
const unitPriceSpec = Object.assign({ typeOf: factory.priceSpecificationType.UnitPriceSpecification, name: { ja: ticketInfo.ticketName, en: ticketInfo.ticketNameEng }, price: Number(ticketInfo.stdPrice), priceCurrency: factory.priceCurrency.JPY, referenceQuantity: {
|
|
101
|
+
typeOf: 'QuantitativeValue',
|
|
102
|
+
unitCode: factory.unitCode.C62,
|
|
103
|
+
value: 1
|
|
104
|
+
}, valueAddedTaxIncluded: true }, (appliesToMovieTicket !== undefined || appliesToMovieTicket4surfrock !== undefined)
|
|
105
|
+
? {
|
|
106
|
+
appliesToMovieTicket: [
|
|
107
|
+
...(appliesToMovieTicket !== undefined) ? [appliesToMovieTicket] : [],
|
|
108
|
+
...(appliesToMovieTicket4surfrock !== undefined) ? [appliesToMovieTicket4surfrock] : []
|
|
109
|
+
]
|
|
110
|
+
}
|
|
111
|
+
: undefined);
|
|
112
|
+
switch (ticketInfo.limitUnit) {
|
|
113
|
+
case '001':
|
|
114
|
+
unitPriceSpec.referenceQuantity.value = Number(ticketInfo.limitCount);
|
|
115
|
+
unitPriceSpec.price = Number(ticketInfo.limitCount) * Number(ticketInfo.stdPrice);
|
|
116
|
+
break;
|
|
117
|
+
case '002':
|
|
118
|
+
unitPriceSpec.referenceQuantity.minValue = Number(ticketInfo.limitCount);
|
|
119
|
+
break;
|
|
120
|
+
default:
|
|
121
|
+
unitPriceSpec.referenceQuantity.value = 1;
|
|
122
|
+
}
|
|
123
|
+
const priceComponent = [
|
|
124
|
+
unitPriceSpec,
|
|
125
|
+
...(movieTicketTypeChargePriceSpec !== undefined) ? [movieTicketTypeChargePriceSpec] : [],
|
|
126
|
+
...(surfrockChargePriceSpec !== undefined) ? [surfrockChargePriceSpec] : []
|
|
127
|
+
];
|
|
128
|
+
return { priceComponent, eligibleMonetaryAmount };
|
|
129
|
+
}
|
|
53
130
|
/**
|
|
54
131
|
* 受け入れらたオファーの内容を検証
|
|
55
132
|
*/
|
|
56
133
|
function validateAcceptedOffers(params) {
|
|
57
|
-
// tslint:disable-next-line:max-func-body-length
|
|
58
134
|
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
59
135
|
const offerIds = (Array.isArray(params.object.acceptedOffer))
|
|
60
136
|
? [...new Set(params.object.acceptedOffer.map((o) => o.id))]
|
|
@@ -67,9 +143,8 @@ function validateAcceptedOffers(params) {
|
|
|
67
143
|
project: { id: { $eq: params.project.id } }
|
|
68
144
|
});
|
|
69
145
|
}
|
|
70
|
-
// tslint:disable-next-line:max-func-body-length
|
|
71
146
|
const acceptedOffers = params.object.acceptedOffer.map((acceptedOffer) => {
|
|
72
|
-
var _a, _b, _c, _d, _e, _f
|
|
147
|
+
var _a, _b, _c, _d, _e, _f;
|
|
73
148
|
const availableUnitPriceOffer = availableUnitPriceOffers.find((unitPriceOffer) => unitPriceOffer.id === acceptedOffer.id);
|
|
74
149
|
if (availableUnitPriceOffer === undefined) {
|
|
75
150
|
throw new factory.errors.NotFound(factory.offerType.Offer, `${acceptedOffer.identifier} not found`);
|
|
@@ -78,67 +153,12 @@ function validateAcceptedOffers(params) {
|
|
|
78
153
|
if (priceSpecification === undefined) {
|
|
79
154
|
throw new factory.errors.NotFound('priceSpecification');
|
|
80
155
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
const { appliesToMovieTicket, movieTicketTypeChargePriceSpec } = createAppliesToMovieTicket({
|
|
87
|
-
project: { id: params.project.id },
|
|
88
|
-
ticketInfo,
|
|
89
|
-
availablePaymentMethodTypes: params.availablePaymentMethodTypes
|
|
156
|
+
// priceComponentを再生成(2023-03-14~)
|
|
157
|
+
const { priceComponent, eligibleMonetaryAmount } = createPriceComponent({
|
|
158
|
+
availablePaymentMethodTypes: params.availablePaymentMethodTypes,
|
|
159
|
+
acceptedOffer,
|
|
160
|
+
availableUnitPriceOffer
|
|
90
161
|
});
|
|
91
|
-
let surfrockChargePriceSpec;
|
|
92
|
-
let appliesToMovieTicket4surfrock;
|
|
93
|
-
// appliesToSurfrockの指定があれば強制的にMovieTicket決済
|
|
94
|
-
let eligibleMonetaryAmount;
|
|
95
|
-
const surfrockIdentifier = (_b = (_a = acceptedOffer.priceSpecification) === null || _a === void 0 ? void 0 : _a.appliesToSurfrock) === null || _b === void 0 ? void 0 : _b.identifier;
|
|
96
|
-
if (typeof surfrockIdentifier === 'string') {
|
|
97
|
-
// serviceTypeはticketCode
|
|
98
|
-
const serviceType = (_d = (_c = availableUnitPriceOffer.additionalProperty) === null || _c === void 0 ? void 0 : _c.find((p) => p.name === 'ticketCode')) === null || _d === void 0 ? void 0 : _d.value;
|
|
99
|
-
if (typeof serviceType !== 'string') {
|
|
100
|
-
throw new factory.errors.NotFound('ticketCode of unitPriceOffer');
|
|
101
|
-
}
|
|
102
|
-
surfrockChargePriceSpec = {
|
|
103
|
-
appliesToMovieTicket: {
|
|
104
|
-
typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
|
|
105
|
-
serviceOutput: { typeOf: MENBERSHIP_COUPON_PAYMENT_METHOD_TYPE },
|
|
106
|
-
serviceType
|
|
107
|
-
},
|
|
108
|
-
appliesToVideoFormat: 'Default',
|
|
109
|
-
name,
|
|
110
|
-
price: 0,
|
|
111
|
-
priceCurrency: factory.priceCurrency.JPY,
|
|
112
|
-
typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification,
|
|
113
|
-
valueAddedTaxIncluded: true
|
|
114
|
-
};
|
|
115
|
-
appliesToMovieTicket4surfrock = {
|
|
116
|
-
typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
|
|
117
|
-
identifier: surfrockIdentifier,
|
|
118
|
-
serviceOutput: { typeOf: MENBERSHIP_COUPON_PAYMENT_METHOD_TYPE },
|
|
119
|
-
serviceType
|
|
120
|
-
};
|
|
121
|
-
}
|
|
122
|
-
else {
|
|
123
|
-
// appliesToSurfrockの指定がなければ単価オファーの適用通貨条件を強制適用
|
|
124
|
-
if (Array.isArray(availableUnitPriceOffer.eligibleMonetaryAmount)) {
|
|
125
|
-
eligibleMonetaryAmount = availableUnitPriceOffer.eligibleMonetaryAmount;
|
|
126
|
-
}
|
|
127
|
-
}
|
|
128
|
-
const unitPriceSpec = Object.assign({ typeOf: factory.priceSpecificationType.UnitPriceSpecification, name: unitPriceSpecByRequest.name, price: unitPriceSpecByRequest.price, priceCurrency: factory.priceCurrency.JPY, referenceQuantity: unitPriceSpecByRequest.referenceQuantity, valueAddedTaxIncluded: true }, (appliesToMovieTicket !== undefined || appliesToMovieTicket4surfrock !== undefined)
|
|
129
|
-
? {
|
|
130
|
-
appliesToMovieTicket: [
|
|
131
|
-
...(appliesToMovieTicket !== undefined) ? [appliesToMovieTicket] : [],
|
|
132
|
-
...(appliesToMovieTicket4surfrock !== undefined) ? [appliesToMovieTicket4surfrock] : []
|
|
133
|
-
]
|
|
134
|
-
}
|
|
135
|
-
: undefined);
|
|
136
|
-
// priceComponentを再生成
|
|
137
|
-
const priceComponent = [
|
|
138
|
-
unitPriceSpec,
|
|
139
|
-
...(movieTicketTypeChargePriceSpec !== undefined) ? [movieTicketTypeChargePriceSpec] : [],
|
|
140
|
-
...(surfrockChargePriceSpec !== undefined) ? [surfrockChargePriceSpec] : []
|
|
141
|
-
];
|
|
142
162
|
priceSpecification.priceComponent = priceComponent;
|
|
143
163
|
return Object.assign(Object.assign({ additionalProperty,
|
|
144
164
|
itemOffered,
|
|
@@ -150,10 +170,10 @@ function validateAcceptedOffers(params) {
|
|
|
150
170
|
priceCurrency: availableUnitPriceOffer.priceCurrency, id: String(availableUnitPriceOffer.id), identifier: String(availableUnitPriceOffer.identifier), typeOf: availableUnitPriceOffer.typeOf }, (Array.isArray(eligibleMonetaryAmount)) ? { eligibleMonetaryAmount } : undefined), {
|
|
151
171
|
// tslint:disable-next-line:no-suspicious-comment
|
|
152
172
|
// TODO itemOfferedに完全置き換え
|
|
153
|
-
seatNumber: (
|
|
173
|
+
seatNumber: (_c = (_b = (_a = itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) === null || _c === void 0 ? void 0 : _c.seatNumber,
|
|
154
174
|
// tslint:disable-next-line:no-suspicious-comment
|
|
155
175
|
// TODO itemOfferedに完全置き換え
|
|
156
|
-
seatSection: (
|
|
176
|
+
seatSection: (_f = (_e = (_d = itemOffered.serviceOutput) === null || _d === void 0 ? void 0 : _d.reservedTicket) === null || _e === void 0 ? void 0 : _e.ticketedSeat) === null || _f === void 0 ? void 0 : _f.seatSection
|
|
157
177
|
});
|
|
158
178
|
});
|
|
159
179
|
return { acceptedOffers };
|
package/package.json
CHANGED
|
@@ -9,8 +9,8 @@
|
|
|
9
9
|
}
|
|
10
10
|
],
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@chevre/factory": "4.301.0
|
|
13
|
-
"@cinerino/sdk": "3.149.0
|
|
12
|
+
"@chevre/factory": "4.301.0",
|
|
13
|
+
"@cinerino/sdk": "3.149.0",
|
|
14
14
|
"@motionpicture/coa-service": "9.2.0",
|
|
15
15
|
"@motionpicture/gmo-service": "5.2.0",
|
|
16
16
|
"@sendgrid/mail": "6.4.0",
|
|
@@ -120,5 +120,5 @@
|
|
|
120
120
|
"postversion": "git push origin --tags",
|
|
121
121
|
"prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
|
|
122
122
|
},
|
|
123
|
-
"version": "20.7.0
|
|
123
|
+
"version": "20.7.0"
|
|
124
124
|
}
|