@chevre/domain 21.18.0-alpha.2 → 21.18.0-alpha.20

package/lib/chevre/repo/acceptedOffer.js

@@ -0,0 +1,158 @@
+"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.MongoRepository = void 0;
+const order_1 = require("./mongoose/schemas/order");
+const order_2 = require("./order");
+const settings_1 = require("../settings");
+/**
+ * 注文オファーリポジトリ
+ */
+class MongoRepository {
+    constructor(connection) {
+        this.orderModel = connection.model(order_1.modelName, (0, order_1.createSchema)());
+    }
+    /**
+     * オファー展開の注文検索
+     */
+    searchWithUnwoundAcceptedOffers(params, projection) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = order_2.MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            const aggregate = this.orderModel.aggregate();
+            // pipelineの順序に注意
+            // @see https://docs.mongodb.com/manual/reference/operator/aggregation/sort/
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a.orderDate) === 'number') {
+                aggregate.sort({ orderDate: params.sort.orderDate });
+            }
+            aggregate.unwind('$acceptedOffers');
+            conditions.forEach((c) => {
+                aggregate.match(c);
+            });
+            aggregate.project(Object.assign(Object.assign({}, projection), { acceptedOffers: ['$acceptedOffers'] }));
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                aggregate.limit(params.limit * page)
+                    .skip(params.limit * (page - 1));
+            }
+            return aggregate
+                // .allowDiskUse(true) // false化(2023-11-30~)
+                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+    aggreateOwnershipInfosByOrder(filter) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const aggregate = this.orderModel.aggregate([
+                {
+                    $unwind: {
+                        path: '$acceptedOffers',
+                        includeArrayIndex: 'acceptedOfferIndex'
+                    }
+                },
+                { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } },
+                {
+                    $project: {
+                        _id: 0,
+                        // acceptedOfferIndex: '$acceptedOfferIndex',
+                        // itemOfferedTypeOf: '$acceptedOffers.itemOffered.typeOf',
+                        // customerId: '$customer.id',
+                        // orderNumber: '$orderNumber',
+                        identifier: {
+                            $concat: ['$customer.id', '-', '$acceptedOffers.itemOffered.typeOf', '-', '$orderNumber', '-', { $toString: '$acceptedOfferIndex' }]
+                        }
+                    }
+                }
+            ]);
+            return aggregate
+                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+    /**
+     * 注文オファーを展開して検索する
+     */
+    searchAcceptedOffersByOrderNumber(filter, inclusion) {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchStages = [
+                { $match: { 'project.id': { $eq: filter.project.id.$eq } } },
+                { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } }
+            ];
+            const itemOfferedTypeOfIn = (_c = (_b = (_a = filter.acceptedOffers) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.typeOf) === null || _c === void 0 ? void 0 : _c.$in;
+            if (Array.isArray(itemOfferedTypeOfIn)) {
+                matchStages.push({
+                    $match: { 'acceptedOffers.itemOffered.typeOf': { $exists: true, $in: itemOfferedTypeOfIn } }
+                });
+            }
+            const aggregate = this.orderModel.aggregate([
+                // if (typeof params.sort?.orderDate === 'number') {
+                //     aggregate.sort({ orderDate: params.sort.orderDate });
+                // }
+                {
+                    $unwind: {
+                        path: '$acceptedOffers'
+                        // includeArrayIndex: 'elementIndex'
+                    }
+                },
+                ...matchStages
+            ]);
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                const specifiedProjection = {
+                    _id: 0
+                };
+                inclusion.forEach((key) => {
+                    specifiedProjection[key] = `$acceptedOffers.${key}`;
+                });
+                aggregate.project(specifiedProjection);
+            }
+            else {
+                aggregate.project({
+                    _id: 0,
+                    itemOffered: '$acceptedOffers.itemOffered',
+                    priceSpecification: '$acceptedOffers.priceSpecification',
+                    typeOf: '$acceptedOffers.typeOf',
+                    id: '$acceptedOffers.id',
+                    offeredThrough: '$acceptedOffers.offeredThrough',
+                    name: '$acceptedOffers.name'
+                });
+            }
+            if (typeof filter.limit === 'number' && filter.limit > 0) {
+                const page = (typeof filter.page === 'number' && filter.page > 0) ? filter.page : 1;
+                aggregate.limit(filter.limit * page)
+                    .skip(filter.limit * (page - 1));
+            }
+            return aggregate
+                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+    /**
+     * 特定のフィールド値リストを検索する
+     */
+    distinctValues(filter, field) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!Array.isArray(filter.orderNumber.$in) || filter.orderNumber.$in.length === 0) {
+                return [];
+            }
+            const filterQuery = {
+                orderNumber: { $in: filter.orderNumber.$in }
+            };
+            filterQuery[field] = { $exists: true };
+            return this.orderModel.distinct(field, filterQuery)
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+}
+exports.MongoRepository = MongoRepository;

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

