@chevre/domain 21.8.0-alpha.20 → 21.8.0-alpha.22

package/example/src/chevre/migratePayTransactionPaymentMethodIdentifier.ts

@@ -17,9 +17,11 @@ async function main() {
             typeOf: { $eq: chevre.factory.assetTransactionType.Pay },
             // 'project.id': { $eq: project.id },
             startDate: {
-                $gte: moment()
+                $gte: moment('2023-05-08T00:00:00Z')
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(-24, 'months')
+                    // .add(-12, 'months')
+                    .toDate(),
+                $lte: moment('2023-08-30T21:00:00Z')
                     .toDate()
             }
         },
@@ -48,7 +50,8 @@ async function main() {
         if (alreadyMigrated) {
             console.log(
                 'already exist.',
-                payTransaction.project.id, payTransaction.typeOf, payTransaction.transactionNumber, payTransaction.startDate, i);
+                payTransaction.project.id, payTransaction.typeOf, payTransaction.transactionNumber, payTransaction.startDate,
+                i, updateCount);
         } else {
             const paymentMethodIdentifier = (<any>payTransaction.object.paymentMethod).typeOf;
             console.log(

package/lib/chevre/repo/mongoose/schemas/offer.d.ts

@@ -52,6 +52,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     };
 }, {
     additionalProperty: any[];
+    offers: any[];
     addOn: any[];
     availability: string;
     availableAtOrFrom: any[];
@@ -83,6 +84,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     validRateLimit?: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     additionalProperty: any[];
+    offers: any[];
     addOn: any[];
     availability: string;
     availableAtOrFrom: any[];
@@ -114,6 +116,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     validRateLimit?: any;
 }>> & Omit<import("mongoose").FlatRecord<{
     additionalProperty: any[];
+    offers: any[];
     addOn: any[];
     availability: string;
     availableAtOrFrom: any[];

package/lib/chevre/repo/mongoose/schemas/offer.js

@@ -29,6 +29,7 @@ const schema = new mongoose_1.Schema({
     availableAtOrFrom: [mongoose_1.SchemaTypes.Mixed],
     hasMerchantReturnPolicy: mongoose_1.SchemaTypes.Mixed,
     itemOffered: mongoose_1.SchemaTypes.Mixed,
+    offers: [mongoose_1.SchemaTypes.Mixed],
     priceCurrency: String,
     priceSpecification: mongoose_1.SchemaTypes.Mixed,
     eligibleCustomerType: mongoose_1.SchemaTypes.Mixed,

package/lib/chevre/service/assetTransaction/reserve.js

@@ -386,21 +386,62 @@ function createReservations4transactionObject(params) {
                 }
             }
             // 指定されたアドオンがオファーに存在すれば、アドオンの単価仕様作成
-            let acceptedAddOns = [];
+            const acceptedAddOns = [];
             let availableAddOns;
-            const acceptedAddOnParams = acceptedOffer.addOn;
-            if (Array.isArray(acceptedAddOnParams) && acceptedAddOnParams.length > 0) {
+            const acceptedAddOnsParams = acceptedOffer.addOn;
+            if (Array.isArray(acceptedAddOnsParams) && acceptedAddOnsParams.length > 0) {
                 // アドオンオファー検索(2023-03-02~)
                 availableAddOns = yield searchAvailableAddOns({
-                    ids: acceptedAddOnParams.map((acceptedAddOn) => String(acceptedAddOn.id)),
+                    ids: acceptedAddOnsParams.map((acceptedAddOn) => String(acceptedAddOn.id)),
                     project: { id: params.transaction.project.id },
                     ticketOffer,
                     availableAtOrFrom: params.availableAtOrFrom
                 })(repos);
             }
-            // availableAddOns = <factory.product.ITicketAddOn[] | undefined>ticketOffer.addOn;
-            if (Array.isArray(availableAddOns) && Array.isArray(acceptedAddOnParams)) {
-                acceptedAddOns = availableAddOns.filter((availableAddOn) => acceptedAddOnParams.some((acceptedAddOn) => availableAddOn.id === acceptedAddOn.id));
+            if (Array.isArray(availableAddOns) && Array.isArray(acceptedAddOnsParams)) {
+                acceptedAddOnsParams.forEach((acceptedAddOnParams) => {
+                    var _a, _b, _c;
+                    const availableAddOn = availableAddOns === null || availableAddOns === void 0 ? void 0 : availableAddOns.find((addOn) => addOn.id === acceptedAddOnParams.id);
+                    if (availableAddOn !== undefined) {
+                        // acceptedAddOnsの重複を避ける(単価オファーIDに対して)
+                        if (!acceptedAddOns.some((addOn) => addOn.id === availableAddOn.id)) {
+                            const availableAddOnReferenceQuantityValue = availableAddOn.priceSpecification.referenceQuantity.value;
+                            if (typeof availableAddOnReferenceQuantityValue !== 'number') {
+                                throw new factory.errors.NotImplemented('addOn.priceSpecification.referenceQuantity.value must be number');
+                            }
+                            // 受入数量はデフォルトで単価オファーの基準数量
+                            let referenceQuantityValueAccepted = availableAddOnReferenceQuantityValue;
+                            // 数量指定を検証(2023-08-31~)
+                            const specifiedReferencedQuantityValue = (_b = (_a = acceptedAddOnParams.priceSpecification) === null || _a === void 0 ? void 0 : _a.referenceQuantity) === null || _b === void 0 ? void 0 : _b.value;
+                            if (typeof specifiedReferencedQuantityValue === 'number') {
+                                if (specifiedReferencedQuantityValue < 1) {
+                                    throw new factory.errors.Argument('addOn.priceSpecification.referenceQuantity.value must be > 0');
+                                }
+                                // 数量が適用単位要件を満たしていなければエラー
+                                if (specifiedReferencedQuantityValue % availableAddOnReferenceQuantityValue !== 0) {
+                                    throw new factory.errors.Argument('addOn.priceSpecification.referenceQuantity.value', `Offer ${availableAddOn.id} requires reference quantity value ${specifiedReferencedQuantityValue}`);
+                                }
+                                // 基準数量上書き
+                                referenceQuantityValueAccepted = specifiedReferencedQuantityValue;
+                            }
+                            const priceAccepted = availableAddOn.priceSpecification.price *
+                                (referenceQuantityValueAccepted / availableAddOnReferenceQuantityValue);
+                            const accountsReceivableAccepted = (typeof ((_c = availableAddOn.priceSpecification.accounting) === null || _c === void 0 ? void 0 : _c.accountsReceivable) === 'number')
+                                ? availableAddOn.priceSpecification.accounting.accountsReceivable *
+                                    (referenceQuantityValueAccepted / availableAddOnReferenceQuantityValue)
+                                : undefined;
+                            const acceptedAddOn = Object.assign(Object.assign({}, availableAddOn), { priceSpecification: Object.assign(Object.assign(Object.assign({}, availableAddOn.priceSpecification), (typeof accountsReceivableAccepted === 'number')
+                                    ? {
+                                        accounting: Object.assign(Object.assign({}, availableAddOn.priceSpecification.accounting), { accountsReceivable: accountsReceivableAccepted, typeOf: 'Accounting' })
+                                    }
+                                    : undefined), { price: priceAccepted, referenceQuantity: Object.assign(Object.assign({}, availableAddOn.priceSpecification.referenceQuantity), { value: referenceQuantityValueAccepted }) }) });
+                            acceptedAddOns.push(acceptedAddOn);
+                        }
+                    }
+                });
+                // acceptedAddOns = availableAddOns.filter(
+                //     (availableAddOn) => acceptedAddOnsParams.some((acceptedAddOn) => availableAddOn.id === acceptedAddOn.id)
+                // );
             }
             const subReservation = (_j = (_h = acceptedOffer.itemOffered) === null || _h === void 0 ? void 0 : _h.serviceOutput) === null || _j === void 0 ? void 0 : _j.subReservation;
             const reservationId = `${reservationNumber}-${reservationIndex}`;

package/lib/chevre/service/offer/event/factory.js

@@ -299,6 +299,7 @@ function createReservation(params) {
     }
     return reservationItem;
 }
+// tslint:disable-next-line:max-func-body-length
 function coaTicket2offer(params) {
     var _a, _b;
     // 適用通貨区分
@@ -322,7 +323,6 @@ function coaTicket2offer(params) {
             }]
         : undefined;
     const unitPriceSpec = {
-        // project: { typeOf: factory.organizationType.Project, id: params.project.id },
         typeOf: factory.priceSpecificationType.UnitPriceSpecification,
         price: 0,
         priceCurrency: factory.priceCurrency.JPY,
@@ -332,15 +332,25 @@ function coaTicket2offer(params) {
             unitCode: factory.unitCode.C62,
             value: 1
         }
-        // appliesToMovieTicket?: {};
     };
     const identifier = (0, util_1.format)('%s-%s-%s', factory.service.webAPI.Identifier.COA, params.theaterCode, params.ticketResult.ticketCode);
-    return Object.assign(Object.assign(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY, id: '', identifier: identifier, name: {
-            ja: params.ticketResult.ticketName,
-            en: (typeof params.ticketResult.ticketNameEng === 'string')
-                ? params.ticketResult.ticketNameEng
-                : ''
-        }, description: {
+    const offerName = {
+        ja: params.ticketResult.ticketName,
+        en: (typeof params.ticketResult.ticketNameEng === 'string')
+            ? params.ticketResult.ticketNameEng
+            : ''
+    };
+    const subOfferPriceSpec = {
+        price: unitPriceSpec.price,
+        typeOf: unitPriceSpec.typeOf
+    };
+    const subOffers = [{
+            typeOf: factory.offerType.Offer,
+            identifier: identifier,
+            name: offerName,
+            priceSpecification: subOfferPriceSpec
+        }];
+    return Object.assign(Object.assign(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY, id: '', identifier: identifier, name: offerName, description: {
             ja: '',
             en: ''
         }, alternateName: {
@@ -350,7 +360,7 @@ function coaTicket2offer(params) {
                 : ''
         }, availability: factory.itemAvailability.InStock, itemOffered: {
             typeOf: factory.product.ProductType.EventService
-        }, priceSpecification: unitPriceSpec }, (Array.isArray(eligibleMembershipType)) ? { eligibleMembershipType } : undefined), (Array.isArray(eligibleMonetaryAmount)) ? { eligibleMonetaryAmount } : undefined), { additionalProperty: [
+        }, offers: subOffers, priceSpecification: unitPriceSpec }, (Array.isArray(eligibleMembershipType)) ? { eligibleMembershipType } : undefined), (Array.isArray(eligibleMonetaryAmount)) ? { eligibleMonetaryAmount } : undefined), { additionalProperty: [
             { name: 'theaterCode', value: params.theaterCode },
             ...Object.keys(params.ticketResult)
                 .map((key) => {

package/lib/chevre/service/payment/any.js

@@ -186,9 +186,14 @@ function processVoidPayTransaction(params) {
                         project: { id: { $eq: action.project.id } },
                         typeOf: factory.assetTransactionType.Pay,
                         transactionNumber: { $eq: transactionNumber }
-                    });
-                    if (payTransactions.length > 0) {
-                        yield PayTransactionService.cancel({ transactionNumber })(repos);
+                    }, ['_id', 'status']);
+                    const payTransaction = payTransactions.shift();
+                    if (payTransaction !== undefined) {
+                        // ステータス検証(Expiredから実行される可能性がある)
+                        if (payTransaction.status !== factory.transactionStatusType.Canceled
+                            && payTransaction.status !== factory.transactionStatusType.Expired) {
+                            yield PayTransactionService.cancel({ transactionNumber })(repos);
+                        }
                     }
                 }
                 yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });

package/lib/chevre/service/task/returnPayTransaction.js

@@ -159,7 +159,11 @@ function transaction2refundFee(params) {
     return refundFee;
 }
 function createStartRefundTransactionParams(params) {
-    var _a;
+    var _a, _b;
+    const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
+    if (typeof paymentMethodType !== 'string') {
+        throw new factory.errors.NotFound('object.paymentMethod.identifier');
+    }
     return {
         project: { id: params.project.id, typeOf: factory.organizationType.Project },
         typeOf: factory.assetTransactionType.Refund,
@@ -173,11 +177,12 @@ function createStartRefundTransactionParams(params) {
         recipient: { typeOf: params.recipient.typeOf, name: params.recipient.name },
         object: {
             typeOf: params.paymentServiceType,
-            id: (typeof ((_a = params.object.issuedThrough) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? params.object.issuedThrough.id : '',
+            id: (typeof ((_b = params.object.issuedThrough) === null || _b === void 0 ? void 0 : _b.id) === 'string') ? params.object.issuedThrough.id : '',
             paymentMethod: {
                 additionalProperty: params.object.additionalProperty,
                 name: params.object.name,
-                typeOf: params.object.typeOf,
+                // typeOf: params.object.typeOf,
+                typeOf: paymentMethodType,
                 paymentMethodId: params.object.paymentMethodId
             },
             refundFee: params.refundFee

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateMovieTicket.js

@@ -149,10 +149,10 @@ function authorizeSeatReservationActions2requiredMovieTickets(params) {
                         appliesToMovieTickets4paymentMethod = appliesToMovieTickets4reservation.filter((a) => {
                             return a.serviceOutput.typeOf === paymentMethodType;
                         });
-                    }
-                    else if (typeof (appliesToMovieTickets4reservation === null || appliesToMovieTickets4reservation === void 0 ? void 0 : appliesToMovieTickets4reservation.identifier) === 'string') {
-                        // Arrayでない場合を廃止(2022-08-01~)
-                        throw new factory.errors.NotImplemented('appliesToMovieTickets.typeOf as string not implemented');
+                        // Array以外への考慮自体を廃止(2023-09-01~)
+                        // } else if (typeof appliesToMovieTickets4reservation?.identifier === 'string') {
+                        //     // Arrayでない場合を廃止(2022-08-01~)
+                        //     throw new factory.errors.NotImplemented('appliesToMovieTickets.typeOf as string not implemented');
                     }
                     if (Array.isArray(appliesToMovieTickets4paymentMethod) && appliesToMovieTickets4paymentMethod.length > 0) {
                         appliesToMovieTickets4paymentMethod.forEach((appliesToMovieTicket) => {

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js

@@ -138,18 +138,19 @@ function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
         const order = params.order;
         const returnFeesMovieTicketByTransaction = params.transaction.object.returnPolicy.returnFeesMovieTicket;
         return Promise.all(params.order.paymentMethods
-            .filter((paymentMethod) => {
-            return paymentMethod.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket;
+            .filter((invoice) => {
+            return invoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket;
         })
             // 決済カード着券取消有無設定を適用
-            .filter((paymentMethod) => {
+            .filter((invoice) => {
             // デフォルトで実行する
             let returnPaymentMethod = true;
-            const movieTicketIdentifier = paymentMethod.accountId;
+            const movieTicketIdentifier = invoice.accountId;
             const returnFeesMovieTicketSettingsByIdentifier = returnFeesMovieTicketByTransaction === null || returnFeesMovieTicketByTransaction === void 0 ? void 0 : returnFeesMovieTicketByTransaction.filter((r) => {
-                var _a;
+                var _a, _b;
                 return r.identifier === String(movieTicketIdentifier)
-                    && ((_a = r.serviceOutput) === null || _a === void 0 ? void 0 : _a.typeOf) === paymentMethod.typeOf;
+                    // && r.serviceOutput?.typeOf === invoice.typeOf;
+                    && ((_a = r.serviceOutput) === null || _a === void 0 ? void 0 : _a.typeOf) === ((_b = invoice.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier);
             });
             // 設定がなければスルー
             if (Array.isArray(returnFeesMovieTicketSettingsByIdentifier) && returnFeesMovieTicketSettingsByIdentifier.length > 0) {

package/lib/chevre/service/transaction/returnOrder.js

@@ -356,7 +356,11 @@ function isSellerReturnPolicyApplicable(params) {
     if (Array.isArray(applicablePaymentMethod)) {
         const everyOrderApplicable = params.orders.every((order) => {
             // 全決済方法区分がapplicablePaymentMethodに含まれれば適用
-            return order.paymentMethods.every((paymentMethod) => applicablePaymentMethod.includes(paymentMethod.typeOf));
+            return order.paymentMethods.every((invoice) => {
+                var _a;
+                return typeof ((_a = invoice.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier) === 'string'
+                    && applicablePaymentMethod.includes(invoice.paymentMethod.identifier);
+            });
         });
         // 全注文について確認ができれば適用
         if (everyOrderApplicable) {

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.327.0",
-    "@cinerino/sdk": "3.165.0",
+    "@chevre/factory": "4.329.0-alpha.0",
+    "@cinerino/sdk": "3.166.0-alpha.3",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.8.0-alpha.20"
+  "version": "21.8.0-alpha.22"
 }