@chevre/domain 21.9.0-alpha.13 → 21.9.0-alpha.15

package/lib/chevre/repo/offerCatalogItem.js

@@ -146,38 +146,61 @@ class MongoRepository {
             return (result.length > 0) ? result[0].numItems : 0;
         });
     }
-    search(params) {
+    search(params, projection) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             const matchStages = conditions.map((condition) => {
                 return { $match: condition };
             });
+            let projectStage = {
+                _id: 0,
+                name: '$name',
+                description: '$description',
+                project: '$project',
+                typeOf: '$typeOf',
+                id: { $toString: '$_id' },
+                identifier: '$identifier',
+                itemOffered: '$itemOffered',
+                additionalProperty: '$additionalProperty',
+                relatedOffer: '$relatedOffer',
+                numberOfItems: {
+                    $cond: {
+                        if: { $isArray: '$itemListElement' },
+                        then: { $size: '$itemListElement' },
+                        else: 0
+                    }
+                },
+                itemListElementTypeOf: { $first: '$itemListElement.typeOf' },
+                dateSynced: '$dateSynced'
+            };
+            const positiveProjectionFields = Object.keys(projection)
+                .filter((key) => projection[key] !== 0);
+            const negativeProjectionFields = Object.keys(projection)
+                .filter((key) => projection[key] === 0);
+            if (positiveProjectionFields.length > 0) {
+                projectStage = {
+                    _id: 0,
+                    id: { $toString: '$_id' }
+                };
+                positiveProjectionFields.forEach((field) => {
+                    if (field !== '_id' && field !== 'id') {
+                        projectStage[field] = `$${field}`;
+                    }
+                });
+            }
+            else if (negativeProjectionFields.length > 0) {
+                negativeProjectionFields.forEach((field) => {
+                    if (projectStage[field] !== undefined && projectStage[field] !== null) {
+                        // tslint:disable-next-line:no-dynamic-delete
+                        delete projectStage[field];
+                    }
+                });
+            }
             const aggregate = this.offerCatalogItemModel.aggregate([
                 ...(((_a = params.sort) === null || _a === void 0 ? void 0 : _a.identifier) !== undefined) ? [{ $sort: { identifier: params.sort.identifier } }] : [],
                 ...matchStages,
-                {
-                    $project: {
-                        _id: 0,
-                        name: '$name',
-                        description: '$description',
-                        project: '$project',
-                        typeOf: '$typeOf',
-                        id: { $toString: '$_id' },
-                        identifier: '$identifier',
-                        itemOffered: '$itemOffered',
-                        additionalProperty: '$additionalProperty',
-                        relatedOffer: '$relatedOffer',
-                        numberOfItems: {
-                            $cond: {
-                                if: { $isArray: '$itemListElement' },
-                                then: { $size: '$itemListElement' },
-                                else: 0
-                            }
-                        },
-                        itemListElementTypeOf: { $first: '$itemListElement.typeOf' }
-                    }
-                }
+                { $project: projectStage }
             ]);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;

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

@@ -74,7 +74,7 @@ export declare class MongoRepository {
              */
             $nin?: factory.taskName[];
         };
-    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncAggregateOffer").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
     retry(params: {
         intervalInMinutes: number;
     }): Promise<void>;

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

@@ -1,6 +1,7 @@
 import { MongoRepository as EventRepo } from '../../../repo/event';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
 import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
+import { MongoRepository as OfferCatalogItemRepo } from '../../../repo/offerCatalogItem';
 import { MongoRepository as PriceSpecificationRepo } from '../../../repo/priceSpecification';
 import { MongoRepository as ProductRepo } from '../../../repo/product';
 import { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
@@ -77,4 +78,53 @@ declare function searchOfferAppliesToMovieTicket(params: {
     offerCatalog: OfferCatalogRepo;
     product: ProductRepo;
 }) => Promise<Pick<factory.priceSpecification.unitPrice.IAppliesToMovieTicket, 'serviceOutput'>[]>;
-export { searchEventTicketOffers, searchOfferAppliesToMovieTicket };
+type ISearchOfferCatalogItemResult = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'additionalProperty' | 'relatedOffer'> & {
+    elementIndex: number;
+};
+/**
+ * サブカタログ検索
+ */
+declare function searchOfferCatalogItems(params: {
+    event: {
+        /**
+         * イベントID
+         */
+        id: string;
+    };
+    limit: number;
+    page: number;
+}): (repos: {
+    event: EventRepo;
+    offerCatalog: OfferCatalogRepo;
+    offerCatalogItem: OfferCatalogItemRepo;
+    product: ProductRepo;
+}) => Promise<ISearchOfferCatalogItemResult[]>;
+interface ISearchOfferCatalogItemAvailabilityResult {
+    id: string;
+    isAvailable: boolean;
+}
+/**
+ * サブカタログ利用可能性検索
+ */
+declare function searchOfferCatalogItemAvailability(params: {
+    event: {
+        /**
+         * イベントID
+         */
+        id: string;
+    };
+    /**
+     * どのアプリケーションに対して
+     */
+    availableAtOrFrom: {
+        id: string;
+    };
+    limit: number;
+    page: number;
+}): (repos: {
+    event: EventRepo;
+    offer: OfferRepo;
+    offerCatalog: OfferCatalogRepo;
+    product: ProductRepo;
+}) => Promise<ISearchOfferCatalogItemAvailabilityResult[]>;
+export { searchEventTicketOffers, searchOfferAppliesToMovieTicket, searchOfferCatalogItems, searchOfferCatalogItemAvailability };

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.searchOfferAppliesToMovieTicket = exports.searchEventTicketOffers = void 0;
+exports.searchOfferCatalogItemAvailability = exports.searchOfferCatalogItems = exports.searchOfferAppliesToMovieTicket = exports.searchEventTicketOffers = void 0;
 const moment = require("moment-timezone");
 const factory = require("../../../factory");
 const factory_1 = require("../factory");
@@ -349,3 +349,118 @@ function searchOfferAppliesToMovieTicket(params) {
     });
 }
 exports.searchOfferAppliesToMovieTicket = searchOfferAppliesToMovieTicket;
