@chevre/domain 23.0.0-alpha.4 → 23.0.0-alpha.6

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

@@ -0,0 +1,34 @@
+// 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 notes = await noteRepo.findNotes(
+        {
+            limit: 10,
+            page: 1,
+            project: { id: { $eq: project.id } },
+            hasDigitalDocumentPermission: {
+                grantee: {
+                    audienceType: {
+                        $eq: chevre.factory.creativeWork.noteDigitalDocument.PermissionGranteeAudienceType.Public
+                    }
+                }
+            }
+        },
+        ['about', 'identifier']
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(notes, { depth: null });
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -27,14 +27,13 @@ async function main() {
     };
     const createResult = await noteRepo.upsertNotesByIdentifier(
         [
-            {
-                $set: creatingNote
-                // $unset: {}
-            },
             {
                 $set: creatingNote
                 // $unset: {}
             }
+            // {
+            //     $set: creatingNote
+            // }
         ],
         { update: false }
     );
@@ -46,6 +45,9 @@ async function main() {
             {
                 $set: creatingNote
             }
+            // {
+            //     $set: creatingNote
+            // }
         ],
         { update: true }
     );

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

@@ -85,6 +85,15 @@ const indexes = [
     [
         { identifier: 1, dateCreated: -1 },
         { name: 'identifier' }
+    ],
+    [
+        { 'hasDigitalDocumentPermission.grantee.audienceType': 1, dateCreated: -1 },
+        {
+            name: 'permissionGranteeAudienceType',
+            partialFilterExpression: {
+                'hasDigitalDocumentPermission.grantee.audienceType': { $exists: true }
+            }
+        }
     ]
     // discontinue(2025-05-08~)
     // [

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

@@ -2,7 +2,7 @@ import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from '
 import * as factory from '../../../factory';
 export type IDocTypeAsProduct = Omit<factory.product.IProduct, 'id'>;
 export interface IDocTypeAsProductOffer {
-    offers?: factory.product.IOffer[];
+    offers?: [];
 }
 type IDocType = IDocTypeAsProduct & IDocTypeAsProductOffer;
 type IModel = Model<IDocType>;

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

@@ -15,6 +15,8 @@ export declare class NoteRepo {
     })[]>;
     /**
      * メモ識別子をキーにして冪等置換
+     * 主題+識別子でユニーク必須
+     * 編集の場合、存在検証される
      */
     upsertNotesByIdentifier(params: {
         $set: Pick<INoteDigitalDocument, 'about' | 'creator' | 'identifier' | 'project' | 'provider' | 'text' | 'version' | 'hasDigitalDocumentPermission'> & {
@@ -32,15 +34,6 @@ export declare class NoteRepo {
             id: string;
         }[];
     } | void>;
-    /**
-     * 既知のメモIDリストからメモを削除する
-     */
-    deleteNotesByIds(params: {
-        project: {
-            id: string;
-        };
-        ids: string[];
-    }): Promise<DeleteResult | void>;
     /**
      * 主題リソースから全メモを削除する
      */

package/lib/chevre/repo/note.js

@@ -35,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, _r, _s;
+        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;
         if (Array.isArray(idIn)) {
@@ -77,6 +77,10 @@ class NoteRepo {
         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;
+        if (typeof audienceTypeEq === 'string') {
+            andConditions.push({ 'hasDigitalDocumentPermission.grantee.audienceType': { $exists: true, $eq: audienceTypeEq } });
+        }
         return andConditions;
     }
     findNotes(params, inclusion) {
@@ -107,25 +111,33 @@ class NoteRepo {
     }
     /**
      * メモ識別子をキーにして冪等置換
+     * 主題+識別子でユニーク必須
+     * 編集の場合、存在検証される
      */
+    // 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 identifier !== 'string' || identifier.length === 0) {
+                    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.length === 0) {
+                    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 },
@@ -167,6 +179,25 @@ class NoteRepo {
                 });
             }
             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 = yield this.noteModel.find({ $or: queryFilters }, {
+                        _id: 0,
+                        id: { $toString: '$_id' }
+                    })
+                        .lean()
+                        .exec();
+                    // tslint:disable-next-line:no-console
+                    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 = yield this.noteModel.bulkWrite(bulkWriteOps, { ordered: false });
                 // modifiedの場合upsertedIdsに含まれないので、idを検索する
                 const modifiedNotes = yield this.noteModel.find({ $or: queryFilters }, {
@@ -179,21 +210,24 @@ class NoteRepo {
             }
         });
     }
-    /**
-     * 既知のメモIDリストからメモを削除する
-     */
-    deleteNotesByIds(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { project, ids } = params;
-            if (Array.isArray(ids) && ids.length > 0) {
-                return this.noteModel.deleteMany({
-                    'project.id': { $eq: project.id },
-                    _id: { $in: ids }
-                })
-                    .exec();
-            }
-        });
-    }
+    // /**
+    //  * 既知のメモIDリストからメモを削除する
+    //  */
+    // public async deleteNotesByIds(params: {
+    //     project: { id: string };
+    //     ids: string[];
+    // }): Promise<DeleteResult | void> {
+    //     const { project, ids } = params;
+    //     if (Array.isArray(ids) && ids.length > 0) {
+    //         return this.noteModel.deleteMany(
+    //             {
+    //                 'project.id': { $eq: project.id },
+    //                 _id: { $in: ids }
+    //             }
+    //         )
+    //             .exec();
+    //     }
+    // }
     /**
      * 主題リソースから全メモを削除する
      */

