@chevre/domain 21.6.0-alpha.0 → 21.6.0-alpha.10

package/example/src/chevre/createManyEventsIfNotExist.ts

@@ -105,7 +105,6 @@ async function main() {
                 },
                 offers: {
                     typeOf: chevre.factory.offerType.Offer,
-                    priceCurrency: chevre.factory.priceCurrency.JPY,
                     availabilityEnds: moment('2023-06-26T14:20:00.000Z')
                         .toDate(),
                     availabilityStarts: moment('2023-06-23T15:00:00.000Z')
@@ -275,7 +274,6 @@ async function main() {
                 },
                 offers: {
                     typeOf: chevre.factory.offerType.Offer,
-                    priceCurrency: chevre.factory.priceCurrency.JPY,
                     availabilityEnds: moment('2023-06-26T14:20:00.000Z')
                         .toDate(),
                     availabilityStarts: moment('2023-06-23T15:00:00.000Z')

package/example/src/chevre/migrateEventOrganizer.ts

@@ -5,7 +5,7 @@ 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;
+const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
@@ -17,7 +17,7 @@ async function main() {
     const cursor = eventRepo.getCursor(
         {
             // 'project.id': { $eq: project.id },
-            // 'project.id': { $ne: EXCLUDED_PROJECT_ID },
+            'project.id': { $ne: EXCLUDED_PROJECT_ID },
             typeOf: {
                 $in: [
                     // chevre.factory.eventType.ScreeningEvent,
@@ -96,16 +96,16 @@ async function main() {
 
         if (alreadyMigrated) {
             console.log('already exist...', event.project.id, event.id, event.startDate, organizerId, i);
-            if (organizerId !== sellerId) {
+            if (organizerId === sellerId) {
+                console.log('organizerId is valid', event.project.id, event.id, event.startDate, organizerId, i);
+            } else {
                 invalidOrganizerCount += 1;
-            }
-        } else {
-            throw new Error('organizer not found');
-            // if (typeof sellerId !== 'string') {
-            //     throw new Error('movieTheater not found');
-            // }
-            if (typeof sellerId === 'string') {
-                const newOrganizer: chevre.factory.event.screeningEventSeries.IOrganizer = {
+
+                // organizerを修正する
+                if (typeof sellerId !== 'string') {
+                    throw new Error('movieTheater not found');
+                }
+                const fixedOrganizer: chevre.factory.event.screeningEventSeries.IOrganizer = {
                     id: sellerId
                 };
                 console.log('updating event...', event.project.id, event.id, event.startDate, i);
@@ -114,12 +114,33 @@ async function main() {
                     id: event.id,
                     attributes: <any>{
                         typeOf: event.typeOf,
-                        organizer: newOrganizer
+                        organizer: fixedOrganizer
                     }
                 });
                 updateCount += 1;
                 console.log('updated.', event.project.id, event.id, event.startDate, i);
             }
+        } else {
+            throw new Error('organizer not found');
+            // if (typeof sellerId !== 'string') {
+            //     throw new Error('movieTheater not found');
+            // }
+            // if (typeof sellerId === 'string') {
+            //     const newOrganizer: chevre.factory.event.screeningEventSeries.IOrganizer = {
+            //         id: sellerId
+            //     };
+            //     console.log('updating event...', event.project.id, event.id, event.startDate, i);
+            //     await eventRepo.updatePartiallyById({
+            //         project: { id: event.project.id },
+            //         id: event.id,
+            //         attributes: <any>{
+            //             typeOf: event.typeOf,
+            //             organizer: newOrganizer
+            //         }
+            //     });
+            //     updateCount += 1;
+            //     console.log('updated.', event.project.id, event.id, event.startDate, i);
+            // }
         }
     });
 

package/example/src/chevre/migrateMovieAvailabilityStarts.ts

@@ -24,6 +24,7 @@ async function main() {
     let i = 0;
     let updateCount = 0;
     let datePublishedUndefinedCount = 0;
+    let datePublishedIsAfterNowCount = 0;
     await cursor.eachAsync(async (doc) => {
         i += 1;
         const movie: chevre.factory.creativeWork.movie.ICreativeWork = doc.toObject();
@@ -38,6 +39,14 @@ async function main() {
 
         if (alreadyMigrated) {
             console.log('already exist...', movie.project.id, movie.id, movie.identifier, availabilityStarts, availabilityEnds, i);
+
+            if (moment(movie.datePublished)
+                .isAfter(moment())) {
+                datePublishedIsAfterNowCount += 1;
+                // tslint:disable-next-line:max-line-length
+                // throw new Error(`movie.datePublished isAfter now ${movie.project.id} ${movie.id} ${movie.identifier} ${movie.datePublished}`);
+
+            }
         } else {
             if (movie.datePublished === undefined) {
                 console.error('movie.datePublished undefined', movie.project.id, movie.id, movie.identifier, i);
@@ -63,6 +72,8 @@ async function main() {
     console.log(i, 'creativeWorks checked');
     console.log(updateCount, 'creativeWorks updated');
     console.log(datePublishedUndefinedCount, 'datePublishedUndefinedCount');
+    console.log(datePublishedIsAfterNowCount, 'datePublishedIsAfterNowCount');
+
 }
 
 main()

package/example/src/chevre/searchSellers.ts

@@ -0,0 +1,28 @@
+// tslint:disable:no-console
+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 sellerRepo = new chevre.repository.Seller(mongoose.connection);
+
+    const sellers = await sellerRepo.search(
+        {
+            project: { id: { $eq: project.id } },
+            paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
+            hasMerchantReturnPolicy: { applicablePaymentMethod: {} }
+        },
+        ['name'],
+        []
+    );
+    console.log('sellers found', sellers);
+    console.log(sellers.length, 'sellers found');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -4,16 +4,28 @@ import * as mongoose from 'mongoose';
 import { chevre } from '../../../lib/index';
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const offerRepo = new chevre.repository.Offer(mongoose.connection);
+    const eventRepo = new chevre.repository.Event(mongoose.connection);
 
     let updateResult: any;
-    updateResult = await offerRepo.unsetUnnecessaryFields({
-        filter: { 'category.project': { $exists: true } },
-        $unset: { 'category.project': 1 }
+    updateResult = await eventRepo.unsetUnnecessaryFields({
+        filter: { 'offers.acceptedPaymentMethod': { $exists: true } },
+        $unset: { 'offers.acceptedPaymentMethod': 1 }
     });
-    console.log('offers unset', updateResult);
+    console.log('events unset', updateResult);
+
+    updateResult = await eventRepo.unsetUnnecessaryFields({
+        filter: { 'offers.project': { $exists: true } },
+        $unset: { 'offers.project': 1 }
+    });
+    console.log('events unset', updateResult);
+
+    updateResult = await eventRepo.unsetUnnecessaryFields({
+        filter: { 'offers.priceCurrency': { $exists: true } },
+        $unset: { 'offers.priceCurrency': 1 }
+    });
+    console.log('events unset', updateResult);
 }
 
 main()

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

@@ -237,6 +237,21 @@ export declare class MongoRepository {
             };
         };
     }): Promise<import("mongodb").DeleteResult>;
+    /**
+     * 興行(プロダクト)から削除する
+     */
+    deleteManyByItemOfferedId(params: {
+        project: {
+            id: string;
+        };
+        offers: {
+            itemOffered: {
+                id: {
+                    $in: string[];
+                };
+            };
+        };
+    }): Promise<import("mongodb").DeleteResult>;
     deleteByProject(params: {
         project: {
             id: string;

package/lib/chevre/repo/event.js

@@ -954,6 +954,18 @@ class MongoRepository {
                 .exec();
         });
     }
+    /**
+     * 興行(プロダクト)から削除する
+     */
+    deleteManyByItemOfferedId(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.eventModel.deleteMany({
+                'project.id': { $eq: params.project.id },
+                'offers.itemOffered.id': { $exists: true, $in: params.offers.itemOffered.id.$in }
+            })
+                .exec();
+        });
+    }
     deleteByProject(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.eventModel.deleteMany({

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

@@ -75,6 +75,18 @@ schema.index({ additionalProperty: 1, branchCode: 1 }, {
         additionalProperty: { $exists: true }
     }
 });
+schema.index({ 'paymentAccepted.paymentMethodType': 1, branchCode: 1 }, {
+    name: 'searchByPaymentAccepted',
+    partialFilterExpression: {
+        'paymentAccepted.paymentMethodType': { $exists: true }
+    }
+});
+schema.index({ 'hasMerchantReturnPolicy.applicablePaymentMethod': 1, branchCode: 1 }, {
+    name: 'searchByHasMerchantReturnPolicyApplicablePaymentMethod',
+    partialFilterExpression: {
+        'hasMerchantReturnPolicy.applicablePaymentMethod': { $exists: true }
+    }
+});
 schema.index({ 'hasMerchantReturnPolicy.itemCondition.id': 1, branchCode: 1 }, {
     name: 'searchByHasMerchantReturnPolicyItemConditionId',
     partialFilterExpression: {

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

@@ -71,6 +71,21 @@ export declare class MongoRepository {
         attributes: factory.unitPriceOffer.IUnitPriceOffer;
         upsert?: boolean;
     }[]): Promise<void>;
+    /**
+     * プロダクトIDからアドオンを除外する
+     */
+    pullAddOns(params: {
+        project: {
+            id: string;
+        };
+        addOn: {
+            itemOffered: {
+                id: {
+                    $in: string[];
+                };
+            };
+        };
+    }): Promise<import("mongodb").UpdateResult | undefined>;
     deleteById(params: {
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/offer.js

@@ -494,6 +494,27 @@ class MongoRepository {
             }
         });
     }
+    /**
+     * プロダクトIDからアドオンを除外する
+     */
+    pullAddOns(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (params.addOn.itemOffered.id.$in.length === 0) {
+                return;
+            }
+            return this.offerModel.updateMany({
+                'project.id': { $eq: params.project.id },
+                'addOn.itemOffered.id': { $exists: true, $in: params.addOn.itemOffered.id.$in }
+            }, {
+                $pull: {
+                    addOn: {
+                        'itemOffered.id': { $in: params.addOn.itemOffered.id.$in }
+                    }
+                }
+            })
+                .exec();
+        });
+    }
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.offerModel.findOneAndRemove({ _id: params.id })

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

@@ -52,6 +52,20 @@ export declare class MongoRepository {
             };
         };
     }): Promise<void>;
+    pullItemListElement(params: {
+        project: {
+            id: string;
+        };
+        $pull: {
+            itemListElement: {
+                $elemMatch: {
+                    id: {
+                        $in: string[];
+                    };
+                };
+            };
+        };
+    }): Promise<import("mongodb").UpdateResult | undefined>;
     search(params: factory.offerCatalog.ISearchConditions): Promise<(Omit<factory.offerCatalog.IOfferCatalog, 'itemListElement'> & {
         numberOfItems?: number;
     })[]>;

package/lib/chevre/repo/offerCatalog.js

@@ -178,6 +178,27 @@ class MongoRepository {
                 .exec();
         });
     }
+    pullItemListElement(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (params.$pull.itemListElement.$elemMatch.id.$in.length === 0) {
+                return;
+            }
+            return this.offerCatalogModel.updateMany({
+                'project.id': { $eq: params.project.id },
+                'itemListElement.id': {
+                    $exists: true,
+                    $in: params.$pull.itemListElement.$elemMatch.id.$in
+                }
+            }, {
+                $pull: {
+                    itemListElement: {
+                        id: { $in: params.$pull.itemListElement.$elemMatch.id.$in }
+                    }
+                }
+            })
+                .exec();
+        });
+    }
     search(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -68,6 +68,14 @@ export declare class MongoRepository {
          */
         createIfNotExist?: boolean;
     }): Promise<factory.product.IProduct>;
+    deleteByHasOfferCatalog(params: {
+        project: {
+            id: string;
+        };
+        hasOfferCatalog: {
+            id: string;
+        };
+    }): Promise<import("mongodb").DeleteResult>;
     /**
      * プロジェクト指定で削除する
      */

package/lib/chevre/repo/product.js

@@ -371,6 +371,15 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    deleteByHasOfferCatalog(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.productModel.deleteMany({
+                'project.id': { $eq: params.project.id },
+                'hasOfferCatalog.id': { $exists: true, $eq: params.hasOfferCatalog.id }
+            })
+                .exec();
+        });
+    }
     /**
      * プロジェクト指定で削除する
      */

package/lib/chevre/repo/seller.js

@@ -34,7 +34,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -120,7 +120,19 @@ class MongoRepository {
                 }
             });
         }