+/**
+ * サブカタログ検索
+ */
+function searchOfferCatalogItems(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        if (typeof params.limit !== 'number') {
+            throw new factory.errors.Argument('limit', 'must be number');
+        }
+        if (typeof params.page !== 'number') {
+            throw new factory.errors.Argument('page', 'must be number');
+        }
+        let offerCatalogItems = [];
+        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id });
+        // 興行設定があれば興行のカタログを参照する
+        const eventOffers = event.offers;
+        let catalogId;
+        if (typeof ((_a = eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+            const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+            if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
+                catalogId = eventService.hasOfferCatalog.id;
+            }
+        }
+        if (typeof catalogId !== 'string') {
+            throw new factory.errors.NotFound('itemOffered.hasOfferCatalog');
+        }
+        const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: catalogId });
+        if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
+            const catalogItemListElements = yield repos.offerCatalog.searchItemListElementById({
+                id: catalogId,
+                limit: params.limit,
+                page: params.page
+            });
+            if (catalogItemListElements.length > 0) {
+                // サブカタログ検索
+                const searchOfferCatalogItemsResult = yield repos.offerCatalogItem.search({
+                    id: { $in: catalogItemListElements.map((element) => element.id) }
+                }, {
+                    id: 1,
+                    name: 1,
+                    description: 1,
+                    additionalProperty: 1,
+                    relatedOffer: 1
+                });
+                offerCatalogItems = catalogItemListElements.map((element) => {
+                    const offerCatalogItem = searchOfferCatalogItemsResult.find((item) => item.id === element.id);
+                    if (offerCatalogItem === undefined) {
+                        throw new factory.errors.NotFound('OfferCatalog', `offerCatalogItem '${element.id}' not found`);
+                    }
+                    return Object.assign(Object.assign({}, element), offerCatalogItem);
+                });
+            }
+        }
+        else {
+            // Offerによるカタログの場合はひとまずempty
+        }
+        return offerCatalogItems;
+    });
+}
+exports.searchOfferCatalogItems = searchOfferCatalogItems;
+/**
+ * サブカタログ利用可能性検索
+ */
+function searchOfferCatalogItemAvailability(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        if (typeof params.limit !== 'number') {
+            throw new factory.errors.Argument('limit', 'must be number');
+        }
+        if (typeof params.page !== 'number') {
+            throw new factory.errors.Argument('page', 'must be number');
+        }
+        let availabilities = [];
+        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id });
+        // 興行設定があれば興行のカタログを参照する
+        const eventOffers = event.offers;
+        let catalogId;
+        if (typeof ((_a = eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+            const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
+            if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
+                catalogId = eventService.hasOfferCatalog.id;
+            }
+        }
+        if (typeof catalogId !== 'string') {
+            throw new factory.errors.NotFound('itemOffered.hasOfferCatalog');
+        }
+        const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: catalogId });
+        if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
+            const catalogItemListElements = yield repos.offerCatalog.searchItemListElementById({
+                id: catalogId,
+                limit: params.limit,
+                page: params.page
+            });
+            if (catalogItemListElements.length > 0) {
+                // 単価オファーから利用可能なサブカタログを検索
+                const availableCatalogs = yield repos.offer.searchAvailableCatalogs({
+                    project: { id: event.project.id },
+                    includedInDataCatalog: { id: catalogItemListElements.map((element) => element.id) },
+                    availableAtOrFrom: { id: params.availableAtOrFrom.id }
+                });
+                availabilities = catalogItemListElements.map((element) => {
+                    return {
+                        id: element.id,
+                        isAvailable: availableCatalogs.some((item) => item.id === element.id)
+                    };
+                });
+            }
+        }
+        else {
+            // Offerによるカタログの場合はひとまずempty
+        }
+        return availabilities;
+    });
+}
+exports.searchOfferCatalogItemAvailability = searchOfferCatalogItemAvailability;

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

