@chevre/domain 23.0.0-alpha.29 → 23.0.0-alpha.30

package/example/src/chevre/event/migrateEventAdditionalProperty2identifier.ts

@@ -1,5 +1,6 @@
 // tslint:disable:no-console no-magic-numbers
 import { webcrypto } from 'crypto';
+// import * as moment from 'moment';
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../../lib/index';
@@ -43,6 +44,10 @@ async function main() {
         {
             // _id: { $eq: '68f5d32176b5f6b689ff24a6' },
             // 'project.id': { $eq: project.id },
+            // startDate: {
+            //     $lte: moment('2025-05-01T10:00:00Z')
+            //         .toDate()
+            // },
             'additionalProperty.name': { $exists: true, $eq: PROPERTY_NAME }
         },
         {

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

@@ -1,7 +1,7 @@
 import { AnyExpression, Connection, FilterQuery, Types } from 'mongoose';
 import * as factory from '../factory';
 type IUnset = {
-    [key in keyof Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'color' | 'image' | 'paymentMethod'>]?: 1;
+    [key in keyof Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'color' | 'image'>]?: 1;
 };
 export type CategorySetIdentifierExceptMovieTicketType = factory.categoryCode.CategorySetIdentifier;
 export type ICategoryCodeExceptMovieTicketType = Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'codeValue' | 'color' | 'id' | 'image' | 'name' | 'project' | 'typeOf' | 'inCodeSet'>;
@@ -26,7 +26,7 @@ export declare class CategoryCodeRepo {
     /**
      * 区分検索
      */
-    projectCategoryCodeFields(params: Omit<factory.categoryCode.ISearchConditions, 'inCodeSet' | 'paymentMethod'> & {
+    projectCategoryCodeFields(params: Omit<factory.categoryCode.ISearchConditions, 'inCodeSet'> & {
         inCodeSet?: {
             identifier?: {
                 $eq?: CategorySetIdentifierExceptMovieTicketType;

package/lib/chevre/repo/categoryCode.js

@@ -26,7 +26,7 @@ const categoryCode_1 = require("./mongoose/schemas/categoryCode");
 const factory = require("../factory");
 const settings_1 = require("../settings");
 const AVAILABLE_PROJECT_FIELDS = [
-    'additionalProperty', 'codeValue', 'color', 'image', 'inCodeSet', 'name', 'paymentMethod', 'project', 'typeOf'
+    'additionalProperty', 'codeValue', 'color', 'image', 'inCodeSet', 'name', 'project', 'typeOf'
 ];
 /**
  * 区分(決済カード区分を除く)リポジトリ
@@ -174,8 +174,8 @@ class CategoryCodeRepo {
             image: '$image',
             codeValue: '$codeValue',
             inCodeSet: '$inCodeSet',
-            name: '$name',
-            paymentMethod: '$paymentMethod'
+            name: '$name'
+            // paymentMethod: '$paymentMethod' // discontinue(2025-11-08~)
         };
         if (inclusion.length > 0) {
             projectStage = { _id: 0 };

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

@@ -9,20 +9,14 @@ const modelName = 'CategoryCode';
 exports.modelName = modelName;
 const schemaDefinition = {
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    typeOf: {
-        type: String,
-        required: true
-    },
+    typeOf: { type: String, required: true },
     additionalProperty: [mongoose_1.SchemaTypes.Mixed],
     color: String,
     image: String,
-    codeValue: {
-        type: String,
-        required: true
-    },
+    codeValue: { type: String, required: true },
     inCodeSet: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    name: mongoose_1.SchemaTypes.Mixed,
-    paymentMethod: mongoose_1.SchemaTypes.Mixed
+    name: mongoose_1.SchemaTypes.Mixed
+    // paymentMethod: SchemaTypes.Mixed // discontinue(2025-11-08~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -75,15 +69,16 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'paymentMethod.typeOf': 1, codeValue: 1 },
-        {
-            name: 'searchByPaymentMethodTypeOf',
-            partialFilterExpression: {
-                'paymentMethod.typeOf': { $exists: true }
-            }
-        }
-    ],
+    // discontinue(2025-11-08~)
+    // [
+    //     { 'paymentMethod.typeOf': 1, codeValue: 1 },
+    //     {
+    //         name: 'searchByPaymentMethodTypeOf',
+    //         partialFilterExpression: {
+    //             'paymentMethod.typeOf': { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'project.id': 1, codeValue: 1 },
         {

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

@@ -1,11 +1,10 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
-type IMovieTicketType = Pick<factory.movieTicketType.IMovieTicketType, 'codeValue' | 'color' | 'id' | 'image' | 'name' | 'project' | 'typeOf' | 'inCodeSet' | 'paymentMethod'>;
-type IDocType = factory.categoryCode.ICategoryCode;
+type IDocType = factory.movieTicketType.IMovieTicketType;
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "MovieTicketType";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
-export { createSchema, IModel, IMovieTicketType, indexes, modelName };
+export { createSchema, IModel, IDocType, indexes, modelName };

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

@@ -1,17 +1,17 @@
 import { AnyExpression, Connection, FilterQuery } from 'mongoose';
-import { IMovieTicketType } from './mongoose/schemas/movieTicketTypes';
+import { IDocType } from './mongoose/schemas/movieTicketTypes';
 import * as factory from '../factory';
 type IUnset = {
-    [key in keyof Pick<factory.movieTicketType.IMovieTicketType, 'color' | 'image'>]?: 1;
+    [key in keyof Pick<IDocType, 'color' | 'image'>]?: 1;
 };
-type IKeyOfProjection = keyof IMovieTicketType;
+type IKeyOfProjection = keyof IDocType;
 /**
  * 決済カード区分リポジトリ
  */
 export declare class MovieTicketTypeRepo {
     private readonly categoryCodeModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.movieTicketType.ISearchConditions): FilterQuery<IMovieTicketType>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.movieTicketType.ISearchConditions): FilterQuery<IDocType>[];
     static CREATE_AGGREGATE_PROJECTION(inclusion: IKeyOfProjection[]): {
         [field: string]: AnyExpression;
     };
@@ -28,12 +28,12 @@ export declare class MovieTicketTypeRepo {
     /**
      * 空の場合無効
      */
-    inclusion: IKeyOfProjection[]): Promise<(IMovieTicketType & {
+    inclusion: IKeyOfProjection[]): Promise<(IDocType & {
         id: string;
     })[]>;
     saveMovieTicketType(params: {
         id?: string;
-        attributes: IMovieTicketType & {
+        attributes: IDocType & {
             $unset?: IUnset;
         };
     }): Promise<{
@@ -53,7 +53,5 @@ export declare class MovieTicketTypeRepo {
             id: string;
         };
     }): Promise<void>;
-    migrateCollections(connection: Connection): Promise<void>;
-    deleteOldMovieTicketTypes(connection: Connection): Promise<void>;
 }
 export {};

package/lib/chevre/repo/movieTicketType.js

@@ -23,7 +23,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MovieTicketTypeRepo = void 0;
 // tslint:disable-next-line:no-implicit-dependencies
 const mongoose_1 = require("mongoose");
-const categoryCode_1 = require("./mongoose/schemas/categoryCode");
+// import { createSchema, modelName } from './mongoose/schemas/categoryCode';
 const movieTicketTypes_1 = require("./mongoose/schemas/movieTicketTypes");
 const factory = require("../factory");
 const settings_1 = require("../settings");
@@ -139,15 +139,6 @@ class MovieTicketTypeRepo {
                 }
             });
         }
-        // const additionalPropertyElemMatch = params.additionalProperty?.$elemMatch;
-        // if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
-        //     andConditions.push({
-        //         additionalProperty: {
-        //             $exists: true,
-        //             $elemMatch: additionalPropertyElemMatch
-        //         }
-        //     });
-        // }
         return andConditions;
     }
     static CREATE_AGGREGATE_PROJECTION(inclusion) {
@@ -156,7 +147,6 @@ class MovieTicketTypeRepo {
             id: { $toString: '$_id' },
             project: '$project',
             typeOf: '$typeOf',
-            // additionalProperty: '$additionalProperty',
             color: '$color',
             image: '$image',
             codeValue: '$codeValue',
@@ -259,47 +249,5 @@ class MovieTicketTypeRepo {
                 .exec();
         });
     }
-    // tslint:disable-next-line:prefer-function-over-method
-    migrateCollections(connection) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const oldCategoryCodeModel = connection.model(categoryCode_1.modelName, (0, categoryCode_1.createSchema)());
-            const movieTicketTypeModel = connection.model(movieTicketTypes_1.modelName, (0, movieTicketTypes_1.createSchema)());
-            const cursor = oldCategoryCodeModel.find({
-                'inCodeSet.identifier': { $eq: factory.movieTicketType.CategorySetIdentifier.MovieTicketType }
-            })
-                .sort({ codeValue: factory.sortType.Ascending })
-                .cursor();
-            let i = 0;
-            yield cursor.eachAsync((doc) => __awaiter(this, void 0, void 0, function* () {
-                i += 1;
-                const movieTicketType = doc.toObject();
-                const { additionalProperty } = movieTicketType, docWithoutAdditinalProperty = __rest(movieTicketType, ["additionalProperty"]);
-                // tslint:disable-next-line:no-console
-                console.log('upserting...', docWithoutAdditinalProperty, i);
-                const result = yield movieTicketTypeModel.findOneAndReplace({ _id: { $eq: doc._id } }, docWithoutAdditinalProperty, {
-                    upsert: true,
-                    projection: { _id: 1 }
-                })
-                    .exec();
-                // await additionalPropertyRepo.save({ attributes: additionalProperty });
-                // tslint:disable-next-line:no-console
-                console.log('upserted', result, movieTicketType.id, movieTicketType.project.id, movieTicketType.codeValue, i);
-            }));
-            // tslint:disable-next-line:no-console
-            console.log(i, 'docs checked');
-        });
-    }
-    // tslint:disable-next-line:prefer-function-over-method
-    deleteOldMovieTicketTypes(connection) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const oldCategoryCodeModel = connection.model(categoryCode_1.modelName, (0, categoryCode_1.createSchema)());
-            const result = yield oldCategoryCodeModel.deleteMany({
-                'inCodeSet.identifier': { $eq: factory.movieTicketType.CategorySetIdentifier.MovieTicketType }
-            })
-                .exec();
-            // tslint:disable-next-line:no-console
-            console.log(result);
-        });
-    }
 }
 exports.MovieTicketTypeRepo = MovieTicketTypeRepo;

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

