@chevre/domain 23.1.0-alpha.16 → 23.1.0-alpha.18

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

@@ -79,8 +79,9 @@ export declare class EventRepo {
      * 特定の追加特性をキーにして、存在しなければ作成する(複数対応)
      * 施設コンテンツとルームは1つに限定
      * 存在すれば、特定の属性のみ更新する
+     * @deprecated migrate to upsertManyScreeningEventByIdentifier
      */
-    upsertManyByAdditionalProperty(params: {
+    upsertManyByAdditionalPropertyDeprecated(params: {
         events: factory.event.screeningEvent.IAttributes[];
         additionalPropertyFilter: {
             name: string;

package/lib/chevre/repo/event.js

@@ -295,9 +295,10 @@ class EventRepo {
      * 特定の追加特性をキーにして、存在しなければ作成する(複数対応)
      * 施設コンテンツとルームは1つに限定
      * 存在すれば、特定の属性のみ更新する
+     * @deprecated migrate to upsertManyScreeningEventByIdentifier
      */
     // tslint:disable-next-line:max-func-body-length
-    upsertManyByAdditionalProperty(params, options) {
+    upsertManyByAdditionalPropertyDeprecated(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const { update } = options;
             const bulkWriteOps = [];

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

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

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

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,8 @@
+import * as factory from '../../../../../factory';
+import { IAuthorizePaymentAction } from './factory';
+declare function validateInvoiceReferencesOrder(authorizePaymentActions: IAuthorizePaymentAction[], 
+/**
+ * 受け入れられた興行オファー
+ */
+eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[]): void;
+export { validateInvoiceReferencesOrder };

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

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateInvoiceReferencesOrder = validateInvoiceReferencesOrder;
+const createDebug = require("debug");
+const factory = require("../../../../../factory");
+const debug = createDebug('chevre-domain:service:transaction');
+function validateInvoiceReferencesOrder(authorizePaymentActions, 
+/**
+ * 受け入れられた興行オファー
+ */
+eventReservationAcceptedOffers) {
+    // 興行オファーに含まれるイベントIDリスト
+    let eventIdsMustBe = [];
+    if (Array.isArray(eventReservationAcceptedOffers)) {
+        eventReservationAcceptedOffers.forEach((offer) => {
+            eventIdsMustBe.push(offer.itemOffered.reservationFor.id);
+        });
+    }
+    eventIdsMustBe = [...new Set(eventIdsMustBe)];
+    debug('validateInvoiceReferencesOrder: eventIdsMustBe: ', JSON.stringify(eventIdsMustBe));
+    // 全決済承認について、承認ごとに検証
+    authorizePaymentActions.forEach((authorizePaymentAction) => {
+        var _a, _b, _c, _d;
+        const paymentMethodId = (_a = authorizePaymentAction.result) === null || _a === void 0 ? void 0 : _a[0].paymentMethodId;
+        const paymentServiceType = (_b = authorizePaymentAction.result) === null || _b === void 0 ? void 0 : _b[0].issuedThrough.typeOf;
+        if (paymentServiceType !== factory.service.paymentService.PaymentServiceType.CreditCard) {
+            // クレジットカードIF以外は検証不要
+            return;
+        }
+        const orderedItemsByInvoice = (_d = (_c = authorizePaymentAction.result) === null || _c === void 0 ? void 0 : _c[0].referencesOrder) === null || _d === void 0 ? void 0 : _d.orderedItem;
+        if (!Array.isArray(orderedItemsByInvoice)) {
+            // 決済承認時に注文アイテムの指定がなければ検証不要
+            return;
+        }
+        // 請求の関連注文アイテムが定義されていれば(空配列であったとしても)、イベントIDの一致検証が必要
+        // 請求の関連イベントIDリスト
+        const eventIdsByInvoice = orderedItemsByInvoice.map((orderedItem) => orderedItem.orderedItem.serviceOutput.reservationFor.id);
+        debug('validateInvoiceReferencesOrder: eventIdsByInvoice: ', JSON.stringify(eventIdsByInvoice), paymentServiceType, paymentMethodId);
+        const eventIdsMatched = eventIdsMustBe.length === eventIdsByInvoice.length
+            && eventIdsMustBe.every((eventIdMustExist) => eventIdsByInvoice.includes(eventIdMustExist));
+        if (!eventIdsMatched) {
+            throw new factory.errors.Argument('id', `referencesOrder.orderedItem not matched. ${paymentMethodId}`);
+        }
+    });
+}

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

@@ -0,0 +1,3 @@
+import { IAuthorizeEventServiceOffer, IAuthorizeMoneyTransferOffer, IAuthorizePaymentAction, IAuthorizeProductOffer } from './factory';
+declare function validatePrice(authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], authorizeProductOfferActions: Pick<IAuthorizeProductOffer, 'id' | 'result'>[], authorizeMoneyTansferActions: Pick<IAuthorizeMoneyTransferOffer, 'id' | 'result'>[]): void;
+export { validatePrice };

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

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validatePrice = validatePrice;
+const factory = require("../../../../../factory");
+function validatePrice(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions, authorizeMoneyTansferActions) {
+    let priceByAgent = 0;
+    let priceBySeller = 0;
+    // 決済承認を確認
+    authorizePaymentActions.forEach(({ result }) => {
+        var _a;
+        const resultAsInvoice = (Array.isArray(result))
+            // ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            ? result[0]
+            : undefined;
+        const jpyAmount = (((_a = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _a === void 0 ? void 0 : _a.currency) === factory.priceCurrency.JPY)
+            ? resultAsInvoice.totalPaymentDue.value
+            : 0;
+        priceByAgent += jpyAmount;
+    });
+    // 販売者が提供するアイテムの発生金額
+    [
+        ...authorizeEventServiceOfferActions,
+        ...authorizeProductOfferActions,
+        ...authorizeMoneyTansferActions
+    ].forEach(({ id, result }) => {
+        const priceByAction = result === null || result === void 0 ? void 0 : result.price;
+        if (typeof priceByAction === 'number' && priceByAction >= 0) {
+            priceBySeller += priceByAction;
+        }
+        else {
+            // price未確定(オファー未指定)のオファー承認アクションが存在すれば確定不可能(2023-11-27~)
+            throw new factory.errors.Argument('id', `some actions with no offer specified. [${id}]`);
+        }
+    });
+    if (priceByAgent !== priceBySeller) {
+        throw new factory.errors.Argument('id', `prices are not matched. [${priceByAgent},${priceBySeller}]`);
+    }
+}

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

@@ -1,13 +1,7 @@
 import * as factory from '../../../../factory';
 import { placeOrder as PlaceOrderFactory } from '../../../../factory/transaction';
-export type IAcceptPayAction = Pick<factory.action.accept.pay.IAction, 'object' | 'result' | 'endDate'>;
-export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction;
-export type IAuthorizeProductOffer = factory.action.authorize.offer.product.IAction;
-export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyTransfer.IAction;
-export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'result' | 'endDate' | 'instrument'> & {
-    object: Pick<factory.action.authorize.paymentMethod.any.IObject, 'typeOf'>;
-};
-export type IPayTransaction = Pick<factory.assetTransaction.pay.ITransaction, 'object'>;
+import { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizeMoneyTransferOffer, IAuthorizePaymentAction, IAuthorizeProductOffer, IPayTransaction } from './validation/factory';
+export { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizeMoneyTransferOffer, IAuthorizePaymentAction, IAuthorizeProductOffer, IPayTransaction };
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */

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

@@ -11,7 +11,9 @@ exports.validateEventOffers = validateEventOffers;
 const createDebug = require("debug");
 const util_1 = require("util");
 const factory = require("../../../../factory");
+const validateInvoiceReferencesOrder_1 = require("./validation/validateInvoiceReferencesOrder");
 const validateMovieTicket_1 = require("./validation/validateMovieTicket");
+const validatePrice_1 = require("./validation/validatePrice");
 const debug = createDebug('chevre-domain:service:transaction');
 /**
  * 取引が確定可能な状態かどうかをチェックする
@@ -19,7 +21,9 @@ const debug = createDebug('chevre-domain:service:transaction');
 function validateTransaction(transaction, acceptPayActions, authorizePaymentActions, authorizeEventServiceOfferActions, authorizeMoneyTansferActions, authorizeProductOfferActions, eventReservationAcceptedOffers, payTransactions, customer) {
     // validateProfile(transaction);
     validateProfile({ customer });
-    validatePrice(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions, authorizeMoneyTansferActions);
+    (0, validatePrice_1.validatePrice)(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions, authorizeMoneyTansferActions);
+    // 請求のreferencesOrder検証(2025-11-23~)
+    (0, validateInvoiceReferencesOrder_1.validateInvoiceReferencesOrder)(authorizePaymentActions, eventReservationAcceptedOffers);
     // 利用可能な通貨単位に対して取引検証
     validateMonetaryAmount(authorizePaymentActions, authorizeEventServiceOfferActions);
     // 利用可能なMovieTicketIF決済方法タイプに対して動的にコーディング
@@ -119,40 +123,6 @@ function validateProfile(params) {
         throw new factory.errors.Argument('Transaction', 'customer name required');
     }
 }
-function validatePrice(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions, authorizeMoneyTansferActions) {
-    let priceByAgent = 0;
-    let priceBySeller = 0;
-    // 決済承認を確認
-    authorizePaymentActions.forEach(({ result }) => {
-        var _a;
-        const resultAsInvoice = (Array.isArray(result))
-            // ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
-            ? result[0]
-            : undefined;
-        const jpyAmount = (((_a = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _a === void 0 ? void 0 : _a.currency) === factory.priceCurrency.JPY)
-            ? resultAsInvoice.totalPaymentDue.value
-            : 0;
-        priceByAgent += jpyAmount;
-    });
-    // 販売者が提供するアイテムの発生金額
-    [
-        ...authorizeEventServiceOfferActions,
-        ...authorizeProductOfferActions,
-        ...authorizeMoneyTansferActions
-    ].forEach(({ id, result }) => {
-        const priceByAction = result === null || result === void 0 ? void 0 : result.price;
-        if (typeof priceByAction === 'number' && priceByAction >= 0) {
-            priceBySeller += priceByAction;
-        }
-        else {
-            // price未確定(オファー未指定)のオファー承認アクションが存在すれば確定不可能(2023-11-27~)
-            throw new factory.errors.Argument('id', `some actions with no offer specified. [${id}]`);
-        }
-    });
-    if (priceByAgent !== priceBySeller) {
-        throw new factory.errors.Argument('id', `prices are not matched. [${priceByAgent},${priceBySeller}]`);
-    }
-}
 function validatePaymentUrl(transaction, acceptPayActions, authorizePaymentActions) {
     var _a;
     // 決済URLが発行されている場合、検証

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.1.0-alpha.16"
+  "version": "23.1.0-alpha.18"
 }

package/example/src/chevre/upsertManyEventsByAdditionalProperty.ts

@@ -1,193 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-import { chevre } from '../../../lib/index';
-
-const PROJECT_ID = String(process.env.PROJECT_ID);
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    const now = new Date();
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
-    const result = await eventRepo.upsertManyByAdditionalProperty(
-        {
-            events: [
-                {
-                    additionalProperty: [
-                        {
-                            name: 'sampleCreateId',
-                            value: 'akeuu512i-202410171410-01'
-                        }
-                    ],
-                    project: {
-                        id: PROJECT_ID,
-                        typeOf: chevre.factory.organizationType.Project
-                    },
-                    typeOf: chevre.factory.eventType.ScreeningEvent,
-                    doorTime: new Date('2024-10-17T05:30:00.000Z'),
-                    endDate: new Date('2024-10-17T05:45:00.000Z'),
-                    eventStatus: chevre.factory.eventStatusType.EventScheduled,
-                    // eventStatus: chevre.factory.eventStatusType.EventCancelled,
-                    location: {
-                        typeOf: chevre.factory.placeType.ScreeningRoom,
-                        branchCode: '10',
-                        name: {
-                            ja: 'シネマ1',
-                            en: 'CINEMA1'
-                        },
-                        address: {
-                            ja: '7階',
-                            en: '7F'
-                        }
-                    },
-                    name: {
-                        en: 'Ocean\'s Eight',
-                        ja: 'オーシャンズ8'
-                    },
-                    offers: {
-                        typeOf: chevre.factory.offerType.Offer,
-                        // availabilityEnds: new Date('2024-09-15T11:45:00.000Z'),
-                        // availabilityStarts: new Date('2024-09-01T15:00:00.000Z'),
-                        eligibleQuantity: {
-                            typeOf: 'QuantitativeValue',
-                            unitCode: chevre.factory.unitCode.C62,
-                            maxValue: 10
-                        },
-                        itemOffered: {
-                            id: '6603a61f0c914b6c7fd18f99',
-                            name: {
-                                ja: 'アップロードテスト用（ムビチケあり）'
-                            },
-                            serviceOutput: {
-                                typeOf: chevre.factory.reservationType.EventReservation,
-                                reservedTicket: {
-                                    typeOf: 'Ticket',
-                                    ticketedSeat: {
-                                        typeOf: chevre.factory.placeType.Seat
-                                    }
-                                }
-                            },
-                            typeOf: chevre.factory.product.ProductType.EventService,
-                            availableChannel: {
-                                typeOf: 'ServiceChannel',
-                                serviceLocation: {
-                                    typeOf: chevre.factory.placeType.ScreeningRoom,
-                                    branchCode: '10',
-                                    name: {
-                                        ja: 'シネマ1',
-                                        en: 'CINEMA1'
-                                    },
-                                    containedInPlace: {
-                                        typeOf: chevre.factory.placeType.MovieTheater,
-                                        id: '5bfb841d5a78d7948369979a',
-                                        branchCode: '118',
-                                        name: {
-                                            ja: 'シネモーション赤坂 ',
-                                            en: 'CineMotion Akasaka'
-                                        }
-                                    }
-                                }
-                            },
-                            serviceType: {
-                                codeValue: '0001',
-                                id: '64caf203c73a205ccefe80c5',
-                                inCodeSet: {
-                                    typeOf: 'CategoryCodeSet',
-                                    identifier: chevre.factory.categoryCode.CategorySetIdentifier.ServiceType
-                                },
-                                typeOf: 'CategoryCode'
-                            }
-                        },
-                        // validFrom: new Date('2024-09-01T15:00:00.000Z'),
-                        // validThrough: new Date('2024-09-15T11:45:00.000Z'),
-                        seller: {
-                            typeOf: chevre.factory.organizationType.Corporation,
-                            id: '59d20831e53ebc2b4e774466',
-                            name: {
-                                ja: 'シネモーション赤坂',
-                                en: 'CineMotion Akasaka'
-                            },
-                            makesOffer: [
-                                {
-                                    typeOf: chevre.factory.offerType.Offer,
-                                    availableAtOrFrom: { id: '51qbjcfr72h62m06vtv5kkhgje' },
-                                    availabilityEnds: now,
-                                    availabilityStarts: now,
-                                    validFrom: now,
-                                    validThrough: now
-                                }
-                            ]
-                        },
-                        unacceptedPaymentMethod: [
-                            'MovieTicket'
-                        ]
-                    },
-                    organizer: {
-                        id: '59d20831e53ebc2b4e774466'
-                    },
-                    startDate: new Date('2024-10-17T05:30:00.000Z'),
-                    superEvent: {
-                        typeOf: chevre.factory.eventType.ScreeningEventSeries,
-                        id: 'akeuu512i',
-                        videoFormat: [
-                            {
-                                typeOf: '2D',
-                                name: '2D'
-                            }
-                        ],
-                        soundFormat: [],
-                        workPerformed: {
-                            typeOf: chevre.factory.creativeWorkType.Movie,
-                            identifier: '00002',
-                            id: '5bfb841d5a78d79483699803',
-                            name: {
-                                en: 'Ocean\'s Eight',
-                                ja: 'オーシャンズ8'
-                            },
-                            duration: 'PT1H50M'
-                        },
-                        location: {
-                            typeOf: chevre.factory.placeType.MovieTheater,
-                            id: '5bfb841d5a78d7948369979a',
-                            branchCode: '118',
-                            name: {
-                                ja: 'シネモーション赤坂 ',
-                                en: 'CineMotion Akasaka'
-                            }
-                        },
-                        kanaName: '',
-                        name: {
-                            en: 'Ocean\'s Eight',
-                            ja: 'オーシャンズ8'
-                        },
-                        additionalProperty: [],
-                        startDate: new Date('2020-08-31T15:00:00.000Z'),
-                        endDate: new Date('2030-01-01T15:00:00.000Z'),
-                        description: {
-                            en: '2018 United States crime movie.',
-                            ja: '2018年のアメリカ合衆国の犯罪映画。'
-                        },
-                        headline: {
-                            ja: '2018/12/14'
-                        }
-                    }
-                }
-            ],
-            additionalPropertyFilter: { name: 'sampleCreateId' },
-            eventSeries: {
-                id: 'akeuu512i'
-            },
-            screeningRoom: {
-                branchCode: '10'
-            }
-        },
-        { update: false }
-    );
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(result, { depth: null });
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);