@chevre/domain 22.9.0-alpha.114 → 22.9.0-alpha.116

package/example/src/chevre/offers/projectItemListElement.ts

@@ -0,0 +1,54 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+const formatter = new Intl.NumberFormat('ja-JP');
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    let startTime: [number, number] = process.hrtime();
+    let diff: [number, number] = process.hrtime(startTime);
+    let result: any;
+
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const offerCatalogRepo = await chevre.repository.OfferCatalog.createInstance(mongoose.connection);
+    const offerCatalogItemRepo = await chevre.repository.OfferCatalogItem.createInstance(mongoose.connection);
+
+    // startTime = process.hrtime();
+    // result = await offerCatalogRepo.searchItemListElementById({
+    //     id: 'blpc770py',
+    //     limit: 100,
+    //     page: 1
+    // });
+    // diff = process.hrtime(startTime);
+    // console.log('diff:', [diff[0], formatter.format(diff[1])]);
+    // console.log('result:', result);
+
+    startTime = process.hrtime();
+    result = await offerCatalogRepo.sliceItemListElementById({
+        id: 'blpc770py',
+        limit: 10,
+        page: 1
+    });
+    diff = process.hrtime(startTime);
+    console.log('diff:', [diff[0], formatter.format(diff[1])]);
+    console.log('result:', result);
+
+    startTime = process.hrtime();
+    result = await offerCatalogItemRepo.sliceItemListElementById({
+        id: '65669285c7b871dba60ed72e',
+        limit: 10,
+        page: 1
+    });
+    diff = process.hrtime(startTime);
+    console.log('diff:', [diff[0], formatter.format(diff[1])]);
+    console.log('result:', result);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/offers/searchByOfferCatalogIdWithSortIndex.ts

@@ -0,0 +1,44 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    const offerRepo = await chevre.repository.Offer.createInstance(mongoose.connection);
+
+    const result = await offerRepo.searchByOfferCatalogIdWithSortIndex({
+        offerCatalog: { id: '65669285c7b871dba60ed72e', isOfferCatalogItem: true },
+        // availableAtOrFrom: { id: params.store?.id },
+        // unacceptedPaymentMethod: params.unacceptedPaymentMethod,
+        excludeAppliesToMovieTicket: false,
+        priceSpecification: {
+            appliesToMovieTicket: {
+                // serviceOutput: {
+                //     typeOf: {
+                //         ...(typeof req.query.priceSpecification?.appliesToMovieTicket?.serviceOutput?.typeOf?.$eq === 'string')
+                //             ? { $eq: req.query.priceSpecification.appliesToMovieTicket.serviceOutput.typeOf.$eq }
+                //             : undefined
+                //     }
+                // },
+                serviceType: {
+                    $exists: false
+                }
+            }
+        },
+        onlyValid: false,
+        useIncludeInDataCatalog: true,
+        limit: 10,
+        page: 1
+    });
+    console.log('result:', result);
+    console.log(result.offers.map(({ name }) => name));
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/stockHolder/checkRedisKeyCount.ts

