@chevre/domain 21.18.0-alpha.4 → 21.18.0-alpha.41

package/lib/chevre/service/order/placeOrder.js

@@ -8,12 +8,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.placeOrderWithoutTransaction = exports.placeOrder = void 0;
 const moment = require("moment");
 const order_1 = require("../../factory/order");
 const createAccountingReportIfNotExist_1 = require("./createAccountingReportIfNotExist");
-const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
 const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusChanged");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
@@ -78,17 +88,31 @@ function createOrderFromBody(params) {
         const confirmationNumber = String(params.confirmationNumber);
         const orderNumber = params.orderNumber;
         let order;
-        const placeOrderTransaction = yield (0, findPlaceOrderTransaction_1.findPlaceOrderTransaction)({
-            project: { id: params.project.id },
-            confirmationNumber,
-            orderNumber
-        })(repos);
-        const orderByTransaction = (_a = placeOrderTransaction.result) === null || _a === void 0 ? void 0 : _a.order;
+        const placeOrderTransactions = yield repos.transaction.search({
+            limit: 1,
+            page: 1,
+            project: { id: { $eq: params.project.id } },
+            typeOf: factory.transactionType.PlaceOrder,
+            statuses: [factory.transactionStatusType.Confirmed],
+            result: {
+                order: {
+                    confirmationNumber: { $eq: confirmationNumber },
+                    orderNumbers: [orderNumber]
+                }
+            },
+            inclusion: ['id', 'potentialActions', 'project', 'typeOf', 'result'],
+            exclusion: []
+        });
+        const placeOrderTransactionWithResult = placeOrderTransactions.shift();
+        if (placeOrderTransactionWithResult === undefined) {
+            throw new factory.errors.NotFound(factory.transactionType.PlaceOrder);
+        }
+        const orderByTransaction = (_a = placeOrderTransactionWithResult.result) === null || _a === void 0 ? void 0 : _a.order;
         if (orderByTransaction === undefined) {
             throw new factory.errors.NotFound('transaction.result.order');
         }
-        order = orderByTransaction;
-        order = createOrder(order);
+        order = createOrder(orderByTransaction);
+        const { result } = placeOrderTransactionWithResult, placeOrderTransaction = __rest(placeOrderTransactionWithResult, ["result"]);
         return { order, placeOrderTransaction };
     });
 }
@@ -124,7 +148,7 @@ function placeOrderWithoutTransaction(params) {
         };
         const action = yield repos.action.start(orderActionAttributes);
         try {
-            yield repos.order.createIfNotExist(order);
+            yield repos.order.createIfNotExist(Object.assign(Object.assign({}, order), { discounts: [], acceptedOffers: [] }));
         }
         catch (error) {
             // actionにエラー結果を追加
@@ -138,12 +162,8 @@ function placeOrderWithoutTransaction(params) {
             throw error;
         }
         yield repos.action.complete({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
-        // 経理レポートを保管
-        yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(order)({ accountingReport: repos.accountingReport });
-        // await onOrderStatusChanged({ order: <factory.order.IOrder>order })({
-        //     registerActionInProgress: repos.registerActionInProgress,
-        //     task: repos.task
-        // });
+        // 経理レポートを保管は外部注文の場合保留(2023-12-08~)
+        // await createAccountingReportIfNotExist(order)({ accountingReport: repos.accountingReport });
     });
 }
 exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;