@@ -0,0 +1,39 @@
+import * as factory from '../../../../factory';
+import type { ActionRepo } from '../../../../repo/action';
+import type { AuthorizationRepo } from '../../../../repo/authorization';
+import type { TicketRepo } from '../../../../repo/ticket';
+import type { ITransactionInProgress, TransactionRepo } from '../../../../repo/transaction';
+import type { TransactionNumberRepo } from '../../../../repo/transactionNumber';
+import * as PayTransactionService from '../../../assetTransaction/pay';
+import { IPermitOrInvoice } from '../verifyTicketTokenAsNeeded';
+interface IFixTransactionNumberRepos {
+    action: ActionRepo;
+    authorization: AuthorizationRepo;
+    ticket: TicketRepo;
+    transaction: TransactionRepo;
+    transactionNumber: TransactionNumberRepo;
+}
+type IFixTransactionNumberOperation<T> = (repos: IFixTransactionNumberRepos) => Promise<T>;
+type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail & {
+    ticketToken?: string;
+};
+/**
+ * 決済承認時の取引番号を決定する
+ */
+declare function fixTransactionNumber(params: {
+    object: IObjectWithoutDetail;
+    transaction: Pick<ITransactionInProgress<factory.transactionType.PlaceOrder>, 'agent' | 'expires' | 'id' | 'typeOf' | 'project' | 'seller'>;
+    paymentServiceType: factory.service.paymentService.PaymentServiceType;
+}): IFixTransactionNumberOperation<{
+    transactionNumber: string;
+    pendingPaymentAgencyTransaction?: PayTransactionService.IPaymentAgencyTransaction;
+    creditCard?: factory.action.authorize.paymentMethod.any.ICreditCard;
+    permitOrInvoice?: IPermitOrInvoice;
+    id?: never;
+} | {
+    /**
+     * 完了済の決済承認アクションID
+     */
+    id: string;
+}>;
+export { fixTransactionNumber };

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

