@chevre/domain 21.7.0-alpha.1 → 21.7.0-alpha.10

package/example/src/chevre/migrateAuthorizePaymentActionResult.ts

@@ -0,0 +1,83 @@
+// 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) };
+// const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const actionRepo = new chevre.repository.Action(mongoose.connection);
+
+    const cursor = actionRepo.getCursor(
+        {
+            typeOf: { $eq: chevre.factory.actionType.AuthorizeAction },
+            actionStatus: { $eq: chevre.factory.actionStatusType.CompletedActionStatus },
+            'object.typeOf': { $exists: true, $eq: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment },
+            'result.typeOf': { $exists: true, $eq: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment },
+            startDate: {
+                $gte: moment('2022-08-16T00:00:00Z')
+                    .toDate()
+                // $lte: moment('2023-08-01T00:00:00Z')
+                //     .toDate()
+            }
+        },
+        {
+            _id: 1,
+            typeOf: 1,
+            result: 1,
+            project: 1,
+            startDate: 1,
+            actionStatus: 1
+        }
+    );
+    console.log('actions found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const action: Pick<
+            chevre.factory.action.authorize.paymentMethod.any.IAction,
+            'id' | 'project' | 'result' | 'typeOf' | 'startDate' | 'actionStatus'
+        > = doc.toObject();
+
+        const oldPaymentMethodType = action.result?.paymentMethod;
+        const paymentMethodType = action.result?.paymentMethodAsObject?.typeOf;
+        const alreadyMigrated = typeof paymentMethodType === 'string' && oldPaymentMethodType === paymentMethodType;
+
+        if (alreadyMigrated) {
+            console.log('already exist...', action.project.id, action.id, action.startDate, paymentMethodType, i);
+        } else {
+            if (typeof oldPaymentMethodType !== 'string') {
+                console.error('updating action...', action.project.id, action.id, action.startDate, oldPaymentMethodType, i, updateCount);
+                throw new Error('oldPaymentMethodType undefined');
+            }
+
+            const newPaymentMethodAsObject: chevre.factory.action.authorize.paymentMethod.any.IResultPaymentMethod = {
+                typeOf: oldPaymentMethodType
+            };
+            console.log(
+                'updating action...', action.project.id, action.id, action.startDate, newPaymentMethodAsObject.typeOf, i, updateCount);
+            await actionRepo.updateById({
+                id: action.id,
+                update: {
+                    'result.paymentMethodAsObject': newPaymentMethodAsObject
+                }
+            });
+            updateCount += 1;
+            console.log('updated.', action.project.id, action.id, action.startDate, newPaymentMethodAsObject.typeOf, i, updateCount);
+        }
+    });
+
+    console.log(i, 'actions checked');
+    console.log(updateCount, 'actions updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -1,25 +1,31 @@
 // 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);
+
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const creativeWorkRepo = new chevre.repository.CreativeWork(mongoose.connection);
+    const transactionRepo = new chevre.repository.Transaction(mongoose.connection);
 
     let updateResult: any;
-    updateResult = await creativeWorkRepo.unsetUnnecessaryFields({
-        filter: { 'offers.project': { $exists: true } },
-        $unset: { 'offers.project': 1 }
-    });
-    console.log('unset processed.', updateResult);
-
-    updateResult = await creativeWorkRepo.unsetUnnecessaryFields({
-        filter: { 'offers.priceCurrency': { $exists: true } },
-        $unset: { 'offers.priceCurrency': 1 }
+    updateResult = await transactionRepo.unsetUnnecessaryFields({
+        filter: {
+            'project.id': { $eq: PROJECT_ID },
+            typeOf: { $eq: chevre.factory.transactionType.PlaceOrder },
+            status: { $eq: chevre.factory.transactionStatusType.Confirmed },
+            startDate: {
+                $lte: moment('2023-08-16T07:26:00Z')
+                    .toDate()
+            },
+            'object.authorizeActions': { $exists: true }
+        },
+        $unset: { 'object.authorizeActions': 1 }
     });
-    console.log('unset processed.', updateResult);
+    console.log('unset processed.', updateResult, 'PROJECT_ID:', PROJECT_ID);
 }
 
 main()

package/lib/chevre/emailMessageBuilder.d.ts

@@ -24,6 +24,6 @@ export declare function createReturnOrderMessage(params: {
  */
 export declare function createRefundMessage(params: {
     order: factory.order.IOrder;
-    paymentMethods: factory.order.IPaymentMethod[];
+    paymentMethods: factory.order.IReferencedInvoice[];
     email?: factory.creativeWork.message.email.ICustomization;
 }): Promise<factory.creativeWork.message.email.ICreativeWork>;

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

@@ -150,6 +150,10 @@ export declare class MongoRepository {
         object: factory.action.authorize.offer.seatReservation.IObject<T>;
         result: factory.action.authorize.offer.seatReservation.IResult<T>;
     }): Promise<factory.action.authorize.offer.seatReservation.IAction<T>>;
+    updateById(params: {
+        id: string;
+        update: any;
+    }): Promise<void>;
     findByIdAndUpdate<T extends factory.actionType>(params: {
         id: string;
         update: any;

package/lib/chevre/repo/action.js

@@ -643,6 +643,12 @@ class MongoRepository {
             });
         });
     }
+    updateById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.actionModel.updateOne({ _id: { $eq: params.id } }, params.update)
+                .exec();
+        });
+    }
     findByIdAndUpdate(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.actionModel.findOneAndUpdate({ _id: params.id }, params.update, { new: true })

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

@@ -252,6 +252,18 @@ export declare class MongoRepository {
             };
         };
     }): Promise<import("mongodb").DeleteResult>;