@@ -1,6 +1,6 @@
 import { authorize } from './event/authorize';
 import { cancel } from './event/cancel';
 import { importCategoryCodesFromCOA, importFromCOA } from './event/importFromCOA';
-import { searchEventTicketOffers, searchOfferAppliesToMovieTicket } from './event/searchEventTicketOffers';
+import { searchEventTicketOffers, searchOfferAppliesToMovieTicket, searchOfferCatalogItemAvailability, searchOfferCatalogItems } from './event/searchEventTicketOffers';
 import { voidTransaction } from './event/voidTransaction';
-export { authorize, cancel, importCategoryCodesFromCOA, importFromCOA, voidTransaction, searchEventTicketOffers, searchOfferAppliesToMovieTicket };
+export { authorize, cancel, importCategoryCodesFromCOA, importFromCOA, voidTransaction, searchEventTicketOffers, searchOfferAppliesToMovieTicket, searchOfferCatalogItemAvailability, searchOfferCatalogItems };

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.searchOfferAppliesToMovieTicket = exports.searchEventTicketOffers = exports.voidTransaction = exports.importFromCOA = exports.importCategoryCodesFromCOA = exports.cancel = exports.authorize = void 0;
+exports.searchOfferCatalogItems = exports.searchOfferCatalogItemAvailability = exports.searchOfferAppliesToMovieTicket = exports.searchEventTicketOffers = exports.voidTransaction = exports.importFromCOA = exports.importCategoryCodesFromCOA = exports.cancel = exports.authorize = void 0;
 const authorize_1 = require("./event/authorize");
 Object.defineProperty(exports, "authorize", { enumerable: true, get: function () { return authorize_1.authorize; } });
 const cancel_1 = require("./event/cancel");