@@ -0,0 +1,86 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixTransactionNumber = fixTransactionNumber;
+const factory = require("../../../../factory");
+const verifyTicketTokenAsNeeded_1 = require("../verifyTicketTokenAsNeeded");
+const handlePrePublishedPaymentMethodIdOnAuthorizing_1 = require("./handlePrePublishedPaymentMethodIdOnAuthorizing");
+/**
+ * 決済承認時の取引番号を決定する
+ */
+function fixTransactionNumber(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const { paymentServiceType, transaction, object } = params;
+        // 取引番号生成
+        let transactionNumber;
+        let pendingPaymentAgencyTransaction;
+        let creditCard = object.creditCard;
+        // ticketTokenを解釈(2024-08-13~)
+        const { permitOrInvoice } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
+            project: { id: transaction.project.id },
+            object: object,
+            paymentServiceType,
+            purpose: { id: transaction.id }
+        })(repos);
+        /**
+         * ticketTokenによって指定された決済方法ID
+         */
+        let paymentMethodIdByTicketToken;
+        if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === factory.permit.PermitType.Permit) {
+            paymentMethodIdByTicketToken = permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.identifier;
+            if (typeof paymentMethodIdByTicketToken === 'string') {
+                transactionNumber = paymentMethodIdByTicketToken; // メンバーシップ指定の場合、取引番号に適用(2024-08-13~)
+            }
+        }
+        else if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === 'Invoice') {
+            // support paymentServiceType.MovieTicket(2024-11-23~)
+            if (typeof (permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.paymentMethodId) === 'string') {
+                paymentMethodIdByTicketToken = permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.paymentMethodId;
+                if (typeof paymentMethodIdByTicketToken === 'string') {
+                    transactionNumber = paymentMethodIdByTicketToken;
+                }
+            }
+        }
+        // リクエストでpaymentMethodIdを指定された場合、取引に保管されたpaymentMethodIdに一致すればそちらを適用(外部サイト決済対応)
+        if (typeof object.paymentMethodId === 'string' && object.paymentMethodId.length > 0) {
+            if (typeof paymentMethodIdByTicketToken === 'string') {
+                // 指定されたpaymentMethodIdとチケットから読み取った決済方法IDは一致しなければいけない
+                if (paymentMethodIdByTicketToken !== object.paymentMethodId) {
+                    throw new factory.errors.Argument('ticketToken', 'not matched with paymentMethodId');
+                }
+            }
+            const { authorizeParams, existingCompletedAuthorizeAction } = yield (0, handlePrePublishedPaymentMethodIdOnAuthorizing_1.handlePrePublishedPaymentMethodIdOnAuthorizing)({
+                object: object,
+                prePublishedPaymentMethodId: object.paymentMethodId,
+                transaction
+            })(repos);
+            if (existingCompletedAuthorizeAction !== undefined) {
+                return { id: existingCompletedAuthorizeAction.id };
+            }
+            else if (authorizeParams !== undefined) {
+                // creditCardを決済URL発行時の情報で上書き(2024-01-08~)
+                // creditCard = authorizeParams.paymentMethodByTransaction.paymentMethod?.creditCard;
+                creditCard = authorizeParams.creditCard;
+                transactionNumber = object.paymentMethodId;
+                pendingPaymentAgencyTransaction = authorizeParams.pendingPaymentAgencyTransaction;
+            }
+            else {
+                throw new factory.errors.NotImplemented('pendingPaymentAgencyTransaction required on paymentMethodId specified');
+            }
+        }
+        // 取引番号発行済でなければ発行
+        if (typeof transactionNumber !== 'string') {
+            const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+            transactionNumber = publishTransactionNumberResult.transactionNumber;
+        }
+        return Object.assign(Object.assign(Object.assign({ transactionNumber }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined), (creditCard !== undefined) ? { creditCard } : undefined), (permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined);
+    });
+}

