@chevre/domain 21.33.0-alpha.8 → 21.33.0-alpha.9

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

@@ -23,7 +23,8 @@ const schemaDefinition = {
     tasksExportAction: mongoose_1.SchemaTypes.Mixed,
     tasksExportedAt: Date,
     tasksExportationStatus: String,
-    potentialActions: mongoose_1.SchemaTypes.Mixed
+    potentialActions: mongoose_1.SchemaTypes.Mixed,
+    instrument: mongoose_1.SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

package/lib/chevre/repo/transaction.js

@@ -260,11 +260,9 @@ class MongoRepository {
                 };
             }
             else if (typeOf === factory.transactionType.PlaceOrder) {
-                const { agent, project, object, seller } = params;
-                creatingTransaction = {
-                    status, startDate, expires, typeOf, tasksExportAction, tasksExportationStatus,
-                    agent, project, seller, object
-                };
+                const { agent, project, object, seller, instrument } = params;
+                creatingTransaction = Object.assign({ status, startDate, expires, typeOf, tasksExportAction, tasksExportationStatus,
+                    agent, project, seller, object }, (typeof (instrument === null || instrument === void 0 ? void 0 : instrument.id) === 'string') ? { instrument } : undefined);
             }
             else if (typeOf === factory.transactionType.ReturnOrder) {
                 const { agent, project, object, seller } = params;

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

@@ -118,12 +118,16 @@ function validateCreateRequest(params) {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
-        }, ['agent', 'expires', 'project', 'seller', 'typeOf', 'object']);
+        }, ['agent', 'expires', 'project', 'seller', 'typeOf', 'instrument']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
         // クライアント検証(2024-02-07~)
-        if (((_a = transaction.object.clientUser) === null || _a === void 0 ? void 0 : _a.client_id) !== params.store.id) {
+        // if (transaction.object.clientUser?.client_id !== params.store.id) {
+        //     throw new factory.errors.Forbidden('client not match that of the transaction');
+        // }
+        const instrumentId = (_a = transaction.instrument) === null || _a === void 0 ? void 0 : _a.id;
+        if (typeof instrumentId === 'string' && instrumentId !== params.store.id) {
             throw new factory.errors.Forbidden('client not match that of the transaction');
         }
         if (typeof ((_b = params.object.reservationFor) === null || _b === void 0 ? void 0 : _b.id) !== 'string' || params.object.reservationFor.id.length === 0) {

package/lib/chevre/service/offer/event/voidTransactionByActionId.js

@@ -19,21 +19,6 @@ const processVoidTransaction4coa_1 = require("./voidTransaction/processVoidTrans
  * 特定の承認アクションについて処理する
  */
 function voidTransactionByActionId(params) {
-    // export function cancel(params: {
-    //     project: { id: string; typeOf: factory.organizationType.Project };
-    //     /**
-    //      * 承認アクションID
-    //      */
-    //     id: string;
-    //     /**
-    //      * 取引進行者
-    //      */
-    //     agent: { id: string };
-    //     /**
-    //      * 取引
-    //      */
-    //     transaction: { id: string };
-    // }) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         if (typeof params.id !== 'string' || params.id === '') {
@@ -43,10 +28,11 @@ function voidTransactionByActionId(params) {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
-        }, ['typeOf', 'object']);
+        }, ['typeOf']);
         // if (transaction.agent.id !== params.agent.id) {
         //     throw new factory.errors.Forbidden('Transaction not yours');
         // }
+        const orderNumber = yield repos.transaction.findInProgressOrderNumberById({ id: params.purpose.id });
         const action = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
         if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
             throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
@@ -56,7 +42,8 @@ function voidTransactionByActionId(params) {
         yield repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id, cancelAction });
         // add orderInTransaction(2024-01-15~)
         // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
