@chevre/domain 21.8.0-alpha.6 → 21.8.0-alpha.60

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

@@ -69,6 +69,12 @@ export declare class MongoRepository {
     search(params: factory.offerCatalog.ISearchConditions): Promise<(Omit<factory.offerCatalog.IOfferCatalog, 'itemListElement'> & {
         numberOfItems?: number;
     })[]>;
+    findItemListElementById(params: {
+        id: string;
+        project: {
+            id: string;
+        };
+    }): Promise<Pick<factory.offerCatalog.IOfferCatalog, 'itemListElement'>>;
     deleteById(params: {
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/offerCatalog.js

@@ -240,6 +240,19 @@ class MongoRepository {
             return aggregate.exec();
         });
     }
+    findItemListElementById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.offerCatalogModel.findOne({
+                'project.id': { $eq: params.project.id },
+                _id: { $eq: params.id }
+            }, { 'itemListElement.id': 1 })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.offerCatalogModel.modelName);
+            }
+            return doc.toObject();
+        });
+    }
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.offerCatalogModel.findOneAndRemove({

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

@@ -70,6 +70,21 @@ export declare class MongoRepository {
     }): Promise<{
         updatedAt: Date;
     }>;
+    /**
+     * 注文後に決済方法区分を確定する
+     */
+    fixPaymentMethodIdentifier(params: {
+        project: {
+            id: string;
+        };
+        orderNumber: string;
+        invoice: {
+            paymentMethodId: string;
+            paymentMethod: {
+                identifier: string;
+            };
+        };
+    }): Promise<void>;
     findById(params: {
         id: string;
         inclusion: string[];

package/lib/chevre/repo/order.js

@@ -24,7 +24,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(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, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19;
+        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, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22;
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
@@ -82,10 +82,11 @@ class MongoRepository {
         if (Array.isArray(sellerIds)) {
             andConditions.push({ 'seller.id': { $exists: true, $in: sellerIds } });
         }
-        if (typeof ((_m = params.seller) === null || _m === void 0 ? void 0 : _m.typeOf) === 'string') {
-            andConditions.push({ 'seller.typeOf': { $exists: true, $eq: params.seller.typeOf } });
-        }
-        const brokerIdEq = (_p = (_o = params.broker) === null || _o === void 0 ? void 0 : _o.id) === null || _p === void 0 ? void 0 : _p.$eq;
+        // 不要なので廃止(2023-09-11~)
+        // if (typeof params.seller?.typeOf === 'string') {
+        //     andConditions.push({ 'seller.typeOf': { $exists: true, $eq: params.seller.typeOf } });
+        // }
+        const brokerIdEq = (_o = (_m = params.broker) === null || _m === void 0 ? void 0 : _m.id) === null || _o === void 0 ? void 0 : _o.$eq;
         if (typeof brokerIdEq === 'string') {
             andConditions.push({
                 'broker.id': {
@@ -302,7 +303,7 @@ class MongoRepository {
                 }
             }
         }
-        const nameEq = (_q = params.name) === null || _q === void 0 ? void 0 : _q.$eq;
+        const nameEq = (_p = params.name) === null || _p === void 0 ? void 0 : _p.$eq;
         if (typeof nameEq === 'string') {
             andConditions.push({
                 name: {
@@ -311,7 +312,7 @@ class MongoRepository {
                 }
             });
         }
-        const nameRegex = (_r = params.name) === null || _r === void 0 ? void 0 : _r.$regex;
+        const nameRegex = (_q = params.name) === null || _q === void 0 ? void 0 : _q.$regex;
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {
             andConditions.push({
                 name: {
@@ -344,7 +345,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedIdentifierIn = (_u = (_t = (_s = params.acceptedOffers) === null || _s === void 0 ? void 0 : _s.itemOffered) === null || _t === void 0 ? void 0 : _t.identifier) === null || _u === void 0 ? void 0 : _u.$in;
+        const itemOfferedIdentifierIn = (_t = (_s = (_r = params.acceptedOffers) === null || _r === void 0 ? void 0 : _r.itemOffered) === null || _s === void 0 ? void 0 : _s.identifier) === null || _t === void 0 ? void 0 : _t.$in;
         if (Array.isArray(itemOfferedIdentifierIn)) {
             andConditions.push({
                 'acceptedOffers.itemOffered.identifier': {
@@ -353,7 +354,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedTypeOfIn = (_x = (_w = (_v = params.acceptedOffers) === null || _v === void 0 ? void 0 : _v.itemOffered) === null || _w === void 0 ? void 0 : _w.typeOf) === null || _x === void 0 ? void 0 : _x.$in;
+        const itemOfferedTypeOfIn = (_w = (_v = (_u = params.acceptedOffers) === null || _u === void 0 ? void 0 : _u.itemOffered) === null || _v === void 0 ? void 0 : _v.typeOf) === null || _w === void 0 ? void 0 : _w.$in;
         if (Array.isArray(itemOfferedTypeOfIn)) {
             andConditions.push({
                 'acceptedOffers.itemOffered.typeOf': {
@@ -362,7 +363,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedIssuedThroughTypeOfEq = (_1 = (_0 = (_z = (_y = params.acceptedOffers) === null || _y === void 0 ? void 0 : _y.itemOffered) === null || _z === void 0 ? void 0 : _z.issuedThrough) === null || _0 === void 0 ? void 0 : _0.typeOf) === null || _1 === void 0 ? void 0 : _1.$eq;
+        const itemOfferedIssuedThroughTypeOfEq = (_0 = (_z = (_y = (_x = params.acceptedOffers) === null || _x === void 0 ? void 0 : _x.itemOffered) === null || _y === void 0 ? void 0 : _y.issuedThrough) === null || _z === void 0 ? void 0 : _z.typeOf) === null || _0 === void 0 ? void 0 : _0.$eq;
         if (typeof itemOfferedIssuedThroughTypeOfEq === 'string') {
             andConditions.push({
                 'acceptedOffers.itemOffered.issuedThrough.typeOf': {
@@ -371,7 +372,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedIssuedThroughIdIn = (_5 = (_4 = (_3 = (_2 = params.acceptedOffers) === null || _2 === void 0 ? void 0 : _2.itemOffered) === null || _3 === void 0 ? void 0 : _3.issuedThrough) === null || _4 === void 0 ? void 0 : _4.id) === null || _5 === void 0 ? void 0 : _5.$in;
+        const itemOfferedIssuedThroughIdIn = (_4 = (_3 = (_2 = (_1 = params.acceptedOffers) === null || _1 === void 0 ? void 0 : _1.itemOffered) === null || _2 === void 0 ? void 0 : _2.issuedThrough) === null || _3 === void 0 ? void 0 : _3.id) === null || _4 === void 0 ? void 0 : _4.$in;
         if (Array.isArray(itemOfferedIssuedThroughIdIn)) {
             andConditions.push({
                 'acceptedOffers.itemOffered.issuedThrough.id': {
@@ -380,7 +381,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedProgramMembershipUsedIdentifierEq = (_9 = (_8 = (_7 = (_6 = params.acceptedOffers) === null || _6 === void 0 ? void 0 : _6.itemOffered) === null || _7 === void 0 ? void 0 : _7.programMembershipUsed) === null || _8 === void 0 ? void 0 : _8.identifier) === null || _9 === void 0 ? void 0 : _9.$eq;
+        const itemOfferedProgramMembershipUsedIdentifierEq = (_8 = (_7 = (_6 = (_5 = params.acceptedOffers) === null || _5 === void 0 ? void 0 : _5.itemOffered) === null || _6 === void 0 ? void 0 : _6.programMembershipUsed) === null || _7 === void 0 ? void 0 : _7.identifier) === null || _8 === void 0 ? void 0 : _8.$eq;
         if (typeof itemOfferedProgramMembershipUsedIdentifierEq === 'string') {
             andConditions.push({
                 'acceptedOffers.itemOffered.programMembershipUsed.identifier': {
@@ -389,7 +390,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq = (_15 = (_14 = (_13 = (_12 = (_11 = (_10 = params.acceptedOffers) === null || _10 === void 0 ? void 0 : _10.itemOffered) === null || _11 === void 0 ? void 0 : _11.programMembershipUsed) === null || _12 === void 0 ? void 0 : _12.issuedThrough) === null || _13 === void 0 ? void 0 : _13.serviceType) === null || _14 === void 0 ? void 0 : _14.codeValue) === null || _15 === void 0 ? void 0 : _15.$eq;
+        const itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq = (_14 = (_13 = (_12 = (_11 = (_10 = (_9 = params.acceptedOffers) === null || _9 === void 0 ? void 0 : _9.itemOffered) === null || _10 === void 0 ? void 0 : _10.programMembershipUsed) === null || _11 === void 0 ? void 0 : _11.issuedThrough) === null || _12 === void 0 ? void 0 : _12.serviceType) === null || _13 === void 0 ? void 0 : _13.codeValue) === null || _14 === void 0 ? void 0 : _14.$eq;
         if (typeof itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq === 'string') {
             andConditions.push({
                 'acceptedOffers.itemOffered.programMembershipUsed.issuedThrough.serviceType.codeValue': {
@@ -551,6 +552,14 @@ class MongoRepository {
                 }
             }
         }
+        const paymentMethodIdentifierIn = (_17 = (_16 = (_15 = params.paymentMethods) === null || _15 === void 0 ? void 0 : _15.paymentMethod) === null || _16 === void 0 ? void 0 : _16.identifier) === null || _17 === void 0 ? void 0 : _17.$in;
+        if (Array.isArray(paymentMethodIdentifierIn)) {
+            andConditions.push({ 'paymentMethods.paymentMethod.identifier': { $exists: true, $in: paymentMethodIdentifierIn } });
+        }
+        const paymentMethodsTypeOfIn = (_18 = params.paymentMethods) === null || _18 === void 0 ? void 0 : _18.typeOfs;
+        if (Array.isArray(paymentMethodsTypeOfIn)) {
+            andConditions.push({ 'paymentMethods.typeOf': { $exists: true, $in: paymentMethodsTypeOfIn } });
+        }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.paymentMethods !== undefined) {
@@ -566,16 +575,6 @@ class MongoRepository {
             }
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
-            if (Array.isArray(params.paymentMethods.typeOfs)) {
-                andConditions.push({
-                    'paymentMethods.typeOf': {
-                        $exists: true,
-                        $in: params.paymentMethods.typeOfs
-                    }
-                });
-            }
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
             if (Array.isArray(params.paymentMethods.paymentMethodIds)) {
                 andConditions.push({
                     'paymentMethods.paymentMethodId': {
@@ -585,7 +584,7 @@ class MongoRepository {
                 });
             }
         }
-        const paymentMethodAdditionalPropertyAll = (_17 = (_16 = params.paymentMethods) === null || _16 === void 0 ? void 0 : _16.additionalProperty) === null || _17 === void 0 ? void 0 : _17.$all;
+        const paymentMethodAdditionalPropertyAll = (_20 = (_19 = params.paymentMethods) === null || _19 === void 0 ? void 0 : _19.additionalProperty) === null || _20 === void 0 ? void 0 : _20.$all;
         if (Array.isArray(paymentMethodAdditionalPropertyAll)) {
             andConditions.push({
                 'paymentMethods.additionalProperty': {
@@ -594,7 +593,7 @@ class MongoRepository {
                 }
             });
         }
-        const paymentMethodAdditionalPropertyIn = (_19 = (_18 = params.paymentMethods) === null || _18 === void 0 ? void 0 : _18.additionalProperty) === null || _19 === void 0 ? void 0 : _19.$in;
+        const paymentMethodAdditionalPropertyIn = (_22 = (_21 = params.paymentMethods) === null || _21 === void 0 ? void 0 : _21.additionalProperty) === null || _22 === void 0 ? void 0 : _22.$in;
         if (Array.isArray(paymentMethodAdditionalPropertyIn)) {
             andConditions.push({
                 'paymentMethods.additionalProperty': {
@@ -681,7 +680,10 @@ class MongoRepository {
                 orderNumber: { $eq: params.orderNumber },
                 orderStatus: { $eq: params.previousOrderStatus },
                 'project.id': { $eq: params.project.id }
-            }, { orderStatus: params.orderStatus }, {
+            }, {
+                previousOrderStatus: params.previousOrderStatus,
+                orderStatus: params.orderStatus
+            }, {
                 new: true,
                 projection: {
                     __v: 0,
@@ -723,6 +725,7 @@ class MongoRepository {
                 orderStatus: { $eq: factory.orderStatus.OrderDelivered },
                 'project.id': { $eq: params.project.id }
             }, {
+                previousOrderStatus: factory.orderStatus.OrderDelivered,
                 orderStatus: factory.orderStatus.OrderReturned,
                 dateReturned: params.dateReturned,
                 returner: params.returner
@@ -782,6 +785,35 @@ class MongoRepository {
             return { updatedAt: doc.updatedAt };
         });
     }
+    /**
+     * 注文後に決済方法区分を確定する
+     */
+    fixPaymentMethodIdentifier(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.orderModel.findOneAndUpdate({
+                orderNumber: { $eq: params.orderNumber },
+                'project.id': { $eq: params.project.id },
+                'paymentMethods.paymentMethodId': { $exists: true, $eq: params.invoice.paymentMethodId }
+            }, {
+                $set: {
+                    'paymentMethods.$[invoice].paymentMethod.identifier': params.invoice.paymentMethod.identifier,
+                    // tslint:disable-next-line:no-suspicious-comment
+                    // TODO 互換性維持対応としてtypeOfも変更しているが、そのうち廃止(2023-08-30)
+                    'paymentMethods.$[invoice].typeOf': params.invoice.paymentMethod.identifier
+                }
+            }, {
+                arrayFilters: [{ 'invoice.paymentMethodId': { $eq: params.invoice.paymentMethodId } }],
+                new: true,
+                projection: {
+                    _id: 1
+                }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.orderModel.modelName);
+            }
+        });
+    }
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let projection = {};

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

@@ -30,11 +30,17 @@ 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>;
     /**
      * 取引削除タスク冪等作成
      */
     createDeleteTransactionTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.DeleteTransaction>, options: IOptionOnCreate): Promise<void>;
+    createConfirmReserveTransactionTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.ConfirmReserveTransaction>, options: IOptionOnCreate): Promise<void>;
+    createOnAssetTransactionStatusChangedTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.OnAssetTransactionStatusChanged>, options: IOptionOnCreate): Promise<void>;
     createSendOrderTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.SendOrder>, options: IOptionOnCreate): Promise<void>;
     executeById(params: {
         id: string;
@@ -68,7 +74,7 @@ export declare class MongoRepository {
              */
             $nin?: factory.taskName[];
         };
-    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncAggregateOffer").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
     retry(params: {
         intervalInMinutes: number;
     }): 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({
@@ -219,6 +243,56 @@ class MongoRepository {
             }
         });
     }
+    createConfirmReserveTransactionTaskIfNotExist(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const createdTask = yield this.taskModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                name: { $eq: params.name },
+                'data.object.transactionNumber': {
+                    $exists: true,
+                    $eq: String(params.data.object.transactionNumber)
+                },
+                'data.purpose.orderNumber': {
+                    $exists: true,
+                    $eq: String(params.data.purpose.orderNumber)
+                }
+            }, { $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
+                });
+            }
+        });
+    }
+    createOnAssetTransactionStatusChangedTaskIfNotExist(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const createdTask = yield this.taskModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                name: { $eq: params.name },
+                'data.object.transactionNumber': {
+                    $exists: true,
+                    $eq: String(params.data.object.transactionNumber)
+                },
+                'data.purpose.orderNumber': {
+                    $exists: true,
+                    $eq: String(params.data.purpose.orderNumber)
+                }
+            }, { $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
+                });
+            }
+        });
+    }
     createSendOrderTaskIfNotExist(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const createdTask = yield this.taskModel.findOneAndUpdate({
@@ -240,6 +314,32 @@ class MongoRepository {
             }
         });
     }
+    // public async createOnOrderPaymentCompletedTaskIfNotExist(
+    //     params: factory.task.IAttributes<factory.taskName.OnOrderPaymentCompleted>,
+    //     options: IOptionOnCreate
+    // ): Promise<void> {
+    //     const createdTask = await this.taskModel.findOneAndUpdate(
+    //         {
+    //             'project.id': { $eq: params.project.id },
+    //             name: { $eq: params.name },
+    //             'data.object.orderNumber': {
+    //                 $exists: true,
+    //                 $eq: String(params.data.object.orderNumber)
+    //             }
+    //         },
+    //         { $setOnInsert: params },
+    //         { new: true, upsert: true }
+    //     )
+    //         .select({ _id: 1 })
+    //         .exec();
+    //     if (options.emitImmediately) {
+    //         taskEventEmitter.emitTaskStatusChanged({
+    //             id: createdTask.id,
+    //             name: params.name,
+    //             status: factory.taskStatus.Ready
+    //         });
+    //     }
+    // }
     executeById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.taskModel.findOneAndUpdate({

package/lib/chevre/repository.d.ts

@@ -7,6 +7,7 @@ import { MongoRepository as AccountTitleRepo } from './repo/accountTitle';
 import { MongoRepository as AccountTransactionRepo } from './repo/accountTransaction';
 import { MongoRepository as ActionRepo } from './repo/action';
 import { MongoRepository as AdditionalPropertyRepo } from './repo/additionalProperty';
+import { MongoRepository as AggregateOfferRepo } from './repo/aggregateOffer';
 import { MongoRepository as AggregationRepo } from './repo/aggregation';
 import { MongoRepository as AssetTransactionRepo } from './repo/assetTransaction';
 import { MongoRepository as CategoryCodeRepo } from './repo/categoryCode';
@@ -71,6 +72,8 @@ export declare class Action extends ActionRepo {
  */
 export declare class AdditionalProperty extends AdditionalPropertyRepo {
 }
+export declare class AggregateOffer extends AggregateOfferRepo {
+}
 export declare class Aggregation extends AggregationRepo {
 }
 export declare namespace action {

package/lib/chevre/repository.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rateLimit = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.ProductOffer = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalog = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
+exports.rateLimit = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.ProductOffer = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalog = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
 // tslint:disable:max-classes-per-file completed-docs
 /**
  * リポジトリ
@@ -11,6 +11,7 @@ const accountTitle_1 = require("./repo/accountTitle");
 const accountTransaction_1 = require("./repo/accountTransaction");
 const action_1 = require("./repo/action");
 const additionalProperty_1 = require("./repo/additionalProperty");
+const aggregateOffer_1 = require("./repo/aggregateOffer");
 const aggregation_1 = require("./repo/aggregation");
 const assetTransaction_1 = require("./repo/assetTransaction");
 const categoryCode_1 = require("./repo/categoryCode");
@@ -81,6 +82,9 @@ exports.Action = Action;
 class AdditionalProperty extends additionalProperty_1.MongoRepository {
 }
 exports.AdditionalProperty = AdditionalProperty;
+class AggregateOffer extends aggregateOffer_1.MongoRepository {
+}
+exports.AggregateOffer = AggregateOffer;
 class Aggregation extends aggregation_1.MongoRepository {
 }
 exports.Aggregation = Aggregation;

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -180,7 +180,8 @@ function findOffers(params) {
                     const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                         offerCatalog: { id: eventService.hasOfferCatalog.id },
                         excludeAppliesToMovieTicket: false,
-                        sort: false // ソート不要(2023-01-27~)
+                        useOffersAsPrimaryForcible: false
+                        // sort: false // ソート不要(2023-01-27~) // 完全廃止(2023-09-04~)
                     });
                     availableOffers = findOffersByOfferCatalogIdResult.offers;
                 }

package/lib/chevre/service/aggregation/event/aggregateUseActionsOnEvent.js

@@ -105,7 +105,8 @@ function findOffers(params) {
                     const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                         offerCatalog: { id: eventService.hasOfferCatalog.id },
                         excludeAppliesToMovieTicket: false,
-                        sort: false // ソート不要(2023-01-27~)
+                        useOffersAsPrimaryForcible: false
+                        // sort: false // ソート不要(2023-01-27~) // 完全廃止(2023-09-04~)
                     });
                     availableOffers = findOffersByOfferCatalogIdResult.offers;
                 }

package/lib/chevre/service/assetTransaction/pay/account/validation.js

@@ -15,9 +15,9 @@ function validateAccount(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         // 引き出し口座の存在を確認する
-        const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
+        const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
+            throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         const accountNumber = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.accountId;
         if (typeof accountNumber !== 'string') {

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

@@ -8,16 +8,16 @@ 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)
         : '';
     const paymentMethodType = (params.paymentService !== undefined)
         // FaceToFace以外は、プロダクトから決済方法タイプを自動取得
         ? (_a = params.paymentService.serviceType) === null || _a === void 0 ? void 0 : _a.codeValue
-        : (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.typeOf;
+        : (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
     if (typeof paymentMethodType !== 'string') {
-        throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
+        throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
     }
     let totalPaymentDue;
     switch (params.paymentServiceType) {
@@ -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,22 +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, typeOf: 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 }
+        amount: (settings_1.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT) ? paymentMethodAmount : params.amount, 
+        // paymentMethodId: params.transactionNumber, // object.paymentMethodIdへ完全移行(2023-08-30~)
+        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 = {
         // パラメータから必要なもののみ取り込む
@@ -105,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/pay/potentialActions.js

@@ -33,9 +33,9 @@ function createPayObject(params) {
     var _a;
     const transaction = params.transaction;
     const paymentMethod = transaction.object.paymentMethod;
-    const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf);
+    const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.identifier);
     const additionalProperty = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.additionalProperty;
-    const paymentMethodId = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.paymentMethodId) === 'string') ? paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.paymentMethodId : transaction.id;
+    const paymentMethodId = transaction.object.paymentMethodId;
     const paymentMethodName = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.name) === 'string') ? paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.name : paymentMethodType;
     // MonetaryAmount対応(2023-08-13~)
     const paymentMethodAmountValue = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.amount) === 'number')
@@ -139,7 +139,7 @@ function createPayObjectServiceOutput(params) {
             // }
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
-            const paymentMethodType = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf;
+            const paymentMethodType = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.identifier;
             const movieTickets = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets;
             if (Array.isArray(movieTickets)) {
                 paymentServiceOutput = movieTickets.map((movieTicket) => {