+    deleteManyEndedByIds(params: {
+        typeOf: {
+            $in: factory.eventType[];
+        };
+        project: {
+            id: string;
+        };
+        ids: string[];
+        endDate: {
+            $lte: Date;
+        };
+    }): Promise<import("mongodb").DeleteResult>;
     deleteByProject(params: {
         project: {
             id: string;

package/lib/chevre/repo/event.js

@@ -966,6 +966,17 @@ class MongoRepository {
                 .exec();
         });
     }
+    deleteManyEndedByIds(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.eventModel.deleteMany({
+                typeOf: { $in: params.typeOf.$in },
+                'project.id': { $eq: params.project.id },
+                _id: { $in: params.ids },
+                endDate: { $lte: params.endDate.$lte }
+            })
+                .exec();
+        });
+    }
     deleteByProject(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.eventModel.deleteMany({

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

@@ -25,7 +25,7 @@
 import { Schema } from 'mongoose';
 declare const modelName = "Offer";
 /**
- * オファースキーマ
+ * 単価オファースキーマ
  */
 declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     collection: string;
@@ -53,6 +53,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }, {
     additionalProperty: any[];
     addOn: any[];
+    availability: string;
     availableAtOrFrom: any[];
     _id?: string | undefined;
     name?: any;
@@ -68,7 +69,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     validFrom?: Date | undefined;
     category?: any;
     advanceBookingRequirement?: any;
-    availability?: string | undefined;
     hasMerchantReturnPolicy?: any;
     priceSpecification?: any;
     eligibleCustomerType?: any;
@@ -84,6 +84,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     additionalProperty: any[];
     addOn: any[];
+    availability: string;
     availableAtOrFrom: any[];
     _id?: string | undefined;
     name?: any;
@@ -99,7 +100,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     validFrom?: Date | undefined;
     category?: any;
     advanceBookingRequirement?: any;
-    availability?: string | undefined;
     hasMerchantReturnPolicy?: any;
     priceSpecification?: any;
     eligibleCustomerType?: any;
@@ -115,6 +115,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }>> & Omit<import("mongoose").FlatRecord<{
     additionalProperty: any[];
     addOn: any[];
+    availability: string;
     availableAtOrFrom: any[];
     _id?: string | undefined;
     name?: any;
@@ -130,7 +131,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     validFrom?: Date | undefined;
     category?: any;
     advanceBookingRequirement?: any;
-    availability?: string | undefined;
     hasMerchantReturnPolicy?: any;
     priceSpecification?: any;
     eligibleCustomerType?: any;

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

@@ -6,7 +6,7 @@ const writeConcern_1 = require("../writeConcern");
 const modelName = 'Offer';
 exports.modelName = modelName;
 /**
- * オファースキーマ
+ * 単価オファースキーマ
  */
 const schema = new mongoose_1.Schema({
     project: mongoose_1.SchemaTypes.Mixed,
@@ -22,14 +22,13 @@ const schema = new mongoose_1.Schema({
     alternateName: mongoose_1.SchemaTypes.Mixed,
     // acceptedPaymentMethod: SchemaTypes.Mixed, // 削除(2023-02-27~)
     addOn: [mongoose_1.SchemaTypes.Mixed],
-    // availableAddOn: SchemaTypes.Mixed, // 削除(2023-02-27~)
-    availability: String,
-    // availabilityEnds: Date, // 削除(2023-02-27~)
-    // availabilityStarts: Date, // 削除(2023-02-27~)
+    availability: {
+        type: String,
+        required: true
+    },
     availableAtOrFrom: [mongoose_1.SchemaTypes.Mixed],
     hasMerchantReturnPolicy: mongoose_1.SchemaTypes.Mixed,
     itemOffered: mongoose_1.SchemaTypes.Mixed,
-    // price: Number, // 削除(2023-02-27~)
     priceCurrency: String,
     priceSpecification: mongoose_1.SchemaTypes.Mixed,
     eligibleCustomerType: mongoose_1.SchemaTypes.Mixed,

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

@@ -25,7 +25,7 @@
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 export type IProduct = factory.product.IProduct | factory.service.paymentService.IService;
-export type IPaymentServiceByProvider = Pick<factory.service.paymentService.IService, 'name' | 'description' | 'typeOf' | 'id' | 'productID' | 'serviceType' | 'additionalProperty'> & {
+export type IPaymentServiceByProvider = Pick<factory.service.paymentService.IService, 'name' | 'description' | 'typeOf' | 'id' | 'productID' | 'serviceType' | 'serviceOutput' | 'additionalProperty'> & {
     provider?: Pick<factory.service.paymentService.IProvider, 'credentials'>;
 };
 /**

package/lib/chevre/repo/product.js

@@ -286,6 +286,7 @@ class MongoRepository {
                         name: '$name',
                         // provider: [ [Object] ],
                         additionalProperty: '$additionalProperty',
+                        serviceOutput: '$serviceOutput',
                         serviceType: '$serviceType',
                         id: { $toString: '$_id' },
                         // ↓セキュアな情報を隠蔽するように

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

@@ -98,7 +98,6 @@ export declare class MongoRepository {
     confirm<T extends factory.transactionType>(params: {
         typeOf: T;
         id: string;
-        authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
         result: factory.transaction.IResult<T>;
         potentialActions: factory.transaction.IPotentialActions<T>;
     }): Promise<void>;
@@ -190,6 +189,10 @@ export declare class MongoRepository {
     findByIdAndDelete(params: {
         id: string;
     }): Promise<void>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
     aggregatePlaceOrder(params: {
         project?: {
             id?: {

package/lib/chevre/repo/transaction.js

@@ -438,7 +438,7 @@ class MongoRepository {
             }, {
                 status: factory.transactionStatusType.Confirmed,
                 endDate: new Date(),
-                'object.authorizeActions': params.authorizeActions,
+                // 'object.authorizeActions': params.authorizeActions,
                 result: params.result,
                 potentialActions: params.potentialActions // resultを更新
             }, {
@@ -770,6 +770,12 @@ class MongoRepository {
                 .exec();
         });
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.transactionModel.updateMany(params.filter, { $unset: params.$unset })
+                .exec();
+        });
+    }
     aggregatePlaceOrder(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([

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

@@ -6,6 +6,6 @@ export declare function createStartParams(params: factory.assetTransaction.pay.I
     transactionNumber: string;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     amount: number;
-    paymentService?: factory.service.paymentService.IService;
+    paymentService?: factory.service.paymentService.IService | factory.product.IProduct;
     location?: factory.action.trade.pay.ILocation;
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Pay>;

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

@@ -5,9 +5,10 @@ exports.createStartParams = void 0;
  * 決済取引ファクトリー
  */
 const factory = require("../../../factory");
+const settings_1 = require("../../../settings");
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createStartParams(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
     const paymentServiceId = (params.paymentService !== undefined)
         ? String(params.paymentService.id)
         : '';
@@ -25,14 +26,14 @@ function createStartParams(params) {
             totalPaymentDue = {
                 typeOf: 'MonetaryAmount',
                 currency: factory.priceCurrency.JPY,
-                value: Number(params.amount)
+                value: params.amount
             };
             break;
         case factory.service.paymentService.PaymentServiceType.CreditCard:
             totalPaymentDue = {
                 typeOf: 'MonetaryAmount',
                 currency: factory.priceCurrency.JPY,
-                value: Number(params.amount)
+                value: params.amount
             };
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
@@ -54,36 +55,57 @@ function createStartParams(params) {
         default:
         // no op
     }
-    const informPaymentParams = createInformPaymentParams({ paymentService: params.paymentService });
+    const informPaymentParams = createInformPaymentParams({
+        paymentService: params.paymentService
+    });
     const accountId = (_g = params.object.paymentMethod) === null || _g === void 0 ? void 0 : _g.accountId;
-    const creditCardAsPaymentServiceOutputCurrency = (_k = (_j = (_h = params.paymentService) === null || _h === void 0 ? void 0 : _h.serviceOutput) === null || _j === void 0 ? void 0 : _j.amount) === null || _k === void 0 ? void 0 : _k.currency;
-    const paymentMethod = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray((_l = params.object.paymentMethod) === null || _l === void 0 ? void 0 : _l.additionalProperty))
-            ? (_m = params.object.paymentMethod) === null || _m === void 0 ? void 0 : _m.additionalProperty
-            : [], name: (typeof ((_o = params.object.paymentMethod) === null || _o === void 0 ? void 0 : _o.name) === 'string')
+    // currencyはデフォルトでJPY
+    let paymentMethodCurrency = factory.priceCurrency.JPY;
+    if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.PaymentCard) {
+        const paymentCardServiceOutputCurrency = (_k = (_j = (_h = params.paymentService) === null || _h === void 0 ? void 0 : _h.serviceOutput) === null || _j === void 0 ? void 0 : _j.amount) === null || _k === void 0 ? void 0 : _k.currency;
+        if (typeof paymentCardServiceOutputCurrency === 'string') {
+            paymentMethodCurrency = paymentCardServiceOutputCurrency;
+        }
+    }
+    else if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
+        // カード通貨区分が存在すれば適用
+        const creditCardAsPaymentServiceOutputCurrency = (_p = (_o = (_m = (_l = params.paymentService) === null || _l === void 0 ? void 0 : _l.serviceOutput) === null || _m === void 0 ? void 0 : _m.paymentMethod) === null || _o === void 0 ? void 0 : _o.amount) === null || _p === void 0 ? void 0 : _p.currency;
+        if (typeof creditCardAsPaymentServiceOutputCurrency === 'string') {
+            paymentMethodCurrency = creditCardAsPaymentServiceOutputCurrency;
+        }
+    }
+    const paymentMethodAmount = {
+        typeOf: 'MonetaryAmount',
+        currency: paymentMethodCurrency,
+        value: params.amount
+    };
+    const paymentMethod = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray((_q = params.object.paymentMethod) === null || _q === void 0 ? void 0 : _q.additionalProperty))
+            ? (_r = params.object.paymentMethod) === null || _r === void 0 ? void 0 : _r.additionalProperty
+            : [], name: (typeof ((_s = params.object.paymentMethod) === null || _s === void 0 ? void 0 : _s.name) === 'string')
             ? params.object.paymentMethod.name
-            : paymentMethodType, amount: params.amount, paymentMethodId: params.transactionNumber, typeOf: paymentMethodType }, (typeof ((_p = params.object.paymentMethod) === null || _p === void 0 ? void 0 : _p.description) === 'string')
-        ? { description: (_q = params.object.paymentMethod) === null || _q === void 0 ? void 0 : _q.description }
+            : paymentMethodType, 
+        // MonetaryAmount対応(2023-08-14~)
+        amount: (settings_1.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT) ? paymentMethodAmount : params.amount, paymentMethodId: params.transactionNumber, typeOf: paymentMethodType }, (typeof ((_t = params.object.paymentMethod) === null || _t === void 0 ? void 0 : _t.description) === 'string')
+        ? { description: (_u = params.object.paymentMethod) === null || _u === void 0 ? void 0 : _u.description }
         : undefined), (totalPaymentDue !== undefined)
         ? { totalPaymentDue: totalPaymentDue }
-        : undefined), (typeof accountId === 'string') ? { accountId: accountId } : undefined), (typeof ((_r = params.object.paymentMethod) === null || _r === void 0 ? void 0 : _r.method) === 'string')
-        ? { method: (_s = params.object.paymentMethod) === null || _s === void 0 ? void 0 : _s.method }
-        : undefined), (((_t = params.object.paymentMethod) === null || _t === void 0 ? void 0 : _t.creditCard) !== undefined)
-        ? { creditCard: (_u = params.object.paymentMethod) === null || _u === void 0 ? void 0 : _u.creditCard }
-        : undefined), (Array.isArray((_v = params.object.paymentMethod) === null || _v === void 0 ? void 0 : _v.movieTickets))
-        ? { movieTickets: (_w = params.object.paymentMethod) === null || _w === void 0 ? void 0 : _w.movieTickets }
+        : undefined), (typeof accountId === 'string') ? { accountId: accountId } : undefined), (typeof ((_v = params.object.paymentMethod) === null || _v === void 0 ? void 0 : _v.method) === 'string')
+        ? { method: (_w = params.object.paymentMethod) === null || _w === void 0 ? void 0 : _w.method }
+        : undefined), (((_x = params.object.paymentMethod) === null || _x === void 0 ? void 0 : _x.creditCard) !== undefined)
+        ? { creditCard: (_y = params.object.paymentMethod) === null || _y === void 0 ? void 0 : _y.creditCard }
+        : undefined), (Array.isArray((_z = params.object.paymentMethod) === null || _z === void 0 ? void 0 : _z.movieTickets))
+        ? { movieTickets: (_0 = params.object.paymentMethod) === null || _0 === void 0 ? void 0 : _0.movieTickets }
         : undefined);