@@ -11,5 +11,7 @@ Object.defineProperty(exports, "importFromCOA", { enumerable: true, get: functio
 const searchEventTicketOffers_1 = require("./event/searchEventTicketOffers");
 Object.defineProperty(exports, "searchEventTicketOffers", { enumerable: true, get: function () { return searchEventTicketOffers_1.searchEventTicketOffers; } });
 Object.defineProperty(exports, "searchOfferAppliesToMovieTicket", { enumerable: true, get: function () { return searchEventTicketOffers_1.searchOfferAppliesToMovieTicket; } });
+Object.defineProperty(exports, "searchOfferCatalogItemAvailability", { enumerable: true, get: function () { return searchEventTicketOffers_1.searchOfferCatalogItemAvailability; } });
+Object.defineProperty(exports, "searchOfferCatalogItems", { enumerable: true, get: function () { return searchEventTicketOffers_1.searchOfferCatalogItems; } });
 const voidTransaction_1 = require("./event/voidTransaction");
 Object.defineProperty(exports, "voidTransaction", { enumerable: true, get: function () { return voidTransaction_1.voidTransaction; } });

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

@@ -26,17 +26,17 @@ export type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | '
  */
 export declare function createOnOrderSentTasksByTransaction(params: {
     potentialActions?: factory.action.transfer.send.order.IPotentialActions;
-}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncAggregateOffer").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
 /**
  * 注文返品後のアクション
  */
 export declare function createOnOrderReturnedTasksByTransaction(params: {
     potentialActions?: factory.action.transfer.returnAction.order.IPotentialActions;
-}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncAggregateOffer").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
 /**
  * 注文中止時のアクション
  */
 export declare function createOnOrderCancelledTasksByTransaction(params: {
     transaction?: factory.transaction.placeOrder.ITransaction;
-}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncAggregateOffer").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
 export {};

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

@@ -0,0 +1,20 @@
+import * as factory from '../../../factory';
+import { MongoRepository as AggregateOfferRepo } from '../../../repo/aggregateOffer';
+import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
+import { MongoRepository as OfferCatalogItemRepo } from '../../../repo/offerCatalogItem';
+/**
+ * オファーカタログ変更時処理
+ */
+export declare function onOfferCatalogUpdated(params: {
+    project: {
+        id: string;
+    };
+    ids: string[];
+    typeOf: factory.task.onResourceUpdated.OfferCatalogType;
+    isDeleted: boolean;
+    isOfferCatalogItem: boolean;
+}): (repos: {
+    aggregateOffer: AggregateOfferRepo;
+    offerCatalog: OfferCatalogRepo;
+    offerCatalogItem: OfferCatalogItemRepo;
+}) => Promise<void>;

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

@@ -0,0 +1,28 @@
+"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.onOfferCatalogUpdated = void 0;
+const syncOfferCatalog_1 = require("./syncOfferCatalog");
+/**
+ * オファーカタログ変更時処理
+ */
+function onOfferCatalogUpdated(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        yield (0, syncOfferCatalog_1.syncOfferCatalog)({
+            project: { id: params.project.id },
+            ids: params.ids,
+            typeOf: params.typeOf,
+            isDeleted: false,
+            isOfferCatalogItem: params.isOfferCatalogItem === true
+        })(repos);
+    });
+}
+exports.onOfferCatalogUpdated = onOfferCatalogUpdated;

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

@@ -29,27 +29,13 @@ function syncOfferCatalog(params) {
                         includedInDataCatalog: { $elemMatch: { id: { $eq: offerCatalogId } } }
                     }
                 });
-                // 記載サブカタログ同期
-                yield repos.aggregateOffer.pullIncludedInOfferCatalogItemByCatalogId({
-                    project: { id: params.project.id },
-                    $pull: {
-                        includedInOfferCatalogItem: { $elemMatch: { includedInDataCatalog: { id: { $eq: offerCatalogId } } } }
-                    }
-                });
-                // 記載サブカタログ同期
-                yield repos.aggregateOffer.pullIncludedInOfferCatalogItemByCatalogItemId({
-                    project: { id: params.project.id },
-                    $pull: {
-                        includedInOfferCatalogItem: { $elemMatch: { id: { $eq: offerCatalogId } } }
-                    }
-                });
             }
         }
         else {
             for (const offerCatalogId of params.ids) {
                 let offerCatalogs = [];
                 if (params.isOfferCatalogItem) {
-                    offerCatalogs = yield repos.offerCatalogItem.search({ id: { $in: [offerCatalogId] } });
+                    offerCatalogs = yield repos.offerCatalogItem.search({ id: { $in: [offerCatalogId] } }, {});
                 }
                 else {
                     offerCatalogs = yield repos.offerCatalog.search({ id: { $in: [offerCatalogId] } });
@@ -63,13 +49,6 @@ function syncOfferCatalog(params) {
                             project: { id: params.project.id },
                             isOfferCatalogItem: params.isOfferCatalogItem
                         })(repos);
-                        if (params.isOfferCatalogItem) {
-                            // offerCatalogItemの場合、記載サブカタログ情報を単価オファーへ同期(2023-09-21~)
-                            yield syncOfferCatalogItem2offer({
-                                id: offerCatalogId,
-                                project: { id: params.project.id }
-                            })(repos);
-                        }
                         // 同期済記録を補完
                         if (params.isOfferCatalogItem) {
                             yield repos.offerCatalogItem.updateDateSynced({ id: offerCatalogId, dateSynced: new Date() });
@@ -79,11 +58,7 @@ function syncOfferCatalog(params) {
                         }
                         break;
                     case 'OfferCatalog':
-                        // 記載サブカタログ情報を単価オファーへ同期(2023-09-21~)
-                        yield syncOfferCatalog2offer({
-                            id: offerCatalogId,
-                            project: { id: params.project.id }
-                        })(repos);
+                        // 特に何もしない
                         yield repos.offerCatalog.updateDateSynced({ id: offerCatalogId, dateSynced: new Date() });
                         break;
                     default:
@@ -128,103 +103,3 @@ function syncOfferCatalogOfOffer2offer(params) {
         }
     });
 }
