@chevre/domain 21.20.0-alpha.44 → 21.20.0-alpha.46

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

@@ -503,7 +503,11 @@ function createPotentialActions(params) {
             }));
         });
         reservationPackage = {
-            reservationFor,
+            reservationFor: {
+                id: String(reservationFor.id),
+                typeOf: reservationFor.typeOf,
+                optimized: true
+            },
             reservationNumber: transaction.object.reservationNumber,
             reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
                 ? params.transaction.object.reservationStatus

package/lib/chevre/service/assetTransaction/reserveCOA.d.ts

@@ -1,9 +1,9 @@
+/**
+ * COA予約取引サービス
+ */
+import * as COA from '@motionpicture/coa-service';
 import * as factory from '../../factory';
-import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
-import type { MongoRepository as OrderRepo } from '../../repo/order';
 interface IConfirmRepo {
-    acceptedOffer: AcceptedOfferRepo;
-    order: OrderRepo;
 }
 type IConfirmOperation<T> = (repos: IConfirmRepo) => Promise<T>;
 /**
@@ -15,5 +15,5 @@ declare function confirm(params: {
     };
     object: factory.action.interact.confirm.reservation.IObject4COA;
     purpose: factory.action.interact.confirm.reservation.IPurpose;
-}): IConfirmOperation<void>;
+}): IConfirmOperation<COA.factory.reserve.IUpdReserveResult | undefined>;
 export { confirm };

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

@@ -14,90 +14,16 @@ exports.confirm = void 0;
  * COA予約取引サービス
  */
 const COA = require("@motionpicture/coa-service");
-const createDebug = require("debug");
-const google_libphonenumber_1 = require("google-libphonenumber");
-const util_1 = require("util");
 const credentials_1 = require("../../credentials");
-const factory = require("../../factory");
-const debug = createDebug('chevre-domain:service:assetTransaction');
 const coaAuthClient = new COA.auth.RefreshToken({
     endpoint: credentials_1.credentials.coa.endpoint,
     refreshToken: credentials_1.credentials.coa.refreshToken
 });
-function createConfirmObject4COAByOrder(params) {
-    // COA予約のみ
-    const coaReservationOffers = params.order.acceptedOffers.filter((o) => {
-        var _a;
-        return o.itemOffered.typeOf === factory.reservationType.EventReservation
-            && ((_a = o.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.COA;
-    });
-    const customer = params.order.customer;
-    // 電話番号のフォーマットを日本人にリーダブルに調整(COAではこのフォーマットで扱うので)
-    const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
-    const phoneNumber = phoneUtil.parse(customer.telephone, 'JP');
-    let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
-    // COAでは数字のみ受け付けるので数字以外を除去
-    telNum = telNum.replace(/[^\d]/g, '');
-    const mailAddr = customer.email;
-    if (mailAddr === undefined) {
-        throw new factory.errors.Argument('order', 'order.customer.email undefined');
-    }
-    const coaReservations = coaReservationOffers
-        .filter((o) => o.itemOffered.reservationNumber === params.reservationNumber)
-        .map((o) => {
-        return o.itemOffered;
-    });
-    const coaReservation = coaReservations[0];
-    const reservationForCOAInfo = coaReservation.reservationFor.coaInfo;
-    if (reservationForCOAInfo === undefined) {
-        throw new factory.errors.NotFound('reservationFor.coaInfo');
-    }
-    const totalPrice = coaReservation.reservedTicket.coaReserveAmount;
-    if (totalPrice === undefined) {
-        throw new factory.errors.NotFound('reservedTicket.coaReserveAmount');
-    }
-    const listTicket = coaReservations.map((r) => {
-        var _a;
-        if (typeof ((_a = r.reservedTicket.coaTicketInfo) === null || _a === void 0 ? void 0 : _a.ticketCode) !== 'string') {
-            throw new factory.errors.NotFound('reservedTicket.coaTicketInfo');
-        }
-        // 冗長な属性を排除(2023-03-20~)
-        const { ticketCode, stdPrice, addPrice, spseatAdd1, spseatAdd2, disPrice, salePrice, mvtkAppPrice, ticketCount, spseatKbn, seatNum, addGlasses, kbnEisyahousiki, mvtkNum, mvtkKbnDenshiken, mvtkKbnMaeuriken, mvtkKbnKensyu, mvtkSalesPrice, kbnMgtk } = r.reservedTicket.coaTicketInfo;
-        return {
-            ticketCode, stdPrice, addPrice, spseatAdd1, spseatAdd2,
-            disPrice, salePrice, mvtkAppPrice, ticketCount, spseatKbn,
-            seatNum, addGlasses, kbnEisyahousiki, mvtkNum, mvtkKbnDenshiken,
-            mvtkKbnMaeuriken, mvtkKbnKensyu, mvtkSalesPrice, kbnMgtk
-        };
-    });
-    return {
-        theaterCode: reservationForCOAInfo.theaterCode,
-        dateJouei: reservationForCOAInfo.dateJouei,
-        titleCode: reservationForCOAInfo.titleCode,
-        titleBranchNum: reservationForCOAInfo.titleBranchNum,
-        timeBegin: reservationForCOAInfo.timeBegin,
-        tmpReserveNum: params.reservationNumber,
-        // tslint:disable-next-line:no-irregular-whitespace
-        reserveName: (0, util_1.format)('%s　%s', customer.familyName, customer.givenName),
-        // tslint:disable-next-line:no-irregular-whitespace
-        reserveNameJkana: (0, util_1.format)('%s　%s', customer.familyName, customer.givenName),
-        telNum: telNum,
-        mailAddr: mailAddr,
-        reserveAmount: totalPrice,
-        listTicket
-        // transactionNumber: reservationNumber,
-        // typeOf: 'COAReserveTransaction'
-    };
-}
 /**
  * 取引確定
  */
 function confirm(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // ここでIObject4COAを注文から生成する(2024-01-24~)
-        const order = yield fixOrderAsPurpose(params)(repos);
-        const updReserveArgs = createConfirmObject4COAByOrder({ order, reservationNumber: params.object.transactionNumber });
-        debug('confirming coa reserve transaction...', order, updReserveArgs);
+    return (__) => __awaiter(this, void 0, void 0, function* () {
         // 未本予約であれば実行(COA本予約は一度成功すると成功できない)
         // リトライ可能な前提でつくる必要があるので、要注意
         // すでに本予約済みかどうか確認
@@ -111,30 +37,9 @@ function confirm(params) {
             telNum: params.object.telNum
         });
         if (stateReserveResult === null) {
-            yield reserveService.updReserve(params.object);
+            return reserveService.updReserve(params.object);
         }
+        return;
     });
 }
 exports.confirm = confirm;
-function fixOrderAsPurpose(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let order;
-        const purposeOrderNumber = params.purpose.orderNumber;
-        const orders = yield repos.order.search({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: params.project.id } },
-            // confirmationNumbers: [payPurposeConfirmationNumber],
-            orderNumbers: [purposeOrderNumber]
-        }, { customer: 1, orderNumber: 1, typeOf: 1 });
-        order = orders.shift();
-        if (order === undefined) {
-            throw new factory.errors.NotFound('Order as purpose');
-        }
-        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
-            orderNumber: { $eq: order.orderNumber },
-            project: { id: { $eq: params.project.id } }
-        }, ['itemOffered', 'offeredThrough']);
-        return Object.assign(Object.assign({}, order), { acceptedOffers });
-    });
-}

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.d.ts

