@chevre/domain 23.2.0-alpha.3 → 23.2.0-alpha.5

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

@@ -95,7 +95,7 @@ class CreativeWorkRepo {
             // 多言語名称対応(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) } }
                 ]

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/lib/chevre/service/payment/any/factory.d.ts

@@ -41,6 +41,10 @@ export declare function creatPayTransactionStartParams(params: {
      * 決済方法チケット
      */
     ticketToken?: string;
+    /**
+     * ツールとしての対応決済方法オファー
+     */
+    instrument: factory.action.trade.pay.IAcceptedPaymentMethodOfferAsInstrument[];
 }): factory.assetTransaction.pay.IStartParamsWithoutDetail & {
     instrument: factory.action.trade.pay.IPlaceOrderRelatedInstrument[];
 };

package/lib/chevre/service/payment/any/factory.js

@@ -79,7 +79,8 @@ function creatPayTransactionStartParams(params) {
     const instrument = [
         { id: params.action.id, typeOf: params.action.typeOf },
         { orderNumber, typeOf: factory.order.OrderType.Order },
-        ...(ticketAsInstrument !== undefined) ? [ticketAsInstrument] : [] // add ticketAsInstrument(2025-11-25~)
+        ...(ticketAsInstrument !== undefined) ? [ticketAsInstrument] : [], // add ticketAsInstrument(2025-11-25~)
+        ...(Array.isArray(params.instrument)) ? params.instrument : [] // instrumentを対応決済方法オファーに対応(2025-12-14~)
     ];
     return Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
             typeOf: params.transaction.seller.typeOf,

package/lib/chevre/service/payment/any.d.ts

@@ -177,6 +177,10 @@ declare function authorize(params: {
          */
         id: string;
     };
+    /**
+     * ツールとしての対応決済方法オファー
+     */
+    instrument: factory.action.trade.pay.IAcceptedPaymentMethodOfferAsInstrument[];
 }): IAuthorizeOperation<{
     /**
      * 承認アクションID

package/lib/chevre/service/payment/any.js

@@ -539,7 +539,8 @@ function authorize(params) {
                 // orderNumber required(2025-02-14~)
                 order: { confirmationNumber, orderNumber },
                 action: { id: action.id, typeOf: action.typeOf },
-                ticketToken
+                ticketToken,
+                instrument: params.instrument
             });
             payTransaction = yield PayTransactionService.start(startParams, Object.assign({ 
                 // useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet,

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

@@ -53,7 +53,7 @@ function call(params) {
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
             && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         try {
-            yield (0, any_1.authorize)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
+            yield (0, any_1.authorize)(Object.assign(Object.assign({}, params.data), { instrument: (Array.isArray(params.data.instrument)) ? params.data.instrument : [], sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
              }))({
                 acceptedPaymentMethod: new acceptedPaymentMethod_1.AcceptedPaymentMethodRepo(connection),
                 accountingReport: new accountingReport_1.AccountingReportRepo(connection),

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.7",
+    "@chevre/factory": "5.4.0-alpha.8",
     "@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.3"
+  "version": "23.2.0-alpha.5"
 }