@chevre/domain 21.8.0-alpha.21 → 21.8.0-alpha.23

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/pay/factory.js

@@ -8,7 +8,7 @@ const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createStartParams(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
     const paymentServiceId = (params.paymentService !== undefined)
         ? String(params.paymentService.id)
         : '';
@@ -68,10 +68,16 @@ function createStartParams(params) {
         }
     }
     else if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
+        const creditCardPaymentServiceOutput = (_l = params.paymentService) === null || _l === void 0 ? void 0 : _l.serviceOutput;
+        const invoiceAsServiceOutput = (Array.isArray(creditCardPaymentServiceOutput))
+            ? creditCardPaymentServiceOutput.find((output) => output.typeOf === 'Invoice')
+            : creditCardPaymentServiceOutput;
         // カード通貨区分が存在すれば適用
-        const creditCardAsPaymentServiceOutputCurrency = (_p = (_o = (_m = (_l = params.paymentService) === null || _l === void 0 ? void 0 : _l.serviceOutput) === null || _m === void 0 ? void 0 : _m.paymentMethod) === null || _o === void 0 ? void 0 : _o.amount) === null || _p === void 0 ? void 0 : _p.currency;
-        if (typeof creditCardAsPaymentServiceOutputCurrency === 'string') {
-            paymentMethodCurrency = creditCardAsPaymentServiceOutputCurrency;
+        if ((invoiceAsServiceOutput === null || invoiceAsServiceOutput === void 0 ? void 0 : invoiceAsServiceOutput.typeOf) === 'Invoice') {
+            const creditCardAsPaymentServiceOutputCurrency = (_o = (_m = invoiceAsServiceOutput.paymentMethod) === null || _m === void 0 ? void 0 : _m.amount) === null || _o === void 0 ? void 0 : _o.currency;
+            if (typeof creditCardAsPaymentServiceOutputCurrency === 'string') {
+                paymentMethodCurrency = creditCardAsPaymentServiceOutputCurrency;
+            }
         }
     }
     const paymentMethodAmount = {
@@ -79,24 +85,24 @@ function createStartParams(params) {
         currency: paymentMethodCurrency,
         value: params.amount
     };
-    const paymentMethod = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray((_q = params.object.paymentMethod) === null || _q === void 0 ? void 0 : _q.additionalProperty))
-            ? (_r = params.object.paymentMethod) === null || _r === void 0 ? void 0 : _r.additionalProperty
-            : [], name: (typeof ((_s = params.object.paymentMethod) === null || _s === void 0 ? void 0 : _s.name) === 'string')
+    const paymentMethod = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray((_p = params.object.paymentMethod) === null || _p === void 0 ? void 0 : _p.additionalProperty))
+            ? (_q = params.object.paymentMethod) === null || _q === void 0 ? void 0 : _q.additionalProperty
+            : [], name: (typeof ((_r = params.object.paymentMethod) === null || _r === void 0 ? void 0 : _r.name) === 'string')
             ? params.object.paymentMethod.name
             : paymentMethodType, 
         // MonetaryAmount対応(2023-08-14~)
         amount: (settings_1.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT) ? paymentMethodAmount : params.amount, 
         // paymentMethodId: params.transactionNumber, // object.paymentMethodIdへ完全移行(2023-08-30~)
-        identifier: paymentMethodType }, (typeof ((_t = params.object.paymentMethod) === null || _t === void 0 ? void 0 : _t.description) === 'string')
-        ? { description: (_u = params.object.paymentMethod) === null || _u === void 0 ? void 0 : _u.description }
+        identifier: paymentMethodType }, (typeof ((_s = params.object.paymentMethod) === null || _s === void 0 ? void 0 : _s.description) === 'string')
+        ? { description: (_t = params.object.paymentMethod) === null || _t === void 0 ? void 0 : _t.description }
         : undefined), (totalPaymentDue !== undefined)
         ? { totalPaymentDue: totalPaymentDue }