package/lib/chevre/service/payment/any/{handlePrePublishedPaymentMethodIdOnAuthorizing.d.ts → authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.d.ts}

@@ -1,7 +1,7 @@
-import * as factory from '../../../factory';
-import type { ActionRepo } from '../../../repo/action';
-import type { ITransactionInProgress, TransactionRepo } from '../../../repo/transaction';
-import * as PayTransactionService from '../../assetTransaction/pay';
+import * as factory from '../../../../factory';
+import type { ActionRepo } from '../../../../repo/action';
+import type { ITransactionInProgress, TransactionRepo } from '../../../../repo/transaction';
+import * as PayTransactionService from '../../../assetTransaction/pay';
 type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail;
 declare function handlePrePublishedPaymentMethodIdOnAuthorizing(params: {
     object: Pick<IObjectWithoutDetail, 'amount' | 'issuedThrough' | 'paymentMethod'>;

package/lib/chevre/service/payment/any/{handlePrePublishedPaymentMethodIdOnAuthorizing.js → authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.js}

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handlePrePublishedPaymentMethodIdOnAuthorizing = handlePrePublishedPaymentMethodIdOnAuthorizing;
 const createDebug = require("debug");
-const factory = require("../../../factory");
+const factory = require("../../../../factory");
 const debug = createDebug('chevre-domain:service:payment');
 function recipe2paymentAgencyTransaction(actionRecipe) {
     var _a;

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

@@ -0,0 +1,25 @@
+import * as factory from '../../../../factory';
+import type { AuthorizationRepo } from '../../../../repo/authorization';
+import type { TicketRepo } from '../../../../repo/ticket';
+import type { ITransactionInProgress } from '../../../../repo/transaction';
+import type { TransactionNumberRepo } from '../../../../repo/transactionNumber';
+interface IFixTransactionNumberRepos {
+    authorization: AuthorizationRepo;
+    ticket: TicketRepo;
+    transactionNumber: TransactionNumberRepo;
+}
+type IFixTransactionNumberOperation<T> = (repos: IFixTransactionNumberRepos) => Promise<T>;
+type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail & {
+    ticketToken?: string;
+};
+/**
+ * 外部決済ロケーション発行時の取引番号を決定する
+ */
+declare function fixTransactionNumberOnPublishPaymentUrl(params: {
+    object: IObjectWithoutDetail;
+    transaction: Pick<ITransactionInProgress<factory.transactionType.PlaceOrder>, 'id' | 'project'>;
+    paymentServiceType: factory.service.paymentService.PaymentServiceType;
+}): IFixTransactionNumberOperation<{
+    transactionNumber: string;
+}>;
+export { fixTransactionNumberOnPublishPaymentUrl };

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

@@ -0,0 +1,51 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixTransactionNumberOnPublishPaymentUrl = fixTransactionNumberOnPublishPaymentUrl;
+const factory = require("../../../../factory");
+const verifyTicketTokenAsNeeded_1 = require("../verifyTicketTokenAsNeeded");
+/**
+ * 外部決済ロケーション発行時の取引番号を決定する
+ */
+function fixTransactionNumberOnPublishPaymentUrl(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const { paymentServiceType, transaction, object } = params;
+        // 取引番号生成
+        let transactionNumber;
+        // support ticketToken(2024-08-21~)
+        const { permitOrInvoice } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
+            project: { id: transaction.project.id },
+            object,
+            paymentServiceType,
+            purpose: { id: transaction.id }
+        })(repos);
+        if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === factory.permit.PermitType.Permit) {
+            const paymentMethodIdByPermit = permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.identifier;
+            if (typeof paymentMethodIdByPermit === 'string') {
+                transactionNumber = paymentMethodIdByPermit;
+            }
+        }
+        else if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === 'Invoice') {
+            // support Invoice ticket(2025-11-09~)
+            if (typeof (permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.paymentMethodId) === 'string') {
+                transactionNumber = permitOrInvoice.paymentMethodId;
+            }
+        }
+        if (typeof transactionNumber !== 'string') {
+            const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+            transactionNumber = publishTransactionNumberResult.transactionNumber;
+        }
+        return {
+            transactionNumber
+            // ...(permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined
+        };
+    });
+}

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

