@chevre/domain 22.11.0-alpha.6 → 22.11.0-alpha.8

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

@@ -47,6 +47,7 @@ async function main() {
         'admin.sellers.events.update',
         'admin.sellers.orders.read',
         'admin.sellers.reservations.read',
+        'admin.sellers.reservations.useActions.read',
         'admin.sellers.assetTransactions.cancelReservation.write'
     ];
     for (const roleName of roleNames) {
@@ -92,7 +93,8 @@ async function main() {
         'admin.sellers.orders.read',
         'admin.sellers.orders.update',
         'admin.sellers.reservations.read',
-        'admin.sellers.reservations.attended',
+        'admin.sellers.reservations.useActions.read',
+        'admin.sellers.reservations.useActions.create',
         'admin.sellers.assetTransactions.cancelReservation.write'
     ];
     for (const roleName of roleNames) {
@@ -110,7 +112,8 @@ async function main() {
     ];
     permissions = [
         'admin.sellers.reservations.read',
-        'admin.sellers.reservations.attended'
+        'admin.sellers.reservations.useActions.read',
+        'admin.sellers.reservations.useActions.create'
     ];
     for (const roleName of roleNames) {
         for (const permission of permissions) {

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

@@ -0,0 +1,37 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+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.Customer,
+        chevre.factory.role.organizationRole.RoleName.InventoryManager,
+        chevre.factory.role.organizationRole.RoleName.POS,
+        chevre.factory.role.organizationRole.RoleName.SellersInventoryManager,
+        chevre.factory.role.organizationRole.RoleName.SellersOwner,
+        chevre.factory.role.organizationRole.RoleName.TicketClerk,
+        chevre.factory.role.organizationRole.RoleName.User
+    ];
+    const permissions = [
+        'db.primary.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/example/src/chevre/stockHolder/checkRedisKeyCount.ts

@@ -98,11 +98,6 @@ async function main() {
         mongoose.connection
     );
 
-    // const setting = await settingRepo.findOne(
-    //     { project: { id: { $eq: '*' } } },
-    //     ['useMongoAsStockHolder']
-    // );
-    // const useMongoAsStockHolder = setting?.useMongoAsStockHolder === true;
     let checkingProjects: string[] = [];
     // 全プロジェクト
     checkingProjects = (await projectRepo.projectFields(

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -18,9 +18,11 @@ async function main() {
             'project.id': { $eq: '*' }
         },
         $unset: {
-            useMongo4confirmationNumberFrom: 1,
-            useMongo4orderNumberFrom: 1,
-            useMongo4transactionNumberFrom: 1
+            useMongoAsStockHolder: 1,
+            useMongoAsStockHolderProjects: 1
+            // useMongo4confirmationNumberFrom: 1,
+            // useMongo4orderNumberFrom: 1,
+            // useMongo4transactionNumberFrom: 1
         }
     });
     console.log(updateResult);

package/lib/chevre/repo/stockHolder.js

@@ -287,17 +287,6 @@ class StockHolderRepo {
                 throw new factory.errors.Argument('startDate', 'must be Date');
             }
             let useMongoose = false;
-            // useMongoAsStockHolder設定有の場合のみmongo利用(2025-04-18~)
-            // const useMongoAsStockHolderBySettings = await this.useMongoAsStockHolderBySettings({ project: { id: params.project.id } });
-            // if (useMongoAsStockHolderBySettings) {
-            //     const redisKeyExists = await this.redisKeyExists(params);
-            //     if (redisKeyExists) {
-            //         useMongoose = false;
-            //     } else {
-            //         // redis keyが存在しなければmongo利用
-            //         useMongoose = true;
-            //     }
-            // }
             // always use mongo(2025-05-21~)
             const redisKeyExists = yield this.redisKeyExists(params);
             if (redisKeyExists) {

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

@@ -19,7 +19,7 @@ const orderNumber_1 = require("../../repo/orderNumber");
 const project_1 = require("../../repo/project");
 const reserveInterface_1 = require("../../repo/reserveInterface");
 const transaction_1 = require("../../repo/transaction");
-const transactionProcess_1 = require("../../repo/transactionProcess");
+// import { TransactionProcessRepo } from '../../repo/transactionProcess';
 const acceptOffer_1 = require("../offer/eventServiceByCOA/acceptOffer");
 let coaAuthClient;
 /**
@@ -62,7 +62,7 @@ function call(params) {
             coaAuthClient = new COA.auth.RefreshToken(Object.assign(Object.assign({}, credentials), (credentialsRepo !== undefined) ? { credentialsRepo } : undefined));
         }
         const actionRepo = new action_1.ActionRepo(connection);
-        const transactionProcessRepo = new transactionProcess_1.TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
+        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             const reserveService = new COA.service.Reserve({
                 endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
@@ -128,8 +128,9 @@ function call(params) {
             }
         }
         finally {
+            // taskRepo.runImmediatelyのnextパラメータでの解決へ移行したためここでの解除は不要(2025-07-12~)
             // 取引プロセスロック解除
-            yield transactionProcessRepo.unlock({ typeOf: factory.transactionType.PlaceOrder, id: params.data.purpose.id });
+            // await transactionProcessRepo.unlock({ typeOf: factory.transactionType.PlaceOrder, id: params.data.purpose.id });
         }
     });
 }

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

@@ -29,7 +29,7 @@ const task_1 = require("../../repo/task");
 const ticket_1 = require("../../repo/ticket");
 const transaction_1 = require("../../repo/transaction");
 const transactionNumber_1 = require("../../repo/transactionNumber");
-const transactionProcess_1 = require("../../repo/transactionProcess");
+// import { TransactionProcessRepo } from '../../repo/transactionProcess';
 const any_1 = require("../payment/any");
 /**
  * タスク実行関数
@@ -45,7 +45,7 @@ function call(params) {
         }
         let callResult;
         const actionRepo = new action_1.ActionRepo(connection);
-        const transactionProcessRepo = new transactionProcess_1.TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
+        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object.issuedThrough.id;
         const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
@@ -101,7 +101,8 @@ function call(params) {
         finally {
             // 取引プロセスロック解除(2024-04-20~)
             if (params.data.options.useUnlockTransactionProcess) {
-                yield transactionProcessRepo.unlock({ typeOf: params.data.purpose.typeOf, id: params.data.purpose.id });
+                // taskRepo.runImmediatelyのnextパラメータでの解決へ移行したためここでの解除は不要(2025-07-12~)
+                // await transactionProcessRepo.unlock({ typeOf: params.data.purpose.typeOf, id: params.data.purpose.id });
             }
         }
         if (callResult !== undefined) {

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

@@ -17,7 +17,7 @@ const event_1 = require("../../repo/event");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
-const transactionProcess_1 = require("../../repo/transactionProcess");
+// import { TransactionProcessRepo } from '../../repo/transactionProcess';
 const pay_1 = require("../assetTransaction/pay");
 /**
  * タスク実行関数
@@ -33,7 +33,7 @@ function call(params) {
             return;
         }
         const actionRepo = new action_1.ActionRepo(connection);
-        const transactionProcessRepo = new transactionProcess_1.TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
+        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = (_b = params.data.object[0]) === null || _b === void 0 ? void 0 : _b.id;
         const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
@@ -67,7 +67,8 @@ function call(params) {
         finally {
             // 取引プロセスロック解除
             if (typeof ((_d = params.data.purpose) === null || _d === void 0 ? void 0 : _d.id) === 'string') {
-                yield transactionProcessRepo.unlock({ typeOf: params.data.purpose.typeOf, id: params.data.purpose.id });
+                // taskRepo.runImmediatelyのnextパラメータでの解決へ移行したためここでの解除は不要(2025-07-12~)
+                // await transactionProcessRepo.unlock({ typeOf: params.data.purpose.typeOf, id: params.data.purpose.id });
             }
         }
     });

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

@@ -22,7 +22,7 @@ const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const ticket_1 = require("../../repo/ticket");
 const transaction_1 = require("../../repo/transaction");
 const transactionNumber_1 = require("../../repo/transactionNumber");
-const transactionProcess_1 = require("../../repo/transactionProcess");
+// import { TransactionProcessRepo } from '../../repo/transactionProcess';
 const any_1 = require("../payment/any");
 /**
  * タスク実行関数
@@ -37,7 +37,7 @@ function call(params) {
             return;
         }
         const actionRepo = new action_1.ActionRepo(connection);
-        const transactionProcessRepo = new transactionProcess_1.TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
+        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             yield (0, any_1.publishPaymentUrl)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }))({
                 action: actionRepo,
@@ -69,10 +69,9 @@ function call(params) {
             }
         }
         finally {
+            // taskRepo.runImmediatelyのnextパラメータでの解決へ移行したためここでの解除は不要(2025-07-12~)
             // 取引プロセスロック解除
-            // if (params.data.options.useUnlockTransactionProcess) {
-            yield transactionProcessRepo.unlock({ typeOf: params.data.purpose.typeOf, id: params.data.purpose.id });
-            // }
+            // await transactionProcessRepo.unlock({ typeOf: params.data.purpose.typeOf, id: params.data.purpose.id });
         }
     });
 }

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

@@ -23,7 +23,7 @@ const setting_1 = require("../../repo/setting");
 const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
-const transactionProcess_1 = require("../../repo/transactionProcess");
+// import { TransactionProcessRepo } from '../../repo/transactionProcess';
 let coaAuthClientCreated = false;
 let coaAuthClient = new COA.auth.RefreshToken({
     endpoint: '', // 使用されないので空文字でok
@@ -59,7 +59,7 @@ function call(params) {
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
         }, { timeout: settings.coa.timeout });
-        const transactionProcessRepo = new transactionProcess_1.TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
+        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             yield (0, voidTransaction_1.voidTransaction)(Object.assign(Object.assign({}, params.data), { project: { id: params.project.id }, sameAs: { id: params.id } }))({
                 action: new action_1.ActionRepo(connection),
@@ -80,7 +80,8 @@ function call(params) {
         finally {
             // アクションID指定であれば取引プロセスロック解除(2024-05-26~)
             if (voidByActionId) {
-                yield transactionProcessRepo.unlock({ typeOf: params.data.purpose.typeOf, id: params.data.purpose.id });
+                // taskRepo.runImmediatelyのnextパラメータでの解決へ移行したためここでの解除は不要(2025-07-12~)
+                // await transactionProcessRepo.unlock({ typeOf: params.data.purpose.typeOf, id: params.data.purpose.id });
             }
         }
     });

package/package.json

@@ -113,5 +113,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.11.0-alpha.6"
+  "version": "22.11.0-alpha.8"
 }