@chevre/domain 21.20.0-alpha.9 → 21.20.0

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.js

@@ -21,7 +21,7 @@ const informReservations = settings_1.settings.onReservationStatusChanged.inform
 /**
  * 予約使用
  */
-function onReservationUsed(action, attendedReservation) {
+function onReservationUsed(attendedReservation) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const tasks = [];
@@ -54,7 +54,7 @@ function onReservationUsed(action, attendedReservation) {
                     typeOf: factory.actionType.InformAction
                 };
                 return {
-                    project: action.project,
+                    project: attendedReservation.project,
                     name: factory.taskName.TriggerWebhook,
                     status: factory.taskStatus.Ready,
                     runsAt: informTaskRunsAt,
@@ -67,9 +67,9 @@ function onReservationUsed(action, attendedReservation) {
         }
         // projectを限定する(2023-02-21~)
         // 使用アクション集計タスクを作成する(冗長な作成を避ける)
-        if (settings_1.settings.useAggregateEntranceGateProjects.includes(action.project.id)) {
+        if (settings_1.settings.useAggregateEntranceGateProjects.includes(attendedReservation.project.id)) {
             const readyAggregateUseActionsTaskDoc = yield repos.task.taskModel.findOne({
-                'project.id': { $eq: action.project.id },
+                'project.id': { $eq: attendedReservation.project.id },
                 name: { $eq: factory.taskName.AggregateUseActionsOnEvent },
                 status: { $eq: factory.taskStatus.Ready },
                 'data.id': { $exists: true, $eq: attendedReservation.reservationFor.id }

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

@@ -16,7 +16,8 @@ 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
+    refreshToken: credentials_1.credentials.coa.refreshToken,
+    useFetch: credentials_1.credentials.coa.useFetch
 });
 function searchByOrder(params) {
     // tslint:disable-next-line:max-func-body-length

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

@@ -4,7 +4,6 @@ import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTr
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as ReservationRepo } from '../../repo/reservation';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
-import { IUseReservationAction } from './potentialActions/onReservationUsed';
 /**
  * 予約使用
  */
@@ -26,11 +25,10 @@ export declare function useReservation(params: {
         identifier?: string;
     };
     verifyToken: boolean;
-    reserveIfNotYet: boolean;
 }): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
-}) => Promise<IUseReservationAction>;
+}) => Promise<void>;

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

@@ -38,10 +38,7 @@ function useReservation(params) {
             }
         }
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
-        debug('reserveIfNotYet?', params.reserveIfNotYet, 'id:', params.object.id);
-        if (params.reserveIfNotYet === true) {
-            yield reserveIfNotYet({ object: params.object })(repos);
-        }
+        yield reserveIfNotYet({ object: params.object })(repos);
         // 予約検索
         // 取得属性最適化(2023-01-30~)
         const reservation = yield repos.reservation.findById({
@@ -68,7 +65,7 @@ function useReservation(params) {
                 }
             }
             : undefined);
-        let action = yield repos.action.start(actionAttributes);
+        const action = yield repos.action.start(actionAttributes);
         // ひとまず予約数:1に限定する
         if (actionAttributes.object.length !== 1) {
             throw new factory.errors.Argument('object', 'number of using reservations must be 1');
@@ -88,9 +85,9 @@ function useReservation(params) {
             throw error;
         }
         // アクション完了
-        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: {} }));
-        yield (0, onReservationUsed_1.onReservationUsed)(action, attendedReservation)({ task: repos.task });
-        return action;
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: {} });
+        yield (0, onReservationUsed_1.onReservationUsed)(attendedReservation)({ task: repos.task });
+        // return action;
     });
 }
 exports.useReservation = useReservation;
@@ -120,7 +117,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/verifyToken4reservation.js