@@ -8,11 +8,11 @@ declare function verifyTicketTokenAsNeeded(params: {
     };
     object: Pick<factory.action.authorize.paymentMethod.any.IObjectWithoutDetail, 'issuedThrough' | 'ticketToken'>;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
-    purpose: factory.action.authorize.paymentMethod.any.IPurpose;
+    purpose: Pick<factory.action.authorize.paymentMethod.any.IPurpose, 'id'>;
 }): (repos: {
     authorization: AuthorizationRepo;
     ticket: TicketRepo;
 }) => Promise<{
     permitOrInvoice?: IPermitOrInvoice;
 }>;
-export { verifyTicketTokenAsNeeded };
+export { IPermitOrInvoice, verifyTicketTokenAsNeeded };

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

@@ -23,14 +23,14 @@ const factory = require("../../factory");
 // import type { TransactionProcessRepo } from '../../repo/transactionProcess';
 const PayTransactionService = require("../assetTransaction/pay");
 const publishOrderNumberIfNotExist_1 = require("../transaction/placeOrder/publishOrderNumberIfNotExist");
+const fixTransactionNumber_1 = require("./any/authorize/fixTransactionNumber");
+const fixTransactionNumberOnPublishPaymentUrl_1 = require("./any/publishPaymentUrl/fixTransactionNumberOnPublishPaymentUrl");
 const factory_1 = require("./any/factory");
 const fixOrderAsNeeded_1 = require("./any/fixOrderAsNeeded");
