@chevre/domain 22.13.0-alpha.9 → 22.14.0-alpha.0

package/example/src/chevre/migrateProjectSettings.ts

@@ -0,0 +1,64 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const projectRepo = await chevre.repository.Project.createInstance(mongoose.connection);
+
+    const cursor = projectRepo.getCursor(
+        {
+            // _id: { $eq: 'cinerino' }
+        },
+        {
+            _id: 1,
+            settings: 1,
+            typeOf: 1
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const project: Pick<chevre.factory.project.IProject, 'id' | 'typeOf' | 'settings'> = doc.toObject();
+
+        console.log(
+            'alreadyMigrated?', project.id, i);
+        const includeCustomerAsFindByConfirmationNumberResult = project.settings?.includeCustomerAsFindByConfirmationNumberResult;
+        let alreadyMigrated = false;
+        if (typeof includeCustomerAsFindByConfirmationNumberResult === 'boolean') {
+            alreadyMigrated = true;
+        }
+
+        if (alreadyMigrated) {
+            console.log(
+                'already migrated.', project.id, i);
+        } else {
+            console.log(
+                'updating project...',
+                project.id, i);
+            await projectRepo.updateById({
+                id: project.id,
+                settings: {
+                    includeCustomerAsFindByConfirmationNumberResult: true
+                }
+            });
+            updateCount += 1;
+            console.log(
+                'updated.',
+                project.id, i);
+        }
+    });
+
+    console.log(i, 'docs checked');
+    console.log(updateCount, 'docs updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/orders/searchOrders.ts

@@ -0,0 +1,28 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
+
+    const orders = await orderRepo.projectFields(
+        {
+            limit: 1,
+            page: 1
+        },
+        { inclusion: ['customer.id', 'customer.typeOf'] }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(orders, { depth: null });
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/roles/addPermissionIfNotExists.ts

@@ -9,10 +9,10 @@ async function main() {
     const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
 
     const roleNames = [
-        chevre.factory.role.organizationRole.RoleName.InventoryManager
+        chevre.factory.role.organizationRole.RoleName.AdminInventoryManager
     ];
     const permissions = [
-        'sellerMakesOffer.*'
+        'admin.sellers.events.*'
     ];
     for (const roleName of roleNames) {
         for (const permission of permissions) {

package/lib/chevre/repo/event.js

@@ -73,6 +73,10 @@ class EventRepo {
         if (Array.isArray(idIn)) {
             andConditions.push({ _id: { $in: idIn } });
         }
+        const identifierIn = conditions.identifiers;
+        if (Array.isArray(identifierIn)) {
+            andConditions.push({ identifier: { $exists: true, $in: identifierIn } });
+        }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (Array.isArray(conditions.eventStatuses)) {
@@ -130,16 +134,6 @@ class EventRepo {
         if (Array.isArray(locationBranchCodeIn)) {
             andConditions.push({ 'location.branchCode': { $exists: true, $in: locationBranchCodeIn } });
         }
-        // discontinue(2024-09-30)
-        // const hasOfferCatalogIdEq = conditions.hasOfferCatalog?.id?.$eq;
-        // if (typeof hasOfferCatalogIdEq === 'string') {
-        //     andConditions.push({
-        //         'hasOfferCatalog.id': {
-        //             $exists: true,
-        //             $eq: hasOfferCatalogIdEq
-        //         }
-        //     });
-        // }
         const additionalPropertyElemMatch = (_l = conditions.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({

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

@@ -1,4 +1,3 @@
-import type { BulkWriteResult } from 'mongodb';
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type INoteDigitalDocument = factory.creativeWork.noteDigitalDocument.INoteDigitalDocument;
@@ -10,22 +9,9 @@ export declare class NoteRepo {
     private readonly noteModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.noteDigitalDocument.ISearchConditions): FilterQuery<import("@chevre/factory/lib/creativeWork/noteDigitalDocument").INoteDigitalDocument>[];
-    /**
-     * 検索
-     */
-    projectFields(params: factory.creativeWork.noteDigitalDocument.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<(INoteDigitalDocument & {
+    findNotes(params: factory.creativeWork.noteDigitalDocument.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<(INoteDigitalDocument & {
         id: string;
     })[]>;
-    /**
-     * コードをキーにしてなければ作成する(複数対応)
-     */
-    upsertByIdentifier(params: Pick<INoteDigitalDocument, 'about' | 'creator' | 'identifier' | 'project' | 'provider' | 'text' | 'version'>[], options: {
-        overwrite: boolean;
-    }): Promise<BulkWriteResult | void>;
-    updateById(params: {
-        id: string;
-        attributes: Pick<INoteDigitalDocument, 'text' | 'editor'>;
-    }): Promise<void>;
     deleteManyByAbout(params: {
         about: {
             id: string;

package/lib/chevre/repo/note.js

@@ -74,10 +74,7 @@ class NoteRepo {
         }
         return andConditions;
     }
-    /**
-     * 検索
-     */
-    projectFields(params, inclusion) {
+    findNotes(params, inclusion) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             const conditions = NoteRepo.CREATE_MONGO_CONDITIONS(params);
@@ -103,73 +100,6 @@ class NoteRepo {
                 .exec();
         });
     }
-    /**
-     * コードをキーにしてなければ作成する(複数対応)
-     */
-    upsertByIdentifier(params, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const now = new Date();
-            const bulkWriteOps = [];
-            if (Array.isArray(params)) {
-                params.forEach((creatingNoteParams) => {
-                    const { about, creator, identifier, project, provider, text, version } = creatingNoteParams;
-                    if (typeof identifier !== 'string' || identifier.length === 0) {
-                        throw new factory.errors.ArgumentNull('identifier');
-                    }
-                    if (typeof version !== 'string' || version.length === 0) {
-                        throw new factory.errors.ArgumentNull('version');
-                    }
-                    if (typeof text !== 'string') {
-                        throw new factory.errors.ArgumentNull('text');
-                    }
-                    // リソースのユニークネスを保証するfilter
-                    const filter = {
-                        // typeOf: { $eq: factory.creativeWorkType.NoteDigitalDocument },
-                        'project.id': { $eq: project.id },
-                        'about.id': { $eq: about.id },
-                        identifier: { $eq: identifier },
-                        version: { $eq: version }
-                    };
-                    const setOnInsert = Object.assign({ about, creator, identifier, project, provider, version, dateCreated: now, typeOf: factory.creativeWorkType.NoteDigitalDocument }, (!options.overwrite) ? { text } : undefined // overwriteでない場合はinsert時にtextをセット
-                    );
-                    // 変更可能な属性のみ上書き
-                    const setFields = {
-                        dateModified: now,
-                        editor: creator,
-                        text
-                    };
-                    const updateFilter = Object.assign({ $setOnInsert: setOnInsert }, (options.overwrite) ? { $set: setFields } : undefined);
-                    const updateOne = {
-                        filter,
-                        update: updateFilter,
-                        upsert: true
-                    };
-                    bulkWriteOps.push({ updateOne });
-                });
-            }
-            if (bulkWriteOps.length > 0) {
-                return this.noteModel.bulkWrite(bulkWriteOps, { ordered: false });
-            }
-        });
-    }
-    updateById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const updateFields = {
-                $set: Object.assign(Object.assign({ dateModified: new Date() }, (typeof params.attributes.text === 'string') ? { text: params.attributes.text } : undefined), (typeof ((_a = params.attributes.editor) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { editor: params.attributes.editor } : undefined)
-            };
-            const doc = yield this.noteModel.findOneAndUpdate({ _id: { $eq: params.id } }, updateFields, {
-                upsert: false,
-                new: true,
-                projection: { _id: 1 }
-            })
-                .lean()
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.noteModel.modelName);
-            }
-        });
-    }
     deleteManyByAbout(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.noteModel.deleteMany({

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

@@ -0,0 +1,30 @@
+import type { BulkWriteResult } from 'mongodb';
+import type { Connection, FilterQuery } from 'mongoose';
+import * as factory from '../factory';
+type INoteAboutOrder = factory.creativeWork.noteDigitalDocument.INoteAboutOrder;
+type IKeyOfProjection = keyof INoteAboutOrder;
+/**
+ * 注文メモリポジトリ
+ */
+export declare class NoteAboutOrderRepo {
+    private readonly noteModel;
+    constructor(connection: Connection);
+    static CREATE_MONGO_CONDITIONS(params: factory.creativeWork.noteDigitalDocument.ISearchConditions): FilterQuery<import("@chevre/factory/lib/creativeWork/noteDigitalDocument").INoteAboutOrder>[];
+    /**
+     * 検索
+     */
+    findOrderNotes(params: factory.creativeWork.noteDigitalDocument.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<(INoteAboutOrder & {
+        id: string;
+    })[]>;
+    /**
+     * コードをキーにしてなければ作成する(複数対応)
+     */
+    upsertOrderNoteByIdentifier(params: Pick<INoteAboutOrder, 'about' | 'creator' | 'identifier' | 'project' | 'provider' | 'text' | 'version'>[], options: {
+        overwrite: boolean;
+    }): Promise<BulkWriteResult | void>;
+    updateById(params: {
+        id: string;
+        attributes: Pick<INoteAboutOrder, 'text' | 'editor'>;
+    }): Promise<void>;
+}
+export {};

package/lib/chevre/repo/noteAboutOrder.js

@@ -0,0 +1,179 @@
+"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.NoteAboutOrderRepo = void 0;
+const factory = require("../factory");
+const settings_1 = require("../settings");
+const note_1 = require("./mongoose/schemas/note");
+const AVAILABLE_PROJECT_FIELDS = [
+    'identifier',
+    'text',
+    'project',
+    'provider',
+    'about',
+    'dateCreated',
+    'dateModified',
+    'creator',
+    'editor',
+    'version',
+    'typeOf'
+];
+/**
+ * 注文メモリポジトリ
+ */
+class NoteAboutOrderRepo {
+    constructor(connection) {
+        this.noteModel = connection.model(note_1.modelName, (0, note_1.createSchema)());
+    }
+    static CREATE_MONGO_CONDITIONS(params) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        const andConditions = [
+            { 'about.typeOf': { $eq: factory.order.OrderType.Order } } // Orderに絞る
+        ];
+        const idIn = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$in;
+        if (Array.isArray(idIn)) {
+            andConditions.push({ _id: { $in: idIn } });
+        }
+        const projectIdEq = (_c = (_b = params.project) === null || _b === void 0 ? void 0 : _b.id) === null || _c === void 0 ? void 0 : _c.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        const providerIdEq = (_e = (_d = params.provider) === null || _d === void 0 ? void 0 : _d.id) === null || _e === void 0 ? void 0 : _e.$eq;
+        if (typeof providerIdEq === 'string') {
+            andConditions.push({ 'provider.id': { $eq: providerIdEq } });
+        }
+        const aboutIdEq = (_g = (_f = params.about) === null || _f === void 0 ? void 0 : _f.id) === null || _g === void 0 ? void 0 : _g.$eq;
+        if (typeof aboutIdEq === 'string') {
+            andConditions.push({ 'about.id': { $eq: aboutIdEq } });
+        }
+        const aboutIdIn = (_j = (_h = params.about) === null || _h === void 0 ? void 0 : _h.id) === null || _j === void 0 ? void 0 : _j.$in;
+        if (Array.isArray(aboutIdIn)) {
+            andConditions.push({ 'about.id': { $in: aboutIdIn } });
+        }
+        const aboutOrderNumberEq = (_l = (_k = params.about) === null || _k === void 0 ? void 0 : _k.orderNumber) === null || _l === void 0 ? void 0 : _l.$eq;
+        if (typeof aboutOrderNumberEq === 'string') {
+            andConditions.push({ 'about.orderNumber': { $exists: true, $eq: aboutOrderNumberEq } });
+        }
+        const aboutOrderNumberIn = (_o = (_m = params.about) === null || _m === void 0 ? void 0 : _m.orderNumber) === null || _o === void 0 ? void 0 : _o.$in;
+        if (Array.isArray(aboutOrderNumberIn)) {
+            andConditions.push({ 'about.orderNumber': { $exists: true, $in: aboutOrderNumberIn } });
+        }
+        const identifierEq = (_p = params.identifier) === null || _p === void 0 ? void 0 : _p.$eq;
+        if (typeof identifierEq === 'string') {
+            andConditions.push({ identifier: { $eq: identifierEq } });
+        }
+        const identifierIn = (_q = params.identifier) === null || _q === void 0 ? void 0 : _q.$in;
+        if (Array.isArray(identifierIn)) {
+            andConditions.push({ identifier: { $in: identifierIn } });
+        }
+        return andConditions;
+    }
+    /**
+     * 検索
+     */
+    findOrderNotes(params, inclusion) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const conditions = NoteAboutOrderRepo.CREATE_MONGO_CONDITIONS(params);
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+            }
+            else {
+                throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
+            }
+            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));
+            }
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean() // 2024-09-19~
+                .exec();
+        });
+    }
+    /**
+     * コードをキーにしてなければ作成する(複数対応)
+     */
+    upsertOrderNoteByIdentifier(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const now = new Date();
+            const bulkWriteOps = [];
+            if (Array.isArray(params)) {
+                params.forEach((creatingNoteParams) => {
+                    const { about, creator, identifier, project, provider, text, version } = creatingNoteParams;
+                    if (typeof identifier !== 'string' || identifier.length === 0) {
+                        throw new factory.errors.ArgumentNull('identifier');
+                    }
+                    if (typeof version !== 'string' || version.length === 0) {
+                        throw new factory.errors.ArgumentNull('version');
+                    }
+                    if (typeof text !== 'string') {
+                        throw new factory.errors.ArgumentNull('text');
+                    }
+                    // リソースのユニークネスを保証するfilter
+                    const filter = {
+                        // typeOf: { $eq: factory.creativeWorkType.NoteDigitalDocument },
+                        'project.id': { $eq: project.id },
+                        'about.id': { $eq: about.id },
+                        identifier: { $eq: identifier },
+                        version: { $eq: version }
+                    };
+                    const setOnInsert = Object.assign({ about, creator, identifier, project, provider, version, dateCreated: now, typeOf: factory.creativeWorkType.NoteDigitalDocument }, (!options.overwrite) ? { text } : undefined // overwriteでない場合はinsert時にtextをセット
+                    );
+                    // 変更可能な属性のみ上書き
+                    const setFields = {
+                        dateModified: now,
+                        editor: creator,
+                        text
+                    };
+                    const updateFilter = Object.assign({ $setOnInsert: setOnInsert }, (options.overwrite) ? { $set: setFields } : undefined);
+                    const updateOne = {
+                        filter,
+                        update: updateFilter,
+                        upsert: true
+                    };
+                    bulkWriteOps.push({ updateOne });
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                return this.noteModel.bulkWrite(bulkWriteOps, { ordered: false });
+            }
+        });
+    }
+    updateById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const updateFields = {
+                $set: Object.assign(Object.assign({ dateModified: new Date() }, (typeof params.attributes.text === 'string') ? { text: params.attributes.text } : undefined), (typeof ((_a = params.attributes.editor) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { editor: params.attributes.editor } : undefined)
+            };
+            const doc = yield this.noteModel.findOneAndUpdate({
+                _id: { $eq: params.id },
+                'about.typeOf': { $eq: factory.order.OrderType.Order }
+            }, updateFields, {
+                upsert: false,
+                new: true,
+                projection: { _id: 1 }
+            })
+                .lean()
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.noteModel.modelName);
+            }
+        });
+    }
+}
+exports.NoteAboutOrderRepo = NoteAboutOrderRepo;

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

@@ -1,7 +1,7 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type IOrderWithoutAcceptedOffers = factory.order.IOrder;
-type IKeyOfProjection = Extract<keyof IOrderWithoutAcceptedOffers, 'broker' | 'confirmationNumber' | 'customer' | 'dateReturned' | 'identifier' | 'name' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'previousOrderStatus' | 'price' | 'priceCurrency' | 'project' | 'returner' | 'seller' | 'typeOf' | 'url'> | 'paymentMethods.accountId' | 'paymentMethods.name' | 'paymentMethods.paymentMethod' | 'paymentMethods.paymentMethodId' | 'paymentMethods.totalPaymentDue' | 'paymentMethods.additionalProperty' | 'paymentMethods.issuedThrough';
+type IKeyOfProjection = Extract<keyof IOrderWithoutAcceptedOffers, 'broker' | 'confirmationNumber' | 'customer' | 'dateReturned' | 'identifier' | 'name' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'previousOrderStatus' | 'price' | 'priceCurrency' | 'project' | 'returner' | 'seller' | 'typeOf' | 'url'> | 'paymentMethods.accountId' | 'paymentMethods.name' | 'paymentMethods.paymentMethod' | 'paymentMethods.paymentMethodId' | 'paymentMethods.totalPaymentDue' | 'paymentMethods.additionalProperty' | 'paymentMethods.issuedThrough' | 'customer.id' | 'customer.typeOf';
 export type IReturnedOrder = Pick<IOrderWithoutAcceptedOffers, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner' | 'seller' | 'price' | 'priceCurrency' | 'orderDate'> & {
     id: string;
 };

package/lib/chevre/repo/order.js

@@ -21,7 +21,8 @@ const AVAILABLE_PROJECT_FIELDS = [
     'broker', 'confirmationNumber', 'customer', 'dateReturned', 'identifier', 'name', 'orderDate', 'orderNumber', 'orderStatus', 'orderedItem',
     'paymentMethods', 'previousOrderStatus', 'price', 'priceCurrency', 'project', 'returner', 'seller', 'typeOf', 'url',
     'paymentMethods.accountId', 'paymentMethods.additionalProperty', 'paymentMethods.issuedThrough', 'paymentMethods.name', 'paymentMethods.paymentMethod',
-    'paymentMethods.paymentMethodId', 'paymentMethods.totalPaymentDue'
+    'paymentMethods.paymentMethodId', 'paymentMethods.totalPaymentDue',
+    'customer.id', 'customer.typeOf'
 ];
 /**
  * 注文リポジトリ

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

@@ -27,7 +27,7 @@ export declare class ProjectRepo {
         logo?: string;
         hasMerchantReturnPolicy?: Pick<factory.project.IHasMerchantReturnPolicy, 'sameAs' | 'identifier'>;
         name?: string;
-        settings?: {
+        settings?: Pick<factory.project.ISettings, 'includeCustomerAsFindByConfirmationNumberResult'> & {
             sendEmailMessage?: factory.project.ISendEmailMessageSettings;
             sendgridApiKey?: string;
         };

package/lib/chevre/repo/project.js

@@ -134,23 +134,26 @@ class ProjectRepo {
     }
     updateById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g;
             let hasMerchantReturnPolicy;
             if (typeof ((_a = params.hasMerchantReturnPolicy) === null || _a === void 0 ? void 0 : _a.sameAs) === 'string') {
                 hasMerchantReturnPolicy = Object.assign({ sameAs: params.hasMerchantReturnPolicy.sameAs, typeOf: 'MerchantReturnPolicy' }, (typeof params.hasMerchantReturnPolicy.identifier === 'string')
                     ? { identifier: params.hasMerchantReturnPolicy.identifier } : undefined);
             }
-            yield this.projectModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (typeof params.alternateName === 'string' && params.alternateName.length > 0)
+            const includeCustomerAsFindByConfirmationNumberResult = (_b = params.settings) === null || _b === void 0 ? void 0 : _b.includeCustomerAsFindByConfirmationNumberResult;
+            yield this.projectModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (typeof params.alternateName === 'string' && params.alternateName.length > 0)
                 ? { alternateName: params.alternateName }
-                : undefined), (typeof params.name === 'string' && params.name.length > 0) ? { name: params.name } : undefined), (typeof params.logo === 'string' && params.logo.length > 0) ? { logo: params.logo } : undefined), (typeof ((_d = (_c = (_b = params.settings) === null || _b === void 0 ? void 0 : _b.sendEmailMessage) === null || _c === void 0 ? void 0 : _c.sender) === null || _d === void 0 ? void 0 : _d.email) === 'string')
+                : undefined), (typeof params.name === 'string' && params.name.length > 0) ? { name: params.name } : undefined), (typeof params.logo === 'string' && params.logo.length > 0) ? { logo: params.logo } : undefined), (typeof ((_e = (_d = (_c = params.settings) === null || _c === void 0 ? void 0 : _c.sendEmailMessage) === null || _d === void 0 ? void 0 : _d.sender) === null || _e === void 0 ? void 0 : _e.email) === 'string')
                 ? {
                     'settings.sendEmailMessage': {
                         sender: { email: params.settings.sendEmailMessage.sender.email }
                     }
                 }
-                : undefined), (typeof ((_e = params.settings) === null || _e === void 0 ? void 0 : _e.sendgridApiKey) === 'string')
+                : undefined), (typeof ((_f = params.settings) === null || _f === void 0 ? void 0 : _f.sendgridApiKey) === 'string')
                 ? { 'settings.sendgridApiKey': params.settings.sendgridApiKey }
-                : undefined), (typeof ((_f = params.subscription) === null || _f === void 0 ? void 0 : _f.useEventServiceAsProduct) === 'boolean')
+                : undefined), (typeof includeCustomerAsFindByConfirmationNumberResult === 'boolean')
+                ? { 'settings.includeCustomerAsFindByConfirmationNumberResult': includeCustomerAsFindByConfirmationNumberResult }
+                : undefined), (typeof ((_g = params.subscription) === null || _g === void 0 ? void 0 : _g.useEventServiceAsProduct) === 'boolean')
                 ? { 'subscription.useEventServiceAsProduct': params.subscription.useEventServiceAsProduct }
                 : undefined), (hasMerchantReturnPolicy !== undefined) ? { hasMerchantReturnPolicy } : undefined), { $unset: {
                     'settings.cognito': 1 // 廃止(2023-11-10~)

package/lib/chevre/repository.d.ts

@@ -33,6 +33,7 @@ import type { MemberProgramRepo } from './repo/memberProgram';
 import type { MerchantReturnPolicyRepo } from './repo/merchantReturnPolicy';
 import type { MessageRepo } from './repo/message';
 import type { NoteRepo } from './repo/note';
+import type { NoteAboutOrderRepo } from './repo/noteAboutOrder';
 import type { EventOfferRepo } from './repo/offer/event';
 import type { OfferRepo } from './repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from './repo/offerCatalog';
@@ -223,6 +224,10 @@ export type Note = NoteRepo;
 export declare namespace Note {
     function createInstance(...params: ConstructorParameters<typeof NoteRepo>): Promise<NoteRepo>;
 }
+export type NoteAboutOrder = NoteAboutOrderRepo;
+export declare namespace NoteAboutOrder {
+    function createInstance(...params: ConstructorParameters<typeof NoteAboutOrderRepo>): Promise<NoteAboutOrderRepo>;
+}
 export type OfferCatalog = OfferCatalogRepo;
 export declare namespace OfferCatalog {
     function createInstance(...params: ConstructorParameters<typeof OfferCatalogRepo>): Promise<OfferCatalogRepo>;

package/lib/chevre/repository.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Permit = exports.Person = exports.paymentMethod = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.Note = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AdvanceBookingRequirement = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = void 0;
+exports.Person = exports.paymentMethod = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AdvanceBookingRequirement = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
+exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Permit = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -453,6 +453,19 @@ var Note;
     }
     Note.createInstance = createInstance;
 })(Note || (exports.Note = Note = {}));
+var NoteAboutOrder;
+(function (NoteAboutOrder) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/noteAboutOrder'))).NoteAboutOrderRepo;
+            }
+            return new repo(...params);
+        });
+    }
+    NoteAboutOrder.createInstance = createInstance;
+})(NoteAboutOrder || (exports.NoteAboutOrder = NoteAboutOrder = {}));
 var OfferCatalog;
 (function (OfferCatalog) {
     let repo;

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

@@ -187,7 +187,7 @@ function onResourceUpdated(params) {
 function createInformNoteTasks(params, setting) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const notes4inform = yield repos.note.projectFields({ id: { $in: params.ids } }, ['about', 'identifier', 'project', 'text', 'typeOf', 'version']);
+        const notes4inform = yield repos.note.findNotes({ id: { $in: params.ids } }, ['about', 'identifier', 'project', 'text', 'typeOf', 'version']);
         // const informResources = settings.onResourceUpdated.informResource;
         const informResources = (_a = setting === null || setting === void 0 ? void 0 : setting.onResourceUpdated) === null || _a === void 0 ? void 0 : _a.informResource;
         if (notes4inform.length > 0) {

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.398.0-alpha.4",
+    "@chevre/factory": "4.399.0-alpha.0",
     "@cinerino/sdk": "12.2.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.13.0-alpha.9"
+  "version": "22.14.0-alpha.0"
 }

package/example/src/chevre/migrateProjectTokenIssuers.ts

@@ -1,100 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-// const excludedProject = { id: String(process.env.EXCLUDED_PROJECT_ID) };
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const identityProviderRepo = await chevre.repository.IdentityProvider.createInstance(mongoose.connection);
-    const projectRepo = await chevre.repository.Project.createInstance(mongoose.connection);
-
-    const cursor = projectRepo.getCursor(
-        {
-            // _id: { $eq: 'cinerino' }
-        },
-        {
-            _id: 1,
-            settings: 1,
-            typeOf: 1
-        }
-    );
-    console.log('docs found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const project: Pick<chevre.factory.project.IProject, 'id' | 'typeOf' | 'settings'> = doc.toObject();
-
-        console.log(
-            'alreadyMigrated?', project.id, i);
-        const tokenIssuers: string[] | undefined = (<any>project.settings).tokenIssuers;
-        let alreadyMigrated = false;
-        if (Array.isArray(tokenIssuers)) {
-            let existingProvidersCount = 0;
-            for (const tokenIssuer of tokenIssuers) {
-                const existingProviders = await identityProviderRepo.projectFields(
-                    {
-                        limit: 1,
-                        page: 1,
-                        project: { id: { $eq: project.id } },
-                        identifier: { $eq: tokenIssuer }
-                    },
-                    ['identifier']
-                );
-                existingProvidersCount += existingProviders.length;
-            }
-            if (existingProvidersCount === tokenIssuers.length) {
-                alreadyMigrated = true;
-            }
-        } else {
-            alreadyMigrated = true;
-        }
-
-        if (alreadyMigrated) {
-            console.log(
-                'already migrated.', project.id, i);
-        } else {
-            if (Array.isArray(tokenIssuers)) {
-                const newProviders = tokenIssuers.map((tokenIssuer) => {
-                    return {
-                        identifier: tokenIssuer,
-                        project: {
-                            id: project.id,
-                            typeOf: <chevre.factory.organizationType.Project>chevre.factory.organizationType.Project
-                        },
-                        typeOf: <chevre.factory.organizationType.Organization>chevre.factory.organizationType.Organization,
-                        verified: true
-                    };
-                });
-                console.log(
-                    'updating project...',
-                    project.id, i, newProviders.length, 'newProviders');
-                for (const newProvider of newProviders) {
-                    console.log(
-                        'updating project...',
-                        project.id, i, newProvider);
-                    // await identityProviderRepo.save({
-                    //     attributes: newProvider
-                    // });
-                }
-                updateCount += 1;
-                console.log(
-                    'updated.',
-                    project.id, i);
-            }
-        }
-    });
-
-    console.log(i, 'docs checked');
-    console.log(updateCount, 'docs updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/searchOrderAcceptedOffers.ts

@@ -1,48 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-mongoose.Model.on('index', (...args) => {
-    console.error('******** index event emitted. ********\n', args);
-});
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const acceptedOfferRepo = await chevre.repository.AcceptedOffer.createInstance(mongoose.connection);
-
-    const acceptedOffers = await acceptedOfferRepo.searchAcceptedOffersByOrderNumber(
-        {
-            // tslint:disable-next-line:no-magic-numbers
-            limit: 10,
-            page: 1,
-            project: { id: { $eq: project.id } },
-            orderNumber: { $eq: 'CIN7-9247770-0699829' },
-            acceptedOffers: {
-                itemOffered: {
-                    typeOf: { $in: [chevre.factory.reservationType.EventReservation] },
-                    reservationFor: { id: { $in: ['blpw1ew8f'] } },
-                    reservedTicket: { ticketedSeat: { seatNumber: { $in: ['A-26', 'xxx'] } } }
-                }
-            }
-        },
-        ['itemOffered', 'priceSpecification']
-    );
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(acceptedOffers, { depth: 1 });
-    const reservationIds = acceptedOffers.map((acceptedOffer) => {
-        if (acceptedOffer.itemOffered.typeOf === chevre.factory.reservationType.EventReservation) {
-            return acceptedOffer.itemOffered.id;
-        } else {
-            return '';
-        }
-    });
-    console.log('reservationIds:', reservationIds);
-}
-
-main()
-    .then()
-    .catch(console.error);