@chevre/domain 21.29.0-alpha.9 → 21.29.0

package/lib/chevre/repo/productModel.js

@@ -109,7 +109,7 @@ class MongoRepository {
             let doc;
             if (typeof params.id === 'string') {
                 // 上書き禁止属性を除外
-                const _a = params.$set, { id, project, typeOf, offers } = _a, setFields = __rest(_a, ["id", "project", "typeOf", "offers"]);
+                const _a = params.$set, { category, id, project, typeOf } = _a, setFields = __rest(_a, ["category", "id", "project", "typeOf"]);
                 doc = yield this.productModelModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
                     $set: setFields
                     // $unset: params.$unset
@@ -126,10 +126,47 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    deleteByProject(params) {
+    /**
+     * 区分から同期する
+     */
+    upsertByCategory(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const upsertingProductModel = {
+                project: { id: params.category.project.id, typeOf: factory.organizationType.Project },
+                typeOf: 'ProductModel',
+                category: {
+                    codeValue: params.category.codeValue,
+                    inCodeSet: params.category.inCodeSet,
+                    id: params.category.id
+                },
+                name: params.category.name,
+                offers: [{
+                        typeOf: factory.offerType.Offer
+                    }]
+            };
+            const { id, project, typeOf, offers, category } = upsertingProductModel, setFields = __rest(upsertingProductModel, ["id", "project", "typeOf", "offers", "category"]);
+            const doc = yield this.productModelModel.findOneAndUpdate({
+                'project.id': { $eq: upsertingProductModel.project.id },
+                'category.id': { $exists: true, $eq: upsertingProductModel.category.id }
+            }, {
+                $setOnInsert: { project, typeOf, offers, category },
+                $set: setFields
+            }, { new: true, upsert: true, projection: { _id: 1 } })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.productModelModel.modelName);
+            }
+            return doc.toObject();
+        });
+    }
+    /**
+     * 区分から削除する
+     */
+    deleteByCategory(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.productModelModel.deleteMany({
-                'project.id': { $eq: params.project.id }
+                'project.id': { $eq: params.category.project.id },
+                'category.id': { $exists: true, $eq: params.category.id }
             })
                 .exec();
         });

package/lib/chevre/repo/seller.js

@@ -316,7 +316,7 @@ class MongoRepository {
     }
     unsetUnnecessaryFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.organizationModel.updateMany(params.filter, { $unset: params.$unset })
+            return this.organizationModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
                 .exec();
         });
     }

package/lib/chevre/repo/serviceOutput.js

@@ -172,7 +172,7 @@ class MongoRepository {
     }
     unsetUnnecessaryFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.serviceOutputModel.updateMany(params.filter, { $unset: params.$unset })
+            return this.serviceOutputModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
                 .exec();
         });
     }

package/lib/chevre/repo/transaction.js

@@ -755,7 +755,7 @@ class MongoRepository {
     }
     unsetUnnecessaryFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.transactionModel.updateMany(params.filter, { $unset: params.$unset })
+            return this.transactionModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
                 .exec();
         });
     }

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

@@ -9,6 +9,7 @@ function createStartParams(params) {
     var _a;
     let reserveTransactionAsObject;
     let eventReservationsAsObject;
+    let reservationNumber;
     if (typeof ((_a = params.transaction) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
         const reservationFor = params.transaction.object.reservationFor;
         if (typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.typeOf) !== 'string') {
@@ -25,6 +26,7 @@ function createStartParams(params) {
                 }
             }
         };
+        reservationNumber = params.transaction.transactionNumber;
     }
     if (Array.isArray(params.reservations)) {
         eventReservationsAsObject = params.reservations.map((r) => {
@@ -36,8 +38,13 @@ function createStartParams(params) {
                 typeOf: r.typeOf
             };
         });
+        reservationNumber = eventReservationsAsObject[0].reservationNumber;
     }