-        const orderNumberByTransaction = transaction.object.orderNumber;
+        // const orderNumberByTransaction = transaction.object.orderNumber;
+        const orderNumberByTransaction = orderNumber; // transaction.objectへのアクセス回避(2024-05-30~)
         if (typeof orderNumberByTransaction === 'string') {
             yield (0, any_1.voidAcceptedOffer)({
                 // authorizeActions: [action],

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

@@ -26,12 +26,16 @@ function authorize(params) {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
-        }, ['agent', 'project', 'seller', 'typeOf', 'object']);
+        }, ['agent', 'project', 'seller', 'typeOf', 'instrument']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
         // クライアント検証(2024-02-07~)
-        if (((_a = transaction.object.clientUser) === null || _a === void 0 ? void 0 : _a.client_id) !== params.store.id) {
+        // if (transaction.object.clientUser?.client_id !== params.store.id) {
+        //     throw new factory.errors.Forbidden('client not match that of the transaction');
+        // }
+        const instrumentId = (_a = transaction.instrument) === null || _a === void 0 ? void 0 : _a.id;
+        if (typeof instrumentId === 'string' && instrumentId !== params.store.id) {
             throw new factory.errors.Forbidden('client not match that of the transaction');
         }
         let screeningEvent;

package/lib/chevre/service/offer/eventServiceByCOA/cancel.js

@@ -25,10 +25,11 @@ function cancel(params) {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
-        }, ['typeOf', 'object', 'agent']);
+        }, ['typeOf', 'agent']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
+        const orderNumber = yield repos.transaction.findInProgressOrderNumberById({ id: params.transaction.id });
         // 取引内のアクションかどうか確認
         const action = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
         if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
@@ -37,7 +38,8 @@ function cancel(params) {
         yield repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id, cancelAction });
         // add orderInTransaction(2024-01-15~)
         // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