-    const serviceOutput = (typeof creditCardAsPaymentServiceOutputCurrency === 'string')
-        ? {
-            amount: {
-                currency: creditCardAsPaymentServiceOutputCurrency,
-                value: paymentMethod.amount // 通貨区分としての金額
-            }
-        }
-        : undefined;
-    const object = Object.assign({ 
+    const object = {
         // パラメータから必要なもののみ取り込む
-        accountId: (typeof accountId === 'string') ? accountId : '', paymentMethodId: params.transactionNumber, typeOf: params.paymentServiceType, id: paymentServiceId, onPaymentStatusChanged: { informPayment: informPaymentParams }, paymentMethod }, (typeof serviceOutput !== undefined) ? { serviceOutput } : undefined);
-    return Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object, expires: params.expires }, (typeof ((_x = params.location) === null || _x === void 0 ? void 0 : _x.typeOf) === 'string')
+        accountId: (typeof accountId === 'string') ? accountId : '',
+        paymentMethodId: params.transactionNumber,
+        typeOf: params.paymentServiceType,
+        id: paymentServiceId,
+        onPaymentStatusChanged: { informPayment: informPaymentParams },
+        paymentMethod
+    };
+    return Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object, expires: params.expires }, (typeof ((_1 = params.location) === null || _1 === void 0 ? void 0 : _1.typeOf) === 'string')
         ? { location: params.location }
         : undefined);
 }

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