-    const cancelReservationObject = Object.assign(Object.assign({ clientUser: params.paramsWithoutDetail.object.clientUser }, (typeof (reserveTransactionAsObject === null || reserveTransactionAsObject === void 0 ? void 0 : reserveTransactionAsObject.typeOf) === 'string') ? { transaction: reserveTransactionAsObject } : undefined), (Array.isArray(eventReservationsAsObject)) ? { reservations: eventReservationsAsObject } : undefined);
+    if (typeof reservationNumber !== 'string') {
+        throw new factory.errors.Argument('object', 'reservationNumber must be specified');
+    }
+    const cancelReservationObject = Object.assign(Object.assign(Object.assign({ clientUser: params.paramsWithoutDetail.object.clientUser }, (typeof (reserveTransactionAsObject === null || reserveTransactionAsObject === void 0 ? void 0 : reserveTransactionAsObject.typeOf) === 'string') ? { transaction: reserveTransactionAsObject } : undefined), (Array.isArray(eventReservationsAsObject)) ? { reservations: eventReservationsAsObject } : undefined), { reservationNumber, typeOf: factory.reservationType.ReservationPackage // 拡張(2024-04-18~)
+     });
     return {
         project: { id: params.project.id, typeOf: params.project.typeOf },
         transactionNumber: params.transactionNumber,

package/lib/chevre/service/assetTransaction/pay/potentialActions/createPayObjectServiceOutput.d.ts

@@ -1,4 +1,8 @@
 import * as factory from '../../../../factory';
+/**
+ * PayAction.object.serviceOutputを作成する
+ * 決済カード決済の場合のみ、対象予約情報をserviceOutputに持つ決済カード情報として存在する
+ */
 declare function createPayObjectServiceOutput(params: {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Pay>;
     order: {

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

@@ -2,6 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPayObjectServiceOutput = void 0;
 const factory = require("../../../../factory");
+const settings_1 = require("../../../../settings");
+/**
+ * PayAction.object.serviceOutputを作成する
+ * 決済カード決済の場合のみ、対象予約情報をserviceOutputに持つ決済カード情報として存在する
+ */
 function createPayObjectServiceOutput(params) {
     const transaction = params.transaction;
     const paymentMethod = transaction.object.paymentMethod;
@@ -19,7 +24,7 @@ function createPayObjectServiceOutput(params) {
                 paymentServiceOutput = movieTickets.map((movieTicket) => {
                     var _a;
                     const amount = movieTicket2amount(transaction, movieTicket);
-                    const reservation4invoice = movieTicket2reservation4invoice(movieTicket, order, String(paymentMethodType));
+                    const reservation4invoice = movieTicket2reservation4invoice(movieTicket, order, String(paymentMethodType), transaction.transactionNumber);
                     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 }
                         : undefined);
@@ -88,11 +93,11 @@ function reservationPriceComponent2invoicePriceComponent(component) {
         throw new factory.errors.NotImplemented(`unexpected priceComponent: ${component.typeOf}`);
     }
 }
-function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType) {
+/**
+ * 決済カードの対象予約情報を作成する
+ */
+function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType, payTransactionNumber) {
     var _a;
-    let ticketToken;
-    let reservationNumber = '';
-    let priceComponents4invoice = [];
     // Orderから対象予約を取得
     const reservationOffer = order.acceptedOffersMovieTicketUsed.find(({ itemOffered, priceSpecification }) => {
         var _a, _b;
@@ -101,9 +106,6 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
         if ((priceSpecification === null || priceSpecification === void 0 ? void 0 : priceSpecification.typeOf) === factory.priceSpecificationType.CompoundPriceSpecification) {
             // 適用購入管理番号が一致、かつ、決済方法区分が一致、の単価仕様を検索
             mvtkUnitPriceSpec = (_a = priceSpecification === null || priceSpecification === void 0 ? void 0 : priceSpecification.priceComponent) === null || _a === void 0 ? void 0 : _a.find((p) => {
-                // if (p.typeOf !== factory.priceSpecificationType.UnitPriceSpecification) {
-                //     return false;
-                // }
                 return p.typeOf === factory.priceSpecificationType.UnitPriceSpecification
                     && Array.isArray(p.appliesToMovieTicket)
                     && p.appliesToMovieTicket.some((appliesToMovieTicket) => {
@@ -112,32 +114,38 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
                     });
             });
         }
-        return (itemOffered.typeOf === factory.reservationType.EventReservation
-            || itemOffered.typeOf === factory.reservationType.BusReservation)
-            && mvtkUnitPriceSpec !== undefined
+        let isMovieTicketServiceOutput = mvtkUnitPriceSpec !== undefined
             && itemOffered.reservationFor.id === movieTicket.serviceOutput.reservationFor.id
             && ((_b = itemOffered.reservedTicket.ticketedSeat) === null || _b === void 0 ? void 0 : _b.seatNumber) === movieTicket.serviceOutput.reservedTicket.ticketedSeat.seatNumber
             && itemOffered.reservedTicket.ticketedSeat.seatSection === movieTicket.serviceOutput.reservedTicket.ticketedSeat.seatSection;
-    });
-    if (reservationOffer !== undefined) {
-        // if (reservationOffer.itemOffered.typeOf !== factory.reservationType.EventReservation
-        //     && reservationOffer.itemOffered.typeOf !== factory.reservationType.BusReservation) {
-        //     throw new factory.errors.NotImplemented(`itemOffered.typeOf: ${reservationOffer.itemOffered.typeOf} not implemented`);
-        // }
-        const ticketTokenByReservationOffer = reservationOffer.itemOffered.reservedTicket.ticketToken;
-        if (typeof ticketTokenByReservationOffer === 'string' && ticketTokenByReservationOffer.length > 0) {
-            ticketToken = ticketTokenByReservationOffer;
-        }
-        reservationNumber = reservationOffer.itemOffered.reservationNumber;
-        const priceComponent = (_a = reservationOffer.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent;
-        if (Array.isArray(priceComponent)) {
-            priceComponents4invoice = priceComponent.map(reservationPriceComponent2invoicePriceComponent);
+        // チケット識別子で照合(2024-04-17~)
+        if (settings_1.USE_VALIDATE_MOVIE_TICKET_BY_TICKET_IDENTIFIER) {
+            isMovieTicketServiceOutput = isMovieTicketServiceOutput
+                && typeof itemOffered.reservedTicket.identifier === 'string'
+                && itemOffered.reservedTicket.identifier === movieTicket.serviceOutput.reservedTicket.identifier;
         }
+        return isMovieTicketServiceOutput;
+    });
+    // 対象予約は存在必須(2024-04-17~)
+    if (reservationOffer === undefined) {
+        throw new factory.errors.NotFound(factory.offerType.Offer, `acceptedOffer for the movieTicket not found at movieTicket2reservation4invoice. [movieTicket.identifier:${movieTicket.identifier} movieTicket.serviceType:${movieTicket.serviceType} paymentMethodType:${paymentMethodType} payTransactionNumber:${payTransactionNumber}]`);
+    }
+    /**
+     * COAの場合のみ予約のチケットトークンが存在
+     */
+    let ticketToken;
+    const ticketTokenByReservationOffer = reservationOffer.itemOffered.reservedTicket.ticketToken;
+    if (typeof ticketTokenByReservationOffer === 'string' && ticketTokenByReservationOffer.length > 0) {
+        ticketToken = ticketTokenByReservationOffer;
+    }
+    const reservationNumber = reservationOffer.itemOffered.reservationNumber;
+    let priceComponents4invoice = [];
+    const priceComponent = (_a = reservationOffer.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent;
+    if (Array.isArray(priceComponent)) {
+        priceComponents4invoice = priceComponent.map(reservationPriceComponent2invoicePriceComponent);
     }
     return Object.assign({ priceSpecification: {
             typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
             priceComponent: priceComponents4invoice
-        }, 
-        // add reservationNumber(2023-03-20~)
-        reservationNumber }, (typeof ticketToken === 'string') ? { reservedTicket: { ticketToken } } : undefined);
+        }, reservationNumber }, (typeof ticketToken === 'string') ? { reservedTicket: { ticketToken } } : undefined);
 }

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

@@ -18,6 +18,7 @@ export declare function creatPayTransactionStartParams(params: {
     transactionNumber: string;
     location?: factory.action.trade.pay.ILocation;
 }): factory.assetTransaction.pay.IStartParamsWithoutDetail;
+export declare function createMovieTicket(params: factory.action.trade.pay.IMovieTicket): factory.action.trade.pay.IMovieTicket;
 export declare function createAuthorizeResult(params: {
     object: factory.action.authorize.paymentMethod.any.IObject;
     payTransaction: factory.assetTransaction.pay.ITransaction;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.optimizeAction4inform = exports.createAuthorizeResult = exports.creatPayTransactionStartParams = void 0;
+exports.optimizeAction4inform = exports.createAuthorizeResult = exports.createMovieTicket = exports.creatPayTransactionStartParams = void 0;
 const moment = require("moment");
 const util = require("util");
 const factory = require("../../../factory");
@@ -96,6 +96,7 @@ function createMovieTicket(params) {
         serviceOutput
     };
 }
+exports.createMovieTicket = createMovieTicket;
 function createAuthorizeResult(params) {
     var _a, _b, _c, _d, _e, _f;
     const payTransactionObject = params.payTransaction.object;

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

@@ -329,11 +329,12 @@ function authorize(params) {
             const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
             transactionNumber = publishTransactionNumberResult.transactionNumber;
         }
+        const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(factory_1.createMovieTicket) : undefined;
         const { accountId } = yield fixAccountIdIfPossible({
             object: params.object,
             project: { id: transaction.project.id }
         })({ action: repos.action });
-        const authorizeObject = Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined);
+        const authorizeObject = Object.assign(Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined);
         // 承認アクションを開始する
         const actionAttributes = {
             project: transaction.project,

package/lib/chevre/service/report/telemetry.js

@@ -184,7 +184,7 @@ function createSellerFlow(measuredFrom, measuredThrough, sellerId) {
         }, [], []);
         debug(actionsOnExpiredTransactions.length, 'actionsOnExpiredTransactions found.');
         const numbersOfActionsOnExpired = expiredTransactionIds.map((transactionId) => {
-            return actionsOnExpiredTransactions.filter((action) => action.purpose.id === transactionId).length;
+            return actionsOnExpiredTransactions.filter((action) => { var _a; return ((_a = action.purpose) === null || _a === void 0 ? void 0 : _a.id) === transactionId; }).length;
         });
         const totalNumberOfActionsOnExpired = numbersOfActionsOnExpired.reduce((a, b) => a + b, 0);
         const maxNumberOfActionsOnExpired = numbersOfActionsOnExpired.reduce((a, b) => Math.max(a, b), 0);

package/lib/chevre/service/task/onResourceUpdated/onCategoryCodeUpdated.d.ts

@@ -0,0 +1,15 @@
+import type { MongoRepository as CategoryCodeRepo } from '../../../repo/categoryCode';
+import type { MongoRepository as ProductModelRepo } from '../../../repo/productModel';
+/**
+ * 区分変更時処理
+ */
+export declare function onCategoryCodeUpdated(params: {
+    project: {
+        id: string;
+    };
+    ids: string[];
+    isDeleted: boolean;
+}): (repos: {
+    categoryCode: CategoryCodeRepo;
+    productModel: ProductModelRepo;
+}) => Promise<void>;

package/lib/chevre/service/task/onResourceUpdated/onCategoryCodeUpdated.js

@@ -0,0 +1,26 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.onCategoryCodeUpdated = void 0;
+const syncCategoryCode_1 = require("./syncCategoryCode");
+/**
+ * 区分変更時処理
+ */
+function onCategoryCodeUpdated(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        yield (0, syncCategoryCode_1.syncCategoryCode)({
+            project: { id: params.project.id },
+            ids: params.ids,
+            isDeleted: false
+        })(repos);
+    });
+}
+exports.onCategoryCodeUpdated = onCategoryCodeUpdated;

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.d.ts

@@ -14,6 +14,7 @@ import type { MongoRepository as HasPOSRepo } from '../../../repo/place/hasPOS';
 import type { MongoRepository as MovieTheaterRepo } from '../../../repo/place/movieTheater';
 import type { MongoRepository as ScreeningRoomRepo } from '../../../repo/place/screeningRoom';
 import type { MongoRepository as ProductRepo } from '../../../repo/product';
+import type { MongoRepository as ProductModelRepo } from '../../../repo/productModel';
 import type { MongoRepository as ProductOfferRepo } from '../../../repo/productOffer';
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 export declare function onResourceDeleted(params: factory.task.onResourceUpdated.IData): (repos: {
@@ -32,6 +33,7 @@ export declare function onResourceDeleted(params: factory.task.onResourceUpdated
     offerCatalogItem: OfferCatalogItemRepo;
     screeningRoom: ScreeningRoomRepo;
     product: ProductRepo;
+    productModel: ProductModelRepo;
     productOffer: ProductOfferRepo;
     task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.onResourceDeleted = void 0;
 const factory = require("../../../factory");
 const onHasPOSUpdated_1 = require("./onHasPOSUpdated");
+const syncCategoryCode_1 = require("./syncCategoryCode");
 const syncOfferCatalog_1 = require("./syncOfferCatalog");
 // tslint:disable-next-line:max-func-body-length
 function onResourceDeleted(params) {
@@ -89,6 +90,14 @@ function onResourceDeleted(params) {
                         typeOf: params.typeOf
                     })(repos);
                     break;
+                // 区分削除に対応(2024-04-18~)
+                case 'CategoryCode':
+                    yield (0, syncCategoryCode_1.syncCategoryCode)({
+                        project: { id: params.project.id },
+                        ids: params.id,
+                        isDeleted: true
+                    })(repos);
+                    break;
                 default:
                     // no op
                     throw new factory.errors.NotImplemented(`${params.typeOf} onDeleted not implemented`);

package/lib/chevre/service/task/onResourceUpdated/syncCategoryCode.d.ts

@@ -0,0 +1,15 @@
+import type { MongoRepository as CategoryCodeRepo } from '../../../repo/categoryCode';
+import type { MongoRepository as ProductModelRepo } from '../../../repo/productModel';
+/**
+ * 区分を他リソースへ同期する
+ */
+export declare function syncCategoryCode(params: {
+    project: {
+        id: string;
+    };
+    ids: string[];
+    isDeleted: boolean;
+}): (repos: {
+    categoryCode: CategoryCodeRepo;
+    productModel: ProductModelRepo;
+}) => Promise<void>;

package/lib/chevre/service/task/onResourceUpdated/syncCategoryCode.js

@@ -0,0 +1,54 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.syncCategoryCode = void 0;
+const factory = require("../../../factory");
+/**
+ * 区分を他リソースへ同期する
+ */
+function syncCategoryCode(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (params.isDeleted) {
+            for (const categoryCodeId of params.ids) {
+                // プロダクトモデルを削除
+                yield repos.productModel.deleteByCategory({
+                    category: {
+                        project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                        id: categoryCodeId
+                    }
+                });
+            }
+        }
+        else {
+            for (const categoryCodeId of params.ids) {
+                const syncingCategoryCode = (yield repos.categoryCode.search({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: params.project.id } },
+                    id: { $eq: categoryCodeId }
+                }, ['codeValue', 'inCodeSet', 'name', 'project', 'id'], [])).shift();
+                if (syncingCategoryCode !== undefined) {
+                    switch (syncingCategoryCode.inCodeSet.identifier) {
+                        case factory.categoryCode.CategorySetIdentifier.SeatingType:
+                            // プロダクトモデルへ同期
+                            yield repos.productModel.upsertByCategory({
+                                category: Object.assign(Object.assign({}, syncingCategoryCode), { id: categoryCodeId })
+                            });
+                            break;
+                        default:
+                        // no op
+                    }
+                }
+            }
+        }
+    });
+}
+exports.syncCategoryCode = syncCategoryCode;

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

@@ -27,9 +27,11 @@ const hasPOS_1 = require("../../repo/place/hasPOS");
 const movieTheater_1 = require("../../repo/place/movieTheater");
 const screeningRoom_1 = require("../../repo/place/screeningRoom");
 const product_1 = require("../../repo/product");
+const productModel_1 = require("../../repo/productModel");
 const productOffer_1 = require("../../repo/productOffer");
 const task_1 = require("../../repo/task");
 const onAggregateOfferUpdated_1 = require("./onResourceUpdated/onAggregateOfferUpdated");
+const onCategoryCodeUpdated_1 = require("./onResourceUpdated/onCategoryCodeUpdated");
 const onHasPOSUpdated_1 = require("./onResourceUpdated/onHasPOSUpdated");
 const onOfferCatalogUpdated_1 = require("./onResourceUpdated/onOfferCatalogUpdated");
 const onResourceDeleted_1 = require("./onResourceUpdated/onResourceDeleted");
@@ -57,6 +59,7 @@ function call(data) {
             paymentServiceProvider: new paymentServiceProvider_1.MongoRepository(connection),
             screeningRoom: new screeningRoom_1.MongoRepository(connection),
             product: new product_1.MongoRepository(connection),
+            productModel: new productModel_1.MongoRepository(connection),
             productOffer: new productOffer_1.MongoRepository(connection),
             task: new task_1.MongoRepository(connection)
         });