-        const hasMerchantReturnPolicyItemConditionIdEq = (_q = (_p = (_o = params.hasMerchantReturnPolicy) === null || _o === void 0 ? void 0 : _o.itemCondition) === null || _p === void 0 ? void 0 : _p.id) === null || _q === void 0 ? void 0 : _q.$eq;
+        const paymentAcceptedEq = (_p = (_o = params.paymentAccepted) === null || _o === void 0 ? void 0 : _o.paymentMethodType) === null || _p === void 0 ? void 0 : _p.$eq;
+        if (typeof paymentAcceptedEq === 'string') {
+            andConditions.push({
+                'paymentAccepted.paymentMethodType': { $exists: true, $eq: paymentAcceptedEq }
+            });
+        }
+        const hasMerchantReturnApplicablePaymentMethodEq = (_r = (_q = params.hasMerchantReturnPolicy) === null || _q === void 0 ? void 0 : _q.applicablePaymentMethod) === null || _r === void 0 ? void 0 : _r.$eq;
+        if (typeof hasMerchantReturnApplicablePaymentMethodEq === 'string') {
+            andConditions.push({
+                'hasMerchantReturnPolicy.applicablePaymentMethod': { $exists: true, $eq: hasMerchantReturnApplicablePaymentMethodEq }
+            });
+        }
+        const hasMerchantReturnPolicyItemConditionIdEq = (_u = (_t = (_s = params.hasMerchantReturnPolicy) === null || _s === void 0 ? void 0 : _s.itemCondition) === null || _t === void 0 ? void 0 : _t.id) === null || _u === void 0 ? void 0 : _u.$eq;
         if (typeof hasMerchantReturnPolicyItemConditionIdEq === 'string') {
             andConditions.push({
                 'hasMerchantReturnPolicy.itemCondition.id': {

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

@@ -7,7 +7,7 @@ exports.createStartParams = void 0;
 const factory = require("../../../factory");
 // 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;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
     const paymentServiceId = (params.paymentService !== undefined)
         ? String(params.paymentService.id)
         : '';
@@ -36,15 +36,14 @@ function createStartParams(params) {
             };
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
+            const specifiedMovieTickets = (_c = params.object.paymentMethod) === null || _c === void 0 ? void 0 : _c.movieTickets;
             totalPaymentDue = {
                 typeOf: 'MonetaryAmount',
                 currency: factory.unitCode.C62,
-                value: (Array.isArray((_c = params.object.paymentMethod) === null || _c === void 0 ? void 0 : _c.movieTickets))
-                    ? (_d = params.object.paymentMethod) === null || _d === void 0 ? void 0 : _d.movieTickets.length
-                    : 0
+                value: (Array.isArray(specifiedMovieTickets)) ? specifiedMovieTickets.length : 0
             };
             // MovieTicketIFの決済取引において最大同時着券数を設定可能にする(2023-03-27~)
-            const totalPaymentDueMaxValue = (_g = (_f = (_e = params.paymentService) === null || _e === void 0 ? void 0 : _e.availableChannel) === null || _f === void 0 ? void 0 : _f.totalPaymentDue) === null || _g === void 0 ? void 0 : _g.maxValue;
+            const totalPaymentDueMaxValue = (_f = (_e = (_d = params.paymentService) === null || _d === void 0 ? void 0 : _d.availableChannel) === null || _e === void 0 ? void 0 : _e.totalPaymentDue) === null || _f === void 0 ? void 0 : _f.maxValue;
             const totalPaymentDueValue = totalPaymentDue.value;
             if (typeof totalPaymentDueValue === 'number' && typeof totalPaymentDueMaxValue === 'number') {
                 if (totalPaymentDueValue > totalPaymentDueMaxValue) {
@@ -56,30 +55,35 @@ function createStartParams(params) {
         // no op
     }
     const informPaymentParams = createInformPaymentParams({ paymentService: params.paymentService });
-    const accountId = (_h = params.object.paymentMethod) === null || _h === void 0 ? void 0 : _h.accountId;
-    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: {
-            // パラメータから必要なもののみ取り込む
-            accountId: (typeof accountId === 'string') ? accountId : '',
-            paymentMethodId: params.transactionNumber,
-            typeOf: params.paymentServiceType,
-            id: paymentServiceId,
-            onPaymentStatusChanged: { informPayment: informPaymentParams },
-            paymentMethod: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray((_j = params.object.paymentMethod) === null || _j === void 0 ? void 0 : _j.additionalProperty))
-                    ? (_k = params.object.paymentMethod) === null || _k === void 0 ? void 0 : _k.additionalProperty
-                    : [], name: (typeof ((_l = params.object.paymentMethod) === null || _l === void 0 ? void 0 : _l.name) === 'string')
-                    ? params.object.paymentMethod.name
-                    : paymentMethodType, amount: params.amount, paymentMethodId: params.transactionNumber, typeOf: paymentMethodType }, (typeof ((_m = params.object.paymentMethod) === null || _m === void 0 ? void 0 : _m.description) === 'string')
-                ? { description: (_o = params.object.paymentMethod) === null || _o === void 0 ? void 0 : _o.description }
-                : undefined), (totalPaymentDue !== undefined)
-                ? { totalPaymentDue: totalPaymentDue }
-                : undefined), (typeof accountId === 'string') ? { accountId: accountId } : undefined), (typeof ((_p = params.object.paymentMethod) === null || _p === void 0 ? void 0 : _p.method) === 'string')
-                ? { method: (_q = params.object.paymentMethod) === null || _q === void 0 ? void 0 : _q.method }
-                : undefined), (((_r = params.object.paymentMethod) === null || _r === void 0 ? void 0 : _r.creditCard) !== undefined)
-                ? { creditCard: (_s = params.object.paymentMethod) === null || _s === void 0 ? void 0 : _s.creditCard }
-                : undefined), (Array.isArray((_t = params.object.paymentMethod) === null || _t === void 0 ? void 0 : _t.movieTickets))
-                ? { movieTickets: (_u = params.object.paymentMethod) === null || _u === void 0 ? void 0 : _u.movieTickets }
-                : undefined)
-        }, expires: params.expires }, (typeof ((_v = params.location) === null || _v === void 0 ? void 0 : _v.typeOf) === 'string')
+    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')
+            ? 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 }
+        : 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);
+    const serviceOutput = (typeof creditCardAsPaymentServiceOutputCurrency === 'string')
+        ? {
+            amount: {
+                currency: creditCardAsPaymentServiceOutputCurrency,
+                value: paymentMethod.amount // 通貨区分としての金額
+            }
+        }
+        : undefined;
+    const object = Object.assign({ 
+        // パラメータから必要なもののみ取り込む
+        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')
         ? { location: params.location }
         : undefined);
 }

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