@@ -28,7 +28,7 @@ function createPayActions(params) {
     }
     return payActions;
 }
-// tslint:disable-next-line:cyclomatic-complexity
+// tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createPayObject(params) {
     var _a;
     const transaction = params.transaction;
@@ -37,12 +37,20 @@ function createPayObject(params) {
     const additionalProperty = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.additionalProperty;
     const paymentMethodId = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.paymentMethodId) === 'string') ? paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.paymentMethodId : transaction.id;
     const paymentMethodName = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.name) === 'string') ? paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.name : paymentMethodType;
+    // MonetaryAmount対応(2023-08-13~)
+    const paymentMethodAmountValue = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.amount) === 'number')
+        ? paymentMethod.amount
+        : paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.amount.value;
     const paymentServiceOutput = createPayObjectServiceOutput(params);
     let payObject;
     switch (transaction.object.typeOf) {
         case factory.service.paymentService.PaymentServiceType.FaceToFace:
             // 対面決済ではとりあえず問答無用にJPY
-            const totalPaymentDue4faceToFace = { typeOf: 'MonetaryAmount', currency: factory.priceCurrency.JPY, value: Number(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.amount) };
+            const totalPaymentDue4faceToFace = {
+                typeOf: 'MonetaryAmount',
+                currency: factory.priceCurrency.JPY,
+                value: paymentMethodAmountValue
+            };
             payObject = {
                 typeOf: transaction.object.typeOf,
                 id: (typeof transaction.object.id === 'string') ? transaction.object.id : '',
@@ -52,7 +60,11 @@ function createPayObject(params) {
         case factory.service.paymentService.PaymentServiceType.PaymentCard:
             const totalPaymentDue = (typeof ((_a = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.totalPaymentDue) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
                 ? paymentMethod.totalPaymentDue
-                : { typeOf: 'MonetaryAmount', currency: factory.priceCurrency.JPY, value: Number(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.amount) };
+                : {
+                    typeOf: 'MonetaryAmount',
+                    currency: factory.priceCurrency.JPY,
+                    value: paymentMethodAmountValue
+                };
             payObject = {
                 typeOf: transaction.object.typeOf,
                 id: (typeof transaction.object.id === 'string') ? transaction.object.id : '',
@@ -68,11 +80,17 @@ function createPayObject(params) {
             };
             break;
         case factory.service.paymentService.PaymentServiceType.CreditCard:
-            payObject = Object.assign({ typeOf: transaction.object.typeOf, id: (typeof transaction.object.id === 'string') ? transaction.object.id : '', paymentMethod: Object.assign({ additionalProperty: (Array.isArray(additionalProperty)) ? additionalProperty : [], name: paymentMethodName, paymentMethodId: paymentMethodId, totalPaymentDue: {
+            payObject = {
+                typeOf: transaction.object.typeOf,
+                id: (typeof transaction.object.id === 'string') ? transaction.object.id : '',
+                paymentMethod: Object.assign({ additionalProperty: (Array.isArray(additionalProperty)) ? additionalProperty : [], name: paymentMethodName, paymentMethodId: paymentMethodId, totalPaymentDue: {
                         typeOf: 'MonetaryAmount',
                         currency: factory.priceCurrency.JPY,
-                        value: Number(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.amount)
-                    }, typeOf: paymentMethodType }, (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.accountId) === 'string') ? { accountId: paymentMethod.accountId } : undefined) }, (paymentServiceOutput !== undefined) ? { serviceOutput: paymentServiceOutput } : undefined);
+                        value: paymentMethodAmountValue
+                    }, typeOf: paymentMethodType }, (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.accountId) === 'string') ? { accountId: paymentMethod.accountId } : undefined)
+                // CreditCardIFのカード通貨区分を追加(2023-08-07~)
+                // ...(paymentServiceOutput !== undefined) ? { serviceOutput: paymentServiceOutput } : undefined
+            };
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
             payObject = Object.assign({ typeOf: transaction.object.typeOf, id: (typeof transaction.object.id === 'string') ? transaction.object.id : '', paymentMethod: {
@@ -94,7 +112,6 @@ function createPayObject(params) {
     return payObject;
 }
 function createPayObjectServiceOutput(params) {
-    var _a, _b;
     const transaction = params.transaction;
     const paymentMethod = transaction.object.paymentMethod;
     const order = params.order;
@@ -105,17 +122,21 @@ function createPayObjectServiceOutput(params) {
             break;
         case factory.service.paymentService.PaymentServiceType.CreditCard:
             // CreditCardIFのカード通貨区分を追加(2023-08-07~)
-            const creditCardAsPaymentServiceOutput = (typeof ((_b = (_a = transaction.object.serviceOutput) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency) === 'string')
-                ? {
-                    amount: {
-                        currency: transaction.object.serviceOutput.amount.currency,
-                        value: transaction.object.paymentMethod.amount
-                    }
-                }
-                : undefined;
-            if (creditCardAsPaymentServiceOutput !== undefined) {
-                paymentServiceOutput = creditCardAsPaymentServiceOutput;
-            }
+            // const creditCardAsPaymentServiceOutput: factory.order.IOrderPaymentMethodIssuedThroughServiceOutput | undefined =
+            //     (typeof transaction.object.paymentMethod?.amount !== 'number'
+            //         && typeof transaction.object.paymentMethod?.amount?.currency === 'string')
+            //         ? {
+            //             paymentMethod: {
+            //                 amount: {
+            //                     currency: transaction.object.paymentMethod.amount.currency,
+            //                     value: transaction.object.paymentMethod.amount.value
+            //                 }
+            //             }
+            //         }
+            //         : undefined;
+            // if (creditCardAsPaymentServiceOutput !== undefined) {
+            //     paymentServiceOutput = creditCardAsPaymentServiceOutput;
+            // }
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
             const paymentMethodType = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf;

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

@@ -6,7 +6,7 @@ exports.createStartParams = void 0;
  */
 const factory = require("../../../factory");
 function createStartParams(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
     if (typeof paymentMethodType !== 'string') {
         throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
@@ -23,7 +23,7 @@ function createStartParams(params) {
     let refundFee;
     if (((_g = params.paymentService) === null || _g === void 0 ? void 0 : _g.typeOf) === factory.service.paymentService.PaymentServiceType.CreditCard) {
         // カード通貨区分の存在する決済サービスを考慮(2023-08-09~)
-        const paymentServiceOutputAmountCurrency = (_j = (_h = params.paymentService.serviceOutput) === null || _h === void 0 ? void 0 : _h.amount) === null || _j === void 0 ? void 0 : _j.currency;
+        const paymentServiceOutputAmountCurrency = (_k = (_j = (_h = params.paymentService.serviceOutput) === null || _h === void 0 ? void 0 : _h.paymentMethod) === null || _j === void 0 ? void 0 : _j.amount) === null || _k === void 0 ? void 0 : _k.currency;
         if (typeof paymentServiceOutputAmountCurrency !== 'string') {
             if (typeof params.object.refundFee === 'number') {
                 refundFee = params.object.refundFee;

package/lib/chevre/service/order/deleteOrder.d.ts

@@ -1,4 +1,5 @@
 import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
+import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as OrderRepo } from '../../repo/order';
 import { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
@@ -11,6 +12,7 @@ declare function deleteOrder(params: {
     object: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'confirmationNumber' | 'orderDate' | 'orderNumber'>;
 }): (repos: {
     accountingReport: AccountingReportRepo;
+    event: EventRepo;
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;
     reservation: ReservationRepo;

package/lib/chevre/service/order/deleteOrder.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteOrder = void 0;
 const factory_1 = require("../delivery/factory");
 const factory = require("../../factory");
+const settings_1 = require("../../settings");
 /**
  * 注文に関わるリソースを削除する
  * 冪等性を確保すること
@@ -38,6 +39,10 @@ function deleteOrder(params) {
         }
         // 経理レポート削除
         yield repos.accountingReport.deleteByOrderNumber({ mainEntity: { orderNumber: order.orderNumber } });
+        // 終了済の関連イベントを削除(2023-08-16~)
+        if (settings_1.USE_DELETE_EVENT_BY_ORDER) {
+            yield deleteEventsByOrder(order)(repos);
+        }
         // 注文削除
         yield repos.order.deleteByOrderNumber({ orderNumber: order.orderNumber });
     });
@@ -73,3 +78,40 @@ function deleteOwnershipInfosByOrder(order) {
         }
     });
 }
+function deleteEventsByOrder(order) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const now = new Date();
+        const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+        const reservationForIds = acceptedOffers.filter((o) => {
+            return (o.itemOffered.typeOf === factory.reservationType.EventReservation
+                || o.itemOffered.typeOf === factory.reservationType.BusReservation)
+                && typeof o.itemOffered.reservationFor.id === 'string';
+        })
+            .map((o) => {
+            return String(o.itemOffered.reservationFor.id);
+        });
+        if (reservationForIds.length > 0) {
+            for (const reservationForId of reservationForIds) {
+                // 関連注文が存在しなければ削除
+                const relatedOrders = yield repos.order.search({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: order.project.id } },
+                    acceptedOffers: {
+                        itemOffered: {
+                            reservationFor: { ids: [reservationForId] }
+                        }
+                    }
+                }, { _id: 1 });
+                if (relatedOrders.length === 0) {
+                    yield repos.event.deleteManyEndedByIds({
+                        typeOf: { $in: [factory.eventType.Event, factory.eventType.ScreeningEvent] },
+                        project: { id: order.project.id },
+                        ids: [reservationForId],
+                        endDate: { $lte: now }
+                    });
+                }
+            }
+        }
+    });
+}

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

@@ -80,28 +80,39 @@ function createMovieTicket(params) {
     };
 }
 function createAuthorizeResult(params) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const payTransactionObject = params.payTransaction.object;
     const totalPaymentDue = (_a = payTransactionObject.paymentMethod) === null || _a === void 0 ? void 0 : _a.totalPaymentDue;
     if (typeof (totalPaymentDue === null || totalPaymentDue === void 0 ? void 0 : totalPaymentDue.typeOf) !== 'string') {
         throw new factory.errors.ServiceUnavailable('payTransaction.object.paymentMethod.totalPaymentDue undefined');
     }
-    const issuedThrough = Object.assign({ typeOf: payTransactionObject.typeOf, id: (typeof payTransactionObject.id === 'string') ? payTransactionObject.id : '' }, (typeof ((_c = (_b = payTransactionObject.serviceOutput) === null || _b === void 0 ? void 0 : _b.amount) === null || _c === void 0 ? void 0 : _c.currency) === 'string')
-        ? { serviceOutput: payTransactionObject.serviceOutput }
+    const issuedThrough = {
+        typeOf: payTransactionObject.typeOf,
+        id: (typeof payTransactionObject.id === 'string') ? payTransactionObject.id : ''
+    };
+    // 決済取引から決済カード通貨区分を取り出す
+    const paymentMethodAmountCurrencyByPayTransaction = (typeof ((_b = payTransactionObject.paymentMethod) === null || _b === void 0 ? void 0 : _b.amount) !== 'number')
+        ? (_d = (_c = payTransactionObject.paymentMethod) === null || _c === void 0 ? void 0 : _c.amount) === null || _d === void 0 ? void 0 : _d.currency
+        : undefined;
+    const paymentMethodAsObject = Object.assign({ typeOf: params.object.paymentMethod }, (payTransactionObject.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
+        && typeof paymentMethodAmountCurrencyByPayTransaction === 'string')
+        ? { amount: { currency: paymentMethodAmountCurrencyByPayTransaction } }
         : undefined);
     return {
-        accountId: (typeof ((_d = payTransactionObject.paymentMethod) === null || _d === void 0 ? void 0 : _d.accountId) === 'string')
+        accountId: (typeof ((_e = payTransactionObject.paymentMethod) === null || _e === void 0 ? void 0 : _e.accountId) === 'string')
             ? payTransactionObject.paymentMethod.accountId
             : '',
         // 廃止(2023-08-07~)
         // amount: params.object.amount,
         issuedThrough,
-        paymentMethod: params.object.paymentMethod,
+        // 完全廃止(paymentMethodAsObjectへ完全移行)(2023-08-16~)
+        // paymentMethod: params.object.paymentMethod,
+        paymentMethodAsObject,
         paymentStatus: factory.paymentStatusType.PaymentDue,
-        paymentMethodId: (typeof ((_e = payTransactionObject.paymentMethod) === null || _e === void 0 ? void 0 : _e.paymentMethodId) === 'string')
+        paymentMethodId: (typeof ((_f = payTransactionObject.paymentMethod) === null || _f === void 0 ? void 0 : _f.paymentMethodId) === 'string')
             ? payTransactionObject.paymentMethod.paymentMethodId
             : '',
-        name: (typeof ((_f = payTransactionObject.paymentMethod) === null || _f === void 0 ? void 0 : _f.name) === 'string')
+        name: (typeof ((_g = payTransactionObject.paymentMethod) === null || _g === void 0 ? void 0 : _g.name) === 'string')
             ? payTransactionObject.paymentMethod.name
             : params.object.paymentMethod,
         totalPaymentDue: totalPaymentDue,

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

@@ -114,7 +114,9 @@ function processAuthorizeCreditCard(params) {
             shopPass: params.shopPass,
             orderId: params.orderId,
             jobCd: GMO.utils.util.JobCd.Auth,
-            amount: params.object.amount,
+            amount: (typeof params.object.amount === 'number')
+                ? params.object.amount
+                : params.object.amount.value,
             siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId,
             sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass
         };

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

@@ -127,7 +127,7 @@ function validatePaymentMethod(params, paymentServiceId) {
 }
 function processAccountTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         let pendingTransaction;
         const defaultName = `${factory.assetTransactionType.Pay} Transaction ${params.transactionNumber}`;
         const agent = Object.assign(Object.assign({}, params.agent), { name: (typeof params.agent.name === 'string') ? params.agent.name : defaultName });
@@ -165,7 +165,11 @@ function processAccountTransaction(params) {
             expires: params.expires,
             recipient: recipient,
             object: {
-                amount: { value: (_f = params.paymentMethod) === null || _f === void 0 ? void 0 : _f.amount },
+                amount: {
+                    value: (typeof ((_f = params.paymentMethod) === null || _f === void 0 ? void 0 : _f.amount) === 'number')
+                        ? (_g = params.paymentMethod) === null || _g === void 0 ? void 0 : _g.amount
+                        : (_h = params.paymentMethod) === null || _h === void 0 ? void 0 : _h.amount.value
+                },
                 description: description,
                 fromLocation: {
                     accountNumber: accountNumber

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

@@ -13,6 +13,7 @@ exports.call = void 0;
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const reservation_1 = require("../../repo/reservation");
@@ -28,6 +29,7 @@ function call(data) {
             accountingReport: new accountingReport_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            event: new event_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
             ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
             reservation: new reservation_1.MongoRepository(settings.connection),

package/lib/chevre/service/transaction/deleteTransaction.d.ts

@@ -2,6 +2,7 @@ import * as factory from '../../factory';
 import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
+import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as OrderRepo } from '../../repo/order';
 import { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
@@ -15,6 +16,7 @@ export declare function deleteTransaction(params: factory.task.IData<factory.tas
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
+    event: EventRepo;
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;
     reservation: ReservationRepo;

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

@@ -14,12 +14,8 @@ function createStartParams(params, passport, seller, amount, fromLocation, toLoc
             id: String(seller.id),
             name: seller.name,
             typeOf: seller.typeOf
-            // ↓最適化(2022-05-24~)
-            // ...{ project: seller.project }
         },
-        object: Object.assign(Object.assign({ amount: amount, fromLocation: fromLocation, toLocation: toLocation, 
-            // authorizeActions: [],
-            pendingTransaction: Object.assign({ transactionNumber }, (typeof ((_a = params.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
+        object: Object.assign(Object.assign({ amount: amount, fromLocation: fromLocation, toLocation: toLocation, pendingTransaction: Object.assign({ transactionNumber }, (typeof ((_a = params.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
                 ? { identifier: params.object.pendingTransaction.identifier }
                 : undefined) }, (passport !== undefined) ? { passport } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined),
         expires: params.expires

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -537,7 +537,6 @@ function confirm(params) {
         yield repos.transaction.confirm({
             typeOf: factory.transactionType.MoneyTransfer,
             id: transaction.id,
-            authorizeActions: [],
             result: {},
             potentialActions: potentialActions
         });

package/lib/chevre/service/transaction/placeOrderInProgress/result/acceptedOffers.js

@@ -117,10 +117,6 @@ function createProductItems(params) {
 exports.createProductItems = createProductItems;
 function createMoneyTransferAcceptedOffers(params) {
     // 通貨転送承認アクション
-    // const authorizeMoneyTansferActions = (<IAuthorizeMoneyTransferOffer[]>params.transaction.object.authorizeActions)
-    //     .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
-    //     .filter((a) => a.object.typeOf === factory.offerType.Offer)
-    //     .filter((a) => a.object.itemOffered?.typeOf === factory.actionType.MoneyTransfer);
     const authorizeMoneyTansferActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => a.object.typeOf === factory.offerType.Offer)

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

@@ -70,16 +70,18 @@ function createPaymentMethods(params) {
     });
     // 決済方法をセット
     authorizePaymentActions.forEach((a) => {
+        var _a, _b, _c;
         const result = a.result;
-        paymentMethods.push({
-            accountId: result.accountId,
-            additionalProperty: (Array.isArray(result.additionalProperty)) ? result.additionalProperty : [],
-            issuedThrough: result.issuedThrough,
-            name: result.name,
-            paymentMethodId: result.paymentMethodId,
-            totalPaymentDue: result.totalPaymentDue,
-            typeOf: result.paymentMethod
-        });
+        const paymentMethodAmountCurrencyByAuthorizeAction = (_b = (_a = result.paymentMethodAsObject) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency;
+        const paymentMethodOfInvoice = (typeof paymentMethodAmountCurrencyByAuthorizeAction === 'string') ?
+            { amount: { currency: paymentMethodAmountCurrencyByAuthorizeAction } }
+            : undefined;
+        // 決済方法区分は必ず存在するはず(2023-08-15~)
+        const paymentMethodType = (_c = result.paymentMethodAsObject) === null || _c === void 0 ? void 0 : _c.typeOf;
+        if (typeof paymentMethodType !== 'string') {
+            throw new factory.errors.NotFound('authorizePaymentAction.result.paymentMethodAsObject.typeOf');
+        }
+        paymentMethods.push(Object.assign({ accountId: result.accountId, additionalProperty: (Array.isArray(result.additionalProperty)) ? result.additionalProperty : [], issuedThrough: result.issuedThrough, name: result.name, paymentMethodId: result.paymentMethodId, totalPaymentDue: result.totalPaymentDue, typeOf: paymentMethodType }, (paymentMethodOfInvoice !== undefined) ? { paymentMethod: paymentMethodOfInvoice } : undefined));
     });
     // 決済方法から注文金額の計算
     // price += authorizePaymentActions

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateMovieTicket.js

@@ -11,14 +11,16 @@ const debug = createDebug('cinerino-domain:service:validateMovieTicket');
  * 座席予約オファー承認に対してムビチケ承認条件が整っているかどうか検証する
  */
 function validateMovieTicket(paymentMethodType, transaction, authorizeActions) {
-    // const authorizeActions = transaction.object.authorizeActions;
     const authorizeMovieTicketActions = authorizeActions.filter((a) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus
             && ((_a = a.result) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
             && ((_b = a.result) === null || _b === void 0 ? void 0 : _b.issuedThrough.typeOf) === factory.service.paymentService.PaymentServiceType.MovieTicket
-            && ((_c = a.result) === null || _c === void 0 ? void 0 : _c.paymentMethod) === paymentMethodType;
-    });
+            // 決済方法区分は必ず存在するはず(2023-08-15~)
+            && ((_d = (_c = a.result) === null || _c === void 0 ? void 0 : _c.paymentMethodAsObject) === null || _d === void 0 ? void 0 : _d.typeOf) === paymentMethodType;
+    }
+    // && a.result?.paymentMethod === paymentMethodType
+    );
     const seatReservationAuthorizeActions = authorizeActions.filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus
         && a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
     // 予約によって必要とされるMovieTicket

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

@@ -38,10 +38,7 @@ function validateTransaction(transaction, authorizeActions) {
     validatePaymentUrl(transaction, authorizeActions);
 }
 exports.validateTransaction = validateTransaction;
-function findMovieTicketPaymentMethodTypesFromTransaction(
-// transaction: factory.transaction.placeOrder.ITransaction,
-authorizeActions) {
-    // const authorizeActions = transaction.object.authorizeActions;
+function findMovieTicketPaymentMethodTypesFromTransaction(authorizeActions) {
     const authorizeMovieTicketPaymentActions = authorizeActions.filter((a) => {
         var _a, _b;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus
@@ -55,9 +52,6 @@ authorizeActions) {
     seatReservationAuthorizeActions.forEach((action) => {
         var _a;
         // a.objectではなくa.resultを使用する(2022-06-04~)
-        // const acceptedOffer =
-        // tslint:disable-next-line:max-line-length
-        //     (<factory.action.authorize.offer.seatReservation.IObject<factory.service.webAPI.Identifier.Chevre>>action.object).acceptedOffer;
         const acceptedOffers = (_a = action.result) === null || _a === void 0 ? void 0 : _a.acceptedOffers;
         acceptedOffers === null || acceptedOffers === void 0 ? void 0 : acceptedOffers.forEach((offer) => {
             var _a;
@@ -72,14 +66,15 @@ authorizeActions) {
         });
     });
     const paymentMethodTypes = [
-        ...authorizeMovieTicketPaymentActions.map((a) => { var _a; return String((_a = a.result) === null || _a === void 0 ? void 0 : _a.paymentMethod); }),
+        // 決済方法区分は必ず存在するはず(2023-08-15~)
+        ...authorizeMovieTicketPaymentActions.map((a) => { var _a, _b; return String((_b = (_a = a.result) === null || _a === void 0 ? void 0 : _a.paymentMethodAsObject) === null || _b === void 0 ? void 0 : _b.typeOf); }),
+        // ...authorizeMovieTicketPaymentActions.map((a) => String(a.result?.paymentMethod)),
         ...requiredMovieTicketPaymentMethodTypes
     ];
     return [...new Set(paymentMethodTypes)];
 }
 function validateProfile(transaction) {
     // object.customerで検証(2022-05-26~)
-    // const profile = transaction.agent;
     const profile = transaction.object.customer;
     if (typeof (profile === null || profile === void 0 ? void 0 : profile.email) !== 'string' || (profile === null || profile === void 0 ? void 0 : profile.email.length) === 0
         || typeof (profile === null || profile === void 0 ? void 0 : profile.familyName) !== 'string' || (profile === null || profile === void 0 ? void 0 : profile.familyName.length) === 0
@@ -89,7 +84,6 @@ function validateProfile(transaction) {
     }
 }
 function validatePrice(transaction, authorizeActions) {
-    // const authorizeActions = transaction.object.authorizeActions;
     let priceByAgent = 0;
     let priceBySeller = 0;
     // 決済承認を確認
@@ -121,7 +115,6 @@ function validatePrice(transaction, authorizeActions) {
     }
 }
 function validatePaymentUrl(transaction, authorizeActions) {
-    // const authorizeActions = transaction.object.authorizeActions;
     var _a, _b;
     // 決済URLが発行されている場合、検証
     const paymentMethodId = (_a = transaction.object.paymentMethods) === null || _a === void 0 ? void 0 : _a.paymentMethodId;
@@ -145,10 +138,7 @@ function validatePaymentUrl(transaction, authorizeActions) {
 /**
  * JPY以外の通貨について取引を検証する
  */
-function validateMonetaryAmount(
-// transaction: factory.transaction.placeOrder.ITransaction,
-authorizeActions) {
-    // const authorizeActions = transaction.object.authorizeActions;
+function validateMonetaryAmount(authorizeActions) {
     const authorizeMonetaryAmountActions = authorizeActions
         .filter((a) => {
         var _a, _b;
@@ -216,7 +206,7 @@ function validatePaymentMethods(params) {
         const creditCardPaymentMethodCount = params.order.paymentMethods.filter((p) => {
             var _a, _b;
             // カード通貨区分の存在する決済サービスを考慮(2023-08-09~)
-            const serviceOutputAmountCurrency = (_b = (_a = p.issuedThrough.serviceOutput) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency;
+            const serviceOutputAmountCurrency = (_b = (_a = p.paymentMethod) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency;
             return p.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
                 && typeof serviceOutputAmountCurrency !== 'string';
         }).length;
@@ -230,10 +220,6 @@ exports.validatePaymentMethods = validatePaymentMethods;
  * イベントオファー適用条件確認
  */
 function validateEventOffers(params) {
-    // const seatReservationAuthorizeActions = <IAuthorizeSeatReservationOffer[]>
-    //     params.transaction.object.authorizeActions
-    //         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
-    //         .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
     const seatReservationAuthorizeActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);

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

@@ -102,7 +102,6 @@ function confirm(params) {
         }
         // 取引に対する全ての承認アクションをマージ
         const authorizeActions = yield searchAuthorizeActions(params)(repos);
-        // transaction.object.authorizeActions = authorizeActions;
         // 注文番号を発行
         const orderNumber = yield publishOrderNumberIfNotExist({
             project: { id: transaction.project.id },
@@ -134,8 +133,6 @@ function confirm(params) {
             yield repos.transaction.confirm({
                 typeOf: transaction.typeOf,
                 id: transaction.id,
-                // 保管有無を設定化(2023-05-16~)
-                authorizeActions: [],
                 result: result,
                 potentialActions: potentialActions
             });

package/lib/chevre/service/transaction/returnOrder.js

@@ -588,7 +588,6 @@ function confirm(params) {
         yield repos.transaction.confirm({
             typeOf: transaction.typeOf,
             id: transaction.id,
-            authorizeActions: [],
             result: result,
             potentialActions: potentialActions
         });

package/lib/chevre/settings.d.ts

@@ -40,6 +40,8 @@ export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_NEW_EVENT_AVAILABILITY_KEY_FROM: moment.Moment;
 export declare const USE_ADVANCE_BOOKING_REQUIREMENT: boolean;
+export declare const USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT: boolean;
+export declare const USE_DELETE_EVENT_BY_ORDER: boolean;
 export declare const INFORM_RESERVATION_TASK_DELAY_IN_SECONDS: number;
 export declare const MONGO_MAX_TIME_MS: number;
 /**

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_ADVANCE_BOOKING_REQUIREMENT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = exports.USE_ADVANCE_BOOKING_REQUIREMENT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -72,6 +72,8 @@ exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_
 //     ? process.env.USE_NEW_STOCK_HOLDER_REPO_IDS.split(' ')
 //     : [];
 exports.USE_ADVANCE_BOOKING_REQUIREMENT = process.env.USE_ADVANCE_BOOKING_REQUIREMENT === '1';
+exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = process.env.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT === '1';
+exports.USE_DELETE_EVENT_BY_ORDER = process.env.USE_DELETE_EVENT_BY_ORDER === '1';
 exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = (typeof process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS === 'string')
     ? Number(process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS)
     : 0;

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "^4.325.0-alpha.1",
-    "@cinerino/sdk": "3.163.0",
+    "@chevre/factory": "4.325.0-alpha.5",
+    "@cinerino/sdk": "3.164.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.7.0-alpha.1"
+  "version": "21.7.0-alpha.10"
 }

package/example/src/chevre/migrateReservationProvider.ts

@@ -1,119 +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) };
-// const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const reservationRepo = new chevre.repository.Reservation(mongoose.connection);
-    const placeRepo = new chevre.repository.Place(mongoose.connection);
-
-    const cursor = reservationRepo.getCursor(
-        {
-            typeOf: {
-                $in: [
-                    chevre.factory.reservationType.EventReservation
-                ]
-            },
-            // bookingTime: {
-            //     $gte: moment('2022-07-01T00:00:00Z')
-            //         .toDate(),
-            //     $lte: moment('2022-03-01T00:00:00Z')
-            //         .toDate()
-            // },
-            'provider.id': { $exists: false }
-        },
-        {
-            _id: 1,
-            project: 1,
-            provider: 1,
-            bookingTime: 1,
-            reservationFor: 1
-        }
-    );
-    console.log('reservations found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const reservation: Pick<
-            chevre.factory.reservation.IReservation<chevre.factory.reservationType.EventReservation>,
-            'id' | 'project' | 'provider' | 'bookingTime' | 'reservationFor'
-        > = doc.toObject();
-
-        const providerId = reservation.provider?.id;
-        const alreadyMigrated = typeof providerId === 'string';
-
-        if (alreadyMigrated) {
-            console.log('already exist...', reservation.project.id, reservation.id, reservation.bookingTime, providerId, i);
-        } else {
-            const movieTheaterId: string = reservation.reservationFor.superEvent.location.id;
-            const movieTheaterBranchCode: string = reservation.reservationFor.superEvent.location.branchCode;
-            const movieTheaters = <Pick<
-                chevre.factory.place.movieTheater.IPlaceWithoutScreeningRoom,
-                'parentOrganization' | 'branchCode'
-            >[]>
-                await placeRepo.searchMovieTheaters(
-                    {
-                        limit: 1,
-                        page: 1,
-                        project: { id: { $eq: reservation.project.id } },
-                        id: { $eq: movieTheaterId }
-                    },
-                    ['parentOrganization', 'branchCode'],
-                    []
-                );
-            const movieTheater = movieTheaters.shift();
-            const sellerId = movieTheater?.parentOrganization?.id;
-            console.log(
-                'movieTheater found',
-                reservation.project.id, reservation.id, reservation.bookingTime, providerId, 'sellerId:', sellerId,
-                'movieTheaterId:', movieTheaterId,
-                'movieTheaterBranchCode:', movieTheaterBranchCode,
-                i
-            );
-            if (typeof sellerId !== 'string') {
-                console.error(
-                    'movieTheater not found',
-                    reservation.project.id, reservation.id, reservation.bookingTime, providerId, 'sellerId:', sellerId,
-                    'movieTheaterId:', movieTheaterId,
-                    'movieTheaterBranchCode:', movieTheaterBranchCode,
-                    i
-                );
-                throw new Error('movieTheater not found');
-
-                // return;
-            }
-            if (typeof sellerId === 'string') {
-                const newProvider: chevre.factory.reservation.IProvider = {
-                    id: sellerId,
-                    typeOf: chevre.factory.organizationType.Corporation
-                };
-                console.log(
-                    'updating reservation...', reservation.project.id, reservation.id, reservation.bookingTime, providerId, i, updateCount);
-                await reservationRepo.updatePartiallyById({
-                    id: reservation.id,
-                    update: <any>{
-                        provider: newProvider
-                    }
-                });
-                updateCount += 1;
-                console.log('updated.', reservation.project.id, reservation.id, reservation.bookingTime, providerId, i, updateCount);
-            }
-        }
-    });
-
-    console.log(i, 'reservations checked');
-    console.log(updateCount, 'reservations updated');
-}
-
-main()
-    .then()
-    .catch(console.error);