@@ -162,6 +165,14 @@ function onResourceUpdated(params) {
                         isOfferCatalogItem: params.isOfferCatalogItem === true
                     })(repos);
                     break;
+                // 区分に対応(2024-04-18~)
+                case 'CategoryCode':
+                    yield (0, onCategoryCodeUpdated_1.onCategoryCodeUpdated)({
+                        project: { id: params.project.id },
+                        ids: params.id,
+                        isDeleted: false
+                    })(repos);
+                    break;
                 default:
                 // no op
             }

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

@@ -151,6 +151,7 @@ function deleteTransactionById(params) {
         let payTransactionNumbers = [];
         let deleteReservationsResult;
         let deleteReserveTransactionResult;
+        let deleteCancelReservationTransactionResult;
         let deletedReservationNumbers = [];
         let deleteActionResult;
         const action = yield repos.action.start(actionAttributes);
@@ -192,6 +193,8 @@ function deleteTransactionById(params) {
                     const deleteReservationsByPlaceOrderResult = yield deleteReservationsByPlaceOrder({ authorizeActions, transaction })(repos);
                     deleteReservationsResult = deleteReservationsByPlaceOrderResult.deleteResult;
                     deleteReserveTransactionResult = deleteReservationsByPlaceOrderResult.deleteReserveTransactionResult;
+                    deleteCancelReservationTransactionResult =
+                        deleteReservationsByPlaceOrderResult.deleteCancelReservationTransactionResult;
                     deletedReservationNumbers = deleteReservationsByPlaceOrderResult.reserveTransactionNumbers;
                     // アクション削除(2023-05-19~)
                     deleteActionResult = yield repos.action.deleteByPurpose({
@@ -239,6 +242,7 @@ function deleteTransactionById(params) {
             payTransactionNumbers,
             deleteReservationsResult,
             deleteReserveTransactionResult,
+            deleteCancelReservationTransactionResult,
             deletedReservationNumbers,
             deleteActionResult
         };
@@ -249,6 +253,7 @@ function deleteReservationsByPlaceOrder(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let deleteResult;
         let deleteReserveTransactionResult;
+        let deleteCancelReservationTransactionResult;
         const authorizeActions = params.authorizeActions;
         // 予約取引番号を抽出
         const authorizeReservationOfferActions = authorizeActions
@@ -283,10 +288,27 @@ function deleteReservationsByPlaceOrder(params) {
                 ok: deleteAssetTransactionsResult === null || deleteAssetTransactionsResult === void 0 ? void 0 : deleteAssetTransactionsResult.ok,
                 deletedCount: deleteAssetTransactionsResult === null || deleteAssetTransactionsResult === void 0 ? void 0 : deleteAssetTransactionsResult.deletedCount
             };
-            // tslint:disable-next-line:no-suspicious-comment
-            // TODO 予約取消取引も削除可能か？
+            // 予約番号で予約取消取引を検索
+            const deletingCancelReservationTransactions = yield repos.assetTransaction.search({
+                project: { id: { $eq: params.transaction.project.id } },
+                object: { reservationNumber: { $in: reserveTransactionNumbers } },
+                typeOf: factory.assetTransactionType.CancelReservation
+            }, ['transactionNumber'], []);
+            if (deletingCancelReservationTransactions.length > 0) {
+                // 予約取消取引も削除(2024-04-18~)
+                const deleteCancelReservationResult = yield repos.assetTransaction.deleteByTransactionNumber({
+                    project: { id: params.transaction.project.id },
+                    transactionNumbers: deletingCancelReservationTransactions.map(({ transactionNumber }) => String(transactionNumber)),
+                    typeOf: factory.assetTransactionType.CancelReservation
+                });
+                deleteCancelReservationTransactionResult = {
+                    n: deleteCancelReservationResult === null || deleteCancelReservationResult === void 0 ? void 0 : deleteCancelReservationResult.n,
+                    ok: deleteCancelReservationResult === null || deleteCancelReservationResult === void 0 ? void 0 : deleteCancelReservationResult.ok,
+                    deletedCount: deleteCancelReservationResult === null || deleteCancelReservationResult === void 0 ? void 0 : deleteCancelReservationResult.deletedCount
+                };
+            }
         }
-        return { deleteResult, deleteReserveTransactionResult, reserveTransactionNumbers };
+        return { deleteResult, deleteReserveTransactionResult, deleteCancelReservationTransactionResult, reserveTransactionNumbers };
     });
 }
 function deletePayTransactionsByPlaceOrder(params) {

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateMovieTicket.d.ts

@@ -1,9 +1,5 @@
 import * as factory from '../../../../factory';
-export type IMovieTicket4validate = Pick<factory.paymentMethod.paymentCard.movieTicket.IMovieTicketPaymentCard, 'identifier' | 'serviceOutput' | 'serviceType' | 'typeOf'> & {
-    serviceOutput: factory.paymentMethod.paymentCard.movieTicket.IMovieTicketServiceOutput & {
-        reservationFor: factory.paymentMethod.paymentCard.movieTicket.IMovieTicketReservationFor;
-    };
-};
+export type IMovieTicket4validate = Pick<factory.paymentMethod.paymentCard.movieTicket.IMovieTicketPaymentCard, 'identifier' | 'serviceOutput' | 'serviceType' | 'typeOf'>;
 /**
  * 興行オファー承認に対して決済承認条件が整っているかどうか検証する
  * 決済方法区分ごとに検証