-        : undefined), (typeof accountId === 'string') ? { accountId: accountId } : undefined), (typeof ((_v = params.object.paymentMethod) === null || _v === void 0 ? void 0 : _v.method) === 'string')
-        ? { method: (_w = params.object.paymentMethod) === null || _w === void 0 ? void 0 : _w.method }
-        : undefined), (((_x = params.object.paymentMethod) === null || _x === void 0 ? void 0 : _x.creditCard) !== undefined)
-        ? { creditCard: (_y = params.object.paymentMethod) === null || _y === void 0 ? void 0 : _y.creditCard }
-        : undefined), (Array.isArray((_z = params.object.paymentMethod) === null || _z === void 0 ? void 0 : _z.movieTickets))
-        ? { movieTickets: (_0 = params.object.paymentMethod) === null || _0 === void 0 ? void 0 : _0.movieTickets }
+        : undefined), (typeof accountId === 'string') ? { accountId: accountId } : undefined), (typeof ((_u = params.object.paymentMethod) === null || _u === void 0 ? void 0 : _u.method) === 'string')
+        ? { method: (_v = params.object.paymentMethod) === null || _v === void 0 ? void 0 : _v.method }
+        : undefined), (((_w = params.object.paymentMethod) === null || _w === void 0 ? void 0 : _w.creditCard) !== undefined)
+        ? { creditCard: (_x = params.object.paymentMethod) === null || _x === void 0 ? void 0 : _x.creditCard }
+        : undefined), (Array.isArray((_y = params.object.paymentMethod) === null || _y === void 0 ? void 0 : _y.movieTickets))
+        ? { movieTickets: (_z = params.object.paymentMethod) === null || _z === void 0 ? void 0 : _z.movieTickets }
         : undefined);
     const object = {
         // パラメータから必要なもののみ取り込む
@@ -107,7 +113,7 @@ function createStartParams(params) {
         onPaymentStatusChanged: { informPayment: informPaymentParams },
         paymentMethod
     };
-    return Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object, expires: params.expires }, (typeof ((_1 = params.location) === null || _1 === void 0 ? void 0 : _1.typeOf) === 'string')
+    return Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object, expires: params.expires }, (typeof ((_0 = params.location) === null || _0 === void 0 ? void 0 : _0.typeOf) === 'string')
         ? { location: params.location }
         : undefined);
 }

package/lib/chevre/service/assetTransaction/refund/factory.js