package/lib/chevre/repo/product.js

@@ -48,7 +48,7 @@ class ProductRepo {
     }
     // tslint:disable-next-line:max-func-body-length
     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, _w;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -111,15 +111,16 @@ class ProductRepo {
                 productID: { $regex: new RegExp(productIDRegex) }
             });
         }
-        const offersElemMatch = (_m = params.offers) === null || _m === void 0 ? void 0 : _m.$elemMatch;
-        if (offersElemMatch !== undefined && offersElemMatch !== null) {
-            andConditions.push({
-                offers: {
-                    $elemMatch: offersElemMatch
-                }
-            });
-        }
-        const serviceOutputTypeOfEq = (_p = (_o = params.serviceOutput) === null || _o === void 0 ? void 0 : _o.typeOf) === null || _p === void 0 ? void 0 : _p.$eq;
+        // discontinue product.offers
+        // const offersElemMatch = params.offers?.$elemMatch;
+        // if (offersElemMatch !== undefined && offersElemMatch !== null) {
+        //     andConditions.push({
+        //         offers: {
+        //             $elemMatch: offersElemMatch
+        //         }
+        //     });
+        // }
+        const serviceOutputTypeOfEq = (_o = (_m = params.serviceOutput) === null || _m === void 0 ? void 0 : _m.typeOf) === null || _o === void 0 ? void 0 : _o.$eq;
         if (typeof serviceOutputTypeOfEq === 'string') {
             andConditions.push({
                 'serviceOutput.typeOf': {
@@ -128,7 +129,7 @@ class ProductRepo {
                 }
             });
         }
-        const serviceOutputAmountCurrencyEq = (_s = (_r = (_q = params.serviceOutput) === null || _q === void 0 ? void 0 : _q.amount) === null || _r === void 0 ? void 0 : _r.currency) === null || _s === void 0 ? void 0 : _s.$eq;
+        const serviceOutputAmountCurrencyEq = (_r = (_q = (_p = params.serviceOutput) === null || _p === void 0 ? void 0 : _p.amount) === null || _q === void 0 ? void 0 : _q.currency) === null || _r === void 0 ? void 0 : _r.$eq;
         if (typeof serviceOutputAmountCurrencyEq === 'string') {
             andConditions.push({
                 'serviceOutput.amount.currency': {
@@ -137,7 +138,7 @@ class ProductRepo {
                 }
             });
         }
-        const serviceTypeCodeValueEq = (_u = (_t = params.serviceType) === null || _t === void 0 ? void 0 : _t.codeValue) === null || _u === void 0 ? void 0 : _u.$eq;
+        const serviceTypeCodeValueEq = (_t = (_s = params.serviceType) === null || _s === void 0 ? void 0 : _s.codeValue) === null || _t === void 0 ? void 0 : _t.$eq;
         if (typeof serviceTypeCodeValueEq === 'string') {
             andConditions.push({
                 'serviceType.codeValue': {
@@ -146,7 +147,7 @@ class ProductRepo {
                 }
             });
         }
-        const nameRegex = (_v = params.name) === null || _v === void 0 ? void 0 : _v.$regex;
+        const nameRegex = (_u = params.name) === null || _u === void 0 ? void 0 : _u.$regex;
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {
             const nameRegexExp = new RegExp(nameRegex);
             andConditions.push({
@@ -156,7 +157,7 @@ class ProductRepo {
                 ]
             });
         }
-        const additionalPropertyElemMatchNameEq = (_w = params.additionalPropertyMatch) === null || _w === void 0 ? void 0 : _w.nameEq;
+        const additionalPropertyElemMatchNameEq = (_v = params.additionalPropertyMatch) === null || _v === void 0 ? void 0 : _v.nameEq;
         if (typeof additionalPropertyElemMatchNameEq === 'string') {
             andConditions.push({
                 additionalProperty: {

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.js

@@ -20,6 +20,7 @@ function verifyOfferedByToken(params) {
         try {
             result = yield new Promise((resolve, reject) => {
                 jwt.verify(token, secret, {
+                    algorithms: ['HS256'],
                     issuer
                     // ...(Array.isArray(params.audience)) ? { audience: params.audience } : undefined
                 }, (err, decoded) => {

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.0.0",
-    "@cinerino/sdk": "12.5.0-alpha.5",
+    "@chevre/factory": "5.1.0-alpha.1",
+    "@cinerino/sdk": "12.5.0-alpha.7",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.0.0-alpha.4"
+  "version": "23.0.0-alpha.6"
 }