@chevre/domain 21.26.0-alpha.0 → 21.26.0-alpha.2

package/example/src/chevre/migrateAuthorizePaymentActions.ts

@@ -0,0 +1,75 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+
+    const cursor = actionRepo.getCursor(
+        {
+            typeOf: { $eq: chevre.factory.actionType.AuthorizeAction },
+            'object.typeOf': { $eq: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment },
+            startDate: {
+                $gte: moment()
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(-180, 'days')
+                    .toDate()
+            }
+        },
+        {
+            typeOf: 1,
+            project: 1,
+            instrument: 1,
+            startDate: 1,
+            object: 1
+        }
+    );
+    console.log('actions found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const authorizeAction: Pick<
+            chevre.factory.action.authorize.paymentMethod.any.IAction,
+            'project' | 'typeOf' | 'instrument' | 'startDate' | 'object'
+        > = doc.toObject();
+
+        const alreadyMigrated =
+            authorizeAction.instrument.identifier === chevre.factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre;
+
+        if (alreadyMigrated) {
+            console.log(
+                'already exist.',
+                authorizeAction.project.id,
+                authorizeAction.object.typeOf, authorizeAction.object.paymentMethodId, authorizeAction.startDate, i, updateCount
+            );
+        } else {
+            console.log(
+                'updating...',
+                authorizeAction.project.id,
+                authorizeAction.object.typeOf, authorizeAction.object.paymentMethodId, authorizeAction.startDate, i, updateCount
+            );
+            updateCount += 1;
+            console.log(
+                'updated.',
+                authorizeAction.project.id,
+                authorizeAction.object.typeOf, authorizeAction.object.paymentMethodId, authorizeAction.startDate, i, updateCount
+            );
+        }
+    });
+
+    console.log(i, 'actions checked');
+    console.log(updateCount, 'actions updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/migrateDeleteTransactionTasks.ts

@@ -20,11 +20,11 @@ async function main() {
             runsAt: {
                 $gte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(299, 'days')
+                    .add(329, 'days')
                     .toDate(),
                 $lte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(330, 'days')
+                    .add(365, 'days')
                     .toDate()
             }
             // _id: { $eq: '64aba5f37b8b8ef9eca60be5' }

package/lib/chevre/factory/transaction.d.ts

@@ -28,9 +28,13 @@ export declare namespace placeOrder {
         /**
          * オファー制約
          */
-        numItems?: {
-            maxValue?: number;
-            minValue?: number;
+        numItems: {
+            maxValue: number;
+            minValue: number;
+            /**
+             * 最大COA予約数
+             */
+            maxNumCOAReservationNumbers: number;
         };
         /**
          * 注文アイテム制約

package/lib/chevre/service/offer/moneyTransfer/authorize.js

@@ -152,7 +152,10 @@ function createAuthorizeMoneyTransferOfferActionattributes(params) {
                 ? seller.name
                 : String((_b = seller.name) === null || _b === void 0 ? void 0 : _b.ja)
         },
-        recipient: transaction.agent,
+        recipient: {
+            id: transaction.agent.id,
+            typeOf: transaction.agent.typeOf
+        },
         purpose: { typeOf: transaction.typeOf, id: transaction.id }
     };
 }

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

@@ -44,7 +44,6 @@ function createActionAttributes(params) {
     return {
         project: transaction.project,
         typeOf: factory.actionType.AuthorizeAction,
-        // Chevreサービス登録取引を使用して
         instrument: {
             typeOf: factory.assetTransactionType.RegisterService,
             transactionNumber: params.transactionNumber
@@ -57,7 +56,10 @@ function createActionAttributes(params) {
                 ? transaction.seller.name
                 : String((_a = transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja)
         },
-        recipient: transaction.agent,
+        recipient: {
+            id: transaction.agent.id,
+            typeOf: transaction.agent.typeOf
+        },
         purpose: { typeOf: transaction.typeOf, id: transaction.id }
     };
 }

package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.js

@@ -80,12 +80,12 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
                     object: [{ typeOf: factory.assetTransactionType.Pay, transactionNumber: invoice.paymentMethodId }],
                     agent: order.project,
                     purpose: Object.assign(Object.assign({}, simpleOrder), { confirmationNumber: order.confirmationNumber }),
-                    instrument: {
-                        // typeOf: 'WebAPI',
-                        typeOf: factory.assetTransactionType.Pay,
-                        identifier: factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre,
-                        transactionNumber: invoice.paymentMethodId
-                    },
+                    // 廃止(2024-03-12~)
+                    // instrument: {
+                    //     typeOf: factory.assetTransactionType.Pay, // 産取引化(2024-03-11~)
+                    //     identifier: factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre,
+                    //     transactionNumber: invoice.paymentMethodId
+                    // },
                     processOrder: order.orderStatus === factory.orderStatus.OrderPaymentDue,
                     useOnOrderStatusChanged: true
                 };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js

@@ -23,7 +23,7 @@ const factory_1 = require("./onOrderProcessing/factory");
 const debug = createDebug('chevre-domain:service:order');
 function onOrderProcessing(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e;
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
         const sendOrderPotentialActions = (_e = (_d = (_c = (_b = (_a = params.placeOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.potentialActions) === null || _d === void 0 ? void 0 : _d.sendOrder) === null || _e === void 0 ? void 0 : _e.potentialActions;
@@ -64,9 +64,10 @@ function onOrderProcessing(params) {
                 else if (params.order.itemOfferedTypeOf === factory.permit.PermitType.Permit) {
                     yield createConfirmRegisterServiceTasksIfNotExist(params.order, simpleOrder)(repos);
                 }
-                yield createGivePointAwardTaskIfNotExist({
-                    potentialActions: (_h = (_g = (_f = params.placeOrderTransaction) === null || _f === void 0 ? void 0 : _f.potentialActions) === null || _g === void 0 ? void 0 : _g.order) === null || _h === void 0 ? void 0 : _h.potentialActions
-                })(repos);
+                // 完全廃止(2024-03-12~)
+                // await createGivePointAwardTaskIfNotExist({
+                //     potentialActions: params.placeOrderTransaction?.potentialActions?.order?.potentialActions
+                // })(repos);
                 // OrderProcessingにおけるEメール送信に対応(2024-01-17~)
                 if (settings_1.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING) {
                     yield (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({ potentialActions: sendOrderPotentialActions })(repos);
@@ -180,32 +181,3 @@ function createConfirmRegisterServiceTasksIfNotExist(order, simpleOrder) {
         })));
     });
 }
-function createGivePointAwardTaskIfNotExist(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const now = new Date();
-        const givePointAwardsByTransaction = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.givePointAward;
-        if (Array.isArray(givePointAwardsByTransaction)) {
-            for (const givePointAwardByTransaction of givePointAwardsByTransaction) {
-                let taskIdentifier = `${givePointAwardByTransaction.project.id}:${factory.taskName.GivePointAward}:${Date.now()}`;
-                if (typeof givePointAwardByTransaction.object.identifier === 'string'
-                    && givePointAwardByTransaction.object.identifier.length > 0) {
-                    taskIdentifier = `${givePointAwardByTransaction.project.id}:${factory.taskName.GivePointAward}:${givePointAwardByTransaction.object.identifier}`;
-                }
-                const givePointAwardTask = {
-                    identifier: taskIdentifier,
-                    project: givePointAwardByTransaction.project,
-                    name: factory.taskName.GivePointAward,
-                    status: factory.taskStatus.Ready,
-                    runsAt: now,
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: givePointAwardByTransaction
-                };
-                // 冗長なgivePointAwardタスク作成を回避(2023-09-01~)
-                yield repos.task.createIfNotExistByIdentifier(givePointAwardTask, { emitImmediately: true });
-            }
-        }
-    });
-}

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

@@ -27,23 +27,27 @@ Object.defineProperty(exports, "person2username", { enumerable: true, get: funct
  */
 function voidPayTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // 決済承認アクション確認不要(2024-03-12~)
         // 決済承認アクションを検索
-        let authorizeActions = yield repos.action.searchByPurpose({
-            typeOf: factory.actionType.AuthorizeAction,
-            purpose: {
-                typeOf: params.purpose.typeOf,
-                id: params.purpose.id
-            }
-        });
-        authorizeActions = authorizeActions.filter((a) => a.object.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment);
-        // Chevreを使用した承認を取り消し
-        const authorizeActionsWithChevre = authorizeActions.filter((a) => {
-            var _a;
-            return ((_a = a.instrument) === null || _a === void 0 ? void 0 : _a.identifier) === factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre;
-        });
-        if (authorizeActionsWithChevre.length > 0) {
-            yield processVoidPayTransaction(params)(repos);
-        }
+        // let authorizeActions = <factory.action.authorize.paymentMethod.any.IAction[]>
+        //     await repos.action.searchByPurpose({
+        //         typeOf: factory.actionType.AuthorizeAction,
+        //         purpose: {
+        //             typeOf: params.purpose.typeOf,
+        //             id: params.purpose.id
+        //         }
+        //     });
+        // authorizeActions = authorizeActions.filter(
+        //     (a) => a.object.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment
+        // );
+        // // Chevreを使用した承認を取り消し
+        // const authorizeActionsWithChevre = authorizeActions.filter((a) => {
+        //     return a.instrument?.identifier === factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre;
+        // });
+        // if (authorizeActionsWithChevre.length > 0) {
+        //     await processVoidPayTransaction(params)(repos);
+        // }
+        yield processVoidPayTransaction(params)(repos);
         // 決済URL無効化もここで処理
         yield invalidatePaymentUrl(params)(repos);
     });
@@ -140,7 +144,11 @@ function processVoidPayTransaction(params) {
                 },
                 object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } }
             });