@@ -45,7 +45,7 @@ async function main() {
     const cursor = eventRepo.getCursor(
         {
             'project.id': {
-                // $eq: 'toei-production',
+                $eq: 'toei-production',
                 $in: useMongoAsStockHolderProjects
             },
             startDate: {

package/example/src/chevre/upsertOffersByIdentifier.ts

@@ -10,7 +10,7 @@ const PRICE = 1234;
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const offerRepo = await chevre.repository.Offer.createInstance(mongoose.connection);
+    const offerRepo = await chevre.repository.AggregateOffer.createInstance(mongoose.connection);
 
     const result = await offerRepo.upsertByIdentifier(
         [

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

@@ -1,5 +1,7 @@
-import type { AnyExpression, Connection, FilterQuery, PipelineStage } from 'mongoose';
+import type { BulkWriteResult } from 'mongodb';
+import { AnyExpression, Connection, Document, FilterQuery, PipelineStage } from 'mongoose';
 import * as factory from '../factory';
+import { IDocType as IAggregateOfferDocType } from './mongoose/schemas/aggregateOffer';
 type IMatchStage = PipelineStage.Match;
 type KeyOfUnitPriceOffer = keyof factory.unitPriceOffer.IUnitPriceOffer;
 type IProjection = {
@@ -57,15 +59,52 @@ export declare class AggregateOfferRepo {
         };
         id: string;
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, import("./mongoose/schemas/aggregateOffer").IDocType> & import("./mongoose/schemas/aggregateOffer").IDocType & Required<{
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<Document<unknown, {}, IAggregateOfferDocType> & IAggregateOfferDocType & Required<{
         _id: string;
-    }>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, import("./mongoose/schemas/aggregateOffer").IDocType> & import("./mongoose/schemas/aggregateOffer").IDocType & Required<{
+    }>, import("mongoose").QueryOptions<Document<unknown, {}, IAggregateOfferDocType> & IAggregateOfferDocType & Required<{
         _id: string;
     }>>>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<factory.aggregateOffer.IAggregateOffer>;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
+    save(params: factory.unitPriceOffer.IUnitPriceOffer & {}): Promise<{
+        id: string;
+    }>;
+    /**
+     * コードをキーにして冪等置換(2023-12-13~)
+     */
+    upsertByIdentifier(params: Omit<factory.unitPriceOffer.IUnitPriceOffer, 'id'>[]): Promise<{
+        bulkWriteResult: BulkWriteResult;
+        modifiedOffers: {
+            id: string;
+        }[];
+    } | void>;
+    /**
+     * sskts専用オファー保管
+     */
+    saveManyByIdentifier4sskts(params: {
+        project: {
+            id: string;
+        };
+        attributes: factory.aggregateOffer.ISubOffer;
+        upsert?: boolean;
+    }[]): Promise<void>;
+    /**
+     * プロダクトIDからアドオンを除外する
+     */
+    pullAddOns(params: {
+        project: {
+            id: string;
+        };
+        addOn: {
+            itemOffered: {
+                id: {
+                    $in: string[];
+                };
+            };
+        };
+    }): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     countIncludedInDataCatalog(params: {
         id: {
             $eq: string;

package/lib/chevre/repo/aggregateOffer.js

@@ -8,6 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AggregateOfferRepo = void 0;
 const createDebug = require("debug");
@@ -434,19 +445,6 @@ class AggregateOfferRepo {
         }
         return projectStage;
     }
-    // public async count(
-    //     params: Omit<factory.unitPriceOffer.ISearchConditions, 'limit' | 'page' | 'sort'>
-    // ): Promise<number> {
-    //     const matchStages = AggregateOfferRepo.CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params);
-    //     const result = await this.aggregateOfferModel.aggregate<{ offerCount: number }>([
-    //         ...matchStages,
-    //         {
-    //             $count: 'offerCount'
-    //         }
-    //     ])
-    //         .exec();
-    //     return (result.length > 0) ? result[0].offerCount : 0;
-    // }
     search(params, projection) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
@@ -570,6 +568,248 @@ class AggregateOfferRepo {
                 .exec();
         });
     }
+    save(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            let doc;
+            let aggregateOfferId;
+            // const { $unset, ...paramsWithoutUnset } = params;
+            const paramsWithoutUnset = __rest(params, []);
+            // let savedUnitPriceOffer: factory.unitPriceOffer.IUnitPriceOffer;
+            if (typeof params.id !== 'string' || params.id.length === 0) {
+                const uniqid = yield Promise.resolve().then(() => require('uniqid'));
+                const newId = uniqid();
+                aggregateOfferId = newId;
+                // サブオファー最適化(2023-12-22~)
+                // savedUnitPriceOffer = { ...paramsWithoutUnset, id };
+                const { id, project } = paramsWithoutUnset, savedUnitPriceOffer = __rest(paramsWithoutUnset, ["id", "project"]);
+                const aggregateOffer = {
+                    typeOf: factory.offerType.AggregateOffer,
+                    project: params.project,
+                    offers: [savedUnitPriceOffer]
+                };
+                doc = yield this.aggregateOfferModel.create(Object.assign(Object.assign({}, aggregateOffer), { _id: newId }));
+            }
+            else {
+                aggregateOfferId = params.id;
+                // const unitPriceOffers = <Pick<factory.unitPriceOffer.IUnitPriceOffer, 'id' | 'identifier' | 'project' | 'typeOf'>[]>
+                //     await this.search(
+                //         {
+                //             limit: 1,
+                //             page: 1,
+                //             project: { id: { $eq: params.project.id } },
+                //             id: { $eq: params.id }
+                //         },
+                //         { identifier: 1, project: 1, typeOf: 1 }
+                //     );
+                // const originalUnitPriceOffer = unitPriceOffers.shift();
+                const aggregateOffers = yield this.search({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: params.project.id } },
+                    id: { $eq: params.id }
+                });
+                const originalUnitPriceOffer = (_a = aggregateOffers.shift()) === null || _a === void 0 ? void 0 : _a.offers.shift();
+                if (originalUnitPriceOffer === undefined) {
+                    throw new factory.errors.NotFound(factory.offerType.Offer);
+                }
+                // 上書き禁止属性を除外
+                const { id, identifier, project, typeOf } = paramsWithoutUnset, updateFields = __rest(paramsWithoutUnset, ["id", "identifier", "project", "typeOf"]);
+                // サブオファー最適化(2023-12-22~)
+                const subOffer = Object.assign(Object.assign({}, updateFields), { 
+                    // id: originalUnitPriceOffer.id,
+                    identifier: originalUnitPriceOffer.identifier, 
+                    // project: originalUnitPriceOffer.project,
+                    typeOf: originalUnitPriceOffer.typeOf });
+                doc = yield this.aggregateOfferModel.findOneAndUpdate(
+                // { 'offers.id': params.id },
+                { _id: params.id }, // _idに変更(2023-12-22~)
+                {
+                    $set: {
+                        // 'offers.$[offer]': savedUnitPriceOffer
+                        'offers.0': subOffer // _idに変更(2023-12-22~)
+                    }
+                }, {
+                    upsert: false,
+                    new: true
+                    // _idに変更(2023-12-22~)
+                    // arrayFilters: [
+                    //     { 'offer.id': { $eq: params.id } }
+                    // ]
+                })
+                    .exec();
+            }
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.aggregateOfferModel.modelName);
+            }
+            return { id: aggregateOfferId };
+        });
+    }
+    /**
+     * コードをキーにして冪等置換(2023-12-13~)
+     */
+    upsertByIdentifier(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
+            const insertBulkWriteOps = [];
+            // const updateBulkWriteOps: AnyBulkWriteOperation<factory.aggregateOffer.IAggregateOffer>[] = [];
+            const queryFilters = [];
+            if (Array.isArray(params)) {
+                params.forEach((p) => {
+                    // リソースのユニークネスを保証するfilter
+                    const filter = {
+                        'project.id': { $eq: p.project.id },
+                        'offers.identifier': { $exists: true, $eq: p.identifier }
+                    };
+                    queryFilters.push({
+                        'project.id': { $eq: p.project.id },
+                        'offers.identifier': { $exists: true, $eq: p.identifier }
+                    });
+                    const newOfferId = uniqid(); // setOnInsert時のみに利用する新ID
+                    // サブオファー最適化(2023-12-22~)
+                    const { project } = p, subOffer = __rest(p, ["project"]);
+                    const aggregateOffer = {
+                        project: p.project,
+                        typeOf: factory.offerType.AggregateOffer,
+                        offers: [subOffer]
+                    };
+                    const setOnInsert = {
+                        project: aggregateOffer.project,
+                        typeOf: aggregateOffer.typeOf,
+                        _id: newOfferId
+                    };
+                    const updateFilter = {
+                        $setOnInsert: setOnInsert,
+                        $set: { offers: aggregateOffer.offers }
+                    };
+                    const updateOneOnInsert = {
+                        filter,
+                        update: updateFilter,
+                        upsert: true
+                    };
+                    insertBulkWriteOps.push({ updateOne: updateOneOnInsert });
+                });
+            }
+            if (insertBulkWriteOps.length > 0) {
+                const bulkWriteResult = yield this.aggregateOfferModel.bulkWrite(insertBulkWriteOps, { ordered: false });
+                // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                const modifiedOffers = yield this.aggregateOfferModel.find({ $or: queryFilters }, 
+                // { _id: 1, 'offers.identifier': 1 }
+                { _id: 0, id: '$_id' })
+                    .lean() // lean(2024-09-26~)
+                    .exec();
+                return { bulkWriteResult, modifiedOffers };
+            }
+        });
+    }
+    /**
+     * sskts専用オファー保管
+     */
+    // tslint:disable-next-line:max-func-body-length
+    saveManyByIdentifier4sskts(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
+            const insertBulkWriteOps = [];
+            // const updateBulkWriteOps: AnyBulkWriteOperation[] = [];
+            if (Array.isArray(params)) {
+                params.forEach((p) => {
+                    const newOfferId = uniqid();
+                    // サブオファー最適化(2023-12-22~)
+                    // const unitPriceOffer: factory.aggregateOffer.ISubOffer = { ...p.attributes, id: newOfferId };
+                    const subOffer = p.attributes;
+                    const aggregateOffer = {
+                        project: { id: p.project.id, typeOf: factory.organizationType.Project },
+                        typeOf: factory.offerType.AggregateOffer,
+                        offers: [subOffer]
+                    };
+                    insertBulkWriteOps.push({
+                        updateOne: {
+                            filter: {
+                                'project.id': { $eq: p.project.id },
+                                'offers.identifier': { $exists: true, $eq: p.attributes.identifier }
+                            },
+                            update: {
+                                $setOnInsert: {
+                                    // ...aggregateOffer,
+                                    project: aggregateOffer.project,
+                                    typeOf: aggregateOffer.typeOf,
+                                    _id: newOfferId
+                                },
+                                $set: { offers: aggregateOffer.offers } // サブオファー最適化(2023-12-22~)
+                            },
+                            upsert: true
+                        }
+                    });
+                    // updateBulkWriteOps.push({
+                    //     updateOne: {
+                    //         filter: {
+                    //             'project.id': { $eq: aggregateOffer.project.id },
+                    //             'offers.identifier': { $exists: true, $eq: subOffer.identifier }
+                    //         },
+                    //         update: {
+                    //             // 特定の属性のみ更新する(IDを上書きできないので)
+                    //             $set: {
+                    //                 'offers.0.name': subOffer.name,
+                    //                 'offers.0.description': subOffer.description,
+                    //                 'offers.0.alternateName': subOffer.alternateName,
+                    //                 'offers.0.priceSpecification': subOffer.priceSpecification,
+                    //                 'offers.0.additionalProperty': subOffer.additionalProperty,
+                    //                 ...(Array.isArray(subOffer.eligibleMembershipType))
+                    //                     ? { 'offers.0.eligibleMembershipType': subOffer.eligibleMembershipType }
+                    //                     : undefined,
+                    //                 ...(Array.isArray(subOffer.eligibleMonetaryAmount))
+                    //                     ? { 'offers.0.eligibleMonetaryAmount': subOffer.eligibleMonetaryAmount }
+                    //                     : undefined
+                    //             },
+                    //         },
+                    //         upsert: false
+                    //     }
+                    // });
+                });
+            }
+            if (insertBulkWriteOps.length > 0) {
+                yield this.aggregateOfferModel.bulkWrite(insertBulkWriteOps, { ordered: false });
+                // await this.aggregateOfferModel.bulkWrite(updateBulkWriteOps, { ordered: false });
+            }
+        });
+    }
+    /**
+     * プロダクトIDからアドオンを除外する
+     */
+    pullAddOns(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (params.addOn.itemOffered.id.$in.length === 0) {
+                return;
+            }
+            const conditions = {
+                'project.id': { $eq: params.project.id },
+                'offers.addOn.itemOffered.id': { $exists: true, $in: params.addOn.itemOffered.id.$in }
+            };
+            // const updatingOffers = <Pick<factory.unitPriceOffer.IUnitPriceOffer, 'id' | 'identifier'>[]>await this.search(
+            //     {
+            //         project: { id: { $eq: params.project.id } },
+            //         addOn: { itemOffered: { id: { $in: params.addOn.itemOffered.id.$in } } }
+            //     },
+            //     { identifier: 1 }
+            // );
+            return this.aggregateOfferModel.updateMany(conditions, {
+                $pull: {
+                    'offers.$[offer].addOn': {
+                        'itemOffered.id': { $in: params.addOn.itemOffered.id.$in }
+                    }
+                }
+            }, {
+                arrayFilters: [
+                    { 'offer.addOn.itemOffered.id': { $exists: true, $in: params.addOn.itemOffered.id.$in } }
+                ]
+            })
+                .exec();
+            // if (updatingOffers.length > 0) {
+            //     // no op
+            // }
+            // return result;
+        });
+    }
     countIncludedInDataCatalog(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const aggregate = this.aggregateOfferModel.aggregate([

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

@@ -45,6 +45,18 @@ const schemaOptions = {
     }
 };
 const indexes = [
+    [
+        {
+            'project.id': 1,
+            'about.id': 1,
+            identifier: 1,
+            version: 1
+        },
+        {
+            unique: true,
+            name: 'uniqueIdentifier'
+        }
+    ],
     [
         { dateCreated: -1 },
         { name: 'dateCreated' }
@@ -61,6 +73,10 @@ const indexes = [
         { 'about.id': 1, dateCreated: -1 },
         { name: 'aboutId' }
     ],
+    [
+        { 'about.typeOf': 1, dateCreated: -1 },
+        { name: 'aboutTypeOf' }
+    ],
     [
         { 'about.orderNumber': 1, dateCreated: -1 },
         { name: 'aboutOrderNumber' }

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

@@ -1,5 +1,5 @@
 import type { BulkWriteResult } from 'mongodb';
-import type { Connection } from 'mongoose';
+import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type INoteDigitalDocument = factory.creativeWork.noteDigitalDocument.INoteDigitalDocument;
 type IKeyOfProjection = keyof INoteDigitalDocument;
@@ -9,13 +9,11 @@ type IKeyOfProjection = keyof INoteDigitalDocument;
 export declare class NoteRepo {
     private readonly noteModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.noteDigitalDocument.ISearchConditions): any[];
+    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.noteDigitalDocument.ISearchConditions): FilterQuery<import("@chevre/factory/lib/creativeWork/noteDigitalDocument").INoteDigitalDocument>[];
     /**
      * 検索
      */
-    projectFields(params: factory.creativeWork.noteDigitalDocument.ISearchConditions & {
-        sort: factory.creativeWork.noteDigitalDocument.ISortOrder;
-    }, inclusion: IKeyOfProjection[]): Promise<(INoteDigitalDocument & {
+    projectFields(params: factory.creativeWork.noteDigitalDocument.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<(INoteDigitalDocument & {
         id: string;
     })[]>;
     /**

package/lib/chevre/repo/note.js

@@ -90,14 +90,14 @@ class NoteRepo {
             }
             const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
             const query = this.noteModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
+            if (typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a.dateCreated) === 'number') {
+                query.sort({ dateCreated: params.sort.dateCreated });
+            }
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 query.limit(params.limit)
                     .skip(params.limit * (page - 1));
             }
-            if (typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a.dateCreated) === 'number') {
-                query.sort({ dateCreated: params.sort.dateCreated });
-            }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .lean() // 2024-09-19~
                 .exec();
@@ -124,7 +124,7 @@ class NoteRepo {
                     }
                     // リソースのユニークネスを保証するfilter
                     const filter = {
-                        typeOf: { $eq: factory.creativeWorkType.NoteDigitalDocument },
+                        // typeOf: { $eq: factory.creativeWorkType.NoteDigitalDocument },
                         'project.id': { $eq: project.id },
                         'about.id': { $eq: about.id },
                         identifier: { $eq: identifier },