@@ -42,7 +42,11 @@ export declare class MongoRepository {
      */
     upsertMoviesByIdentifier(params: {
         attributes: factory.creativeWork.movie.ICreativeWork;
-    }[]): Promise<BulkWriteResult | void>;
+    }[], options?: {
+        replace?: boolean;
+    }): Promise<{
+        bulkWriteResult: BulkWriteResult;
+    } | void>;
     /**
      * コンテンツを検索する
      */

package/lib/chevre/repo/creativeWork.js

@@ -138,36 +138,56 @@ class MongoRepository {
     /**
      * コードをキーにして冪等作成
      */
-    upsertMoviesByIdentifier(params) {
+    // tslint:disable-next-line:max-func-body-length
+    upsertMoviesByIdentifier(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const bulkWriteOps = [];
             if (Array.isArray(params)) {
-                params.forEach((creatingMovieParams) => {
-                    const _a = creatingMovieParams.attributes, { typeOf, project, identifier, duration, name, additionalProperty, contentRating, headline, distributor, thumbnailUrl, datePublished } = _a, setOnInsertFields = __rest(_a, ["typeOf", "project", "identifier", "duration", "name", "additionalProperty", "contentRating", "headline", "distributor", "thumbnailUrl", "datePublished"]);
-                    if (typeof identifier !== 'string' || identifier.length === 0) {
-                        throw new factory.errors.ArgumentNull('identifier');
+                params.forEach(({ attributes }) => {
+                    // リソースのユニークネスを保証するfilter
+                    const filter = {
+                        typeOf: attributes.typeOf,
+                        'project.id': { $eq: attributes.project.id },
+                        identifier: { $eq: attributes.identifier }
+                    };
+                    if ((options === null || options === void 0 ? void 0 : options.replace) === true) {
+                        const { id } = attributes, replaceFields = __rest(attributes, ["id"]);
+                        if (typeof replaceFields.identifier !== 'string' || replaceFields.identifier.length === 0) {
+                            throw new factory.errors.ArgumentNull('identifier');
+                        }
+                        const replacement = replaceFields;
+                        const replaceOne = {
+                            filter,
+                            replacement,
+                            upsert: true
+                        };
+                        bulkWriteOps.push({ replaceOne });
                     }
-                    const updateFilter = {
-                        $setOnInsert: Object.assign(Object.assign({}, setOnInsertFields), { typeOf,
+                    else {
+                        const { typeOf, project, identifier, duration, name, additionalProperty, contentRating, headline, distributor, thumbnailUrl, datePublished } = attributes, setOnInsertFields = __rest(attributes, ["typeOf", "project", "identifier", "duration", "name", "additionalProperty", "contentRating", "headline", "distributor", "thumbnailUrl", "datePublished"]);
+                        if (typeof identifier !== 'string' || identifier.length === 0) {
+                            throw new factory.errors.ArgumentNull('identifier');
+                        }
+                        const setOnInsert = Object.assign(Object.assign({}, setOnInsertFields), { typeOf,
                             project,
-                            identifier }),
-                        // 変更可能な属性のみ上書き
-                        $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (name !== undefined) ? { name } : undefined), (contentRating !== undefined) ? { contentRating } : undefined), (duration !== undefined) ? { duration } : undefined), (headline !== undefined) ? { headline } : undefined), (datePublished !== undefined) ? { datePublished } : undefined), (distributor !== undefined) ? { distributor } : undefined), (typeof thumbnailUrl === 'string') ? { thumbnailUrl } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty } : [])
-                    };
-                    const updateOne = {
-                        filter: {
-                            typeOf: typeOf,
-                            'project.id': { $eq: project.id },
-                            identifier: { $eq: identifier }
-                        },
-                        update: updateFilter,
-                        upsert: true
-                    };
-                    bulkWriteOps.push({ updateOne });
+                            identifier });
+                        const updateFilter = {
+                            $setOnInsert: setOnInsert,
+                            // 変更可能な属性のみ上書き
+                            $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (name !== undefined) ? { name } : undefined), (contentRating !== undefined) ? { contentRating } : undefined), (duration !== undefined) ? { duration } : undefined), (headline !== undefined) ? { headline } : undefined), (datePublished !== undefined) ? { datePublished } : undefined), (distributor !== undefined) ? { distributor } : undefined), (typeof thumbnailUrl === 'string') ? { thumbnailUrl } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty } : [])
+                        };
+                        const updateOne = {
+                            filter,
+                            update: updateFilter,
+                            upsert: true
+                        };
+                        bulkWriteOps.push({ updateOne });
+                    }
                 });
             }
             if (bulkWriteOps.length > 0) {
-                return this.creativeWorkModel.bulkWrite(bulkWriteOps, { ordered: false });
+                const bulkWriteResult = yield this.creativeWorkModel.bulkWrite(bulkWriteOps, { ordered: false });
+                return { bulkWriteResult };
             }
         });
     }

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