-const handlePrePublishedPaymentMethodIdOnAuthorizing_1 = require("./any/handlePrePublishedPaymentMethodIdOnAuthorizing");
 const onPaymentStatusChanged_1 = require("./any/onPaymentStatusChanged");
 Object.defineProperty(exports, "onPaymentStatusChanged", { enumerable: true, get: function () { return onPaymentStatusChanged_1.onPaymentStatusChanged; } });
 const person2username_1 = require("./any/person2username");
 Object.defineProperty(exports, "person2username", { enumerable: true, get: function () { return person2username_1.person2username; } });
-const verifyTicketTokenAsNeeded_1 = require("./any/verifyTicketTokenAsNeeded");
 /**
  * 決済承認中止
  * タスクから決済承認を取り消す
@@ -319,7 +319,9 @@ function processVoidPayTransaction(params) {
 /**
  * 外部決済ロケーションを発行する
  */
+// tslint:disable-next-line:max-func-body-length
 function publishPaymentUrl(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const { paymentServiceType, purpose, project } = params;
@@ -328,6 +330,9 @@ function publishPaymentUrl(params) {
         }
         try {
             const transaction = yield repos.transaction.projectFieldsInProgressById({ typeOf: purpose.typeOf, id: purpose.id }, ['expires', 'seller', 'project']);
+            if (project.id !== transaction.project.id) {
+                throw new factory.errors.NotFound(factory.transactionType.PlaceOrder);
+            }
             // publishOrderNumber(2025-03-11~)
             yield (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
                 project: { id: transaction.project.id },
@@ -335,19 +340,25 @@ function publishPaymentUrl(params) {
                 object: { orderDate: new Date() }
             })(repos);
             // 取引番号生成
-            let transactionNumber;
-            // support ticketToken(2024-08-21~)
-            const { permitOrInvoice } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({ project, object: params.object, paymentServiceType, purpose })(repos);
-            if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === factory.permit.PermitType.Permit) {
-                const paymentMethodIdByPermit = permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.identifier;
-                if (typeof paymentMethodIdByPermit === 'string') {
-                    transactionNumber = paymentMethodIdByPermit;
-                }
-            }
-            if (typeof transactionNumber !== 'string') {
-                const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
-                transactionNumber = publishTransactionNumberResult.transactionNumber;
-            }
+            const { transactionNumber } = yield (0, fixTransactionNumberOnPublishPaymentUrl_1.fixTransactionNumberOnPublishPaymentUrl)({
+                object: params.object,
+                transaction,
+                paymentServiceType
+            })(repos);
+            // let transactionNumber: string | undefined;
+            // // support ticketToken(2024-08-21~)
+            // const { permitOrInvoice } =
+            //     await verifyTicketTokenAsNeeded({ project, object: params.object, paymentServiceType, purpose })(repos);
+            // if (permitOrInvoice?.typeOf === factory.permit.PermitType.Permit) {
+            //     const paymentMethodIdByPermit = permitOrInvoice?.identifier;
+            //     if (typeof paymentMethodIdByPermit === 'string') {
+            //         transactionNumber = paymentMethodIdByPermit;
+            //     }
+            // }
+            // if (typeof transactionNumber !== 'string') {
+            //     const publishTransactionNumberResult = await repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+            //     transactionNumber = publishTransactionNumberResult.transactionNumber;
+            // }
             let result;
             // URL発行
             const authorizeObject = Object.assign(Object.assign({}, params.object), { accountId: '', paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment });
@@ -411,67 +422,77 @@ function authorize(params) {
             throw new factory.errors.NotImplemented(`purpose.typeOf '${purpose.typeOf} not implemented'`);
         }
         const transaction = yield repos.transaction.projectFieldsInProgressById({ typeOf: purpose.typeOf, id: purpose.id }, ['agent', 'expires', 'typeOf', 'project', 'seller']);
+        if (project.id !== transaction.project.id) {
+            throw new factory.errors.NotFound(factory.transactionType.PlaceOrder);
+        }
         const { confirmationNumber, orderNumber } = yield (0, fixOrderAsNeeded_1.fixOrderAsNeeded)({
             project: { id: transaction.project.id },
             purpose
             // paymentServiceType
         })(repos);
         // 取引番号生成
-        let transactionNumber;
-        let pendingPaymentAgencyTransaction;
-        let creditCard = params.object.creditCard;
-        // ticketTokenを解釈(2024-08-13~)
-        const { permitOrInvoice } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({ project, object: params.object, paymentServiceType, purpose })(repos);
-        /**
-         * ticketTokenによって指定された決済方法ID
-         */
-        let paymentMethodIdByTicketToken;
-        if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === factory.permit.PermitType.Permit) {
-            paymentMethodIdByTicketToken = permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.identifier;
-            if (typeof paymentMethodIdByTicketToken === 'string') {
-                transactionNumber = paymentMethodIdByTicketToken; // メンバーシップ指定の場合、取引番号に適用(2024-08-13~)
-            }
-        }
-        else if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === 'Invoice') {
-            // support paymentServiceType.MovieTicket(2024-11-23~)
-            if (typeof (permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.paymentMethodId) === 'string') {
-                paymentMethodIdByTicketToken = permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.paymentMethodId;
-                if (typeof paymentMethodIdByTicketToken === 'string') {
-                    transactionNumber = paymentMethodIdByTicketToken;
-                }
-            }
-        }
-        // リクエストでpaymentMethodIdを指定された場合、取引に保管されたpaymentMethodIdに一致すればそちらを適用(外部サイト決済対応)
-        if (typeof params.object.paymentMethodId === 'string' && params.object.paymentMethodId.length > 0) {
-            if (typeof paymentMethodIdByTicketToken === 'string') {
-                if (paymentMethodIdByTicketToken !== params.object.paymentMethodId) {
-                    throw new factory.errors.Argument('ticketToken', 'not matched with paymentMethodId');
-                }
-            }
-            const { authorizeParams, existingCompletedAuthorizeAction } = yield (0, handlePrePublishedPaymentMethodIdOnAuthorizing_1.handlePrePublishedPaymentMethodIdOnAuthorizing)({
-                object: params.object,
-                prePublishedPaymentMethodId: params.object.paymentMethodId,
-                transaction
-            })(repos);
-            if (existingCompletedAuthorizeAction !== undefined) {
-                return { id: existingCompletedAuthorizeAction.id };
-            }
-            else if (authorizeParams !== undefined) {
-                // creditCardを決済URL発行時の情報で上書き(2024-01-08~)
-                // creditCard = authorizeParams.paymentMethodByTransaction.paymentMethod?.creditCard;
-                creditCard = authorizeParams.creditCard;
-                transactionNumber = params.object.paymentMethodId;
-                pendingPaymentAgencyTransaction = authorizeParams.pendingPaymentAgencyTransaction;
-            }
-            else {
-                throw new factory.errors.NotImplemented('pendingPaymentAgencyTransaction requied on paymentMethodId specified');
-            }
-        }
-        // 取引番号発行済でなければ発行
-        if (typeof transactionNumber !== 'string') {
-            const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
-            transactionNumber = publishTransactionNumberResult.transactionNumber;
-        }
+        const fixTransactionNumberResult = yield (0, fixTransactionNumber_1.fixTransactionNumber)({
+            object: params.object,
+            transaction,
+            paymentServiceType
+        })(repos);
+        if (typeof fixTransactionNumberResult.id === 'string') {
+            return { id: fixTransactionNumberResult.id };
+        }
+        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard, permitOrInvoice } = fixTransactionNumberResult;
+        // let transactionNumber: string | undefined;
+        // let pendingPaymentAgencyTransaction: PayTransactionService.IPaymentAgencyTransaction | undefined;
+        // let creditCard: factory.action.authorize.paymentMethod.any.ICreditCard | undefined = params.object.creditCard;
+        // // ticketTokenを解釈(2024-08-13~)
+        // const { permitOrInvoice } =
+        //     await verifyTicketTokenAsNeeded({ project, object: params.object, paymentServiceType, purpose })(repos);
+        // /**
+        //  * ticketTokenによって指定された決済方法ID
+        //  */
+        // let paymentMethodIdByTicketToken: string | undefined;
+        // if (permitOrInvoice?.typeOf === factory.permit.PermitType.Permit) {
+        //     paymentMethodIdByTicketToken = permitOrInvoice?.identifier;
+        //     if (typeof paymentMethodIdByTicketToken === 'string') {
+        //         transactionNumber = paymentMethodIdByTicketToken; // メンバーシップ指定の場合、取引番号に適用(2024-08-13~)
+        //     }
+        // } else if (permitOrInvoice?.typeOf === 'Invoice') {
+        //     // support paymentServiceType.MovieTicket(2024-11-23~)
+        //     if (typeof permitOrInvoice?.paymentMethodId === 'string') {
+        //         paymentMethodIdByTicketToken = permitOrInvoice?.paymentMethodId;
+        //         if (typeof paymentMethodIdByTicketToken === 'string') {
+        //             transactionNumber = paymentMethodIdByTicketToken;
+        //         }
+        //     }
+        // }
+        // // リクエストでpaymentMethodIdを指定された場合、取引に保管されたpaymentMethodIdに一致すればそちらを適用(外部サイト決済対応)
+        // if (typeof params.object.paymentMethodId === 'string' && params.object.paymentMethodId.length > 0) {
+        //     if (typeof paymentMethodIdByTicketToken === 'string') {
+        //         if (paymentMethodIdByTicketToken !== params.object.paymentMethodId) {
+        //             throw new factory.errors.Argument('ticketToken', 'not matched with paymentMethodId');
+        //         }
+        //     }
+        //     const { authorizeParams, existingCompletedAuthorizeAction } = await handlePrePublishedPaymentMethodIdOnAuthorizing({
+        //         object: params.object,
+        //         prePublishedPaymentMethodId: params.object.paymentMethodId,
+        //         transaction
+        //     })(repos);
+        //     if (existingCompletedAuthorizeAction !== undefined) {
+        //         return { id: existingCompletedAuthorizeAction.id };
+        //     } else if (authorizeParams !== undefined) {
+        //         // creditCardを決済URL発行時の情報で上書き(2024-01-08~)
+        //         // creditCard = authorizeParams.paymentMethodByTransaction.paymentMethod?.creditCard;
+        //         creditCard = authorizeParams.creditCard;
+        //         transactionNumber = params.object.paymentMethodId;
+        //         pendingPaymentAgencyTransaction = authorizeParams.pendingPaymentAgencyTransaction;
+        //     } else {
+        //         throw new factory.errors.NotImplemented('pendingPaymentAgencyTransaction requied on paymentMethodId specified');
+        //     }
+        // }
+        // // 取引番号発行済でなければ発行
+        // if (typeof transactionNumber !== 'string') {
+        //     const publishTransactionNumberResult = await repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+        //     transactionNumber = publishTransactionNumberResult.transactionNumber;
+        // }
         const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(factory_1.createMovieTicket) : undefined;
         const { accountId } = yield fixAccountIdIfPossible({
             object: params.object, project: { id: transaction.project.id }

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.2.0-alpha.4",
+    "@chevre/factory": "5.2.0-alpha.5",
     "@cinerino/sdk": "12.7.0-alpha.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.0.0-alpha.29"
+  "version": "23.0.0-alpha.30"
 }

package/example/src/chevre/movieTicketType/deleteOldMovieTicketTypes.ts

@@ -1,15 +0,0 @@
-// tslint:disable:no-console no-magic-numbers
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../../lib/index';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const movieTicketTypeRepo = await chevre.repository.MovieTicketType.createInstance(mongoose.connection);
-    await movieTicketTypeRepo.deleteOldMovieTicketTypes(mongoose.connection);
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/movieTicketType/migrateCollections.ts

@@ -1,15 +0,0 @@
-// tslint:disable:no-console no-magic-numbers
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../../lib/index';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const movieTicketTypeRepo = await chevre.repository.MovieTicketType.createInstance(mongoose.connection);
-    await movieTicketTypeRepo.migrateCollections(mongoose.connection);
-}
-
-main()
-    .then()
-    .catch(console.error);