@@ -6,7 +6,7 @@ exports.createStartParams = void 0;
  */
 const factory = require("../../../factory");
 function createStartParams(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
     if (typeof paymentMethodType !== 'string') {
         throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
@@ -23,7 +23,13 @@ function createStartParams(params) {
     let refundFee;
     if (((_g = params.paymentService) === null || _g === void 0 ? void 0 : _g.typeOf) === factory.service.paymentService.PaymentServiceType.CreditCard) {
         // カード通貨区分の存在する決済サービスを考慮(2023-08-09~)
-        const paymentServiceOutputAmountCurrency = (_k = (_j = (_h = params.paymentService.serviceOutput) === null || _h === void 0 ? void 0 : _h.paymentMethod) === null || _j === void 0 ? void 0 : _j.amount) === null || _k === void 0 ? void 0 : _k.currency;
+        const invoiceAsServiceOutput = (Array.isArray(params.paymentService.serviceOutput))
+            ? params.paymentService.serviceOutput.find((output) => output.typeOf === 'Invoice')
+            : params.paymentService.serviceOutput;
+        let paymentServiceOutputAmountCurrency;
+        if ((invoiceAsServiceOutput === null || invoiceAsServiceOutput === void 0 ? void 0 : invoiceAsServiceOutput.typeOf) === 'Invoice') {
+            paymentServiceOutputAmountCurrency = (_j = (_h = invoiceAsServiceOutput === null || invoiceAsServiceOutput === void 0 ? void 0 : invoiceAsServiceOutput.paymentMethod) === null || _h === void 0 ? void 0 : _h.amount) === null || _j === void 0 ? void 0 : _j.currency;
+        }
         if (typeof paymentServiceOutputAmountCurrency !== 'string') {
             if (typeof params.object.refundFee === 'number') {
                 refundFee = params.object.refundFee;

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

@@ -571,31 +571,64 @@ function validateProgramMembershipUsed(params) {
             if (typeof issuedThroughId !== 'string' || issuedThroughId.length === 0) {
                 throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
             }
-            // requestedProgramMembershipUsedの発行サービスIDから外部連携設定を取得する
-            const permitService = yield createPermitService({ issuedThrough: { id: issuedThroughId } })(repos);
-            // メンバーシップの存在確認
-            const serviceOutput = yield permitService.findByIdentifier({
-                project: { id: params.project.id },
-                identifier: programMembershipUsedIdentifier,
-                issuedThrough: { typeOf: factory.product.ProductType.MembershipService }
-            });
-            // 有効期間のチェック
-            if (serviceOutput.validFrom === undefined || serviceOutput.validFrom === null
-                || serviceOutput.validUntil === undefined || serviceOutput.validUntil === null) {
-                throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'not valid programMembership');
-            }
-            if (moment(serviceOutput.validFrom)
-                .isAfter(moment(now))
-                || moment(serviceOutput.validUntil)
-                    .isBefore(moment(now))) {
-                throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'unavailable programMembership');
+            const permitIssuedThrough = yield repos.product.findById({ id: issuedThroughId }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], []);
+            switch (permitIssuedThrough.typeOf) {
+                // 発行サービスがCreditCardのケースに対応(2023-09-01~)
+                case factory.service.paymentService.PaymentServiceType.CreditCard:
+                    // 決済サービスのserviceOutputにPermitが存在すれば、設定されたメンバーシップ区分のPermitをprogramMembershipUsedとして適用する
+                    let issuedThroughServiceType;
+                    if (Array.isArray(permitIssuedThrough.serviceOutput)) {
+                        const serviceOutputAsPermit = permitIssuedThrough.serviceOutput.find((output) => output.typeOf === factory.permit.PermitType.Permit);
+                        if ((serviceOutputAsPermit === null || serviceOutputAsPermit === void 0 ? void 0 : serviceOutputAsPermit.typeOf) === factory.permit.PermitType.Permit) {
+                            issuedThroughServiceType = serviceOutputAsPermit.issuedThrough.serviceType;
+                        }
+                    }
+                    if ((issuedThroughServiceType === null || issuedThroughServiceType === void 0 ? void 0 : issuedThroughServiceType.typeOf) === 'CategoryCode') {
+                        programMembershipUsed = {
+                            project: permitIssuedThrough.project,
+                            typeOf: factory.permit.PermitType.Permit,
+                            identifier: programMembershipUsedIdentifier,
+                            issuedThrough: {
+                                id: permitIssuedThrough.id,
+                                serviceType: issuedThroughServiceType,
+                                typeOf: permitIssuedThrough.typeOf
+                            }
+                        };
+                    }
+                    else {
+                        throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'issuedThrough has no serviceOutput as Permit');
+                    }
+                    break;
+                case factory.product.ProductType.MembershipService:
+                    // requestedProgramMembershipUsedの発行サービスIDから外部連携設定を取得する
+                    const permitService = yield createPermitService({ issuedThrough: { id: issuedThroughId } })(repos);
+                    // メンバーシップの存在確認
+                    const serviceOutput = yield permitService.findByIdentifier({
+                        project: { id: params.project.id },
+                        identifier: programMembershipUsedIdentifier,
+                        issuedThrough: { typeOf: factory.product.ProductType.MembershipService }
+                    });
+                    // 有効期間のチェック
+                    if (serviceOutput.validFrom === undefined || serviceOutput.validFrom === null
+                        || serviceOutput.validUntil === undefined || serviceOutput.validUntil === null) {
+                        throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'not valid programMembership');
+                    }
+                    if (moment(serviceOutput.validFrom)
+                        .isAfter(moment(now))
+                        || moment(serviceOutput.validUntil)
+                            .isBefore(moment(now))) {
+                        throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'unavailable programMembership');
+                    }
+                    programMembershipUsed = {
+                        project: serviceOutput.project,
+                        typeOf: serviceOutput.typeOf,
+                        identifier: serviceOutput.identifier,
+                        issuedThrough: serviceOutput.issuedThrough
+                    };
+                    break;
+                default:
+                    throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', `${permitIssuedThrough.typeOf} not implemented`);
             }
-            programMembershipUsed = {
-                project: serviceOutput.project,
-                typeOf: serviceOutput.typeOf,
-                identifier: serviceOutput.identifier,
-                issuedThrough: serviceOutput.issuedThrough
-            };
         }
         return programMembershipUsed;
     });

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/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/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.328.0",
-    "@cinerino/sdk": "3.165.0",
+    "@chevre/factory": "4.329.0-alpha.1",
+    "@cinerino/sdk": "3.166.0-alpha.4",
     "@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.21"
+  "version": "21.8.0-alpha.23"
 }