@@ -119,6 +119,18 @@ export declare class MongoRepository {
     createScreeningEventSeriesIfNotExistByWorkPerformed(params: {
         attributes: factory.event.IAttributes<factory.eventType.ScreeningEventSeries>;
     }[]): Promise<BulkWriteResult | void>;
+    /**
+     * コンテンツ+バージョンをキーにして冪等置換
+     */
+    upsertScreeningEventSeriesByVersion(params: {
+        attributes: factory.event.IAttributes<factory.eventType.ScreeningEventSeries>;
+    }[]): Promise<{
+        bulkWriteResult4insert: BulkWriteResult;
+        bulkWriteResult: BulkWriteResult;
+        modifiedEvents: {
+            id: string;
+        }[];
+    } | void>;
     /**
      * イベント部分更新
      */

package/lib/chevre/repo/event.js

@@ -605,6 +605,67 @@ class MongoRepository {
             }
         });
     }
+    /**
+     * コンテンツ+バージョンをキーにして冪等置換
+     */
+    // tslint:disable-next-line:max-func-body-length
+    upsertScreeningEventSeriesByVersion(params
+    // options?: {
+    // }
+    ) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
+            // replaceOneでは_idを指定できないので、updateOne(setOnInsert)->replaceOneの2段階でbulkWriteを実行する
+            const bulkWriteOps4insert = [];
+            const bulkWriteOps = [];
+            const queryFilters = [];
+            if (Array.isArray(params)) {
+                params.forEach(({ attributes }) => {
+                    const version = attributes.workPerformed.version;
+                    if (typeof version !== 'string' || version.length === 0) {
+                        throw new factory.errors.ArgumentNull('workPerformed.version');
+                    }
+                    // リソースのユニークネスを保証するfilter
+                    const filter = {
+                        typeOf: attributes.typeOf,
+                        'project.id': { $eq: attributes.project.id },
+                        'location.branchCode': { $exists: true, $eq: attributes.location.branchCode },
+                        'workPerformed.identifier': { $exists: true, $eq: attributes.workPerformed.identifier },
+                        'workPerformed.version': { $exists: true, $eq: version }
+                    };
+                    queryFilters.push({
+                        typeOf: attributes.typeOf,
+                        'project.id': { $eq: attributes.project.id },
+                        'location.branchCode': { $exists: true, $eq: attributes.location.branchCode },
+                        'workPerformed.identifier': { $exists: true, $eq: attributes.workPerformed.identifier },
+                        'workPerformed.version': { $exists: true, $eq: version }
+                    });
+                    const setOnInsert = Object.assign(Object.assign({}, attributes), { _id: uniqid() });
+                    const updateOne = {
+                        filter,
+                        update: { $setOnInsert: setOnInsert },
+                        upsert: true
+                    };
+                    bulkWriteOps4insert.push({ updateOne });
+                    const replacement = attributes;
+                    const replaceOne = {
+                        filter,
+                        replacement,
+                        upsert: true
+                    };
+                    bulkWriteOps.push({ replaceOne });
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                const bulkWriteResult4insert = yield this.eventModel.bulkWrite(bulkWriteOps4insert, { ordered: false });
+                const bulkWriteResult = yield this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
+                // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                const modifiedEvents = yield this.eventModel.find({ $or: queryFilters }, { _id: 1 })
+                    .exec();
+                return { bulkWriteResult4insert, bulkWriteResult, modifiedEvents };
+            }
+        });
+    }
     /**
      * イベント部分更新
      */

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