-function syncOfferCatalog2offer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // サブカタログIDリストを検索
-        let offerCatalogItemIds;
-        const { itemListElement } = yield repos.offerCatalog.findItemListElementById({
-            id: params.id,
-            project: { id: params.project.id }
-        });
-        offerCatalogItemIds = itemListElement.map((element) => element.id);
-        // サブカタログごとに同期
-        if (offerCatalogItemIds.length > 0) {
-            // カタログに含まれるがサブカタログに含まれないものを除外
-            yield repos.aggregateOffer.pullIncludedInOfferCatalogItemByCatalogId({
-                project: { id: params.project.id },
-                $pull: {
-                    includedInOfferCatalogItem: {
-                        $elemMatch: {
-                            id: { $nin: offerCatalogItemIds },
-                            includedInDataCatalog: { id: { $eq: params.id } }
-                        }
-                    }
-                }
-            });
-            for (const offerCatalogItemId of offerCatalogItemIds) {
-                yield syncSubCatalogs2offer({
-                    id: offerCatalogItemId,
-                    includedInDataCatalog: { id: params.id },
-                    project: params.project
-                })(repos);
-            }
-        }
-        else {
-            // 全てpull
-            yield repos.aggregateOffer.pullIncludedInOfferCatalogItemByCatalogId({
-                project: { id: params.project.id },
-                $pull: {
-                    includedInOfferCatalogItem: {
-                        $elemMatch: {
-                            includedInDataCatalog: { id: { $eq: params.id } }
-                        }
-                    }
-                }
-            });
-        }
-    });
-}
-function syncOfferCatalogItem2offer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // 記載カタログを検索
-        const offerCatalogs = yield repos.offerCatalog.search({
-            project: { id: { $eq: params.project.id } },
-            itemListElement: {
-                id: { $in: [params.id] },
-                typeOf: { $eq: 'OfferCatalog' }
-            }
-        });
-        for (const offerCatalog of offerCatalogs) {
-            yield syncSubCatalogs2offer({
-                id: params.id,
-                includedInDataCatalog: { id: String(offerCatalog.id) },
-                project: params.project
-            })(repos);
-        }
-    });
-}
-/**
- * サブカタログ+カタログを単価オファーへ同期する
- */
-function syncSubCatalogs2offer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const offerCatalogItemId = params.id;
-        // 集計オファーIDリストを検索
-        let aggregateOfferIds;
-        const findSubCatalogItemListElementResult = yield repos.offerCatalogItem.findItemListElementById({
-            id: offerCatalogItemId,
-            project: { id: params.project.id }
-        });
-        aggregateOfferIds = findSubCatalogItemListElementResult.itemListElement.map((element) => element.id);
-        yield repos.aggregateOffer.pullIncludedInOfferCatalogItem(Object.assign({ project: { id: params.project.id }, $pull: {
-                includedInOfferCatalogItem: {
-                    $elemMatch: {
-                        id: { $eq: offerCatalogItemId },
-                        includedInDataCatalog: { id: { $eq: params.includedInDataCatalog.id } }
-                    }
-                }
-            } }, (aggregateOfferIds.length > 0) ? { id: { $nin: aggregateOfferIds } } : undefined));
-        if (aggregateOfferIds.length > 0) {
-            yield repos.aggregateOffer.pushIncludedInOfferCatalogItem({
-                project: { id: params.project.id },
-                id: { $in: aggregateOfferIds },
-                $push: {
-                    includedInOfferCatalogItem: {
-                        id: { $eq: offerCatalogItemId },
-                        includedInDataCatalog: { id: { $eq: params.includedInDataCatalog.id } }
-                    }
-                }
-            });
-        }
-    });
-}

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

@@ -26,8 +26,8 @@ const place_1 = require("../../repo/place");
 const product_1 = require("../../repo/product");
 const productOffer_1 = require("../../repo/productOffer");
 const task_1 = require("../../repo/task");
+const onOfferCatalogUpdated_1 = require("./onResourceUpdated/onOfferCatalogUpdated");
 const onResourceDeleted_1 = require("./onResourceUpdated/onResourceDeleted");
-const syncOfferCatalog_1 = require("./onResourceUpdated/syncOfferCatalog");
 const settings_1 = require("../../settings");
 const informResources = settings_1.settings.onResourceUpdated.informResource;
 /**
@@ -114,7 +114,7 @@ function onResourceUpdated(params) {
                     break;
                 // カタログに対応(2023-09-12~)
                 case 'OfferCatalog':
-                    yield (0, syncOfferCatalog_1.syncOfferCatalog)({
+                    yield (0, onOfferCatalogUpdated_1.onOfferCatalogUpdated)({
                         project: { id: params.project.id },
                         ids: params.id,
                         typeOf: params.typeOf,

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.330.0-alpha.3",
-    "@cinerino/sdk": "3.168.0",
+    "@chevre/factory": "4.330.0",
+    "@cinerino/sdk": "3.169.0-alpha.1",
     "@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.9.0-alpha.13"
+  "version": "21.9.0-alpha.15"
 }