@chevre/domain 21.8.0-alpha.22 → 21.8.0-alpha.24

package/lib/chevre/repo/mongoose/schemas/task.d.ts

@@ -57,6 +57,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     status?: string | undefined;
     data?: any;
     project?: any;
+    identifier?: string | undefined;
     runsAt?: Date | undefined;
     remainingNumberOfTries?: number | undefined;
     lastTriedAt?: Date | undefined;
@@ -69,6 +70,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     status?: string | undefined;
     data?: any;
     project?: any;
+    identifier?: string | undefined;
     runsAt?: Date | undefined;
     remainingNumberOfTries?: number | undefined;
     lastTriedAt?: Date | undefined;
@@ -81,6 +83,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     status?: string | undefined;
     data?: any;
     project?: any;
+    identifier?: string | undefined;
     runsAt?: Date | undefined;
     remainingNumberOfTries?: number | undefined;
     lastTriedAt?: Date | undefined;

package/lib/chevre/repo/mongoose/schemas/task.js

@@ -9,6 +9,7 @@ exports.modelName = modelName;
  * タスクスキーマ
  */
 const schema = new mongoose_1.Schema({
+    identifier: String,
     project: mongoose_1.SchemaTypes.Mixed,
     name: String,
     status: String,
@@ -52,6 +53,13 @@ schema.index({ 'project.id': 1, runsAt: -1 }, { name: 'searchByProjectId-v202207
 schema.index({ name: 1, runsAt: -1 }, { name: 'searchByName-v2' });
 schema.index({ status: 1, runsAt: -1 }, { name: 'searchByStatus-v2' });
 schema.index({ runsAt: -1 }, { name: 'searchByRunsAt-v2' });
+// identifier追加(2023-09-01~)
+schema.index({ identifier: 1, runsAt: -1 }, {
+    name: 'searchByIdentifier',
+    partialFilterExpression: {
+        identifier: { $exists: true }
+    }
+});
 schema.index({ dateAborted: 1, runsAt: -1 }, {
     name: 'searchByDateAborted',
     partialFilterExpression: {

package/lib/chevre/repo/task.d.ts

@@ -30,6 +30,10 @@ export declare class MongoRepository {
     saveMany(taskAttributes: factory.task.IAttributes<factory.taskName>[], options: IOptionOnCreate): Promise<{
         id: string;
     }[]>;
+    /**
+     * タスク識別子から冪等作成する
+     */
+    createIfNotExistByIdentifier(params: factory.task.IAttributes<factory.taskName>, options: IOptionOnCreate): Promise<void>;
     createInformTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.TriggerWebhook>, options: IOptionOnCreate): Promise<void>;
     /**
      * 取引削除タスク冪等作成

package/lib/chevre/repo/task.js

@@ -174,6 +174,30 @@ class MongoRepository {
             }
         });
     }
+    /**
+     * タスク識別子から冪等作成する
+     */
+    createIfNotExistByIdentifier(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (typeof params.identifier !== 'string' || params.identifier.length === 0) {
+                throw new factory.errors.ArgumentNull('identifier');
+            }
+            const createdTask = yield this.taskModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                name: { $eq: params.name },
+                identifier: { $exists: true, $eq: params.identifier }
+            }, { $setOnInsert: params }, { new: true, upsert: true })
+                .select({ _id: 1 })
+                .exec();
+            if (options.emitImmediately) {
+                task_2.taskEventEmitter.emitTaskStatusChanged({
+                    id: createdTask.id,
+                    name: params.name,
+                    status: factory.taskStatus.Ready
+                });
+            }
+        });
+    }
     createInformTaskIfNotExist(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const createdTask = yield this.taskModel.findOneAndUpdate({

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

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

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

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

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

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

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

@@ -21,10 +21,6 @@ export declare function createConfirmRegisterServiceActionObjectByOrder(params:
     order: factory.order.IOrder;
 }): factory.action.interact.confirm.registerService.IObject[];
 export type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
-export declare function createOnPlaceOrderTasksByTransaction(params: {
-    object: factory.order.IOrder | IExternalOrder;
-    potentialActions?: factory.action.trade.order.IPotentialActions;
-}): factory.task.IAttributes<factory.taskName>[];
 /**
  * 注文配送後のアクション
  */

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

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createOnOrderCancelledTasksByTransaction = exports.createOnOrderReturnedTasksByTransaction = exports.createOnOrderSentTasksByTransaction = exports.createOnPlaceOrderTasksByTransaction = exports.createConfirmRegisterServiceActionObjectByOrder = exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createInformTasks = exports.getOrderWithToken = void 0;
+exports.createOnOrderCancelledTasksByTransaction = exports.createOnOrderReturnedTasksByTransaction = exports.createOnOrderSentTasksByTransaction = exports.createConfirmRegisterServiceActionObjectByOrder = exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createInformTasks = exports.getOrderWithToken = void 0;
 const google_libphonenumber_1 = require("google-libphonenumber");
 const jwt = require("jsonwebtoken");
 const util_1 = require("util");
@@ -262,62 +262,38 @@ function createConfirmRegisterServiceActionObjectByOrder(params) {
     });
 }
 exports.createConfirmRegisterServiceActionObjectByOrder = createConfirmRegisterServiceActionObjectByOrder;
-function createOnPlaceOrderTasksByTransaction(params) {
-    const potentialActions = params.potentialActions;
-    const now = new Date();
-    // potentialActionsのためのタスクを生成
-    const taskAttributes = [];
-    // tslint:disable-next-line:no-single-line-block-comment
-    /* istanbul ignore else */
-    if (potentialActions !== undefined) {
-        // 冗長なsendOrderタスク作成を回避(createSendOrderTransactionTaskIfNotExistへ移行)(2023-08-25~)
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        // if (potentialActions.sendOrder !== undefined) {
-        //     const sendOrderTaskData: factory.task.IData<factory.taskName.SendOrder> = {
-        //         project: potentialActions.sendOrder.project,
-        //         object: {
-        //             ...potentialActions.sendOrder.object,
-        //             confirmationNumber: params.object.confirmationNumber
-        //         }
-        //         // 廃止(2023-08-21~)
-        //         // ...(potentialActions.sendOrder.potentialActions !== undefined)
-        //         //     ? { potentialActions: potentialActions.sendOrder.potentialActions }
-        //         //     : undefined
-        //     };
-        //     const sendOrderTask: factory.task.IAttributes<factory.taskName.SendOrder> = {
-        //         project: potentialActions.sendOrder.project,
-        //         name: factory.taskName.SendOrder,
-        //         status: factory.taskStatus.Ready,
-        //         runsAt: now, // なるはやで実行
-        //         remainingNumberOfTries: 10,
-        //         numberOfTried: 0,
-        //         executionResults: [],
-        //         data: sendOrderTaskData
-        //     };
-        //     taskAttributes.push(sendOrderTask);
-        // }
-        // ポイント付与
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (Array.isArray(potentialActions.givePointAward)) {
-            taskAttributes.push(...potentialActions.givePointAward.map((a) => {
-                return {
-                    project: a.project,
-                    name: factory.taskName.GivePointAward,
-                    status: factory.taskStatus.Ready,
-                    runsAt: now,
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: a
-                };
-            }));
-        }
-    }
-    return taskAttributes;
-}
-exports.createOnPlaceOrderTasksByTransaction = createOnPlaceOrderTasksByTransaction;
+// export function createOnPlaceOrderTasksByTransaction(params: {
+//     object: factory.order.IOrder | IExternalOrder;
+//     potentialActions?: factory.action.trade.order.IPotentialActions;
+// }): factory.task.IAttributes<factory.taskName>[] {
+//     const potentialActions = params.potentialActions;
+//     const now = new Date();
+//     // potentialActionsのためのタスクを生成
+//     const taskAttributes: factory.task.IAttributes<factory.taskName>[] = [];
+//     // tslint:disable-next-line:no-single-line-block-comment
+//     /* istanbul ignore else */
+//     if (potentialActions !== undefined) {
+//         // ポイント付与
+//         // tslint:disable-next-line:no-single-line-block-comment
+//         /* istanbul ignore else */
+//         if (Array.isArray(potentialActions.givePointAward)) {
+//             taskAttributes.push(...potentialActions.givePointAward.map(
+//                 (a): factory.task.IAttributes<factory.taskName.GivePointAward> => {
+//                     return {
+//                         project: a.project,
+//                         name: factory.taskName.GivePointAward,
+//                         status: factory.taskStatus.Ready,
+//                         runsAt: now, // なるはやで実行
+//                         remainingNumberOfTries: 10,
+//                         numberOfTried: 0,
+//                         executionResults: [],
+//                         data: a
+//                     };
+//                 }));
+//         }
+//     }
+//     return taskAttributes;
+// }
 /**
  * 注文配送後のアクション
  */

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

@@ -94,19 +94,19 @@ function onOrderStatusChanged(params) {
                     // ...await createConfirmPayTransactionTasks(params.order, simpleOrder)(repos),
                     // createConfirmReserveTransactionTasksIfNotExistへ移行(2023-08-25~)
                     // ...await createConfirmReserveTransactionTasks(params.order, simpleOrder)(repos),
-                    ...yield createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos),
+                    ...yield createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos)
                     // 取引のpotentialActionsを適用(2023-08-17~)
-                    ...(0, factory_1.createOnPlaceOrderTasksByTransaction)({
-                        object: params.order,
-                        // potentialActions: params.potentialActions
-                        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
-                    })
+                    // createGivePointAwardTaskIfNotExistへ移行(2023-09-01~)
+                    // ...createOnPlaceOrderTasksByTransaction({
+                    //     object: params.order,
+                    //     potentialActions: params.placeOrderTransaction?.potentialActions?.order?.potentialActions
+                    // })
                 ];
                 break;
             case factory.orderStatus.OrderReturned:
-                const potentialActionsByTransaction = (_m = (_l = (_k = (_j = params.returnOrderTransaction) === null || _j === void 0 ? void 0 : _j.potentialActions) === null || _k === void 0 ? void 0 : _k.returnOrder) === null || _l === void 0 ? void 0 : _l.find((returnOrderActionByTransaction) => {
+                const potentialActionsByTransaction = (_j = (_h = (_g = (_f = params.returnOrderTransaction) === null || _f === void 0 ? void 0 : _f.potentialActions) === null || _g === void 0 ? void 0 : _g.returnOrder) === null || _h === void 0 ? void 0 : _h.find((returnOrderActionByTransaction) => {
                     return returnOrderActionByTransaction.object.orderNumber === params.order.orderNumber;
-                })) === null || _m === void 0 ? void 0 : _m.potentialActions;
+                })) === null || _j === void 0 ? void 0 : _j.potentialActions;
                 tasks = [
                     ...(0, factory_1.createInformTasks)(params.order),
                     ...createReturnReserveTransactionTasks(params.order, simpleOrder),
@@ -133,6 +133,9 @@ function onOrderStatusChanged(params) {
                 // 冗長なsendOrderタスク作成を回避(2023-08-25~)
                 yield createSendOrderTransactionTaskIfNotExist({
                     object: params.order,
+                    potentialActions: (_m = (_l = (_k = params.placeOrderTransaction) === null || _k === void 0 ? void 0 : _k.potentialActions) === null || _l === void 0 ? void 0 : _l.order) === null || _m === void 0 ? void 0 : _m.potentialActions
+                })(repos);
+                yield createGivePointAwardTaskIfNotExist({
                     potentialActions: (_q = (_p = (_o = params.placeOrderTransaction) === null || _o === void 0 ? void 0 : _o.potentialActions) === null || _p === void 0 ? void 0 : _p.order) === null || _q === void 0 ? void 0 : _q.potentialActions
                 })(repos);
                 break;
@@ -309,6 +312,35 @@ function createSendOrderTransactionTaskIfNotExist(params) {
         }
     });
 }
+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 });
+            }
+        }
+    });
+}
 // const RETURN_COA_TASK_DELAY_IN_SECONDS = 0;
 function createReturnReserveTransactionTasks(order, simpleOrder) {
     var _a, _b;

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.329.0-alpha.0",
-    "@cinerino/sdk": "3.166.0-alpha.3",
+    "@chevre/factory": "4.329.0-alpha.2",
+    "@cinerino/sdk": "3.166.0-alpha.5",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.8.0-alpha.22"
+  "version": "21.8.0-alpha.24"
 }