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

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

@@ -0,0 +1,49 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
+
+    const roleNames = [
+        // chevre.factory.role.organizationRole.RoleName.InventoryManager,
+        // chevre.factory.role.organizationRole.RoleName.SellersOwner,
+        // chevre.factory.role.organizationRole.RoleName.SellersInventoryManager,
+        chevre.factory.role.organizationRole.RoleName.TicketClerk
+    ];
+    const permissions = [
+        'admin.sellers.eventSeries.read'
+    ];
+    for (const roleName of roleNames) {
+        for (const permission of permissions) {
+            const result = await roleRepo.addPermissionIfNotExists({
+                roleName: { $eq: roleName },
+                permission
+            });
+            console.log('permission added.', result, roleName);
+        }
+    }
+
+    // roleNames = [
+    //     chevre.factory.role.organizationRole.RoleName.TicketClerk
+    // ];
+    // permissions = [
+    //     'admin.sellers.productOffers.read'
+    // ];
+    // for (const roleName of roleNames) {
+    //     for (const permission of permissions) {
+    //         const result = await roleRepo.addPermissionIfNotExists({
+    //             roleName: { $eq: roleName },
+    //             permission
+    //         });
+    //         console.log('permission added.', result, roleName);
+    //     }
+    // }
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/repo/creativeWork.js

@@ -50,7 +50,7 @@ class CreativeWorkRepo {
     }
     // 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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         const andConditions = [
             { typeOf: { $eq: factory.creativeWorkType.Movie } }
         ];
@@ -90,12 +90,16 @@ class CreativeWorkRepo {
             if (Array.isArray(identifierIn)) {
                 andConditions.push({ identifier: { $in: identifierIn } });
             }
+            const identifierRegex = (_k = params.identifier) === null || _k === void 0 ? void 0 : _k.$regex;
+            if (typeof identifierRegex === 'string' && identifierRegex !== '') {
+                andConditions.push({ identifier: { $regex: new RegExp(identifierRegex) } });
+            }
         }
         if (typeof params.name === 'string' && params.name.length > 0) {
             // 多言語名称対応(2022-07-11~)
             andConditions.push({
                 $or: [
-                    { name: { $exists: true, $regex: new RegExp(params.name) } },
+                    // { name: { $exists: true, $regex: new RegExp(params.name) } }, // string型への互換性維持を廃止(2025-12-20~)
                     { 'name.ja': { $exists: true, $regex: new RegExp(params.name) } },
                     { 'name.en': { $exists: true, $regex: new RegExp(params.name) } }
                 ]
@@ -111,15 +115,15 @@ class CreativeWorkRepo {
         if (params.datePublishedThrough !== undefined) {
             andConditions.push({ datePublished: { $exists: true, $lte: params.datePublishedThrough } });
         }
-        const offersAvailableFrom = (_k = params.offers) === null || _k === void 0 ? void 0 : _k.availableFrom;
+        const offersAvailableFrom = (_l = params.offers) === null || _l === void 0 ? void 0 : _l.availableFrom;
         if (offersAvailableFrom instanceof Date) {
             andConditions.push({ 'offers.availabilityEnds': { $exists: true, $gte: offersAvailableFrom } });
         }
-        const offersAvailableThrough = (_l = params.offers) === null || _l === void 0 ? void 0 : _l.availableThrough;
+        const offersAvailableThrough = (_m = params.offers) === null || _m === void 0 ? void 0 : _m.availableThrough;
         if (offersAvailableThrough instanceof Date) {
             andConditions.push({ 'offers.availabilityStarts': { $exists: true, $lte: offersAvailableThrough } });
         }
-        const additionalPropertyElemMatch = (_m = params.additionalProperty) === null || _m === void 0 ? void 0 : _m.$elemMatch;
+        const additionalPropertyElemMatch = (_o = params.additionalProperty) === null || _o === void 0 ? void 0 : _o.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {

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

@@ -67,15 +67,16 @@ const indexes = [
             name: 'searchByProjectId-v20220721'
         }
     ],
-    [
-        { name: 1, identifier: 1 },
-        {
-            name: 'searchByName2',
-            partialFilterExpression: {
-                name: { $exists: true }
-            }
-        }
-    ],
+    // string型への互換性維持を廃止(2025-12-20~
+    // [
+    //     { name: 1, identifier: 1 },
+    //     {
+    //         name: 'searchByName2',
+    //         partialFilterExpression: {
+    //             name: { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'name.ja': 1, identifier: 1 },
         {

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": "5.4.0-alpha.8",
+    "@chevre/factory": "5.4.0-alpha.9",
     "@cinerino/sdk": "12.12.1",
     "@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": "23.2.0-alpha.4"
+  "version": "23.2.0-alpha.6"
 }