@@ -35,11 +35,17 @@ export declare class MongoRepository {
     private readonly offerCatalogModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.offerCatalog.ISearchConditions): any[];
-    save(params: factory.offerCatalog.IOfferCatalog): Promise<factory.offerCatalog.IOfferCatalog>;
+    save(params: factory.offerCatalog.IOfferCatalog & {
+        $unset?: any;
+    }): Promise<{
+        id: string;
+    }>;
     /**
      * プロジェクトとコードから冪等保管
      */
-    saveByIdentifier(params: factory.offerCatalog.IOfferCatalog): Promise<factory.offerCatalog.IOfferCatalog>;
+    saveByIdentifier(params: factory.offerCatalog.IOfferCatalog): Promise<{
+        id: string;
+    }>;
     /**
      * 同期日時を更新する
      */

package/lib/chevre/repo/offerCatalog.js

@@ -133,13 +133,13 @@ class MongoRepository {
             let doc;
             if (params.id === '') {
                 const uniqid = yield Promise.resolve().then(() => require('uniqid'));
-                const id = uniqid();
-                doc = yield this.offerCatalogModel.create(Object.assign(Object.assign({}, params), { _id: id }));
+                const newId = uniqid();
+                const { id, $unset } = params, creatingDoc = __rest(params, ["id", "$unset"]);
+                doc = yield this.offerCatalogModel.create(Object.assign(Object.assign({}, creatingDoc), { _id: newId }));
             }
             else {
-                // 上書き禁止属性を除外(2022-08-24~)
-                const { id, identifier, project, typeOf } = params, updateFields = __rest(params, ["id", "identifier", "project", "typeOf"]);
-                doc = yield this.offerCatalogModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                const { id, identifier, itemOffered, project, typeOf, $unset } = params, updateFields = __rest(params, ["id", "identifier", "itemOffered", "project", "typeOf", "$unset"]); // 上書き禁止属性を除外
+                doc = yield this.offerCatalogModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign({ $set: updateFields }, (params.$unset !== undefined) ? { $unset: params.$unset } : undefined), { upsert: false, new: true, projection: { _id: 1 } })
                     .exec();
             }
             if (doc === null) {
@@ -155,14 +155,14 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             const newId = uniqid();
-            const { id, identifier, project, typeOf } = params, updateFields = __rest(params, ["id", "identifier", "project", "typeOf"]);
+            const { id, identifier, itemOffered, project, typeOf } = params, updateFields = __rest(params, ["id", "identifier", "itemOffered", "project", "typeOf"]);
             const doc = yield this.offerCatalogModel.findOneAndUpdate({
                 identifier: { $eq: params.identifier },
                 'project.id': { $eq: params.project.id }
             }, {
                 $set: updateFields,
-                $setOnInsert: { _id: newId, identifier, project, typeOf }
-            }, { upsert: true, new: true })
+                $setOnInsert: { _id: newId, identifier, itemOffered, project, typeOf }
+            }, { upsert: true, new: true, projection: { _id: 1 } })
                 .exec();
             return doc.toObject();
         });

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

@@ -24,12 +24,9 @@
 /// <reference types="mongoose/types/inferschematype" />
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
-type IKeyOfProjection = keyof factory.order.IOrder | '_id';
-type IProjection4searchWithUnwoundAcceptedOffers = {
-    [key in keyof Omit<factory.order.IOrder, 'acceptedOffers'>]?: 1;
-} & {
-    _id?: 0 | 1;
-};
+type IOrderWithoutAcceptedOffers = factory.order.IOrder;
+type IKeyOfProjection = keyof IOrderWithoutAcceptedOffers | '_id';
+export type IReturnedOrder = Pick<IOrderWithoutAcceptedOffers, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner' | 'seller' | 'price' | 'priceCurrency' | 'orderDate'>;
 /**
  * 注文リポジトリ
  */