@@ -226,19 +246,42 @@ function placeOrder(params) {
             yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(order)({ accountingReport: repos.accountingReport });
             // PaymentDueであればonOrderStatusChangedを実行(2023-08-23~)
             if (order.orderStatus === factory.orderStatus.OrderPaymentDue) {
-                yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order, placeOrderTransaction })({
-                    registerActionInProgress: repos.registerActionInProgress,
+                yield (0, onOrderStatusChanged_1.onOrderPaymentDue)({
+                    order: {
+                        paymentMethods: order.paymentMethods,
+                        project: order.project,
+                        orderNumber: order.orderNumber,
+                        confirmationNumber: order.confirmationNumber,
+                        customer: order.customer,
+                        orderDate: order.orderDate,
+                        seller: order.seller,
+                        typeOf: order.typeOf,
+                        price: order.price,
+                        priceCurrency: order.priceCurrency,
+                        orderStatus: order.orderStatus
+                    }
+                })({
                     task: repos.task
                 });
             }
             else if (order.orderStatus === factory.orderStatus.OrderProcessing) {
                 // OrderPaymentDueをスキップしてOrderProcessingから開始する場合(2023-08-23~)
                 // OrderPaymentDueに対する処理をまず強制的に実行する(2023-08-24~)
-                yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({
-                    order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderPaymentDue }),
-                    placeOrderTransaction
+                yield (0, onOrderStatusChanged_1.onOrderPaymentDue)({
+                    order: {
+                        paymentMethods: order.paymentMethods,
+                        project: order.project,
+                        orderNumber: order.orderNumber,
+                        confirmationNumber: order.confirmationNumber,
+                        customer: order.customer,
+                        orderDate: order.orderDate,
+                        seller: order.seller,
+                        typeOf: order.typeOf,
+                        price: order.price,
+                        priceCurrency: order.priceCurrency,
+                        orderStatus: factory.orderStatus.OrderPaymentDue
+                    }
                 })({
-                    registerActionInProgress: repos.registerActionInProgress,
                     task: repos.task
                 });
             }

package/lib/chevre/service/order/returnOrder.d.ts

@@ -1,5 +1,5 @@
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
-import type { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/action/registerServiceInProgress';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
@@ -16,11 +16,11 @@ declare function returnOrder(params: {
     };
     useOnOrderStatusChanged: boolean;
 }): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
-    registerServiceInProgress: RegisterServiceInProgressRepo;
 }) => Promise<void>;
 export { returnOrder };

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

@@ -10,10 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.returnOrder = void 0;
+const createDebug = require("debug");
 const order_1 = require("../../factory/order");
