@chevre/domain 23.2.0-alpha.61 → 23.2.0-alpha.63

package/lib/chevre/repo/note.js

@@ -1,13 +1,4 @@
 "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.NoteRepo = void 0;
 const factory = require("../factory");
@@ -31,186 +22,195 @@ const AVAILABLE_PROJECT_FIELDS = [
  * メモリポジトリ
  */
 class NoteRepo {
+    noteModel;
     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, _r, _s, _t, _u, _v;
         const andConditions = [];
-        const idIn = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$in;
+        const idIn = params.id?.$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;
+        const projectIdEq = params.project?.id?.$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;
+        const providerIdEq = params.provider?.id?.$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;
+        const aboutIdEq = params.about?.id?.$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;
+        const aboutIdIn = params.about?.id?.$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;
+        const aboutOrderNumberEq = params.about?.orderNumber?.$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;
+        const aboutOrderNumberIn = params.about?.orderNumber?.$in;
         if (Array.isArray(aboutOrderNumberIn)) {
             andConditions.push({ 'about.orderNumber': { $exists: true, $in: aboutOrderNumberIn } });
         }
-        const aboutTypeOfEq = (_q = (_p = params.about) === null || _p === void 0 ? void 0 : _p.typeOf) === null || _q === void 0 ? void 0 : _q.$eq;
+        const aboutTypeOfEq = params.about?.typeOf?.$eq;
         if (typeof aboutTypeOfEq === 'string') {
             andConditions.push({ 'about.typeOf': { $eq: aboutTypeOfEq } });
         }
-        const identifierEq = (_r = params.identifier) === null || _r === void 0 ? void 0 : _r.$eq;
+        const identifierEq = params.identifier?.$eq;
         if (typeof identifierEq === 'string') {
             andConditions.push({ identifier: { $eq: identifierEq } });
         }
-        const identifierIn = (_s = params.identifier) === null || _s === void 0 ? void 0 : _s.$in;
+        const identifierIn = params.identifier?.$in;
         if (Array.isArray(identifierIn)) {
             andConditions.push({ identifier: { $in: identifierIn } });
         }
-        const audienceTypeEq = (_v = (_u = (_t = params.hasDigitalDocumentPermission) === null || _t === void 0 ? void 0 : _t.grantee) === null || _u === void 0 ? void 0 : _u.audienceType) === null || _v === void 0 ? void 0 : _v.$eq;
+        const audienceTypeEq = params.hasDigitalDocumentPermission?.grantee?.audienceType?.$eq;
         if (typeof audienceTypeEq === 'string') {
             andConditions.push({ 'hasDigitalDocumentPermission.grantee.audienceType': { $exists: true, $eq: audienceTypeEq } });
         }
         return andConditions;
     }
-    findNotes(params, inclusion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const conditions = NoteRepo.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()
-                .exec();
-        });
+    async findNotes(params, inclusion) {
+        const conditions = NoteRepo.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 = {
+            _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 params.sort?.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()
+            .exec();
     }
     /**
      * メモ識別子をキーにして冪等置換
      * 主題+識別子でユニーク必須
      * 編集の場合、存在検証される
      */
-    // tslint:disable-next-line:max-func-body-length
-    upsertNotesByIdentifier(params, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const now = new Date();
-            const { update } = options;
-            const bulkWriteOps = [];
-            const queryFilters = [];
-            let uniqueIdentifiers = [];
-            if (Array.isArray(params)) {
-                params.forEach(({ $set }) => {
-                    const { about, creator, identifier, project, provider, text, version, hasDigitalDocumentPermission } = $set;
-                    if (typeof about.id !== 'string' || about.id === '') {
-                        throw new factory.errors.ArgumentNull('about.id');
-                    }
-                    if (typeof identifier !== 'string' || identifier === '') {
-                        throw new factory.errors.ArgumentNull('identifier');
-                    }
-                    if (typeof version !== 'string' || version === '') {
-                        throw new factory.errors.ArgumentNull('version');
-                    }
-                    if (typeof text !== 'string') {
-                        throw new factory.errors.ArgumentNull('text');
-                    }
-                    uniqueIdentifiers.push(`${about.id}:${identifier}`);
-                    // リソースのユニークネスを保証するfilter
-                    const filter = {
-                        'project.id': { $eq: project.id },
-                        'about.id': { $eq: about.id },
-                        identifier: { $eq: identifier },
-                        version: { $eq: version }
-                    };
-                    queryFilters.push({
-                        'project.id': { $eq: project.id },
-                        'about.id': { $eq: about.id },
-                        identifier: { $eq: identifier },
-                        version: { $eq: version }
-                    });
-                    if (update === true) {
-                        const setFields = Object.assign({ dateModified: now, editor: creator, text }, (Array.isArray(hasDigitalDocumentPermission)) ? { hasDigitalDocumentPermission } : undefined);
-                        const updateFilter = {
-                            $set: setFields
-                            // ...($unset !== undefined) ? { $unset } : undefined
-                        };
-                        const updateOne = {
-                            filter,
-                            update: updateFilter,
-                            upsert: false
-                        };
-                        bulkWriteOps.push({ updateOne });
-                    }
-                    else {
-                        const setOnInsert = Object.assign({ about, creator, identifier, project, provider, version, dateCreated: now, typeOf: factory.creativeWorkType.NoteDigitalDocument, text }, (Array.isArray(hasDigitalDocumentPermission)) ? { hasDigitalDocumentPermission } : undefined);
-                        const updateFilter = {
-                            $setOnInsert: setOnInsert
-                        };
-                        const updateOne = {
-                            filter,
-                            update: updateFilter,
-                            upsert: true
-                        };
-                        bulkWriteOps.push({ updateOne });
-                    }
-                });
-            }
-            if (bulkWriteOps.length > 0) {
-                // 主題+識別子でユニーク検証
-                uniqueIdentifiers = [...new Set(uniqueIdentifiers)];
-                if (uniqueIdentifiers.length !== bulkWriteOps.length) {
-                    throw new factory.errors.Argument('identifier', '(about.id + identifier)s must be unique');
+    async upsertNotesByIdentifier(params, options) {
+        const now = new Date();
+        const { update } = options;
+        const bulkWriteOps = [];
+        const queryFilters = [];
+        let uniqueIdentifiers = [];
+        if (Array.isArray(params)) {
+            params.forEach(({ $set }) => {
+                const { about, creator, identifier, project, provider, text, version, hasDigitalDocumentPermission } = $set;
+                if (typeof about.id !== 'string' || about.id === '') {
+                    throw new factory.errors.ArgumentNull('about.id');
                 }
+                if (typeof identifier !== 'string' || identifier === '') {
+                    throw new factory.errors.ArgumentNull('identifier');
+                }
+                if (typeof version !== 'string' || version === '') {
+                    throw new factory.errors.ArgumentNull('version');
+                }
+                if (typeof text !== 'string') {
+                    throw new factory.errors.ArgumentNull('text');
+                }
+                uniqueIdentifiers.push(`${about.id}:${identifier}`);
+                // リソースのユニークネスを保証するfilter
+                const filter = {
+                    'project.id': { $eq: project.id },
+                    'about.id': { $eq: about.id },
+                    identifier: { $eq: identifier },
+                    version: { $eq: version }
+                };
+                queryFilters.push({
+                    'project.id': { $eq: project.id },
+                    'about.id': { $eq: about.id },
+                    identifier: { $eq: identifier },
+                    version: { $eq: version }
+                });
                 if (update === true) {
-                    // 編集の場合、存在検証
-                    const modifyingNotes = yield this.noteModel.find({ $or: queryFilters }, {
-                        _id: 0,
-                        id: { $toString: '$_id' }
-                    })
-                        .lean()
-                        .exec();
-                    // console.log(
-                    //     'NoteRepo.upsertNotesByIdentifier:',
-                    //     params.length, 'params ->', modifyingNotes.length, 'modifyingNotes found.', JSON.stringify(modifyingNotes)
-                    // );
-                    if (modifyingNotes.length !== bulkWriteOps.length) {
-                        throw new factory.errors.NotFound(factory.creativeWorkType.NoteDigitalDocument);
-                    }
+                    const setFields = {
+                        dateModified: now,
+                        editor: creator,
+                        text,
+                        ...(Array.isArray(hasDigitalDocumentPermission)) ? { hasDigitalDocumentPermission } : undefined
+                    };
+                    const updateFilter = {
+                        $set: setFields
+                        // ...($unset !== undefined) ? { $unset } : undefined
+                    };
+                    const updateOne = {
+                        filter,
+                        update: updateFilter,
+                        upsert: false
+                    };
+                    bulkWriteOps.push({ updateOne });
                 }
-                const bulkWriteResult = yield this.noteModel.bulkWrite(bulkWriteOps, { ordered: false });
-                // modifiedの場合upsertedIdsに含まれないので、idを検索する
-                const modifiedNotes = yield this.noteModel.find({ $or: queryFilters }, {
+                else {
+                    const setOnInsert = {
+                        about, creator, identifier, project, provider, version,
+                        dateCreated: now,
+                        typeOf: factory.creativeWorkType.NoteDigitalDocument,
+                        text,
+                        ...(Array.isArray(hasDigitalDocumentPermission)) ? { hasDigitalDocumentPermission } : undefined
+                    };
+                    const updateFilter = {
+                        $setOnInsert: setOnInsert
+                    };
+                    const updateOne = {
+                        filter,
+                        update: updateFilter,
+                        upsert: true
+                    };
+                    bulkWriteOps.push({ updateOne });
+                }
+            });
+        }
+        if (bulkWriteOps.length > 0) {
+            // 主題+識別子でユニーク検証
+            uniqueIdentifiers = [...new Set(uniqueIdentifiers)];
+            if (uniqueIdentifiers.length !== bulkWriteOps.length) {
+                throw new factory.errors.Argument('identifier', '(about.id + identifier)s must be unique');
+            }
+            if (update === true) {
+                // 編集の場合、存在検証
+                const modifyingNotes = await this.noteModel.find({ $or: queryFilters }, {
                     _id: 0,
                     id: { $toString: '$_id' }
                 })
                     .lean()
                     .exec();
-                return { bulkWriteResult, modifiedNotes };
+                // console.log(
+                //     'NoteRepo.upsertNotesByIdentifier:',
+                //     params.length, 'params ->', modifyingNotes.length, 'modifyingNotes found.', JSON.stringify(modifyingNotes)
+                // );
+                if (modifyingNotes.length !== bulkWriteOps.length) {
+                    throw new factory.errors.NotFound(factory.creativeWorkType.NoteDigitalDocument);
+                }
             }
-        });
+            const bulkWriteResult = await this.noteModel.bulkWrite(bulkWriteOps, { ordered: false });
+            // modifiedの場合upsertedIdsに含まれないので、idを検索する
+            const modifiedNotes = await this.noteModel.find({ $or: queryFilters }, {
+                _id: 0,
+                id: { $toString: '$_id' }
+            })
+                .lean()
+                .exec();
+            return { bulkWriteResult, modifiedNotes };
+        }
     }
     // /**
     //  * 既知のメモIDリストからメモを削除する
@@ -233,20 +233,16 @@ class NoteRepo {
     /**
      * 主題リソースから全メモを削除する
      */
-    deleteNotesByAbout(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.noteModel.deleteMany({
-                'about.id': { $eq: String(params.about.id) },
-                'about.typeOf': { $eq: String(params.about.typeOf) }
-            })
-                .exec();
-        });
+    async deleteNotesByAbout(params) {
+        return this.noteModel.deleteMany({
+            'about.id': { $eq: String(params.about.id) },
+            'about.typeOf': { $eq: String(params.about.typeOf) }
+        })
+            .exec();
     }
-    unsetUnnecessaryFields(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.noteModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
-                .exec();
-        });
+    async unsetUnnecessaryFields(params) {
+        return this.noteModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+            .exec();
     }
 }
 exports.NoteRepo = NoteRepo;