@@ -33,6 +33,8 @@ function verifyToken4reservation(params) {
                 });
                 // ステータス検証
                 switch (order.orderStatus) {
+                    case factory.orderStatus.OrderProcessing: // OrderProcessingも許可(2024-01-10~)
+                    case factory.orderStatus.OrderInTransit: // OrderInTransitも許可(2024-01-12~)
                     case factory.orderStatus.OrderDelivered:
                         break;
                     default:

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

@@ -12,17 +12,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const task_1 = require("../../repo/task");
 const MoneyTransferOfferService = require("../offer/moneyTransfer");
 /**
  * タスク実行関数
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
         yield MoneyTransferOfferService.settleTransaction(data)({
-            action: actionRepo,
-            assetTransaction: assetTransactionRepo
+            action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
         });
     });
 }

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

@@ -20,6 +20,7 @@ const order_1 = require("../../repo/order");
 const project_1 = require("../../repo/project");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
+const settings_1 = require("../../settings");
 const confirmPayTransaction_1 = require("../order/confirmPayTransaction");
 /**
  * タスク実行関数
@@ -29,7 +30,7 @@ function call(data) {
         if (settings.redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
-        yield (0, confirmPayTransaction_1.confirmPayTransaction)(data)({
+        yield (0, confirmPayTransaction_1.confirmPayTransaction)(data, { minimizePotentialActions: settings_1.USE_MINIMIZED_PAY_TASK })({
             acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),

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

@@ -12,6 +12,6 @@ export declare function confirmRegisterServiceTransaction(params: factory.action
     assetTransaction: AssetTransactionRepo;
     task: TaskRepo;
 }) => Promise<void>;
-export declare function onRegistered(__: factory.action.interact.confirm.registerService.IAttributes): (repos: {
+export declare function onRegistered(params: factory.action.interact.confirm.registerService.IAttributes): (repos: {
     task: TaskRepo;
 }) => Promise<void>;

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

@@ -78,22 +78,44 @@ function confirmRegisterServiceTransaction(params) {
         }
         // アクション完了
         const result = {};
-        yield repos.action.complete({ typeOf: confirmActionAttributes.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: confirmActionAttributes.typeOf, id: action.id, result: result });
         yield onRegistered(confirmActionAttributes)(repos);
     });
 }
 exports.confirmRegisterServiceTransaction = confirmRegisterServiceTransaction;
-function onRegistered(__) {
+function onRegistered(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const taskAttributes = [];
-        // 次のメンバーシップ注文タスクを作成
-        // 廃止(2023-08-18~)
-        // const orderProgramMembershipTasks = actionAttributes.potentialActions?.orderProgramMembership;
-        // if (Array.isArray(orderProgramMembershipTasks)) {
-        //     taskAttributes.push(...orderProgramMembershipTasks);
-        // }
         // タスク保管
         yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
+        if (params.purpose.typeOf === factory.order.OrderType.Order) {
+            // タスク冪等作成
+            const onAssetTransactionStatusChangedTaskData = {
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                object: {
+                    typeOf: params.object.typeOf,
+                    transactionNumber: params.object.transactionNumber,
+                    status: factory.transactionStatusType.Confirmed
+                },
+                purpose: {
+                    confirmationNumber: '',
+                    orderNumber: params.purpose.orderNumber,
+                    typeOf: factory.order.OrderType.Order
+                },
+                useOnOrderStatusChanged: true
+            };
+            const onAssetTransactionStatusChangedTask = {
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                name: factory.taskName.OnAssetTransactionStatusChanged,
+                status: factory.taskStatus.Ready,
+                runsAt: new Date(),
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: onAssetTransactionStatusChangedTaskData
+            };
+            yield repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
+        }
     });
 }
 exports.onRegistered = onRegistered;

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

@@ -1,5 +1,6 @@
 import { IOperation } from '../task';
 import * as factory from '../../factory';
+import { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import { MongoRepository as OrderRepo } from '../../repo/order';
@@ -12,7 +13,11 @@ 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>): (repos: {
+export declare function confirmReserveTransaction(params: factory.task.IData<factory.taskName.ConfirmReserveTransaction>, options: {
+    sendOrder: boolean;
+    useOnOrderStatusChanged: boolean;
+}): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;

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

@@ -10,25 +10,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmReserveTransaction = exports.call = void 0;
-const COA = require("@motionpicture/coa-service");
+const createDebug = require("debug");
+const google_libphonenumber_1 = require("google-libphonenumber");
+const util_1 = require("util");
 const factory = require("../../factory");
+// import { USE_OPTIMIZED_CONFIRM_RESERVE_COA_TASK_VERIFY } from '../../settings';
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const order_1 = require("../../repo/order");
 const reservation_1 = require("../../repo/reservation");
 const task_1 = require("../../repo/task");
 const ReserveTransactionService = require("../assetTransaction/reserve");
-const credentials_1 = require("../../credentials");
-const coaAuthClient = new COA.auth.RefreshToken({
-    endpoint: credentials_1.credentials.coa.endpoint,
-    refreshToken: credentials_1.credentials.coa.refreshToken
-});
+const COAReserveService = require("../assetTransaction/reserveCOA");
+const debug = createDebug('chevre-domain:service:task');
 /**
  * タスク実行関数
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        yield confirmReserveTransaction(data)({
+        yield confirmReserveTransaction(data, {
+            sendOrder: true,
+            useOnOrderStatusChanged: true
+        })({
+            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),
@@ -38,39 +43,145 @@ 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) {
+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);
+                const object4coa = Object.assign(Object.assign({}, updReserveArgs), { transactionNumber: params.object.transactionNumber, typeOf: 'COAReserveTransaction' });
+                // if (USE_OPTIMIZED_CONFIRM_RESERVE_COA_TASK_VERIFY) {
+                //     const isValidObject = JSON.stringify(object4coa) === JSON.stringify(params.object);
+                //     debug('confirmActionObject === params.object?', isValidObject);
+                //     if (!isValidObject) {
+                //         throw new factory.errors.Argument('object', 'object4coa !== params.object');
+                //     }
+                // }
+                // 上書き
+                confirmActionObject = object4coa;
+                // if (USE_OPTIMIZED_CONFIRM_RESERVE_COA_TASK) {
+                //     // 上書き
+                //     confirmActionObject = object4coa;
+                // } else {
+                //     confirmActionObject = <factory.action.interact.confirm.reservation.IObject4COA>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本予約
-                    // 未本予約であれば実行(COA本予約は一度成功すると成功できない)
-                    object = object;
-                    // リトライ可能な前提でつくる必要があるので、要注意
-                    // すでに本予約済みかどうか確認
-                    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: object.theaterCode,
-                        reserveNum: object.tmpReserveNum,
-                        telNum: object.telNum
-                    });
-                    if (stateReserveResult === null) {
-                        yield reserveService.updReserve(object);
-                    }
+                    updReserveResult = yield COAReserveService.confirm({
+                        project: { id: confirmActionAttributes.project.id },
+                        object: object,
+                        purpose: confirmActionAttributes.purpose
+                    })({});
                     break;
                 default:
                     // 予約取引確定
-                    object = object;
                     yield ReserveTransactionService.confirm({
                         transactionNumber: object.transactionNumber,
                         potentialActions: object.potentialActions
@@ -87,8 +198,44 @@ function confirmReserveTransaction(params) {
             throw error;
         }
         // アクション完了
-        const result = {};
-        yield repos.action.complete({ typeOf: confirmActionAttributes.typeOf, id: action.id, result: result });
+        const result = { updReserveResult };
+        yield repos.action.completeWithVoid({ typeOf: confirmActionAttributes.typeOf, id: action.id, result: result });
+        // sendOrder連携(2024-01-11~)
+        yield onConfirmed(confirmActionAttributes, options)({
+            task: repos.task
+        });
     });
 }
 exports.confirmReserveTransaction = confirmReserveTransaction;
+function onConfirmed(params, options) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (options.sendOrder === true) {
+            // タスク冪等作成
+            const onAssetTransactionStatusChangedTaskData = {
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                object: {
+                    typeOf: params.object.typeOf,
+                    transactionNumber: params.object.transactionNumber,
+                    status: factory.transactionStatusType.Confirmed
+                },
+                purpose: {
+                    confirmationNumber: '',
+                    orderNumber: params.purpose.orderNumber,
+                    typeOf: factory.order.OrderType.Order
+                },
+                useOnOrderStatusChanged: options.useOnOrderStatusChanged === true
+            };
+            const onAssetTransactionStatusChangedTask = {
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                name: factory.taskName.OnAssetTransactionStatusChanged,
+                status: factory.taskStatus.Ready,
+                runsAt: new Date(),
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: onAssetTransactionStatusChangedTaskData
+            };
+            yield repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
+        }
+    });
+}

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

@@ -0,0 +1,6 @@
+import { IOperation } from '../task';
+import * as factory from '../../factory';
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.IData<factory.taskName.CreateAccountingReport>): IOperation<void>;

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

@@ -0,0 +1,80 @@
+"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.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 order_1 = require("../../repo/order");
+const createAccountingReportIfNotExist_1 = require("../order/createAccountingReportIfNotExist");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return ({ connection }) => __awaiter(this, void 0, void 0, function* () {
+        yield createAccountingReport(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(connection),
+            accountingReport: new accountingReport_1.MongoRepository(connection),
+            action: new action_1.MongoRepository(connection),
+            order: new order_1.MongoRepository(connection)
+        });
+    });
+}
+exports.call = call;
+function createAccountingReport(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const order = yield repos.order.findByOrderNumber({
+            orderNumber: params.object.mainEntity.orderNumber,
+            project: { id: params.project.id },
+            inclusion: [],
+            exclusion: []
+        });
+        const simpleOrder = {
+            typeOf: order.typeOf,
+            seller: {
+                id: order.seller.id,
+                typeOf: order.seller.typeOf,
+                name: order.seller.name
+            },
+            customer: { typeOf: order.customer.typeOf, id: order.customer.id },
+            orderNumber: order.orderNumber,
+            price: order.price,
+            priceCurrency: order.priceCurrency,
+            orderDate: order.orderDate
+        };
+        const actionAttributes = {
+            project: { id: params.project.id, typeOf: factory.organizationType.Project },
+            typeOf: factory.actionType.CreateAction,
+            agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+            object: Object.assign(Object.assign({}, params), { typeOf: 'Report' }),
+            purpose: simpleOrder
+        };
+        const action = yield repos.action.start(actionAttributes);
+        try {
+            const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                orderNumber: { $eq: params.object.mainEntity.orderNumber },
+                project: { id: { $eq: params.project.id } }
+            });
+            yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(Object.assign(Object.assign({}, order), { acceptedOffers }))(repos);
+        }
+        catch (error) {
+            try {
+                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+            }
+            catch (__) {
+                // 失敗したら仕方ない
+            }
+            throw error;
+        }
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: {} });
+    });
+}

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

@@ -18,7 +18,8 @@ const credentials_1 = require("../../credentials");
 const OfferService = require("../offer");
 const coaAuthClient = new COA.auth.RefreshToken({
     endpoint: credentials_1.credentials.coa.endpoint,
-    refreshToken: credentials_1.credentials.coa.refreshToken
+    refreshToken: credentials_1.credentials.coa.refreshToken,
+    useFetch: credentials_1.credentials.coa.useFetch
 });
 /**
  * タスク実行関数

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

@@ -91,7 +91,6 @@ function onAuthorizationCreated(params) {
                 reservationNumbers: reservationNumbers,
                 reservationFor: { ids: reservationForIds }
             },
-            reserveIfNotYet: params.reserveIfNotYet,
             purpose: { code: params.code }
         })({
             action: repos.action,