@@ -9,17 +9,6 @@ function createPayActions(params) {
     const payObject = createPayObject(params);
     const informPaymentActions = createInformPaymentActions(params);
     if (payObject !== undefined) {
-        // const maskedCustomer = createMaskedCustomer(params.order);
-        // const simpleOrder: factory.order.ISimpleOrder = {
-        //     typeOf: params.order.typeOf,
-        //     seller: params.order.seller,
-        //     // mask
-        //     customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
-        //     orderNumber: params.order.orderNumber,
-        //     price: params.order.price,
-        //     priceCurrency: params.order.priceCurrency,
-        //     orderDate: params.order.orderDate
-        // };
         const payPurpose = {
             typeOf: params.order.typeOf,
             confirmationNumber: params.order.confirmationNumber,
@@ -28,10 +17,7 @@ function createPayActions(params) {
         const payAction = Object.assign({ project: params.transaction.project, typeOf: factory.actionType.PayAction, object: [payObject], agent: params.transaction.project, potentialActions: {
                 add2report: true,
                 informPayment: informPaymentActions
-            }, 
-            // optimize(2023-03-20~)
-            // purpose: simpleOrder,
-            purpose: payPurpose, recipient: {
+            }, purpose: payPurpose, recipient: {
                 id: params.transaction.recipient.id,
                 name: params.transaction.recipient.name,
                 typeOf: params.transaction.recipient.typeOf
@@ -42,8 +28,9 @@ function createPayActions(params) {
     }
     return payActions;
 }
+// tslint:disable-next-line:cyclomatic-complexity
 function createPayObject(params) {
-    var _a, _b;
+    var _a;
     const transaction = params.transaction;
     const paymentMethod = transaction.object.paymentMethod;
     const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf);
@@ -81,15 +68,11 @@ function createPayObject(params) {
             };
             break;
         case factory.service.paymentService.PaymentServiceType.CreditCard:
-            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: {
+            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: {
                         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)
-            };
+                    }, typeOf: paymentMethodType }, (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.accountId) === 'string') ? { accountId: paymentMethod.accountId } : undefined) }, (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: {
@@ -100,7 +83,7 @@ function createPayObject(params) {
                     totalPaymentDue: {
                         typeOf: 'MonetaryAmount',
                         currency: factory.unitCode.C62,
-                        value: (_b = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets) === null || _b === void 0 ? void 0 : _b.length
+                        value: (Array.isArray(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets)) ? paymentMethod.movieTickets.length : 0
                     },
                     typeOf: paymentMethodType
                 }, movieTickets: paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets }, (Array.isArray(paymentServiceOutput)) ? { serviceOutput: paymentServiceOutput } : undefined);
@@ -111,6 +94,7 @@ function createPayObject(params) {
     return payObject;
 }
 function createPayObjectServiceOutput(params) {
+    var _a, _b;
     const transaction = params.transaction;
     const paymentMethod = transaction.object.paymentMethod;
     const order = params.order;
@@ -118,7 +102,20 @@ function createPayObjectServiceOutput(params) {
     switch (transaction.object.typeOf) {
         case factory.service.paymentService.PaymentServiceType.FaceToFace:
         case factory.service.paymentService.PaymentServiceType.PaymentCard:
+            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;
+            }
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
             const paymentMethodType = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf;
@@ -129,9 +126,7 @@ function createPayObjectServiceOutput(params) {
                     const amount = movieTicket2amount(transaction, movieTicket);
                     const reservation4invoice = movieTicket2reservation4invoice(movieTicket, order, String(paymentMethodType));
                     return Object.assign(Object.assign({ identifier: movieTicket.identifier }, (typeof (amount === null || amount === void 0 ? void 0 : amount.value) === 'number') ? { amount } : undefined), (typeof ((_a = reservation4invoice.priceSpecification) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-                        ? {
-                            serviceOutput: reservation4invoice
-                        }
+                        ? { serviceOutput: reservation4invoice }
                         : undefined);
                 });
             }

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

@@ -243,9 +243,6 @@ function processAuthorizeAccount(params, transaction, paymentServiceId) {
             typeOf: 'MonetaryAmount',
             currency,
             value: amount
-            // value: (typeof pendingTransaction.object.amount === 'number')
-            //     ? pendingTransaction.object.amount
-            //     : pendingTransaction.object.amount.value
         };
         const savingPendingTransaction = {
             typeOf: pendingTransaction.typeOf,