@chevre/domain 22.8.0-alpha.1 → 22.8.0-alpha.2

package/example/src/chevre/migrateAuthorizeEventServiceOfferChevre.ts

@@ -37,7 +37,7 @@ async function main() {
     await cursor.eachAsync(async (doc) => {
         i += 1;
         const authorizeAction = <Pick<
-            chevre.factory.action.authorize.offer.eventService.IAction<chevre.factory.service.webAPI.Identifier>,
+            chevre.factory.action.authorize.offer.eventService.IAction,
             'id' | 'startDate' | 'project' | 'typeOf' | 'actionStatus' | 'instrument' | 'object'
         >>doc.toObject();
 

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

@@ -103,22 +103,5 @@ export declare class AcceptedOfferRepo {
             $in: string[];
         };
     }, field: IDistinctField): Promise<string[]>;
-    /**
-     * 互換性維持対応専用
-     */
-    fixReservedTicketIdentifier(params: {
-        project: {
-            id: string;
-        };
-        orderNumber: string;
-        acceptedOffers: {
-            itemOffered: {
-                id: string;
-                reservedTicket: {
-                    identifier: string;
-                };
-            };
-        };
-    }): Promise<void>;
 }
 export {};

package/lib/chevre/repo/acceptedOffer.js

@@ -227,36 +227,5 @@ class AcceptedOfferRepo {
                 .exec();
         });
     }
-    /**
-     * 互換性維持対応専用
-     */
-    fixReservedTicketIdentifier(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 },
-                typeOf: { $eq: factory.order.OrderType.Order },
-                'acceptedOffers.itemOffered.id': { $exists: true, $eq: params.acceptedOffers.itemOffered.id }
-            }, {
-                $set: {
-                    'acceptedOffers.$[offer].itemOffered.reservedTicket.identifier': params.acceptedOffers.itemOffered.reservedTicket.identifier
-                }
-            }, {
-                timestamps: false,
-                arrayFilters: [{
-                        'offer.itemOffered.typeOf': { $eq: factory.reservationType.EventReservation },
-                        'offer.itemOffered.id': { $eq: params.acceptedOffers.itemOffered.id }
-                    }],
-                new: true,
-                projection: {
-                    _id: 1
-                }
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.orderModel.modelName);
-            }
-        });
-    }
 }
 exports.AcceptedOfferRepo = AcceptedOfferRepo;

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

@@ -25,7 +25,7 @@
 import { factory as surfrockFactory } from '@surfrock/sdk';
 import { Connection, FilterQuery, UpdateQuery } from 'mongoose';
 import * as factory from '../factory';