-            authorizeActions = authorizeActionsOnTransaction.filter((a) => { var _a; return ((_a = a.instrument) === null || _a === void 0 ? void 0 : _a.identifier) === factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre; });
+            // filter不要(2024-03-12~)
+            // authorizeActions = authorizeActionsOnTransaction.filter(
+            //     (a) => a.instrument?.identifier === factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre
+            // );
+            authorizeActions = authorizeActionsOnTransaction;
             switch (transaction.status) {
                 case factory.transactionStatusType.InProgress:
                     throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);

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

@@ -136,8 +136,10 @@ function fixOrderAsPurpose(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:
+        switch (params.object.typeOf) {
+            // switch (params.instrument.identifier) {
+            case 'COAReserveTransaction':
+                // case factory.service.webAPI.Identifier.COA:
                 // 最適化されたタスクに対応するため、ここでIObject4COAを注文から生成する(2024-01-24~)
                 const order = yield fixOrderAsPurpose({
                     project: { id: params.project.id },
@@ -171,8 +173,10 @@ function confirmReserveTransaction(params, options) {
         let updReserveResult;
         try {
             const object = confirmActionAttributes.object;
-            switch (params.instrument.identifier) {
-                case factory.service.webAPI.Identifier.COA:
+            switch (object.typeOf) {
+                // switch (params.instrument.identifier) {
+                case 'COAReserveTransaction':
+                    // case factory.service.webAPI.Identifier.COA:
                     // COA本予約
                     updReserveResult = yield COAReserveService.confirm({
                         project: { id: confirmActionAttributes.project.id },

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = void 0;
-const givePointAward_1 = require("./potentialActions/givePointAward");
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
 /**
  * 取引のポストアクションを作成する
@@ -18,7 +17,7 @@ const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
 function createPotentialActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         // ポイントインセンティブに対する承認アクションの分だけ、ポイントインセンティブ付与アクションを作成する
-        const givePointAwardActions = yield (0, givePointAward_1.createGivePointAwardActions)(params);
+        // const givePointAwardActions = await createGivePointAwardActions(params); // 完全廃止(2024-03-12~)
         // 注文配送メール送信設定
         const sendEmailMessageActions = yield (0, sendEmailMessage_1.createSendEmailMessageActions)(params);
         const sendOrderActionAttributes = {
@@ -32,7 +31,7 @@ function createPotentialActions(params) {
         return {
             order: {
                 potentialActions: {
-                    givePointAward: givePointAwardActions,
+                    // givePointAward: givePointAwardActions, // 完全廃止(2024-03-12~)
                     sendOrder: sendOrderActionAttributes // optimize(2024-01-16~)
                 }
             }

package/lib/chevre/service/transaction/placeOrderInProgress/validation.d.ts

@@ -9,6 +9,9 @@ export type IAuthorizePaymentAction = factory.action.authorize.paymentMethod.any
  */
 export declare function validateTransaction(transaction: factory.transaction.placeOrder.ITransaction, authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: IAuthorizeEventServiceOffer[], authorizeMoneyTansferActions: IAuthorizeMoneyTransferOffer[], authorizeProductOfferActions: IAuthorizeProductOffer[], eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[]): void;
 export type IOrderURLGenerator = (order: factory.order.IOrder) => string;
+/**
+ * 注文オファー数検証
+ */
 export declare function validateNumItems(params: {
     result: {
         order: PlaceOrderFactory.IResultOrderParams;

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

@@ -199,8 +199,11 @@ function validateMonetaryAmount(authorizePaymentActions, authorizeEventServiceOf
         throw new factory.errors.Argument('Transaction', 'Required MonetaryAmount not satisfied');
     }
 }
+/**
+ * 注文オファー数検証
+ */
 function validateNumItems(params) {
-    var _a, _b;
+    var _a, _b, _c;
     if (!Array.isArray(params.acceptedOffers)) {
         throw new factory.errors.Argument('order.acceptedOffers', 'must be array');
     }
@@ -223,6 +226,21 @@ function validateNumItems(params) {
     if (itemOfferedTypeOfs.length > 1) {
         throw new factory.errors.Argument('Transaction', `different itemOffered.typeOfs contained. [${itemOfferedTypeOfs.join(',')}]`);
     }
+    const maxNumCOAReservationNumbers = (_c = params.result.order.numItems) === null || _c === void 0 ? void 0 : _c.maxNumCOAReservationNumbers;
+    if (typeof maxNumCOAReservationNumbers === 'number') {
+        // COA予約数検証(2024-03-12~)
+        let coaSerialNumbers = [];
+        params.acceptedOffers.forEach(({ offeredThrough, serialNumber }) => {
+            if ((offeredThrough === null || offeredThrough === void 0 ? void 0 : offeredThrough.identifier) === factory.service.webAPI.Identifier.COA
+                && typeof serialNumber === 'string') {
+                coaSerialNumbers.push(serialNumber);
+            }
+        });
+        coaSerialNumbers = [...new Set(coaSerialNumbers)];
+        if (coaSerialNumbers.length > maxNumCOAReservationNumbers) {
+            throw new factory.errors.Argument('Transaction', (0, util_1.format)('Number of reservationNumbers must be less than or equal to %s', maxNumCOAReservationNumbers));
+        }
+    }
 }
 exports.validateNumItems = validateNumItems;
 function validateOrderedItem(params) {

package/lib/chevre/service/transaction/placeOrderInProgress.d.ts

@@ -1,48 +1,9 @@
 /**
  * 進行中注文取引サービス
  */
-import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
-import * as factory from '../../factory';
 import { POINT_AWARD_IDENTIFIER_NAME } from '../../factory/order';
 import { confirm } from './placeOrderInProgress/confirm';
 import { publishConfirmationNumberIfNotExist } from './placeOrderInProgress/publishConfirmationNumberIfNotExist';
 import { publishOrderNumberIfNotExist } from './placeOrderInProgress/publishOrderNumberIfNotExist';
 import { start } from './placeOrderInProgress/start';
-/**
- * インセンティブ承認
- */
-declare function authorizeAward(params: {
-    transaction: {
-        id: string;
-    };
-    agent: {
-        id: string;
-    };
-    object?: {
-        potentialActions?: {
-            givePointAwardParams?: factory.transaction.placeOrder.IGivePointAwardParams[];
-        };
-    };
-}): (repos: {
-    transaction: TransactionRepo;
-}) => Promise<void>;
-/**
- * インセンティブ承認を取り消す
- */
-declare function voidAward(params: {
-    /**
-     * 取引進行者
-     */
-    agent: {
-        id: string;
-    };
-    /**
-     * 取引
-     */
-    transaction: {
-        id: string;
-    };
-}): (repos: {
-    transaction: TransactionRepo;
-}) => Promise<void>;
-export { authorizeAward, confirm, POINT_AWARD_IDENTIFIER_NAME, publishConfirmationNumberIfNotExist, publishOrderNumberIfNotExist, start, voidAward };
+export { confirm, POINT_AWARD_IDENTIFIER_NAME, publishConfirmationNumberIfNotExist, publishOrderNumberIfNotExist, start };

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

@@ -1,16 +1,9 @@
 "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.voidAward = exports.start = exports.publishOrderNumberIfNotExist = exports.publishConfirmationNumberIfNotExist = exports.POINT_AWARD_IDENTIFIER_NAME = exports.confirm = exports.authorizeAward = void 0;
-const factory = require("../../factory");
+exports.start = exports.publishOrderNumberIfNotExist = exports.publishConfirmationNumberIfNotExist = exports.POINT_AWARD_IDENTIFIER_NAME = exports.confirm = void 0;
+/**
+ * 進行中注文取引サービス
+ */
 const order_1 = require("../../factory/order");
 Object.defineProperty(exports, "POINT_AWARD_IDENTIFIER_NAME", { enumerable: true, get: function () { return order_1.POINT_AWARD_IDENTIFIER_NAME; } });
 const confirm_1 = require("./placeOrderInProgress/confirm");
@@ -21,67 +14,3 @@ const publishOrderNumberIfNotExist_1 = require("./placeOrderInProgress/publishOr
 Object.defineProperty(exports, "publishOrderNumberIfNotExist", { enumerable: true, get: function () { return publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist; } });
 const start_1 = require("./placeOrderInProgress/start");
 Object.defineProperty(exports, "start", { enumerable: true, get: function () { return start_1.start; } });
-/**
- * インセンティブ承認
- */
-function authorizeAward(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const transaction = yield repos.transaction.findInProgressById({
-            typeOf: factory.transactionType.PlaceOrder,
-            id: params.transaction.id
-        });
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore if: please write tests */
-        if (transaction.agent.id !== params.agent.id) {
-            throw new factory.errors.Forbidden('Transaction not yours');
-        }
-        if (transaction.agent.typeOf !== factory.personType.Person) {
-            throw new factory.errors.Forbidden('Membership required');
-        }
-        // いったん特典リセット
-        yield voidAward(params)(repos);
-        const givePointAwardParams = (_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.givePointAwardParams;
-        if (Array.isArray(givePointAwardParams)) {
-            const pointAwardIdentifiers = givePointAwardParams.map((g) => { var _a; return String((_a = g.object) === null || _a === void 0 ? void 0 : _a.identifier); });
-            // 取引にインセンティブ付与アクションパラメータを保管する
-            yield repos.transaction.findByIdAndUpdateInProgress({
-                id: transaction.id,
-                update: {
-                    $set: {
-                        'object.potentialActions.givePointAward': givePointAwardParams
-                    },
-                    // order.identifierに入金識別子を保管する
-                    $push: { 'object.identifier': { name: order_1.POINT_AWARD_IDENTIFIER_NAME, value: JSON.stringify(pointAwardIdentifiers) } }
-                }
-            });
-        }
-    });
-}
-exports.authorizeAward = authorizeAward;
-/**
- * インセンティブ承認を取り消す
- */
-function voidAward(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.findInProgressById({
-            typeOf: factory.transactionType.PlaceOrder,
-            id: params.transaction.id
-        });
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore if */
-        if (transaction.agent.id !== params.agent.id) {
-            throw new factory.errors.Forbidden('Transaction not yours');
-        }
-        yield repos.transaction.findByIdAndUpdateInProgress({
-            id: transaction.id,
-            update: {
-                $unset: {
-                    'object.potentialActions.givePointAward': 1
-                },
-                $pull: { 'object.identifier': { name: order_1.POINT_AWARD_IDENTIFIER_NAME } }
-            }
-        });
-    });
-}
-exports.voidAward = voidAward;

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.361.0",
-    "@cinerino/sdk": "5.13.0",
+    "@chevre/factory": "4.362.0-alpha.2",
+    "@cinerino/sdk": "5.14.0-alpha.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.26.0-alpha.0"
+  "version": "21.26.0-alpha.2"
 }

package/example/src/chevre/migratePayTransactionPaymentMethodId.ts

@@ -1,72 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const assetTransactionRepo = await chevre.repository.AssetTransaction.createInstance(mongoose.connection);
-
-    const cursor = assetTransactionRepo.getCursor(
-        {
-            typeOf: { $eq: chevre.factory.assetTransactionType.Pay },
-            // 'object.paymentMethodId': { $exists: false },
-            // 'project.id': { $eq: project.id },
-            startDate: {
-                $gte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-12, 'months')
-                    .toDate()
-            }
-        },
-        {
-            typeOf: 1,
-            project: 1,
-            object: 1,
-            transactionNumber: 1,
-            startDate: 1
-        }
-    );
-    console.log('transactions found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const payTransaction: Pick<
-            chevre.factory.assetTransaction.pay.ITransaction,
-            'project' | 'object' | 'transactionNumber' | 'startDate' | 'typeOf'
-        > = doc.toObject();
-
-        const alreadyMigrated = typeof payTransaction.object.paymentMethodId === 'string'
-            && payTransaction.object.paymentMethodId === (<any>payTransaction.object.paymentMethod).paymentMethodId;
-
-        if (alreadyMigrated) {
-            console.log(
-                'already exist.',
-                payTransaction.project.id, payTransaction.typeOf, payTransaction.transactionNumber, payTransaction.startDate, i);
-        } else {
-            const paymentMethodIdentifier = (<any>payTransaction.object.paymentMethod).typeOf;
-            console.log(
-                'updating...',
-                payTransaction.project.id, payTransaction.typeOf, payTransaction.transactionNumber, payTransaction.startDate, i,
-                paymentMethodIdentifier);
-            updateCount += 1;
-            console.log(
-                'updated.',
-                payTransaction.project.id, payTransaction.typeOf, payTransaction.transactionNumber, payTransaction.startDate, i);
-        }
-    });
-
-    console.log(i, 'transactions checked');
-    console.log(updateCount, 'transactions updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/givePointAward.d.ts

@@ -1,5 +0,0 @@
-import * as factory from '../../../../factory';
-export declare function createGivePointAwardActions(params: {
-    order: factory.order.IOrder;
-    transaction: factory.transaction.placeOrder.ITransaction;
-}): Promise<factory.action.transfer.give.pointAward.IAttributes[]>;

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/givePointAward.js

@@ -1,70 +0,0 @@
-"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.createGivePointAwardActions = void 0;
-const factory = require("../../../../factory");
-// import { createMaskedCustomer } from '../../../../factory/order';
-function createGivePointAwardActions(params) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const actions = [];
-        // インセンティブ付与アクションの指定があればそちらを反映
-        const givePointAwardParams = (_a = params.transaction.object.potentialActions) === null || _a === void 0 ? void 0 : _a.givePointAward;
-        if (Array.isArray(givePointAwardParams)) {
-            const givePointAwardPurpose = {
-                typeOf: params.order.typeOf,
-                // seller: {
-                //     id: params.order.seller.id,
-                //     typeOf: params.order.seller.typeOf,
-                //     name: params.order.seller.name
-                // }, // 廃止(2024-03-06~)
-                // mask
-                // customer: createMaskedCustomer(params.order, { noProfile: true }), // 廃止(2024-03-06~)
-                orderNumber: params.order.orderNumber,
-                price: params.order.price,
-                priceCurrency: params.order.priceCurrency,
-                orderDate: params.order.orderDate
-            };
-            // メンバーシップごとに、特典を確認してインセンティブ付与
-            givePointAwardParams.forEach((givePointAwardParam) => {
-                var _a, _b, _c, _d, _e, _f, _g, _h;
-                const amount = (_a = givePointAwardParam.object) === null || _a === void 0 ? void 0 : _a.amount;
-                const pointAwardIdentifier = (_b = givePointAwardParam.object) === null || _b === void 0 ? void 0 : _b.identifier;
-                const accountNumber = (_d = (_c = givePointAwardParam.object) === null || _c === void 0 ? void 0 : _c.toLocation) === null || _d === void 0 ? void 0 : _d.accountNumber;
-                const description = (_e = givePointAwardParam.object) === null || _e === void 0 ? void 0 : _e.description;
-                if (typeof amount === 'number' && typeof accountNumber === 'string') {
-                    actions.push({
-                        project: params.transaction.project,
-                        typeOf: factory.actionType.GiveAction,
-                        // agent: params.transaction.project,
-                        agent: {
-                            id: params.order.seller.id,
-                            typeOf: params.order.seller.typeOf,
-                            name: params.order.seller.name
-                        },
-                        recipient: {
-                            typeOf: params.order.customer.typeOf,
-                            id: params.order.customer.id,
-                            name: String(params.order.customer.name)
-                        },
-                        object: Object.assign({ typeOf: factory.action.transfer.give.pointAward.ObjectType.PointAward, amount: amount, toLocation: {
-                                accountNumber: accountNumber,
-                                issuedThrough: { id: String((_h = (_g = (_f = givePointAwardParam.object) === null || _f === void 0 ? void 0 : _f.toLocation) === null || _g === void 0 ? void 0 : _g.issuedThrough) === null || _h === void 0 ? void 0 : _h.id) }
-                            }, description: (typeof description === 'string') ? description : '' }, (typeof pointAwardIdentifier === 'string') ? { identifier: pointAwardIdentifier } : undefined),
-                        purpose: givePointAwardPurpose
-                    });
-                }
-            });
-        }
-        return actions;
-    });
-}
-exports.createGivePointAwardActions = createGivePointAwardActions;