-const factory_1 = require("../delivery/factory");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
+const debug = createDebug('chevre-domain:service:order');
 function returnOrder(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -28,7 +29,10 @@ function returnOrder(params) {
         let order = yield repos.order.findByOrderNumber({
             orderNumber,
             project: { id: params.project.id },
-            inclusion: [],
+            inclusion: [
+                'project', 'typeOf', 'orderNumber', 'dateReturned', 'id',
+                'customer', 'returner', 'seller', 'price', 'priceCurrency', 'orderDate'
+            ],
             exclusion: []
         });
         // 返品取引検索
@@ -39,7 +43,7 @@ function returnOrder(params) {
             typeOf: factory.transactionType.ReturnOrder,
             statuses: [factory.transactionStatusType.Confirmed],
             object: { order: { orderNumbers: [orderNumber] } },
-            inclusion: [],
+            inclusion: ['id', 'typeOf', 'potentialActions'],
             exclusion: []
         });
         const returnOrderTransaction = returnOrderTransactions.shift();
@@ -66,13 +70,15 @@ function returnOrder(params) {
             project: order.project,
             recipient: order.seller,
             typeOf: factory.actionType.ReturnAction
-            // ...(params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined
         };
         let returnedOwnershipInfos = [];
         // アクション開始
         const action = yield repos.action.start(returnOrderActionAttributes);
         try {
-            returnedOwnershipInfos = yield processReturnOrder(order, dateReturned)({ ownershipInfo: repos.ownershipInfo });
+            returnedOwnershipInfos = yield processReturnOrder(order, dateReturned)({
+                acceptedOffer: repos.acceptedOffer,
+                ownershipInfo: repos.ownershipInfo
+            });
             // 注文ステータス変更
             order = yield repos.order.returnOrder({
                 project: { id: order.project.id },
@@ -80,6 +86,7 @@ function returnOrder(params) {
                 dateReturned,
                 returner
             });
+            debug('repos.order.returnOrder processed. returnedOrder:', order);
         }
         catch (error) {
             // actionにエラー結果を追加
@@ -95,24 +102,38 @@ function returnOrder(params) {
         const result = returnedOwnershipInfos;
         yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
         if (params.useOnOrderStatusChanged) {
-            yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order, returnOrderTransaction })({
-                registerActionInProgress: repos.registerServiceInProgress,
+            yield (0, onOrderStatusChanged_1.onOrderReturned)({
+                order: {
+                    project: order.project,
+                    typeOf: order.typeOf,
+                    orderNumber: order.orderNumber,
+                    dateReturned: order.dateReturned,
+                    id: order.id,
+                    customer: order.customer,
+                    returner: order.returner,
+                    seller: order.seller,
+                    price: order.price,
+                    priceCurrency: order.priceCurrency,
+                    orderDate: order.orderDate,
+                    orderStatus: factory.orderStatus.OrderReturned
+                },
+                returnOrderTransaction
+            })({
+                acceptedOffer: repos.acceptedOffer,
                 task: repos.task
             });
         }
-        // 潜在アクション
-        // onOrderStatusChangedへ移行(2023-08-19~)
-        // await onReturn(returnOrderActionAttributes)({ task: repos.task });
     });
 }
 exports.returnOrder = returnOrder;
 function processReturnOrder(order, dateReturned) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const returnedOwnershipInfos = [];
-        // tslint:disable-next-line:no-suspicious-comment
-        // TODO 注文配送によって発生した所有権の特定を他の方法で行えないか？
         // 所有権の所有期間変更
-        const ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({ order });
+        // 注文オファーリポジトリから所有権識別子を検索する(2023-12-07~)
+        const ownershipInfos = yield repos.acceptedOffer.aggreateOwnershipInfosByOrder({ orderNumber: { $eq: order.orderNumber } });
+        // const ownershipInfos = createOwnershipInfosFromOrder({ order });
+        debug('processing findByIdentifierAndUpdateOwnedThrough...', ownershipInfos);
         if (Array.isArray(ownershipInfos)) {
             yield Promise.all(ownershipInfos.map((ownershipInfo) => __awaiter(this, void 0, void 0, function* () {
                 const ownershipInfoReturned = yield repos.ownershipInfo.findByIdentifierAndUpdateOwnedThrough({

package/lib/chevre/service/order/sendOrder.d.ts

@@ -1,15 +1,15 @@
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
-import type { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/action/registerServiceInProgress';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
 import * as factory from '../../factory';
 type ISendOperation<T> = (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;
-    registerActionInProgress: RegisterServiceInProgressRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<T>;

package/lib/chevre/service/order/sendOrder.js

@@ -37,7 +37,7 @@ function sendOrder(params) {
             let order = yield repos.order.findByOrderNumber({
                 orderNumber,
                 project: { id: params.project.id },
-                inclusion: [],
+                inclusion: ['confirmationNumber', 'project', 'typeOf', 'seller', 'orderNumber', 'price', 'priceCurrency', 'orderDate', 'customer', '_id'],
                 exclusion: []
             });
             // プロジェクト条件検証
@@ -76,7 +76,12 @@ function sendOrder(params) {
             let ownershipInfos;
             try {
                 // 所有権作成
-                ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({ order });
+                ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
+                    order: Object.assign(Object.assign({}, order), { acceptedOffers: yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                            orderNumber: { $eq: order.orderNumber },
+                            project: { id: { $eq: order.project.id } }
+                        }) })
+                });
                 ownershipInfos = yield Promise.all(ownershipInfos.map((ownershipInfo) => __awaiter(this, void 0, void 0, function* () {
                     return repos.ownershipInfo.createIfNotExistByIdentifier(ownershipInfo);
                 })));
@@ -100,8 +105,18 @@ function sendOrder(params) {
             const result = ownershipInfos;
             yield repos.action.complete({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
             if (params.useOnOrderStatusChanged) {
-                yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order, placeOrderTransaction })({
-                    registerActionInProgress: repos.registerActionInProgress,
+                yield (0, onOrderStatusChanged_1.onOrderDelivered)({
+                    order: {
+                        id: order.id,
+                        customer: order.customer,
+                        orderDate: order.orderDate,
+                        orderNumber: order.orderNumber,
+                        project: order.project,
+                        typeOf: order.typeOf,
+                        orderStatus: factory.orderStatus.OrderDelivered
+                    },
+                    placeOrderTransaction
+                })({
                     task: repos.task
                 });
             }
@@ -122,8 +137,6 @@ function sendOrder(params) {
                 throw error;
             }
         }
-        // onOrderStatusChangedへ移行(2023-08-17~)
-        // await onSend(params)({ task: repos.task });
     });
 }
 exports.sendOrder = sendOrder;

package/lib/chevre/service/order.d.ts

@@ -4,9 +4,9 @@
 import { confirmPayTransaction } from './order/confirmPayTransaction';
 import { deleteOrder } from './order/deleteOrder';
 import { onAssetTransactionStatusChanged, paymentDue2Processing } from './order/onAssetTransactionStatusChanged';
-import { onOrderStatusChanged } from './order/onOrderStatusChanged';
+import { onOrderProcessing } from './order/onOrderStatusChanged';
 import { onOrderUpdated } from './order/onOrderUpdated';
 import { payOrder } from './order/payOrder';
 import { placeOrder, placeOrderWithoutTransaction } from './order/placeOrder';
 import { sendOrder } from './order/sendOrder';
-export { confirmPayTransaction, deleteOrder, onAssetTransactionStatusChanged, onOrderStatusChanged, onOrderUpdated, paymentDue2Processing, payOrder, placeOrder, placeOrderWithoutTransaction, sendOrder };
+export { confirmPayTransaction, deleteOrder, onAssetTransactionStatusChanged, onOrderProcessing, onOrderUpdated, paymentDue2Processing, payOrder, placeOrder, placeOrderWithoutTransaction, sendOrder };

package/lib/chevre/service/order.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendOrder = exports.placeOrderWithoutTransaction = exports.placeOrder = exports.payOrder = exports.paymentDue2Processing = exports.onOrderUpdated = exports.onOrderStatusChanged = exports.onAssetTransactionStatusChanged = exports.deleteOrder = exports.confirmPayTransaction = void 0;
+exports.sendOrder = exports.placeOrderWithoutTransaction = exports.placeOrder = exports.payOrder = exports.paymentDue2Processing = exports.onOrderUpdated = exports.onOrderProcessing = exports.onAssetTransactionStatusChanged = exports.deleteOrder = exports.confirmPayTransaction = void 0;
 /**
  * 注文サービス
  */
@@ -12,7 +12,7 @@ const onAssetTransactionStatusChanged_1 = require("./order/onAssetTransactionSta
 Object.defineProperty(exports, "onAssetTransactionStatusChanged", { enumerable: true, get: function () { return onAssetTransactionStatusChanged_1.onAssetTransactionStatusChanged; } });
 Object.defineProperty(exports, "paymentDue2Processing", { enumerable: true, get: function () { return onAssetTransactionStatusChanged_1.paymentDue2Processing; } });
 const onOrderStatusChanged_1 = require("./order/onOrderStatusChanged");
-Object.defineProperty(exports, "onOrderStatusChanged", { enumerable: true, get: function () { return onOrderStatusChanged_1.onOrderStatusChanged; } });
+Object.defineProperty(exports, "onOrderProcessing", { enumerable: true, get: function () { return onOrderStatusChanged_1.onOrderProcessing; } });
 const onOrderUpdated_1 = require("./order/onOrderUpdated");
 Object.defineProperty(exports, "onOrderUpdated", { enumerable: true, get: function () { return onOrderUpdated_1.onOrderUpdated; } });
 const payOrder_1 = require("./order/payOrder");

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

@@ -114,7 +114,7 @@ function processVoidPayTransaction(params) {
             transaction = (yield repos.transaction.findById({
                 typeOf: params.purpose.typeOf,
                 id: params.purpose.id,
-                inclusion: ['_id', 'typeOf', 'status', 'result.order.paymentMethods']
+                inclusion: ['_id', 'typeOf', 'status', 'result']
             }));
         }
         // 承認アクションを取得

package/lib/chevre/service/payment/movieTicket/getCredentials.js

@@ -15,12 +15,11 @@ function getCredentials(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         // 決済サービスからcredentialsを取得する
-        const paymentServices = yield repos.product.search({
+        const paymentServices = yield repos.product.searchPaymentServices({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.seller.project.id } },
             typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
-            // serviceType: { codeValue: { $eq: params.paymentMethodType } },
             id: { $eq: params.paymentServiceId }
         }, [], []);
         const paymentService = paymentServices.shift();

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

@@ -79,8 +79,15 @@ function validatePaymentMethod(params, paymentServiceId) {
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         // プロダクトから通貨区分を取得
-        const paymentCatdProduct = yield repos.product.findById({ id: paymentServiceId }, ['serviceOutput'], []);
-        const currency = (_e = (_d = paymentCatdProduct.serviceOutput) === null || _d === void 0 ? void 0 : _d.amount) === null || _e === void 0 ? void 0 : _e.currency;
+        // const paymentCatdProduct = <Pick<factory.product.IProduct, 'serviceOutput'>>
+        //     await repos.product.findProductById({ id: paymentServiceId }, ['serviceOutput'], []);
+        const paymentCatdProduct = (yield repos.product.searchProducts({
+            limit: 1,
+            page: 1,
+            id: { $eq: paymentServiceId },
+            typeOf: { $eq: factory.product.ProductType.PaymentCard }
+        }, ['serviceOutput'], [])).shift();
+        const currency = (_e = (_d = paymentCatdProduct === null || paymentCatdProduct === void 0 ? void 0 : paymentCatdProduct.serviceOutput) === null || _d === void 0 ? void 0 : _d.amount) === null || _e === void 0 ? void 0 : _e.currency;
         if (typeof currency !== 'string') {
             throw new factory.errors.NotFound('product.serviceOutput.amount.currency');
         }

package/lib/chevre/service/reserve/searchByOrder.d.ts

@@ -0,0 +1,21 @@
+import * as factory from '../../factory';
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
+import type { MongoRepository as OrderRepo } from '../../repo/order';
+import type { MongoRepository as ReservationRepo } from '../../repo/reservation';
+type IReservationResult = Pick<factory.reservation.IReservation<factory.reservationType>, 'id' | 'additionalTicketText' | 'reservationStatus'>;
+declare function searchByOrder(params: {
+    limit: number;
+    page: number;
+    typeOf: factory.reservationType;
+    project: {
+        id: string;
+    };
+    orderNumber: string;
+}): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
+    order: OrderRepo;
+    reservation: ReservationRepo;
+}) => Promise<{
+    reservations: IReservationResult[];
+}>;
+export { searchByOrder };

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

@@ -0,0 +1,113 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.searchByOrder = void 0;
+const COA = require("@motionpicture/coa-service");
+const google_libphonenumber_1 = require("google-libphonenumber");
+const factory = require("../../factory");
+const credentials_1 = require("../../credentials");
+const coaAuthClient = new COA.auth.RefreshToken({
+    endpoint: credentials_1.credentials.coa.endpoint,
+    refreshToken: credentials_1.credentials.coa.refreshToken
+});
+function searchByOrder(params) {
+    // tslint:disable-next-line:max-func-body-length
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const reservationType = params.typeOf;
+        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            limit: params.limit,
+            page: params.page,
+            project: { id: { $eq: params.project.id } },
+            orderNumber: { $eq: params.orderNumber },
+            acceptedOffers: { itemOffered: { typeOf: { $in: [reservationType] } } }
+        }, ['itemOffered']);
+        const reservationIds = acceptedOffers.map((offer) => {
+            if (offer.itemOffered.typeOf === reservationType) {
+                return offer.itemOffered.id;
+            }
+            else {
+                // 検索条件にreservationTypeを含めているので、ありえないケース
+                throw new factory.errors.ServiceUnavailable(`unexpected itemOffered.typeOf ${offer.itemOffered.typeOf}`);
+            }
+        });
+        const offeredThroughIdentifier = (yield repos.acceptedOffer.distinctValues({
+            orderNumber: { $in: [params.orderNumber] }
+        }, 'acceptedOffers.offeredThrough.identifier')).shift();
+        let reservations = [];
+        if (reservationIds.length > 0) {
+            switch (offeredThroughIdentifier) {
+                // COA対応
+                case factory.service.webAPI.Identifier.COA:
+                    const order = (yield repos.order.search({
+                        limit: 1,
+                        page: 1,
+                        orderNumbers: [params.orderNumber]
+                    }, { customer: 1 })).shift();
+                    if (order === undefined) {
+                        throw new factory.errors.NotFound(factory.order.OrderType.Order);
+                    }
+                    const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
+                    const phoneNumber = phoneUtil.parse(order.customer.telephone, 'JP');
+                    let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
+                    // COAでは数字のみ受け付けるので数字以外を除去
+                    telNum = telNum.replace(/[^\d]/g, '');
+                    const reservationNumber = (yield repos.acceptedOffer.distinctValues({
+                        orderNumber: { $in: [params.orderNumber] }
+                    }, 'acceptedOffers.itemOffered.reservationNumber')).shift();
+                    const superEventLocationBranchCode = (yield repos.acceptedOffer.distinctValues({
+                        orderNumber: { $in: [params.orderNumber] }
+                    }, 'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode')).shift();
+                    if (typeof reservationNumber !== 'string') {
+                        throw new factory.errors.NotFound('acceptedOffers.itemOffered.reservationNumber');
+                    }
+                    if (typeof superEventLocationBranchCode !== 'string') {
+                        throw new factory.errors.NotFound('acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode');
+                    }
+                    const reserveService = new COA.service.Reserve({
+                        endpoint: credentials_1.credentials.coa.endpoint,
+                        auth: coaAuthClient
+                    }, { timeout: credentials_1.credentials.coa.timeout });
+                    const stateReserveResult = yield reserveService.stateReserve({
+                        theaterCode: superEventLocationBranchCode,
+                        reserveNum: reservationNumber,
+                        telNum
+                    });
+                    const listTicket = stateReserveResult === null || stateReserveResult === void 0 ? void 0 : stateReserveResult.listTicket;
+                    if (Array.isArray(listTicket)) {
+                        reservations = listTicket.map((ticket, key) => {
+                            return {
+                                id: reservationIds[key],
+                                reservationStatus: factory.reservationStatusType.ReservationConfirmed,
+                                additionalTicketText: ticket.seatQrcode
+                            };
+                        });
+                    }
+                    else {
+                        reservations = reservationIds.map((reservationId) => {
+                            return {
+                                id: reservationId,
+                                reservationStatus: factory.reservationStatusType.ReservationCancelled
+                            };
+                        });
+                    }
+                    break;
+                default:
+                    reservations = yield repos.reservation.search({
+                        project: { id: { $eq: params.project.id } },
+                        typeOf: reservationType,
+                        id: { $in: reservationIds }
+                    }, { id: 1, additionalTicketText: 1, reservationStatus: 1 });
+            }
+        }
+        return { reservations };
+    });
+}
+exports.searchByOrder = searchByOrder;

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

@@ -38,17 +38,6 @@ function verifyToken4reservation(params) {
                     default:
                         throw new factory.errors.Argument('token', `invalid orderStatus '${order.orderStatus}'`);
                 }
-                // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
-                // const reservationExistsInOrder = acceptedOffers.some((offer) => {
-                //     return (
-                //         offer.itemOffered.typeOf === factory.reservationType.EventReservation
-                //         || offer.itemOffered.typeOf === factory.reservationType.BusReservation
-                //     )
-                //         && offer.itemOffered.id === params.reservationId;
-                // });
-                // if (!reservationExistsInOrder) {
-                //     throw new factory.errors.NotFound('AcceptedOffer');
-                // }
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payload type ${payload.typeOf} not implemented`);

package/lib/chevre/service/reserve.d.ts

@@ -5,6 +5,7 @@ import { maskUnderName } from './reserve/factory';
 import { cancelPendingReservation, cancelReservation } from './reserve/cancelReservation';
 import { checkInReservation } from './reserve/checkInReservation';
 import { confirmReservation } from './reserve/confirmReservation';
+import { searchByOrder } from './reserve/searchByOrder';
 import { useReservation } from './reserve/useReservation';
 import { verifyToken4reservation } from './reserve/verifyToken4reservation';
-export { maskUnderName, cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, useReservation, verifyToken4reservation };
+export { maskUnderName, cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, searchByOrder, useReservation, verifyToken4reservation };

package/lib/chevre/service/reserve.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyToken4reservation = exports.useReservation = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = exports.maskUnderName = void 0;
+exports.verifyToken4reservation = exports.useReservation = exports.searchByOrder = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = exports.maskUnderName = void 0;
 /**
  * 予約サービス
  */
@@ -13,6 +13,8 @@ const checkInReservation_1 = require("./reserve/checkInReservation");
 Object.defineProperty(exports, "checkInReservation", { enumerable: true, get: function () { return checkInReservation_1.checkInReservation; } });
 const confirmReservation_1 = require("./reserve/confirmReservation");
 Object.defineProperty(exports, "confirmReservation", { enumerable: true, get: function () { return confirmReservation_1.confirmReservation; } });
+const searchByOrder_1 = require("./reserve/searchByOrder");
+Object.defineProperty(exports, "searchByOrder", { enumerable: true, get: function () { return searchByOrder_1.searchByOrder; } });
 const useReservation_1 = require("./reserve/useReservation");
 Object.defineProperty(exports, "useReservation", { enumerable: true, get: function () { return useReservation_1.useReservation; } });
 const verifyToken4reservation_1 = require("./reserve/verifyToken4reservation");

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

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const factory = require("../../factory");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
@@ -30,6 +31,7 @@ function call(data) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
         yield (0, confirmPayTransaction_1.confirmPayTransaction)(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
@@ -37,7 +39,6 @@ function call(data) {
             event: new event_1.MongoRepository(settings.connection),
             product: new product_1.MongoRepository(settings.connection),
             project: new project_1.MongoRepository(settings.connection),
-            // seller: new SellerRepo(settings.connection),
             task: new task_1.MongoRepository(settings.connection),
             transaction: new transaction_1.MongoRepository(settings.connection)
         });

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

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
@@ -26,6 +27,7 @@ const TransactionService = require("../transaction");
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
         yield TransactionService.deleteTransaction(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             accountingReport: new accountingReport_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),