-export type IAction4transaction<T extends factory.actionType.AcceptAction | factory.actionType.AuthorizeAction> = T extends factory.actionType.AcceptAction ? factory.action.accept.coaOffer.IAction | factory.action.accept.pay.IAction : T extends factory.actionType.AuthorizeAction ? (factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier> | factory.action.authorize.offer.moneyTransfer.IAction | factory.action.authorize.offer.product.IAction | factory.action.authorize.paymentMethod.any.IAction) : never;
+export type IAction4transaction<T extends factory.actionType.AcceptAction | factory.actionType.AuthorizeAction> = T extends factory.actionType.AcceptAction ? factory.action.accept.coaOffer.IAction | factory.action.accept.pay.IAction : T extends factory.actionType.AuthorizeAction ? (factory.action.authorize.offer.eventService.IAction | factory.action.authorize.offer.moneyTransfer.IAction | factory.action.authorize.offer.product.IAction | factory.action.authorize.paymentMethod.any.IAction) : never;
 export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AcceptAction ? IAction4transaction<factory.actionType.AcceptAction> : T extends factory.actionType.AuthorizeAction ? factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>> : T extends factory.actionType.CheckAction ? (factory.action.check.paymentMethod.movieTicket.IAction | factory.action.check.token.IAction) : T extends factory.actionType.MoneyTransfer ? factory.action.transfer.moneyTransfer.IAction : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAction<factory.action.update.replace.IAttributes<any, any>> : factory.action.IAction<factory.action.IAttributes<T, any, any>>;
 interface IAggregationByStatus {
     actionCount: number;

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

@@ -10,7 +10,7 @@ interface IAcceptOfferOperationRepos {
     transaction: TransactionRepo;
 }
 type IAcceptOfferOperation<T> = (repos: IAcceptOfferOperationRepos) => Promise<T>;
-export type IAuthorizeActionWithInstrument = Pick<factory.action.authorize.offer.moneyTransfer.IAction | factory.action.authorize.offer.product.IAction | factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>, 'instrument'>;
+export type IAuthorizeActionWithInstrument = Pick<factory.action.authorize.offer.moneyTransfer.IAction | factory.action.authorize.offer.product.IAction | factory.action.authorize.offer.eventService.IAction, 'instrument'>;
 export declare function acceptOffer(params: {
     project: {
         id: string;

package/lib/chevre/service/offer/event/authorize/factory.d.ts

@@ -21,7 +21,7 @@ declare function createAuthorizeSeatReservationActionAttributes(params: {
         transactionNumber: string;
     };
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
-}): factory.action.authorize.offer.eventService.IAttributes<factory.service.webAPI.Identifier.Chevre>;
+}): factory.action.authorize.offer.eventService.IAttributes;
 declare function acceptedOffers2amount(params: {
     acceptedOffers: IResultAcceptedOffer[];
 }): number;

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

@@ -57,11 +57,9 @@ function createReserveTransactionStartParams(params) {
 exports.createReserveTransactionStartParams = createReserveTransactionStartParams;
 function createAuthorizeSeatReservationActionAttributes(params) {
     var _a;
-    // const acceptedOffers = params.acceptedOffers;
     const { event, transaction } = params;
     const authorizeObjectEvent = {
         id: event.id,
-        // イベント提供サービスを識別できるようにするために追加(2022-06-04~)
         // offers: { // discontinue(2024-06-22~)
         //     offeredThrough: {
         //         identifier: factory.service.webAPI.Identifier.Chevre,
@@ -82,7 +80,7 @@ function createAuthorizeSeatReservationActionAttributes(params) {
     const instrument = {
         // typeOf: 'WebAPI',
         typeOf: factory.assetTransactionType.Reserve,
-        identifier: factory.service.webAPI.Identifier.Chevre,
+        // identifier: factory.service.webAPI.Identifier.Chevre, // discontinue(2025-01-02~)
         transactionNumber: params.instrument.transactionNumber
     };
     const agent = {

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -49,7 +49,7 @@ interface IAuthorizeRepos {
     transactionNumber: TransactionNumberRepo;
 }
 type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings) => Promise<T>;
-type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
+type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction;
 type IObjectWithoutDetail = factory.action.authorize.offer.eventService.IObjectWithoutDetail;
 interface IAuthorizeOptions {
     /**

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.d.ts

@@ -9,7 +9,6 @@ import type { SettingRepo } from '../../../../repo/setting';
 import type { StockHolderRepo } from '../../../../repo/stockHolder';
 import type { TaskRepo } from '../../../../repo/task';
 import type { TransactionRepo } from '../../../../repo/transaction';
-export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 interface IVoidTransactionRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
@@ -22,6 +21,6 @@ interface IVoidTransactionRepos {
     transaction: TransactionRepo;
 }
 declare function processVoidTransaction4chevre(params: {
-    action: factory.action.authorize.offer.eventService.IAction<WebAPIIdentifier.Chevre>;
+    action: factory.action.authorize.offer.eventService.IAction;
 }): (repos: IVoidTransactionRepos, settings: Settings) => Promise<void>;
 export { processVoidTransaction4chevre };

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.js

@@ -9,10 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processVoidTransaction4chevre = exports.WebAPIIdentifier = void 0;
+exports.processVoidTransaction4chevre = void 0;
 const factory = require("../../../../factory");
 const reserve_1 = require("../../../assetTransaction/reserve");
-exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
 function processVoidTransaction4chevre(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         // const transactionNumber = params.action.object.pendingTransaction?.transactionNumber;

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4coa.d.ts

@@ -1,9 +1,8 @@
 import type * as COA from '@motionpicture/coa-service';
-import { ActionRepo } from '../../../../repo/action';
 import * as factory from '../../../../factory';
-export import WebAPIIdentifier = factory.service.webAPI.Identifier;
+import { ActionRepo } from '../../../../repo/action';
 declare function processVoidTransaction4coa(params: {
-    action: factory.action.authorize.offer.eventService.IAction<WebAPIIdentifier.COA>;
+    action: factory.action.authorize.offer.eventService.IAction;
 }): (repos: {
     reserveService: COA.service.Reserve;
 }) => Promise<void>;

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4coa.js

@@ -9,10 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processVoidTransactionByAcceptAction4coa = exports.processVoidTransaction4coa = exports.WebAPIIdentifier = void 0;
+exports.processVoidTransactionByAcceptAction4coa = exports.processVoidTransaction4coa = void 0;
 const http_status_1 = require("http-status");
-const factory = require("../../../../factory");
-exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
 function processVoidTransaction4coa(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // object.pendingTransactionに連携内容情報が記録されているので、その情報を元に仮予約を取り消す

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

@@ -15,12 +15,13 @@ const any_1 = require("../any");
 const processVoidTransaction4chevre_1 = require("./voidTransaction/processVoidTransaction4chevre");
 const processVoidTransaction4coa_1 = require("./voidTransaction/processVoidTransaction4coa");
 const voidTransactionByActionId_1 = require("./voidTransactionByActionId");
-var WebAPIIdentifier = factory.service.webAPI.Identifier;
 /**
  * 興行オファー承認取消(タスクから実行 or apiから実行))
  * 取引中の承認アクション全てについて処理する or 特定の承認アクションについて処理する
  */
+// tslint:disable-next-line:max-func-body-length
 function voidTransaction(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         // support void by action ID(2024-05-26~)
@@ -74,19 +75,22 @@ function voidTransaction(params) {
         }
         yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
             yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
-            switch (action.instrument.identifier) {
-                case WebAPIIdentifier.COA:
+            switch (action.instrument.typeOf) {
+                // case WebAPIIdentifier.COA:
+                case factory.assetTransactionType.COAReserveTransaction:
                     const { reserveService } = repos;
                     if (reserveService === undefined) {
                         throw new factory.errors.Internal('repos.reserveService required');
                     }
                     yield (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({
-                        action: action
+                        // action: <factory.action.authorize.offer.eventService.IAction<WebAPIIdentifier.COA>>action
+                        action
                     })({ reserveService });
                     break;
                 default:
                     yield (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({
-                        action: action
+                        // action: <factory.action.authorize.offer.eventService.IAction<WebAPIIdentifier.Chevre>>action
+                        action
                     })(repos, settings);
             }
         })));

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

@@ -51,19 +51,19 @@ function voidTransactionByActionId(params) {
                 orderNumber: orderNumberByTransaction
             })(repos);
         }
-        switch (action.instrument.identifier) {
-            case factory.service.webAPI.Identifier.COA:
+        switch (action.instrument.typeOf) {
+            case factory.assetTransactionType.COAReserveTransaction:
                 const { reserveService } = repos;
                 if (reserveService === undefined) {
                     throw new factory.errors.Internal('repos.reserveService required');
                 }
                 yield (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({
-                    action: action
+                    action
                 })({ reserveService });
                 break;
             default:
                 yield (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({
-                    action: action
+                    action
                 })(repos, settings);
             // const transactionNumber = action.object.pendingTransaction?.transactionNumber;
             // if (typeof transactionNumber === 'string') {

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer/authorize.d.ts

@@ -1,7 +1,6 @@
 import * as COA from '@motionpicture/coa-service';
 import { IAcceptedOfferWithoutDetail } from './factory';
 import * as factory from '../../../../factory';
-export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 export interface IAppliesToSurfrock {
     identifier: string;
     serviceOutput: {

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

@@ -9,12 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateOffers = exports.createAcceptedOffersWithoutDetails = exports.WebAPIIdentifier = void 0;
+exports.validateOffers = exports.createAcceptedOffersWithoutDetails = void 0;
 const COA = require("@motionpicture/coa-service");
 const http_status_1 = require("http-status");
 const errorHandler_1 = require("../../../../errorHandler");
 const factory = require("../../../../factory");
-exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
 function createAcceptedOffersWithoutDetails(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const { listSeat } = yield repos.reserveService.stateReserveSeat(params.coaInfo);

package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.d.ts

@@ -1,7 +1,6 @@
 import type * as COAService from '@motionpicture/coa-service';
 import * as factory from '../../../../factory';
 import { IMinimizedIndividualEvent } from '../../../../factory/event';
-export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 export type IAcceptedOffer4COA = factory.action.accept.coaOffer.IAcceptedOffer4COA;
 export type IRequestBody = COAService.factory.reserve.IUpdTmpReserveSeatArgs;
 export type IResponseBody = COAService.factory.reserve.IUpdTmpReserveSeatResult;
@@ -16,7 +15,7 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
     };
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
     pendingTransaction: factory.action.authorize.offer.eventService.ICOAPendingTransaction;
-}): factory.action.authorize.offer.eventService.IAttributes<WebAPIIdentifier.COA>;
+}): factory.action.authorize.offer.eventService.IAttributes;
 /**
  * 供給情報から承認アクションの価格を導き出す
  */

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

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.responseBody2acceptedOffers4result = exports.offers2resultPrice = exports.createAuthorizeSeatReservationActionAttributes = exports.WebAPIIdentifier = void 0;
+exports.responseBody2acceptedOffers4result = exports.offers2resultPrice = exports.createAuthorizeSeatReservationActionAttributes = void 0;
 const moment = require("moment");
 const util = require("util");
 const factory = require("../../../../factory");
-exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
 function createAuthorizeSeatReservationActionAttributes(params) {
     var _a;
     const transaction = params.transaction;
@@ -31,7 +30,7 @@ function createAuthorizeSeatReservationActionAttributes(params) {
     const instrument = {
         // typeOf: 'WebAPI',
         typeOf: factory.assetTransactionType.COAReserveTransaction,
-        identifier: factory.service.webAPI.Identifier.COA,
+        // identifier: factory.service.webAPI.Identifier.COA,// discontinue(2025-01-02~)
         transactionNumber: params.pendingTransaction.transactionNumber
     };
     return {
@@ -164,7 +163,7 @@ function responseBody2acceptedOffers4result(params) {
         const additionalTicketText = (_d = (_c = requestedOffer.itemOffered) === null || _c === void 0 ? void 0 : _c.serviceOutput) === null || _d === void 0 ? void 0 : _d.additionalTicketText;
         const issuedThrough = {
             typeOf: factory.product.ProductType.EventService,
-            id: '',
+            // id: '', // discontinue(2025-01-02~)
             availableChannel: {
                 typeOf: 'ServiceChannel',
                 serviceLocation: {

package/lib/chevre/service/offer/eventServiceByCOA/authorize.d.ts

@@ -10,7 +10,6 @@ import { IRequestBody, IResponseBody } from './authorize/factory';
 import { IAcceptedOfferBeforeAuthorize4COA } from './authorize/validateAcceptedOffers';
 import * as factory from '../../../factory';
 export { IRequestBody, IResponseBody };
-export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 export type IAuthorizeActionResult = factory.action.authorize.offer.eventService.IResult;
 export interface IAuthorizeRepos {
     action: ActionRepo;
@@ -23,7 +22,7 @@ export interface IAuthorizeRepos {
     transaction: TransactionRepo;
 }
 export type IAuthorizeOperation<T> = (repos: IAuthorizeRepos) => Promise<T>;
-export type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction<WebAPIIdentifier.COA>;
+export type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction;
 /**
  * COA興行オファー承認
  */

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

@@ -9,13 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.authorize = exports.WebAPIIdentifier = void 0;
+exports.authorize = void 0;
 const moment = require("moment");
 const any_1 = require("../any");
 const factory_1 = require("./authorize/factory");
 const validateAcceptedOffers_1 = require("./authorize/validateAcceptedOffers");
 const factory = require("../../../factory");
-exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
 /**
  * COA興行オファー承認
  */

package/lib/chevre/service/offer/eventServiceByCOA/authorizeByAcceptAction.d.ts

@@ -1,6 +1,6 @@
 import { IAuthorizeOperation } from './authorize';
 import * as factory from '../../../factory';
-type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier.COA>;
+type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction;
 /**
  * 採用アクションからCOA興行オファー承認
  */

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.d.ts

@@ -1,7 +1,5 @@
 import { IAuthorizeOfferAction, IAuthorizeOperation } from './authorize';
 import { IAcceptedOfferBeforeAuthorize4COA } from './authorize/validateAcceptedOffers';
-import * as factory from '../../../factory';
-export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 /**
  * COA興行オファー承認のオファーを変更
  */

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

@@ -9,13 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.changeOffers = exports.WebAPIIdentifier = void 0;
+exports.changeOffers = void 0;
 const moment = require("moment");
 const any_1 = require("../any");
 const factory_1 = require("./authorize/factory");
 const validateAcceptedOffers_1 = require("./authorize/validateAcceptedOffers");
 const factory = require("../../../factory");
-exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
 /**
  * COA興行オファー承認のオファーを変更
  */

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

@@ -9,7 +9,7 @@ declare function createConfirmReservationActionObject4ChevreByOrder(params: {
     order: Pick<factory.order.IOrder, 'confirmationNumber' | 'orderNumber'> & {
         serialNumbers: string[];
     };
-}): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.Chevre>[];
+}): factory.action.interact.confirm.reservation.IObject4Chevre[];
 declare function createConfirmReservationActionObject4COAByOrder(params: {
     order: {
         serialNumbers: string[];

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

@@ -67,12 +67,6 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
                 agent: order.project,
                 purpose: simpleOrder
                 // instrument廃止(2024-03-13~)
-                // instrument: {
-                //     typeOf: 'WebAPI',
-                //     identifier: (confirmObject.typeOf === factory.assetTransactionType.COAReserveTransaction)
-                //         ? factory.service.webAPI.Identifier.COA
-                //         : factory.service.webAPI.Identifier.Chevre
-                // }
             };
             const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmReserveTransaction, data.purpose.typeOf, data.purpose.orderNumber, data.object.typeOf, data.object.transactionNumber);
             const confirmReserveTransactionTask = {

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

@@ -113,7 +113,8 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
                     },
                     agent: order.project,
                     purpose: simpleOrder,
-                    instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.COA },
+                    // discontinue(2025-01-02~)
+                    // instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.COA },
                     recipient: returnActionRecipient
                 };
                 break;
@@ -127,7 +128,8 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
                     },
                     agent: order.project,
                     purpose: simpleOrder,
-                    instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre },
+                    // discontinue(2025-01-02~)
+                    // instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre },
                     recipient: returnActionRecipient
                 };
         }

package/lib/chevre/service/order/placeOrder/factory/orderedItem.js

@@ -51,12 +51,12 @@ function reservationOffers2orderedItem(params) {
             startDate: reservationFor.startDate,
             endDate: reservationFor.endDate
         };
-        return Object.assign(Object.assign({ typeOf: issuedThrough.typeOf, id: issuedThrough.id }, (typeof ((_a = issuedThrough.serviceType) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-            ? { serviceType: issuedThrough.serviceType }
-            : undefined), { serviceOutput: {
+        return Object.assign(Object.assign({ typeOf: issuedThrough.typeOf, serviceOutput: {
                 typeOf: factory.reservationType.EventReservation,
                 reservationFor: reservationFor4orderedItem
-            } });
+            } }, (typeof issuedThrough.id === 'string') ? { id: issuedThrough.id } : undefined), (typeof ((_a = issuedThrough.serviceType) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+            ? { serviceType: issuedThrough.serviceType }
+            : undefined);
     }
     else if (reservationFor.typeOf === factory.tripType.BusTrip
         && issuedThrough.typeOf === factory.product.ProductType.Transportation) {

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -76,6 +76,10 @@ function onReservationConfirmed(confirmedReservations) {
                     typeOf,
                     reservedTicket }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), (modifiedTime instanceof Date) ? { modifiedTime } : undefined), (price !== undefined) ? { price } : undefined), (programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined), (Array.isArray(subReservation)) ? { subReservation } : undefined);
             });
+            if (typeof issuedThrough.id !== 'string') {
+                // COA予約では予約アクションを想定していないので、興行idは必ず存在するはず
+                throw new factory.errors.Internal('reservation.issuedThrough.id must be string');
+            }
             const informObject = Object.assign({ bookingTime,
                 issuedThrough,
                 project,

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

@@ -36,13 +36,12 @@ function useReservation(params) {
             id: reservationId,
             inclusion: ['issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
         });
-        // UseActionを作成する
-        // optimize(2024-05-07~)
-        // const reservationAsObject: IReservationAsUseObject = {
-        //     id: reservation.id, issuedThrough: reservation.issuedThrough, reservationFor: reservation.reservationFor,
-        //     reservationNumber: reservation.reservationNumber, reservedTicket: reservation.reservedTicket, typeOf: reservation.typeOf
-        // };
+        if (typeof reservation.issuedThrough.id !== 'string') {
+            // COA予約では予約使用アクションを想定していないので、興行idは必ず存在するはず
+            throw new factory.errors.Internal('reservation.issuedThrough.id must be string');
+        }
         const { reservedTicket } = reservation;
+        // optimize(2024-05-07~)
         const reservationAsObject = {
             id: reservation.id,
             reservationNumber: reservation.reservationNumber,

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

@@ -66,10 +66,10 @@ exports.call = call;
  */
 function returnReserve(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const { agent, instrument, object, project, purpose, recipient, typeOf, sameAs } = params;
-        const returnActionAttributes = Object.assign({ agent, instrument, object, project, purpose, recipient, typeOf }, (typeof (sameAs === null || sameAs === void 0 ? void 0 : sameAs.id) === 'string') ? { sameAs: { id: sameAs.id, typeOf: 'Task' } } : undefined);
+        const { agent, object, project, purpose, recipient, typeOf, sameAs } = params;
+        const returnActionAttributes = Object.assign({ agent, object, project, purpose, recipient, typeOf }, (typeof (sameAs === null || sameAs === void 0 ? void 0 : sameAs.id) === 'string') ? { sameAs: { id: sameAs.id, typeOf: 'Task' } } : undefined);
         let recipe;
-        if (params.instrument.identifier === factory.service.webAPI.Identifier.COA) {
+        if (params.object.typeOf === factory.assetTransactionType.COAReserveTransaction) {
             recipe = (0, factory_1.processReturnCOAReserveResult2recipe)({
                 processReturnCOAReserveResult: { stateReserveArgs: params.object },
                 project: { id: project.id }
@@ -78,8 +78,8 @@ function returnReserve(params) {
         const action = yield repos.action.start(returnActionAttributes, Object.assign({}, (recipe !== undefined) ? { recipe } : undefined // add recipe(2024-06-11~)
         ));
         try {
-            switch (params.instrument.identifier) {
-                case factory.service.webAPI.Identifier.COA:
+            switch (params.object.typeOf) {
+                case factory.assetTransactionType.COAReserveTransaction:
                     const processReturnCOAReserveResult = yield CancelReservationCOAService.confirm({ object: params.object })({
                         reserveService: repos.reserveService
                     });

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

@@ -1,6 +1,6 @@
 import * as factory from '../../../../factory';
 import { placeOrder as PlaceOrderFactory } from '../../../../factory/transaction';
-export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
+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'> & {

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.392.0-alpha.0",
-    "@cinerino/sdk": "10.19.0-alpha.2",
+    "@chevre/factory": "4.392.0-alpha.2",
+    "@cinerino/sdk": "10.19.0-alpha.3",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.8.0-alpha.1"
+  "version": "22.8.0-alpha.2"
 }

package/example/src/chevre/migrateAuthorizeEventServiceOfferCOA.ts

@@ -1,84 +0,0 @@
-// tslint:disable:no-console
-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(
-        {
-            // _id: { $eq: '66697991037c9d7243208261' },
-            typeOf: { $eq: chevre.factory.actionType.AuthorizeAction },
-            // actionStatus: { $eq: chevre.factory.actionStatusType.CompletedActionStatus },
-            // startDate: {
-            //     $lte: moment()
-            //         // tslint:disable-next-line:no-magic-numbers
-            //         .add(-180, 'days'),
-            //     $gte: moment()
-            //         // tslint:disable-next-line:no-magic-numbers
-            //         .add(-180, 'days')
-            // },
-            'object.typeOf': { $exists: true, $eq: chevre.factory.action.authorize.offer.eventService.ObjectType.SeatReservation },
-            'instrument.typeOf': { $exists: true, $eq: chevre.factory.assetTransactionType.COAReserveTransaction }
-        },
-        {
-            __id: 1, startDate: 1, project: 1, typeOf: 1, actionStatus: 1, instrument: 1, object: 1
-        }
-    );
-    console.log('actions found');
-
-    let i = 0;
-    let updateCount = 0;
-    const saveResultCount = 0;
-    // tslint:disable-next-line:max-func-body-length
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const authorizeAction = <Pick<
-            chevre.factory.action.authorize.offer.eventService.IAction<chevre.factory.service.webAPI.Identifier>,
-            'id' | 'startDate' | 'project' | 'typeOf' | 'actionStatus' | 'instrument' | 'object'
-        >>doc.toObject();
-
-        let migrated = false;
-        if (authorizeAction.instrument.typeOf === chevre.factory.assetTransactionType.Reserve) {
-            migrated = true;
-        } else {
-            const acceptedOffers = (<any>authorizeAction.object).acceptedOffer;
-            if (acceptedOffers === undefined) {
-                migrated = true;
-            }
-        }
-
-        if (migrated) {
-            console.log(
-                'already migrated.',
-                authorizeAction.project.id, authorizeAction.id, authorizeAction.actionStatus, authorizeAction.startDate,
-                i, updateCount, saveResultCount);
-
-        } else {
-            // optimize action
-            let unsetResult: any;
-            unsetResult = await actionRepo.unsetUnnecessaryFields({
-                filter: { _id: { $eq: authorizeAction.id } },
-                $unset: {
-                    'object.acceptedOffer': 1
-                }
-            });
-            updateCount += 1;
-            console.log(
-                'result unset. unsetResult:', unsetResult,
-                authorizeAction.project.id, authorizeAction.id, authorizeAction.actionStatus, authorizeAction.startDate, i,
-                updateCount, saveResultCount);
-        }
-    });
-
-    console.log(i, 'actions checked');
-    console.log(updateCount, 'actions updated');
-    console.log(saveResultCount, 'result saved');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/migrateAuthorizeEventServiceOfferInstrument.ts

@@ -1,128 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-type IInstrumentAsAssetTransaction =
-    chevre.factory.action.authorize.offer.eventService.IInstrumentAsAssetTransaction<chevre.factory.service.webAPI.Identifier>;
-
-// 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(
-        {
-            // _id: { $eq: '65eb218c1fb66e469cb2ba7e' },
-            typeOf: { $eq: chevre.factory.actionType.AuthorizeAction },
-            // actionStatus: { $eq: chevre.factory.actionStatusType.CompletedActionStatus },
-            startDate: {
-                // $lte: moment()
-                //     // tslint:disable-next-line:no-magic-numbers
-                //     .add(-90, 'days'),
-                $lte: moment('2023-07-22T01:17:42.541Z')
-                    // tslint:disable-next-line:no-magic-numbers
-                    .toDate()
-                // $gte: moment()
-                //     // tslint:disable-next-line:no-magic-numbers
-                //     .add(-180, 'days')
-            },
-            'object.typeOf': { $exists: true, $eq: chevre.factory.action.authorize.offer.eventService.ObjectType.SeatReservation },
-            'project.id': { $ne: 'sskts-production' }
-        },
-        {
-            __id: 1, startDate: 1, endDate: 1, result: 1, project: 1, typeOf: 1, actionStatus: 1, instrument: 1, object: 1
-        }
-    );
-    console.log('actions found');
-
-    let i = 0;
-    let updateCount = 0;
-    let saveResultCount = 0;
-    // tslint:disable-next-line:max-func-body-length
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const authorizeAction = <Pick<
-            chevre.factory.action.authorize.offer.eventService.IAction<chevre.factory.service.webAPI.Identifier>,
-            'id' | 'startDate' | 'endDate' | 'result' | 'project' | 'typeOf' | 'actionStatus' | 'instrument' | 'object'
-        >>doc.toObject();
-        const { instrument } = authorizeAction;
-
-        let migrated = false;
-        if ((instrument.typeOf === chevre.factory.assetTransactionType.COAReserveTransaction
-            || instrument.typeOf === chevre.factory.assetTransactionType.Reserve)
-            && typeof instrument.transactionNumber === 'string'
-        ) {
-            migrated = true;
-        }
-
-        if (migrated) {
-            console.log(
-                'already migrated.',
-                authorizeAction.project.id, authorizeAction.id, authorizeAction.startDate, i, updateCount, saveResultCount);
-        } else {
-            console.log(
-                'redefining instrument as AssetTransaction...',
-                authorizeAction.project.id, authorizeAction.id, authorizeAction.startDate, i, updateCount, saveResultCount);
-            if ((<any>instrument).typeOf !== 'WebAPI') {
-                throw new Error(`instrument.typeOf must be WebAPI [${authorizeAction.id}]`);
-            }
-            const pendingTransaction = (authorizeAction.object).pendingTransaction;
-            const transactionNumber = pendingTransaction?.transactionNumber;
-            let newInstrument: IInstrumentAsAssetTransaction;
-            if (pendingTransaction?.typeOf === chevre.factory.assetTransactionType.COAReserveTransaction) {
-                newInstrument = {
-                    typeOf: chevre.factory.assetTransactionType.COAReserveTransaction,
-                    identifier: chevre.factory.service.webAPI.Identifier.COA,
-                    ...(typeof transactionNumber === 'string') ? { transactionNumber } : { transactionNumber: '' }
-                };
-            } else if (pendingTransaction?.typeOf === chevre.factory.assetTransactionType.Reserve) {
-                if (typeof transactionNumber !== 'string' || transactionNumber === '') {
-                    throw new Error(`pendingTransaction must exist [${authorizeAction.id}]`);
-                }
-                newInstrument = {
-                    typeOf: chevre.factory.assetTransactionType.Reserve,
-                    identifier: chevre.factory.service.webAPI.Identifier.Chevre,
-                    transactionNumber
-                };
-            } else {
-                if (instrument.identifier === chevre.factory.service.webAPI.Identifier.COA) {
-                    newInstrument = {
-                        typeOf: chevre.factory.assetTransactionType.COAReserveTransaction,
-                        identifier: chevre.factory.service.webAPI.Identifier.COA,
-                        ...(typeof transactionNumber === 'string') ? { transactionNumber } : { transactionNumber: '' }
-                    };
-                } else {
-                    throw new Error(`invalid pendingTransaction [${(<any>pendingTransaction)?.typeOf}] [${authorizeAction.id}]`);
-                }
-            }
-
-            console.log(
-                'saving action...',
-                authorizeAction.project.id, authorizeAction.id, authorizeAction.startDate, i, updateCount, saveResultCount);
-            // tslint:disable-next-line:no-null-keyword
-            console.dir({ instrument, newInstrument }, { depth: null });
-            await actionRepo.findByIdAndUpdate({
-                id: authorizeAction.id,
-                update: {
-                    $set: {
-                        instrument: newInstrument
-                    }
-                }
-            });
-            saveResultCount += 1;
-            console.log(
-                'action saved.',
-                authorizeAction.project.id, authorizeAction.id, authorizeAction.startDate, i, updateCount, saveResultCount);
-        }
-    });
-
-    console.log(i, 'actions checked');
-    console.log(updateCount, 'actions updated');
-    console.log(saveResultCount, 'result saved');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/migrateOrderAcceptedOfferReservedTicketIdentifier.ts

@@ -1,94 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-function createReservedTicketIdentifier(offer: chevre.factory.order.IAcceptedOffer<chevre.factory.order.IReservation>) {
-    let reservedTicketIdentifierShouldBe = `${offer.itemOffered.reservationFor.id}:${offer.itemOffered.id}`;
-    if (typeof offer.itemOffered.reservedTicket.ticketedSeat?.seatNumber === 'string') {
-        reservedTicketIdentifierShouldBe = `${offer.itemOffered.reservationFor.id}:${offer.itemOffered.reservedTicket.ticketedSeat.seatSection}:${offer.itemOffered.reservedTicket.ticketedSeat.seatNumber}`;
-    }
-
-    return reservedTicketIdentifierShouldBe;
-}
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const acceptedOfferRepo = await chevre.repository.AcceptedOffer.createInstance(mongoose.connection);
-    const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
-
-    const cursor = orderRepo.getCursor(
-        {
-            'acceptedOffers.itemOffered.typeOf': { $exists: true, $eq: chevre.factory.reservationType.EventReservation },
-            // 'project.id': { $eq: project.id },
-            // orderNumber: { $eq: 'ASK8-6367700-4398526' },
-            orderDate: {
-                $gte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-13, 'months')
-                    .toDate()
-            }
-        },
-        {
-            orderDate: 1,
-            orderNumber: 1,
-            project: 1,
-            acceptedOffers: 1
-        }
-    );
-    console.log('orders found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const order: Pick<
-            chevre.factory.order.IOrder,
-            'orderDate' | 'orderNumber' | 'project'
-        > & {
-            acceptedOffers: chevre.factory.order.IAcceptedOffer<chevre.factory.order.IReservation>[];
-        } = doc.toObject();
-
-        const alreadyMigrated = order.acceptedOffers.every((offer) => {
-            const reservedTicketIdentifierShouldBe = createReservedTicketIdentifier(offer);
-
-            return typeof offer.itemOffered.reservedTicket.identifier === 'string'
-                && offer.itemOffered.reservedTicket.identifier.length > 0
-                && offer.itemOffered.reservedTicket.identifier === reservedTicketIdentifierShouldBe;
-        });
-
-        if (alreadyMigrated) {
-            console.log('already exist.', order.project.id, order.orderNumber, order.orderDate, i);
-        } else {
-            for (const offer of order.acceptedOffers) {
-                const reservedTicketIdentifierShouldBe = createReservedTicketIdentifier(offer);
-                console.log(
-                    'updating...',
-                    order.project.id, order.orderNumber, order.orderDate, offer.itemOffered.id, reservedTicketIdentifierShouldBe, i);
-                await acceptedOfferRepo.fixReservedTicketIdentifier({
-                    project: { id: order.project.id },
-                    orderNumber: order.orderNumber,
-                    acceptedOffers: {
-                        itemOffered: {
-                            id: offer.itemOffered.id,
-                            reservedTicket: { identifier: reservedTicketIdentifierShouldBe }
-                        }
-                    }
-                });
-            }
-            updateCount += 1;
-            console.log('updated.', order.project.id, order.orderNumber, order.orderDate, i);
-        }
-    });
-
-    console.log(i, 'orders checked');
-    console.log(updateCount, 'orders updated');
-}
-
-main()
-    .then()
-    .catch(console.error);