@@ -14,7 +14,7 @@ declare function createConfirmReservationActionObject4COAByOrder(params: {
     order: factory.order.IOrder & {
         acceptedOffers: IAcceptedOffer[];
     };
-}): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.COA>[];
+}): factory.task.confirmReserveTransaction.IObject4COAOptimized[];
 declare function createConfirmRegisterServiceActionObjectByOrder(params: {
     order: factory.order.IOrder & {
         acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];

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

@@ -100,7 +100,11 @@ function reserveIfNotYet(params) {
                                 reservationStatus: (typeof reserveTransaction.object.reservationStatus === 'string')
                                     ? reserveTransaction.object.reservationStatus
                                     : factory.reservationStatusType.ReservationPending,
-                                reservationFor: reserveTransaction.object.reservationFor
+                                reservationFor: {
+                                    id: String(reserveTransaction.object.reservationFor.id),
+                                    typeOf: reserveTransaction.object.reservationFor.typeOf,
+                                    optimized: true
+                                } // optimize(2024-01-24~)
                             },
                             agent: reserveTransaction.project,
                             purpose: { typeOf: reserveTransaction.typeOf, id: reserveTransaction.id }

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

@@ -120,7 +120,11 @@ function reserveIfNotYet(params) {
                                 reservationStatus: (typeof reserveTransaction.object.reservationStatus === 'string')
                                     ? reserveTransaction.object.reservationStatus
                                     : factory.reservationStatusType.ReservationPending,
-                                reservationFor: reserveTransaction.object.reservationFor
+                                reservationFor: {
+                                    id: String(reserveTransaction.object.reservationFor.id),
+                                    typeOf: reserveTransaction.object.reservationFor.typeOf,
+                                    optimized: true
+                                } // optimize(2024-01-24~)
                             },
                             agent: reserveTransaction.project,
                             purpose: { typeOf: reserveTransaction.typeOf, id: reserveTransaction.id }

package/lib/chevre/service/task/confirmReserveTransaction.d.ts

@@ -13,7 +13,7 @@ export declare function call(data: factory.task.IData<factory.taskName.ConfirmRe
 /**
  * 予約を確定する
  */
-export declare function confirmReserveTransaction(params: factory.action.interact.confirm.reservation.IAttributes<factory.service.webAPI.Identifier>, options: {
+export declare function confirmReserveTransaction(params: factory.task.IData<factory.taskName.ConfirmReserveTransaction>, options: {
     sendOrder: boolean;
     useOnOrderStatusChanged: boolean;
 }): (repos: {

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

@@ -10,6 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmReserveTransaction = exports.call = void 0;
+const createDebug = require("debug");
+const google_libphonenumber_1 = require("google-libphonenumber");
+const util_1 = require("util");
 const factory = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
@@ -19,6 +22,7 @@ const reservation_1 = require("../../repo/reservation");
 const task_1 = require("../../repo/task");
 const ReserveTransactionService = require("../assetTransaction/reserve");
 const COAReserveService = require("../assetTransaction/reserveCOA");
+const debug = createDebug('chevre-domain:service:task');
 /**
  * タスク実行関数
  */
@@ -38,29 +42,132 @@ function call(data) {
     });
 }
 exports.call = call;
+function createConfirmObject4COAByOrder(params) {
+    // COA予約のみ
+    const coaReservationOffers = params.order.acceptedOffers.filter((o) => {
+        var _a;
+        return o.itemOffered.typeOf === factory.reservationType.EventReservation
+            && ((_a = o.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.COA;
+    });
+    const customer = params.order.customer;
+    // 電話番号のフォーマットを日本人にリーダブルに調整(COAではこのフォーマットで扱うので)
+    const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
+    const phoneNumber = phoneUtil.parse(customer.telephone, 'JP');
+    let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
+    // COAでは数字のみ受け付けるので数字以外を除去
+    telNum = telNum.replace(/[^\d]/g, '');
+    const mailAddr = customer.email;
+    if (mailAddr === undefined) {
+        throw new factory.errors.Argument('order', 'order.customer.email undefined');
+    }
+    const coaReservations = coaReservationOffers
+        .filter((o) => o.itemOffered.reservationNumber === params.reservationNumber)
+        .map((o) => {
+        return o.itemOffered;
+    });
+    const coaReservation = coaReservations[0];
+    const reservationForCOAInfo = coaReservation.reservationFor.coaInfo;
+    if (reservationForCOAInfo === undefined) {
+        throw new factory.errors.NotFound('reservationFor.coaInfo');
+    }
+    const totalPrice = coaReservation.reservedTicket.coaReserveAmount;
+    if (totalPrice === undefined) {
+        throw new factory.errors.NotFound('reservedTicket.coaReserveAmount');
+    }
+    const listTicket = coaReservations.map((r) => {
+        var _a;
+        if (typeof ((_a = r.reservedTicket.coaTicketInfo) === null || _a === void 0 ? void 0 : _a.ticketCode) !== 'string') {
+            throw new factory.errors.NotFound('reservedTicket.coaTicketInfo');
+        }
+        // 冗長な属性を排除(2023-03-20~)
+        const { ticketCode, stdPrice, addPrice, spseatAdd1, spseatAdd2, disPrice, salePrice, mvtkAppPrice, ticketCount, spseatKbn, seatNum, addGlasses, kbnEisyahousiki, mvtkNum, mvtkKbnDenshiken, mvtkKbnMaeuriken, mvtkKbnKensyu, mvtkSalesPrice, kbnMgtk } = r.reservedTicket.coaTicketInfo;
+        return {
+            ticketCode, stdPrice, addPrice, spseatAdd1, spseatAdd2,
+            disPrice, salePrice, mvtkAppPrice, ticketCount, spseatKbn,
+            seatNum, addGlasses, kbnEisyahousiki, mvtkNum, mvtkKbnDenshiken,
+            mvtkKbnMaeuriken, mvtkKbnKensyu, mvtkSalesPrice, kbnMgtk
+        };
+    });
+    return {
+        theaterCode: reservationForCOAInfo.theaterCode,
+        dateJouei: reservationForCOAInfo.dateJouei,
+        titleCode: reservationForCOAInfo.titleCode,
+        titleBranchNum: reservationForCOAInfo.titleBranchNum,
+        timeBegin: reservationForCOAInfo.timeBegin,
+        tmpReserveNum: params.reservationNumber,
+        // tslint:disable-next-line:no-irregular-whitespace
+        reserveName: (0, util_1.format)('%s　%s', customer.familyName, customer.givenName),
+        // tslint:disable-next-line:no-irregular-whitespace
+        reserveNameJkana: (0, util_1.format)('%s　%s', customer.familyName, customer.givenName),
+        telNum: telNum,
+        mailAddr: mailAddr,
+        reserveAmount: totalPrice,
+        listTicket
+        // transactionNumber: reservationNumber,
+        // typeOf: 'COAReserveTransaction'
+    };
+}
+function fixOrderAsPurpose(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let order;
+        const purposeOrderNumber = params.purpose.orderNumber;
+        const orders = yield repos.order.search({
+            limit: 1,
+            page: 1,
+            project: { id: { $eq: params.project.id } },
+            // confirmationNumbers: [payPurposeConfirmationNumber],
+            orderNumbers: [purposeOrderNumber]
+        }, { customer: 1, orderNumber: 1, typeOf: 1 });
+        order = orders.shift();
+        if (order === undefined) {
+            throw new factory.errors.NotFound('Order as purpose');
+        }
+        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            orderNumber: { $eq: order.orderNumber },
+            project: { id: { $eq: params.project.id } }
+        }, ['itemOffered', 'offeredThrough']);
+        return Object.assign(Object.assign({}, order), { acceptedOffers });
+    });
+}
 /**
  * 予約を確定する
  */
 function confirmReserveTransaction(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let confirmActionObject;
+        switch (params.instrument.identifier) {
+            case factory.service.webAPI.Identifier.COA:
+                // 最適化されたタスクに対応するため、ここでIObject4COAを注文から生成する(2024-01-24~)
+                const order = yield fixOrderAsPurpose({
+                    project: { id: params.project.id },
+                    purpose: params.purpose
+                })(repos);
+                const updReserveArgs = createConfirmObject4COAByOrder({ order, reservationNumber: params.object.transactionNumber });
+                debug('confirming coa reserve transaction...', order, updReserveArgs);
+                // updReserveArgsで上書き
+                confirmActionObject = Object.assign(Object.assign({}, updReserveArgs), { transactionNumber: params.object.transactionNumber, typeOf: params.object.typeOf });
+                debug('confirmActionObject === params.object?', JSON.stringify(confirmActionObject) === JSON.stringify(params.object));
+                break;
+            default:
+                confirmActionObject = params.object;
+        }
         // アクション開始
-        const confirmActionAttributes = params;
+        const confirmActionAttributes = Object.assign(Object.assign({}, params), { object: confirmActionObject });
         const action = yield repos.action.start(confirmActionAttributes);
+        let updReserveResult;
         try {
-            let object = confirmActionAttributes.object;
+            const object = confirmActionAttributes.object;
             switch (params.instrument.identifier) {
                 case factory.service.webAPI.Identifier.COA:
                     // COA本予約
-                    object = object;
-                    yield COAReserveService.confirm({
+                    updReserveResult = yield COAReserveService.confirm({
                         project: { id: confirmActionAttributes.project.id },
-                        object,
+                        object: object,
                         purpose: confirmActionAttributes.purpose
-                    })(repos);
+                    })({});
                     break;
                 default:
                     // 予約取引確定
-                    object = object;
                     yield ReserveTransactionService.confirm({
                         transactionNumber: object.transactionNumber,
                         potentialActions: object.potentialActions
@@ -77,10 +184,10 @@ function confirmReserveTransaction(params, options) {
             throw error;
         }
         // アクション完了
-        const result = {};
+        const result = { updReserveResult };
         yield repos.action.completeWithVoid({ typeOf: confirmActionAttributes.typeOf, id: action.id, result: result });
         // sendOrder連携(2024-01-11~)
-        yield onConfirmed(params, options)({
+        yield onConfirmed(confirmActionAttributes, options)({
             task: repos.task
         });
     });

package/package.json

@@ -10,9 +10,9 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.352.0-alpha.4",
+    "@chevre/factory": "4.352.0-alpha.6",
     "@cinerino/sdk": "5.9.0-alpha.1",
-    "@motionpicture/coa-service": "9.3.0-alpha.0",
+    "@motionpicture/coa-service": "9.3.0-alpha.1",
     "@motionpicture/gmo-service": "5.3.0-alpha.0",
     "@sendgrid/mail": "6.4.0",
     "@surfrock/sdk": "1.2.0",
@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.20.0-alpha.44"
+  "version": "21.20.0-alpha.46"
 }