@chevre/domain 23.2.0-alpha.2 → 23.2.0-alpha.3

package/example/src/chevre/actions/checkAuthorizePaymentActions.ts

@@ -0,0 +1,55 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+// 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': { $exists: true, $eq: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment },
+            startDate: {
+                $gte: moment()
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(-7, 'days')
+                    .toDate()
+            }
+        },
+        {
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    let expectdCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const authorizeAction = <chevre.factory.action.authorize.paymentMethod.any.IAction>doc.toObject();
+
+        const isExpected = authorizeAction.object.paymentMethodId === authorizeAction.instrument.transactionNumber;
+        if (isExpected) {
+            console.log(
+                authorizeAction.object.paymentMethodId,
+                ' expected.',
+                authorizeAction.project.id, authorizeAction.typeOf, authorizeAction.object.typeOf,
+                authorizeAction.startDate, authorizeAction.identifier, i
+            );
+            expectdCount += 1;
+        } else {
+            throw new Error(`not expected ${authorizeAction.object.paymentMethodId} ${authorizeAction.instrument.transactionNumber} ${authorizeAction.project.id}`);
+        }
+    });
+
+    console.log(i, 'docs checked');
+    console.log(expectdCount, 'expectd');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/repo/acceptedPaymentMethod.js

@@ -31,45 +31,49 @@ class AcceptedPaymentMethodRepo {
         this.acceptedPaymentMethodModel = connection.model(acceptedPaymentMethod_1.modelName, (0, acceptedPaymentMethod_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         const andConditions = [];
         const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
         if (typeof idEq === 'string') {
             andConditions.push({ _id: { $eq: idEq } });
         }
-        const projectIdEq = (_c = (_b = params.project) === null || _b === void 0 ? void 0 : _b.id) === null || _c === void 0 ? void 0 : _c.$eq;
+        const idIn = (_b = params.id) === null || _b === void 0 ? void 0 : _b.$in;
+        if (Array.isArray(idIn)) {
+            andConditions.push({ _id: { $in: idIn } });
+        }
+        const projectIdEq = (_d = (_c = params.project) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
-        const identifierEq = (_d = params.identifier) === null || _d === void 0 ? void 0 : _d.$eq;
+        const identifierEq = (_e = params.identifier) === null || _e === void 0 ? void 0 : _e.$eq;
         if (typeof identifierEq === 'string') {
             andConditions.push({ identifier: { $eq: identifierEq } });
         }
-        const identifierIn = (_e = params.identifier) === null || _e === void 0 ? void 0 : _e.$in;
+        const identifierIn = (_f = params.identifier) === null || _f === void 0 ? void 0 : _f.$in;
         if (Array.isArray(identifierIn)) {
             andConditions.push({ identifier: { $in: identifierIn } });
         }
-        const itemOfferedIdEq = (_g = (_f = params.itemOffered) === null || _f === void 0 ? void 0 : _f.id) === null || _g === void 0 ? void 0 : _g.$eq;
+        const itemOfferedIdEq = (_h = (_g = params.itemOffered) === null || _g === void 0 ? void 0 : _g.id) === null || _h === void 0 ? void 0 : _h.$eq;
         if (typeof itemOfferedIdEq === 'string') {
             andConditions.push({ 'itemOffered.id': { $eq: itemOfferedIdEq } });
         }
-        const itemOfferedIdIn = (_j = (_h = params.itemOffered) === null || _h === void 0 ? void 0 : _h.id) === null || _j === void 0 ? void 0 : _j.$in;
+        const itemOfferedIdIn = (_k = (_j = params.itemOffered) === null || _j === void 0 ? void 0 : _j.id) === null || _k === void 0 ? void 0 : _k.$in;
         if (Array.isArray(itemOfferedIdIn)) {
             andConditions.push({ 'itemOffered.id': { $in: itemOfferedIdIn } });
         }
-        const acceptedPaymentMethodIdEq = (_l = (_k = params.acceptedPaymentMethod) === null || _k === void 0 ? void 0 : _k.id) === null || _l === void 0 ? void 0 : _l.$eq;
+        const acceptedPaymentMethodIdEq = (_m = (_l = params.acceptedPaymentMethod) === null || _l === void 0 ? void 0 : _l.id) === null || _m === void 0 ? void 0 : _m.$eq;
         if (typeof acceptedPaymentMethodIdEq === 'string') {
             andConditions.push({ 'acceptedPaymentMethod.id': { $eq: acceptedPaymentMethodIdEq } });
         }
-        const sellerByIdEq = (_o = (_m = params.seller) === null || _m === void 0 ? void 0 : _m.id) === null || _o === void 0 ? void 0 : _o.$eq;
+        const sellerByIdEq = (_p = (_o = params.seller) === null || _o === void 0 ? void 0 : _o.id) === null || _p === void 0 ? void 0 : _p.$eq;
         if (typeof sellerByIdEq === 'string') {
             andConditions.push({ 'seller.id': { $eq: sellerByIdEq } });
         }
-        const validFromLte = (_p = params.validFrom) === null || _p === void 0 ? void 0 : _p.$lte;
+        const validFromLte = (_q = params.validFrom) === null || _q === void 0 ? void 0 : _q.$lte;
         if (validFromLte instanceof Date) {
             andConditions.push({ validFrom: { $lte: validFromLte } });
         }
-        const validThroughGte = (_q = params.validThrough) === null || _q === void 0 ? void 0 : _q.$gte;
+        const validThroughGte = (_r = params.validThrough) === null || _r === void 0 ? void 0 : _r.$gte;
         if (validThroughGte instanceof Date) {
             andConditions.push({ validThrough: { $gte: validThroughGte } });
         }

package/lib/chevre/service/assetTransaction/pay/validateAcceptedPaymentMethodIfNeeded.d.ts

@@ -1,16 +1,21 @@
 import * as factory from '../../../factory';
+import type { AcceptedPaymentMethodRepo } from '../../../repo/acceptedPaymentMethod';
 import type { EventRepo } from '../../../repo/event';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
 /**
  * 必要あらば関連リソースの対応決済方法を検証する
  */
-export declare function validateAcceptedPaymentMethodIfNeeded(params: Pick<factory.assetTransaction.pay.IStartParamsWithoutDetail, 'object'> | {
+export declare function validateAcceptedPaymentMethodIfNeeded(params: Pick<factory.assetTransaction.pay.IStartParamsWithoutDetail, 'object'> & {
+    instrument: factory.action.trade.pay.IPlaceOrderRelatedInstrument[];
+} | {
     object: factory.action.accept.pay.IPayObject & {
         paymentMethod: factory.action.accept.pay.IPaymentMethod & {
             movieTickets: never;
         };
     };
+    instrument: factory.action.accept.pay.IInstrument[];
 }): (repos: {
+    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;
 }) => Promise<void>;

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

@@ -19,14 +19,18 @@ const debug = createDebug('chevre-domain:service:assetTransaction:pay');
 /**
  * 必要あらば関連リソースの対応決済方法を検証する
  */
+// tslint:disable-next-line:max-func-body-length
 function validateAcceptedPaymentMethodIfNeeded(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
+        const now = new Date();
         /**
          * 検証対象のイベントIDリスト
          */
         let checkingEventIds;
         const paymentServiceType = params.object.typeOf;
+        const paymentServiceId = params.object.id;
         // CreditCard or MovieTicket?
         if (paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
             // クレジットカードIF決済の場合、objectに注文アイテム指定があればそちらで検証する
@@ -77,10 +81,28 @@ function validateAcceptedPaymentMethodIfNeeded(params) {
                 }
                 if (((_b = eventSeries.offers) === null || _b === void 0 ? void 0 : _b.typeOf) === factory.offerType.AggregateOffer) {
                     // 対応決済方法オファーIDの指定が必要
-                    throw new factory.errors.ArgumentNull('acceptedPaymentMethodOfferId');
-                    // if (paymentAccepted !== true) {
-                    //     throw new factory.errors.Argument('recipient', `payment not accepted [${paymentMethodType}]`);
-                    // }
+                    const acceptedPaymentMethodOfferIds = [];
+                    params.instrument.forEach((instrument) => {
+                        if (instrument.typeOf === factory.offerType.Offer) {
+                            acceptedPaymentMethodOfferIds.push(instrument.id);
+                        }
+                    });
+                    if (acceptedPaymentMethodOfferIds.length === 0) {
+                        throw new factory.errors.ArgumentNull('acceptedPaymentMethodOfferIds');
+                    }
+                    // 全施設コンテンツについて有効な対応決済方法オファーの存在を検証
+                    const validAcceptedPaymentMethodOffer = (yield repos.acceptedPaymentMethod.findAcceptedPaymentMethods({
+                        limit: 1,
+                        page: 1,
+                        id: { $in: acceptedPaymentMethodOfferIds }, // 指定されたIDで
+                        itemOffered: { id: { $eq: eventSeriesId } }, // リソースに対して
+                        acceptedPaymentMethod: { id: { $eq: paymentServiceId } }, // 決済方法を許可
+                        validFrom: { $lte: now }, // 現在有効
+                        validThrough: { $gte: now } // 現在有効
+                    }, ['identifier'])).shift();
+                    if (validAcceptedPaymentMethodOffer === undefined) {
+                        throw new factory.errors.NotFound(factory.offerType.Offer, `payment not accepted. eventSeriesId: ${eventSeriesId}`);
+                    }
                 }
                 else {
                     // 集約オファーでなければ検証の必要なし

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -5,6 +5,7 @@ import * as GMO from '@motionpicture/gmo-service';
 import * as factory from '../../factory';
 import { Settings } from '../../settings';
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
+import type { AcceptedPaymentMethodRepo } from '../../repo/acceptedPaymentMethod';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -21,6 +22,7 @@ import type { TaskRepo } from '../../repo/task';
 import * as CreditCardPayment from '../payment/creditCard';
 import * as MovieTicketPayment from '../payment/movieTicket';
 export interface IStartOperationRepos {
+    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     credentials: CredentialsRepo;
@@ -62,6 +64,7 @@ export type ICheckOperation<T> = (repos: {
     paymentServiceProvider: PaymentServiceProviderRepo;
 }, settings: Settings) => Promise<T>;
 export type IPublishPaymentUrlOperation<T> = (repos: {
+    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     action: ActionRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;

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

@@ -16,6 +16,7 @@ export declare function creatPublishPaymentUrlParams(params: {
      * 決済採用に使用される決済方法チケットトークン
      */
     ticketToken?: string;
+    instrument: factory.action.trade.pay.IAcceptedPaymentMethodOfferAsInstrument[];
 }): Pick<factory.assetTransaction.pay.IStartParamsWithoutDetail, 'agent' | 'location' | 'project' | 'recipient' | 'transactionNumber' | 'typeOf'> & {
     object: factory.action.accept.pay.IPayObject;
     identifier?: string;

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

@@ -28,7 +28,15 @@ function creatPublishPaymentUrlParams(params) {
             referencesOrder: params.object.referencesOrder
         }
     };
+    const instrument = [];
     const ticketAsInstrument = (typeof params.ticketToken === 'string') ? { ticketToken: params.ticketToken, typeOf: 'Ticket' } : undefined;
+    if (ticketAsInstrument !== undefined) {
+        instrument.push(ticketAsInstrument);
+    }
+    // instrumentを対応決済方法オファーに対応(2025-12-14~)
+    if (Array.isArray(params.instrument)) {
+        instrument.push(...params.instrument);
+    }
     return Object.assign(Object.assign(Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
             typeOf: params.transaction.seller.typeOf,
             id: params.transaction.seller.id,
@@ -43,7 +51,7 @@ function creatPublishPaymentUrlParams(params) {
             typeOf: params.transaction.seller.typeOf
         }, object }, (typeof ((_d = params.location) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
         ? { location: params.location }
-        : undefined), { instrument: (ticketAsInstrument !== undefined) ? [ticketAsInstrument] : [] }), (typeof params.identifier === 'string')
+        : undefined), { instrument }), (typeof params.identifier === 'string')
         ? { identifier: params.identifier }
         : undefined);
 }

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

@@ -1,5 +1,6 @@
 import * as factory from '../../factory';
 import { Settings } from '../../settings';
+import type { AcceptedPaymentMethodRepo } from '../../repo/acceptedPaymentMethod';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo, IMinimizedPurchaseNumberAuthResult } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -79,6 +80,7 @@ declare function processVoidPayTransaction(params: factory.task.IData<factory.ta
     transaction: TransactionRepo;
 }) => Promise<void>;
 interface IAuthorizeRepos {
+    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
@@ -101,6 +103,7 @@ interface IAuthorizeRepos {
 }
 type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings) => Promise<T>;
 interface IPublishPaymentUrlRepos {
+    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
@@ -143,6 +146,7 @@ declare function publishPaymentUrl(params: {
      * add identifier for an unique index(2025-02-25~)
      */
     identifier?: string;
+    instrument: factory.action.trade.pay.IAcceptedPaymentMethodOfferAsInstrument[];
 }): IPublishPaymentUrlOperation<Pick<PayTransactionService.IPublishPaymentUrlResult, 'paymentMethodId' | 'paymentUrl'>>;
 /**
  * 決済承認

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

@@ -366,7 +366,7 @@ function publishPaymentUrl(params) {
                 referencesOrder: (((_a = params.object.referencesOrder) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.order.OrderType.Order)
                     ? params.object.referencesOrder
                     : { typeOf: factory.order.OrderType.Order } });
-            const startParams = (0, factory_1.creatPublishPaymentUrlParams)(Object.assign(Object.assign({ object: authorizeObject, paymentServiceType, transaction: transaction, transactionNumber: transactionNumber, location: params.location }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined), (typeof ticketToken === 'string') ? { ticketToken } : undefined));
+            const startParams = (0, factory_1.creatPublishPaymentUrlParams)(Object.assign(Object.assign({ object: authorizeObject, paymentServiceType, transaction: transaction, transactionNumber: transactionNumber, location: params.location, instrument: params.instrument }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined), (typeof ticketToken === 'string') ? { ticketToken } : undefined));
             const taskId = (_b = params.sameAs) === null || _b === void 0 ? void 0 : _b.id;
             result = yield PayTransactionService.publishPaymentUrl(startParams, {
                 purposeAsTransaction: { id: transaction.id },

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

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory = require("../../factory");
+const acceptedPaymentMethod_1 = require("../../repo/acceptedPaymentMethod");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
@@ -54,6 +55,7 @@ function call(params) {
         try {
             yield (0, any_1.authorize)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
              }))({
+                acceptedPaymentMethod: new acceptedPaymentMethod_1.AcceptedPaymentMethodRepo(connection),
                 accountingReport: new accountingReport_1.AccountingReportRepo(connection),
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),

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

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory = require("../../factory");
+const acceptedPaymentMethod_1 = require("../../repo/acceptedPaymentMethod");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
@@ -41,7 +42,8 @@ function call(params) {
         const actionRepo = new action_1.ActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
-            yield (0, any_1.publishPaymentUrl)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }))({
+            yield (0, any_1.publishPaymentUrl)(Object.assign(Object.assign({}, params.data), { instrument: (Array.isArray(params.data.instrument)) ? params.data.instrument : [], sameAs: { id: params.id } }))({
+                acceptedPaymentMethod: new acceptedPaymentMethod_1.AcceptedPaymentMethodRepo(connection),
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 authorization: new authorization_1.AuthorizationRepo(connection),

package/lib/chevre/service/transaction/placeOrder/confirm/validation/factory.d.ts

@@ -3,7 +3,7 @@ export type IAcceptPayAction = Pick<factory.action.accept.pay.IAction, 'object'
 export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction;
 export type IAuthorizeProductOffer = factory.action.authorize.offer.product.IAction;
 export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyTransfer.IAction;
-export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'result' | 'endDate' | 'instrument'> & {
-    object: Pick<factory.action.authorize.paymentMethod.any.IObject, 'typeOf'>;
+export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'result' | 'endDate'> & {
+    object: Pick<factory.action.authorize.paymentMethod.any.IObject, 'typeOf' | 'paymentMethodId'>;
 };
 export type IPayTransaction = Pick<factory.assetTransaction.pay.ITransaction, 'object'>;

package/lib/chevre/service/transaction/placeOrder/confirm/validation.js

@@ -47,7 +47,9 @@ function validateTransaction(transaction, acceptPayActions, authorizePaymentActi
                 // authorizeMovieTicketActions.forEach((a) => {
                 //     authorizedMovieTickets.push(...(Array.isArray(a.object.movieTickets)) ? a.object.movieTickets : []);
                 // });
-                const payTransactionNumbers = authorizeMovieTicketActions.map(({ instrument }) => instrument.transactionNumber);
+                // 決済承認アクションのinstrument依存をobject依存へ変更(2025-12-14~)
+                const payTransactionNumbers = authorizeMovieTicketActions.map((authorizeAction) => authorizeAction.object.paymentMethodId);
+                // const payTransactionNumbers = authorizeMovieTicketActions.map(({ instrument }) => instrument.transactionNumber);
                 payTransactions.filter(({ object }) => payTransactionNumbers.includes(object.paymentMethodId))
                     .forEach(({ object }) => {
                     if (Array.isArray(object.paymentMethod.movieTickets)) {

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -106,7 +106,9 @@ function confirm(params, options) {
             .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         // authorizePaymentActionsからpayTransactionsを参照(2024-06-20~)
         let payTransactions = [];
-        const payTransactionNumbers = authorizePaymentActions.map(({ instrument }) => instrument.transactionNumber);
+        // 決済承認アクションのinstrument依存をobject依存へ変更(2025-12-14~)
+        const payTransactionNumbers = authorizePaymentActions.map((authorizeAction) => authorizeAction.object.paymentMethodId);
+        // const payTransactionNumbers = authorizePaymentActions.map(({ instrument }) => instrument.transactionNumber);
         if (payTransactionNumbers.length > 0) {
             payTransactions = yield repos.assetTransaction.search({
                 typeOf: factory.assetTransactionType.Pay,

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.4.0-alpha.5",
+    "@chevre/factory": "5.4.0-alpha.7",
     "@cinerino/sdk": "12.12.1",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.2.0-alpha.2"
+  "version": "23.2.0-alpha.3"
 }