@chevre/domain 22.14.0-alpha.0 → 22.14.0-alpha.2

package/example/src/chevre/note/upsertNotesByIdentifier.ts

@@ -0,0 +1,58 @@
+// tslint:disable:no-console no-magic-numbers
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const noteRepo = await chevre.repository.Note.createInstance(mongoose.connection);
+
+    const creatingNote: Pick<
+        chevre.factory.creativeWork.noteDigitalDocument.INoteAboutProduct,
+        'about' | 'creator' | 'identifier' | 'project' | 'provider' | 'text' | 'version' | 'hasDigitalDocumentPermission'
+    > = {
+        about: { id: '656038908b1cd5ce629f5992', typeOf: chevre.factory.product.ProductType.EventService },
+        creator: { id: 'xxx', typeOf: chevre.factory.personType.Person },
+        identifier: 'abcdefgh',
+        project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+        provider: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+        text: 'sample note text...',
+        version: '1',
+        hasDigitalDocumentPermission: []
+
+    };
+    const createResult = await noteRepo.upsertNotesByIdentifier(
+        [
+            {
+                $set: creatingNote
+                // $unset: {}
+            },
+            {
+                $set: creatingNote
+                // $unset: {}
+            }
+        ],
+        { update: false }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(createResult, { depth: null });
+
+    const updateResult = await noteRepo.upsertNotesByIdentifier(
+        [
+            {
+                $set: creatingNote
+            }
+        ],
+        { update: true }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(updateResult, { depth: null });
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -9,11 +9,8 @@ async function main() {
     const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
 
     const permissions = [
-        'assetTransactions.cancelReservation.write',
-        'orders.read',
-        'orders.update',
-        'reservations.attended',
-        'reservations.read'
+        'notes.*',
+        'notes.read'
     ];
     for (const permission of permissions) {
         const roles = await roleRepo.projectFields(

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

@@ -1,10 +1,13 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
-type IDocType = factory.creativeWork.noteDigitalDocument.INoteDigitalDocument;
+type IDocType = Pick<factory.creativeWork.noteDigitalDocument.INoteDigitalDocument, 'creator' | 'dateCreated' | 'dateModified' | 'editor' | 'hasDigitalDocumentPermission' | 'identifier' | 'project' | 'text' | 'typeOf' | 'version'> & {
+    about: factory.creativeWork.noteDigitalDocument.IAbout;
+    provider: factory.creativeWork.noteDigitalDocument.IProviderAsProject | factory.creativeWork.noteDigitalDocument.IProviderAsSeller;
+};
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "Note";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
-export { createSchema, IModel, indexes, modelName };
+export { createSchema, IDocType, IModel, indexes, modelName };

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

@@ -18,7 +18,8 @@ const schemaDefinition = {
     creator: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     editor: mongoose_1.SchemaTypes.Mixed,
     version: { type: String, required: true },
-    typeOf: { type: String, required: true }
+    typeOf: { type: String, required: true },
+    hasDigitalDocumentPermission: { type: mongoose_1.SchemaTypes.Mixed, required: false } // 2025-09-17~
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -1,3 +1,4 @@
+import type { BulkWriteResult } from 'mongodb';
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type INoteDigitalDocument = factory.creativeWork.noteDigitalDocument.INoteDigitalDocument;
@@ -12,6 +13,25 @@ export declare class NoteRepo {
     findNotes(params: factory.creativeWork.noteDigitalDocument.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<(INoteDigitalDocument & {
         id: string;
     })[]>;
+    /**
+     * メモ識別子をキーにして冪等置換
+     */
+    upsertNotesByIdentifier(params: {
+        $set: Pick<INoteDigitalDocument, 'about' | 'creator' | 'identifier' | 'project' | 'provider' | 'text' | 'version' | 'hasDigitalDocumentPermission'> & {
+            id?: never;
+        };
+    }[], options: {
+        /**
+         * falseの場合setOnInsertのみ
+         * trueの場合setのみ
+         */
+        update: boolean;
+    }): Promise<{
+        bulkWriteResult: BulkWriteResult;
+        modifiedNotes: {
+            id: string;
+        }[];
+    } | void>;
     deleteManyByAbout(params: {
         about: {
             id: string;

package/lib/chevre/repo/note.js

@@ -24,7 +24,8 @@ const AVAILABLE_PROJECT_FIELDS = [
     'creator',
     'editor',
     'version',
-    'typeOf'
+    'typeOf',
+    'hasDigitalDocumentPermission'
 ];
 /**
  * メモリポジトリ
@@ -34,7 +35,7 @@ class NoteRepo {
         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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         const andConditions = [];
         const idIn = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$in;
         if (Array.isArray(idIn)) {
@@ -64,11 +65,15 @@ class NoteRepo {
         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;
+        const aboutTypeOfEq = (_q = (_p = params.about) === null || _p === void 0 ? void 0 : _p.typeOf) === null || _q === void 0 ? void 0 : _q.$eq;
+        if (typeof aboutTypeOfEq === 'string') {
+            andConditions.push({ 'about.typeOf': { $eq: aboutTypeOfEq } });
+        }
+        const identifierEq = (_r = params.identifier) === null || _r === void 0 ? void 0 : _r.$eq;
         if (typeof identifierEq === 'string') {
             andConditions.push({ identifier: { $eq: identifierEq } });
         }
-        const identifierIn = (_q = params.identifier) === null || _q === void 0 ? void 0 : _q.$in;
+        const identifierIn = (_s = params.identifier) === null || _s === void 0 ? void 0 : _s.$in;
         if (Array.isArray(identifierIn)) {
             andConditions.push({ identifier: { $in: identifierIn } });
         }
@@ -96,10 +101,84 @@ class NoteRepo {
                     .skip(params.limit * (page - 1));
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean() // 2024-09-19~
+                .lean()
                 .exec();
         });
     }
+    /**
+     * メモ識別子をキーにして冪等置換
+     */
+    upsertNotesByIdentifier(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const now = new Date();
+            const { update } = options;
+            const bulkWriteOps = [];
+            const queryFilters = [];
+            if (Array.isArray(params)) {
+                params.forEach(({ $set }) => {
+                    const { about, creator, identifier, project, provider, text, version, hasDigitalDocumentPermission } = $set;
+                    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 = {
+                        '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) {
+                const bulkWriteResult = yield this.noteModel.bulkWrite(bulkWriteOps, { ordered: false });
+                // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                const modifiedNotes = yield this.noteModel.find({ $or: queryFilters }, {
+                    _id: 0,
+                    id: { $toString: '$_id' }
+                })
+                    .lean()
+                    .exec();
+                return { bulkWriteResult, modifiedNotes };
+            }
+        });
+    }
     deleteManyByAbout(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.noteModel.deleteMany({

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.399.0-alpha.0",
+    "@chevre/factory": "4.399.0-alpha.2",
     "@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.14.0-alpha.0"
+  "version": "22.14.0-alpha.2"
 }