@@ -40,7 +37,9 @@ export declare class MongoRepository {
     /**
      * なければ作成する
      */
-    createIfNotExist(order: factory.order.IOrder): Promise<void>;
+    createIfNotExist(order: IOrderWithoutAcceptedOffers & {
+        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    }): Promise<void>;
     /**
      * 注文ステータスを変更する
      */
@@ -51,7 +50,7 @@ export declare class MongoRepository {
         orderNumber: string;
         orderStatus: factory.orderStatus;
         previousOrderStatus: factory.orderStatus;
-    }): Promise<factory.order.IOrder>;
+    }): Promise<IOrderWithoutAcceptedOffers>;
     /**
      * 注文を返品する
      */
@@ -62,7 +61,7 @@ export declare class MongoRepository {
         orderNumber: string;
         dateReturned: Date;
         returner: factory.order.IReturner;
-    }): Promise<factory.order.IOrder>;
+    }): Promise<IReturnedOrder>;
     /**
      * 変更可能な属性を更新する
      */
@@ -95,7 +94,7 @@ export declare class MongoRepository {
         id: string;
         inclusion: IKeyOfProjection[];
         exclusion: IKeyOfProjection[];
-    }): Promise<factory.order.IOrder>;
+    }): Promise<IOrderWithoutAcceptedOffers>;
     /**
      * 注文番号から注文を取得する
      */
@@ -108,8 +107,8 @@ export declare class MongoRepository {
             id?: string;
         };
         inclusion: IKeyOfProjection[];
-        exclusion: IKeyOfProjection[];
-    }): Promise<factory.order.IOrder>;
+        exclusion: (IKeyOfProjection | 'acceptedOffers')[];
+    }): Promise<IOrderWithoutAcceptedOffers>;
     findByOrderNumberAndReservationId(params: {
         project: {
             id: string;
@@ -119,7 +118,7 @@ export declare class MongoRepository {
         };
         orderNumber: string;
         reservationId: string;
-    }): Promise<Pick<factory.order.IOrder, 'orderNumber' | 'orderStatus' | 'typeOf'>>;
+    }): Promise<Pick<IOrderWithoutAcceptedOffers, 'orderNumber' | 'orderStatus' | 'typeOf'>>;
     /**
      * 注文番号で削除する
      */
@@ -130,48 +129,9 @@ export declare class MongoRepository {
     /**
      * 注文を検索する
      */
-    search(params: factory.order.ISearchConditions, projection?: {
+    search(params: factory.order.ISearchConditions, projection: {
         [key in IKeyOfProjection]?: 0 | 1;
-    }): Promise<factory.order.IOrder[]>;
-    /**
-     * 注文の受入オファーIDリストを検索する
-     */
-    searchAcceptedOfferIds(params: factory.order.ISearchConditions): Promise<(string)[]>;
-    /**
-     * オファー展開の注文検索
-     */
-    searchWithUnwoundAcceptedOffers(params: factory.order.ISearchConditions, projection?: IProjection4searchWithUnwoundAcceptedOffers): Promise<factory.order.IOrder[]>;
-    /**
-     * オファーのみ展開して検索する
-     */
-    searchAcceptedOffers(params: factory.order.ISearchConditions, inclusion?: (keyof factory.order.IAcceptedOffer<factory.order.IItemOffered>)[]): Promise<factory.order.IAcceptedOffer<factory.order.IItemOffered>[]>;
-    /**
-     * 注文に含まれる予約番号を検索する
-     */
-    searchReservationNumbersByOrderNumbers(params: {
-        orderNumber: {
-            $in: string[];
-        };
-    }): Promise<(string)[]>;
-    /**
-     * 注文に含まれるイベントIDを検索する
-     */
-    searchReservationForIdsByOrderNumbers(params: {
-        orderNumber: {
-            $in: string[];
-        };
-    }): Promise<string[]>;
-    /**
-     * 注文に含まれるacceptedOffersを検索する
-     */
-    searchAcceptedOffersByOrderNumbers(params: {
-        orderNumber: {
-            $in: string[];
-        };
-    }): Promise<{
-        id: string;
-        priceSpecification: factory.order.ITicketPriceSpecification;
-    }[]>;
+    }): Promise<IOrderWithoutAcceptedOffers[]>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<any>;