-        const orderNumberByTransaction = transaction.object.orderNumber;
+        // const orderNumberByTransaction = transaction.object.orderNumber;
+        const orderNumberByTransaction = orderNumber; // transaction.objectへのアクセス回避(2024-05-30~)
         if (typeof orderNumberByTransaction === 'string') {
             yield (0, any_1.voidAcceptedOffer)({
                 // authorizeActions: [action],

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -26,10 +26,15 @@ function changeOffers(params) {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
-        }, ['typeOf', 'object', 'agent', 'project', 'seller']);
+        }, ['typeOf', 'agent', 'project', 'seller']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
+        const orderNumber = yield repos.transaction.findInProgressOrderNumberById({ id: params.transaction.id });
+        if (typeof orderNumber !== 'string') {
+            // 事前に発行されているはず
+            throw new factory.errors.NotFound('transaction.object.orderNumber');
+        }
         // 取引内のアクションかどうか確認
         const authorizeAction = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
         if (authorizeAction.purpose.typeOf !== transaction.typeOf || authorizeAction.purpose.id !== transaction.id) {
@@ -97,7 +102,8 @@ function changeOffers(params) {
         yield repos.action.reStart({ id: authorizeAction.id });
         try {
             // まずvoidAcceptedOffer
-            const orderNumberByTransaction = transaction.object.orderNumber;
+            // const orderNumberByTransaction = transaction.object.orderNumber;
+            const orderNumberByTransaction = orderNumber; // transaction.objectへのアクセス回避(2024-05-30~)
             if (typeof orderNumberByTransaction === 'string') {
                 yield (0, any_1.voidAcceptedOffer)({
                     // authorizeActions: [authorizeAction],

package/lib/chevre/service/payment/any/factory.d.ts

@@ -14,9 +14,15 @@ export declare function creatPayTransactionStartParams(params: {
     accountId?: string;
     object: factory.action.authorize.paymentMethod.any.IObject;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
-    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller' | 'project' | 'object'>;
+    transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller' | 'project'>;
     transactionNumber: string;
     location?: factory.action.trade.pay.ILocation;
+    order: {
+        /**
+         * 決済カード決済承認の場合、事前発行済の確認番号を決済取引へ連携
+         */
+        confirmationNumber?: string;
+    };
 }): factory.assetTransaction.pay.IStartParamsWithoutDetail;
 export declare function createMovieTicket(params: factory.action.trade.pay.IMovieTicket): factory.action.trade.pay.IMovieTicket;
 export declare function createAuthorizeResult(params: {

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

@@ -17,7 +17,8 @@ function creatPayTransactionStartParams(params) {
                 .toDate();
         }
     }
-    const confirmationNumber = params.transaction.object.confirmationNumber;
+    // const confirmationNumber = params.transaction.object.confirmationNumber;
+    const confirmationNumber = params.order.confirmationNumber; // transaction.objectへのアクセス回避(2024-05-30~)
     const issuedThroughId = (_a = params.object.issuedThrough) === null || _a === void 0 ? void 0 : _a.id;
     const accountId = (typeof params.accountId === 'string')
         ? params.accountId

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

@@ -228,7 +228,7 @@ function publishPaymentUrl(params) {
             throw new factory.errors.NotImplemented(`purpose.typeOf '${params.purpose.typeOf} not implemented'`);
         }
         try {
-            const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['expires', 'seller', 'project', 'object']);
+            const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['expires', 'seller', 'project']);
             const paymentServiceType = params.paymentServiceType;
             // 取引番号生成
             const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({
@@ -242,7 +242,8 @@ function publishPaymentUrl(params) {
                 paymentServiceType,
                 transaction: transaction,
                 transactionNumber: transactionNumber,
-                location: params.location
+                location: params.location,
+                order: {}
             });
             const taskId = (_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id;
             result = yield PayTransactionService.publishPaymentUrl(startParams, {
@@ -294,8 +295,9 @@ function authorize(params) {
             throw new factory.errors.NotImplemented(`purpose.typeOf '${params.purpose.typeOf} not implemented'`);
         }
         // MovieTicketの場合、確認番号を発行(着券に連携するため)(2024-05-27~)
+        let confirmationNumber;
         if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket) {
-            yield (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
+            confirmationNumber = yield (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
                 id: params.purpose.id,
                 status: { $in: [factory.transactionStatusType.InProgress] },
                 object: { orderDate: new Date() }
@@ -304,7 +306,7 @@ function authorize(params) {
                 transaction: repos.transaction
             });
         }
-        const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['agent', 'expires', 'object', 'typeOf', 'project', 'seller']);
+        const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['agent', 'expires', 'typeOf', 'project', 'seller']);
         const paymentServiceType = params.paymentServiceType;
         // 取引番号生成
         let transactionNumber;
@@ -386,7 +388,8 @@ function authorize(params) {
                 paymentServiceType,
                 transaction: transaction,
                 transactionNumber: transactionNumber,
-                location: params.location
+                location: params.location,
+                order: Object.assign({}, (typeof confirmationNumber === 'string') ? { confirmationNumber } : undefined)
             });
             payTransaction = yield PayTransactionService.start(startParams, Object.assign({ useCheckMovieTicketBeforePay: params.options.useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet, executor: (typeof taskId === 'string') ? { id: taskId } : {} }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined))(repos);
         }

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

@@ -5,9 +5,11 @@ const factory = require("../../../factory");
 function createStartParams(params, expiresInSeconds, passport, seller, broker, customerType, memeberOfPayload) {
     var _a, _b, _c, _d, _e;
     let clientUser;
+    let instrument;
     if (typeof ((_a = params.object.clientUser) === null || _a === void 0 ? void 0 : _a.client_id) === 'string') {
         const { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ } = params.object.clientUser;
         clientUser = { sub, token_use, iss, exp, iat, version, jti, client_id, username, aud, typ };
+        instrument = { id: client_id, typeOf: factory.creativeWorkType.WebApplication };
     }
     const transactionObject = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (typeof ((_b = params.object.passport) === null || _b === void 0 ? void 0 : _b.token) === 'string') ? { passportToken: params.object.passport.token } : undefined), (typeof (passport === null || passport === void 0 ? void 0 : passport.scope) === 'string') ? { passport } : undefined), (typeof (clientUser === null || clientUser === void 0 ? void 0 : clientUser.client_id) === 'string') ? { clientUser } : undefined), (typeof ((_c = params.object) === null || _c === void 0 ? void 0 : _c.name) === 'string') ? { name: (_d = params.object) === null || _d === void 0 ? void 0 : _d.name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker: broker } : undefined), (typeof ((_e = params.object.customer) === null || _e === void 0 ? void 0 : _e.typeOf) === 'string') ? { customer: params.object.customer } : undefined), (typeof customerType === 'string') ? { customerType } : undefined);
     if (typeof seller.id !== 'string') {
@@ -17,18 +19,11 @@ function createStartParams(params, expiresInSeconds, passport, seller, broker, c
         throw new factory.errors.ArgumentNull('expiresInSeconds');
     }
     const agent = Object.assign(Object.assign({}, params.agent), (memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined);
-    return {
-        project: { typeOf: seller.project.typeOf, id: seller.project.id },
-        typeOf: factory.transactionType.PlaceOrder,
-        agent,
-        seller: {
+    return Object.assign({ project: { typeOf: seller.project.typeOf, id: seller.project.id }, typeOf: factory.transactionType.PlaceOrder, agent, seller: {
             id: seller.id,
             name: seller.name,
             typeOf: seller.typeOf,
             additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : [] // 追加特性を追加(2023-08-08~)
-        },
-        object: transactionObject,
-        expiresInSeconds
-    };
+        }, object: transactionObject, expiresInSeconds }, (typeof (instrument === null || instrument === void 0 ? void 0 : instrument.id) === 'string') ? { instrument } : undefined);
 }
 exports.createStartParams = createStartParams;

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.372.0",
+    "@chevre/factory": "4.373.0",
     "@cinerino/sdk": "7.0.0-alpha.12",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.33.0-alpha.8"
+  "version": "21.33.0-alpha.9"
 }