@chevre/domain 22.11.0-alpha.1 → 22.11.0-alpha.10

package/lib/chevre/repo/serviceOutputIdentifier.js

@@ -12,9 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceOutputIdentifierRepo = void 0;
 const cdigit = require("cdigit");
 const moment = require("moment-timezone");
+// import { RedisClientType } from 'redis';
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
-const setting_1 = require("./mongoose/schemas/setting");
+// import { createSchema as createSettingSchema, modelName as settingModelName } from './mongoose/schemas/setting';
 const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
 const transactionNumberCounter_1 = require("./transactionNumberCounter");
 /**
@@ -22,8 +23,8 @@ const transactionNumberCounter_1 = require("./transactionNumberCounter");
  */
 class ServiceOutputIdentifierRepo {
     constructor(params) {
-        const { connection } = params;
-        this.settingModel = connection.model(setting_1.modelName, (0, setting_1.createSchema)());
+        // const { connection } = params;
+        // this.settingModel = connection.model(settingModelName, createSettingSchema());
         this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
     }
     // private static createKey(params: {
@@ -47,27 +48,15 @@ class ServiceOutputIdentifierRepo {
             let dataFeedExpires;
             const dataFeedIdentifier = timestamp;
             let incrReply;
-            const useMongoBySettings = yield this.useMongoBySettings(params);
-            if (useMongoBySettings) {
-                dataFeedExpires = moment(params.startDate)
-                    .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
-                    .toDate();
-                incrReply = yield this.counterRepo.incrementByMongo({
-                    identifier: dataFeedIdentifier,
-                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.serviceOutputIdentifier },
-                    expires: dataFeedExpires
-                });
-            }
-            else {
-                dataFeedExpires = moment(params.startDate)
-                    .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
-                    .toDate();
-                incrReply = yield this.counterRepo.incrementByRedis({
-                    identifier: dataFeedIdentifier,
-                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.serviceOutputIdentifier },
-                    expires: dataFeedExpires
-                });
-            }
+            // const useMongoBySettings = await this.useMongoBySettings(params);
+            dataFeedExpires = moment(params.startDate)
+                .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
+                .toDate();
+            incrReply = yield this.counterRepo.incrementByMongo({
+                identifier: dataFeedIdentifier,
+                includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.serviceOutputIdentifier },
+                expires: dataFeedExpires
+            });
             let identifier = `${timestamp}${incrReply}`;
             // checkdigit
             const cd = cdigit.luhn.compute(identifier);
@@ -77,19 +66,5 @@ class ServiceOutputIdentifierRepo {
             return identifier;
         });
     }
-    useMongoBySettings(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const setting = yield this.settingModel.findOne({ 'project.id': { $eq: '*' } }, {
-                _id: 0,
-                useMongo4transactionNumberFrom: 1
-            })
-                .lean()
-                .exec();
-            const useMongo4transactionNumberFrom = setting === null || setting === void 0 ? void 0 : setting.useMongo4transactionNumberFrom;
-            return useMongo4transactionNumberFrom instanceof Date
-                && moment(params.startDate)
-                    .isSameOrAfter(moment(useMongo4transactionNumberFrom));
-        });
-    }
 }
 exports.ServiceOutputIdentifierRepo = ServiceOutputIdentifierRepo;

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

@@ -1,4 +1,4 @@
-import type { Connection } from 'mongoose';
+import type { Connection, FilterQuery } from 'mongoose';
 import { ISetting } from './mongoose/schemas/setting';
 type IKeyOfProjection = keyof ISetting;
 export { ISetting };
@@ -23,4 +23,17 @@ export declare class SettingRepo {
             };
         };
     }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota' | 'triggerWebhook' | 'waiter'>): Promise<import("mongoose").UpdateWriteOpResult>;
+    updateByProject4migration(filter: {
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+    }, update: {
+        $set: any;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
+    unsetUnnecessaryFields(params: {
+        filter: FilterQuery<ISetting>;
+        $unset: any;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/setting.js

@@ -56,5 +56,20 @@ class SettingRepo {
                 .exec();
         });
     }
+    updateByProject4migration(filter, update) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { $set } = update;
+            return this.settingModel.updateOne({ 'project.id': { $eq: filter.project.id.$eq } }, {
+                $set
+            })
+                .exec();
+        });
+    }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.settingModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+                .exec();
+        });
+    }
 }
 exports.SettingRepo = SettingRepo;

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/repo/transactionNumber.d.ts

@@ -1,6 +1,4 @@
 import type { Connection } from 'mongoose';
-import { RedisClientType } from 'redis';
-import { ISetting } from './mongoose/schemas/setting';
 interface IPublishResult {
     transactionNumber: string;
 }
@@ -8,10 +6,8 @@ interface IPublishResult {
  * 取引番号リポジトリ
  */
 export declare class TransactionNumberRepo {
-    private readonly settingModel;
     private readonly counterRepo;
     constructor(params: {
-        redisClient: RedisClientType;
         connection: Connection;
     });
     /**
@@ -20,12 +16,5 @@ export declare class TransactionNumberRepo {
     publishByTimestamp(params: {
         startDate: Date;
     }): Promise<IPublishResult>;
-    /**
-     * DB移行時のみに使用目的の設定更新
-     */
-    setUseMongo4transactionNumberFrom(params: {
-        useMongo4transactionNumberFrom: Date;
-    }): Promise<Pick<ISetting, "useMongo4transactionNumberFrom"> | null>;
-    private useMongoBySettings;
 }
 export {};

package/lib/chevre/repo/transactionNumber.js

@@ -12,9 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionNumberRepo = void 0;
 const cdigit = require("cdigit");
 const moment = require("moment-timezone");
+// import { RedisClientType } from 'redis';
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
-const setting_1 = require("./mongoose/schemas/setting");
+// import { createSchema as createSettingSchema, modelName as settingModelName } from './mongoose/schemas/setting';
 const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
 const transactionNumberCounter_1 = require("./transactionNumberCounter");
 /**
@@ -22,8 +23,8 @@ const transactionNumberCounter_1 = require("./transactionNumberCounter");
  */
 class TransactionNumberRepo {
     constructor(params) {
-        const { connection } = params;
-        this.settingModel = connection.model(setting_1.modelName, (0, setting_1.createSchema)());
+        // const { connection } = params;
+        // this.settingModel = connection.model(settingModelName, createSettingSchema());
         this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
     }
     // private static createKey(params: {
@@ -47,27 +48,15 @@ class TransactionNumberRepo {
             let dataFeedExpires;
             const dataFeedIdentifier = timestamp;
             let incrReply;
-            const useMongoBySettings = yield this.useMongoBySettings(params);
-            if (useMongoBySettings) {
-                dataFeedExpires = moment(params.startDate)
-                    .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
-                    .toDate();
-                incrReply = yield this.counterRepo.incrementByMongo({
-                    identifier: dataFeedIdentifier,
-                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.transactionNumber },
-                    expires: dataFeedExpires
-                });
-            }
-            else {
-                dataFeedExpires = moment(params.startDate)
-                    .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
-                    .toDate();
-                incrReply = yield this.counterRepo.incrementByRedis({
-                    identifier: dataFeedIdentifier,
-                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.transactionNumber },
-                    expires: dataFeedExpires
-                });
-            }
+            // const useMongoBySettings = await this.useMongoBySettings(params);
+            dataFeedExpires = moment(params.startDate)
+                .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
+                .toDate();
+            incrReply = yield this.counterRepo.incrementByMongo({
+                identifier: dataFeedIdentifier,
+                includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.transactionNumber },
+                expires: dataFeedExpires
+            });
             let transactionNumber = `${timestamp}${incrReply}`;
             // checkdigit
             const cd = cdigit.luhn.compute(transactionNumber);
@@ -77,32 +66,5 @@ class TransactionNumberRepo {
             return { transactionNumber };
         });
     }
-    /**
-     * DB移行時のみに使用目的の設定更新
-     */
-    setUseMongo4transactionNumberFrom(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { useMongo4transactionNumberFrom } = params;
-            return this.settingModel.findOneAndUpdate({ 'project.id': { $eq: '*' } }, {
-                $set: { useMongo4transactionNumberFrom }
-            }, { projection: { _id: 0, useMongo4transactionNumberFrom: 1 } })
-                .lean()
-                .exec();
-        });
-    }
-    useMongoBySettings(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const setting = yield this.settingModel.findOne({ 'project.id': { $eq: '*' } }, {
-                _id: 0,
-                useMongo4transactionNumberFrom: 1
-            })
-                .lean()
-                .exec();
-            const useMongo4transactionNumberFrom = setting === null || setting === void 0 ? void 0 : setting.useMongo4transactionNumberFrom;
-            return useMongo4transactionNumberFrom instanceof Date
-                && moment(params.startDate)
-                    .isSameOrAfter(moment(useMongo4transactionNumberFrom));
-        });
-    }
 }
 exports.TransactionNumberRepo = TransactionNumberRepo;

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

@@ -1,23 +1,13 @@
 import type { Connection } from 'mongoose';
-import { RedisClientType } from 'redis';
 import { DataCatalogIdentifier } from './mongoose/schemas/transactionNumber';
 /**
  * 取引番号カウンターリポジトリ
  */
 export declare class TransactionNumberCounterRepo {
-    private readonly redisClient;
     private readonly transactionNumberModel;
     constructor(params: {
-        redisClient: RedisClientType;
         connection: Connection;
     });
-    incrementByRedis(params: {
-        identifier: string;
-        includedInDataCatalog: {
-            identifier: DataCatalogIdentifier;
-        };
-        expires: Date;
-    }): Promise<number>;
     incrementByMongo(params: {
         identifier: string;
         includedInDataCatalog: {

package/lib/chevre/repo/transactionNumberCounter.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionNumberCounterRepo = void 0;
+// import { RedisClientType } from 'redis';
 const errorHandler_1 = require("../errorHandler");
 const factory = require("../factory");
 const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
@@ -19,37 +20,41 @@ const MAX_RETRY_INCREMENT = 1;
  */
 class TransactionNumberCounterRepo {
     constructor(params) {
-        const { redisClient, connection } = params;
-        this.redisClient = redisClient;
+        const { connection } = params;
+        // this.redisClient = redisClient;
         this.transactionNumberModel = connection.model(transactionNumber_1.modelName, (0, transactionNumber_1.createSchema)());
     }
-    incrementByRedis(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // const now = moment();
-            const { expires } = params;
-            const key = `${params.includedInDataCatalog.identifier}:${params.identifier}`;
-            // const TTL = moment(expires)
-            //     .diff(now, 'seconds');
-            const [incrReply, expireAtReply] = yield this.redisClient.multi()
-                .incr(key)
-                // .expire(key, TTL)
-                .expireAt(key, expires)
-                .exec();
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else: please write tests */
-            if (typeof incrReply !== 'number') {
-                // 基本的にありえないフロー
-                throw new factory.errors.Internal('transaction number not incremented unexpectedly');
-            }
-            // expireAtReplyの検証も追加する(2023-04-19~)
-            const expiredSet = expireAtReply === 1 || expireAtReply === true;
-            if (!expiredSet) {
-                // 基本的にありえないフロー
-                throw new factory.errors.Internal('transaction number expiration not set unexpectedly');
-            }
-            return incrReply;
-        });
-    }
+    // public async incrementByRedis(params: {
+    //     identifier: string;
+    //     includedInDataCatalog: {
+    //         identifier: DataCatalogIdentifier;
+    //     };
+    //     expires: Date;
+    // }): Promise<number> {
+    //     // const now = moment();
+    //     const { expires } = params;
+    //     const key = `${params.includedInDataCatalog.identifier}:${params.identifier}`;
+    //     // const TTL = moment(expires)
+    //     //     .diff(now, 'seconds');
+    //     const [incrReply, expireAtReply] = await this.redisClient.multi()
+    //         .incr(key)
+    //         // .expire(key, TTL)
+    //         .expireAt(key, expires)
+    //         .exec();
+    //     // tslint:disable-next-line:no-single-line-block-comment
+    //     /* istanbul ignore else: please write tests */
+    //     if (typeof incrReply !== 'number') {
+    //         // 基本的にありえないフロー
+    //         throw new factory.errors.Internal('transaction number not incremented unexpectedly');
+    //     }
+    //     // expireAtReplyの検証も追加する(2023-04-19~)
+    //     const expiredSet = expireAtReply === 1 || <any>expireAtReply === true;
+    //     if (!expiredSet) {
+    //         // 基本的にありえないフロー
+    //         throw new factory.errors.Internal('transaction number expiration not set unexpectedly');
+    //     }
+    //     return incrReply;
+    // }
     incrementByMongo(params) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;

package/lib/chevre/service/code.d.ts

@@ -1,31 +1,8 @@
-import type { AuthorizationRepo } from '../repo/authorization';
-import type { JWTSettingRepo } from '../repo/setting/jwt';
-import type { TicketRepo } from '../repo/ticket';
-import * as factory from '../factory';
-type IToken = string;
-interface IPayload extends Pick<factory.clientUser.IClientUser, 'aud' | 'exp' | 'iat' | 'iss' | 'sub' | 'token_use' | 'typ' | 'version'> {
-    version: string;
-    typ: string;
-    jti?: string;
-}
+/**
+ * 承認サービス
+ * ひとまず不要なので廃止(2025-07-18~)
+ */
 /**
  * コードをトークンに変換する
  */
-declare function getToken(params: {
-    agent: {
-        id: string;
-        typeOf: factory.creativeWorkType.SoftwareApplication | factory.creativeWorkType.WebApplication | factory.personType.Person;
-    };
-    project: {
-        id: string;
-    };
-    code: string;
-    expiresIn: number;
-}): (repos: {
-    authorization: AuthorizationRepo;
-    jwtSetting: JWTSettingRepo;
-    ticket: TicketRepo;
-}) => Promise<{
-    token: IToken;
-}>;
-export { IPayload, getToken };
+export {};

package/lib/chevre/service/code.js

@@ -1,83 +1,7 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getToken = getToken;
 /**
  * 承認サービス
+ * ひとまず不要なので廃止(2025-07-18~)
  */
-const jwt = require("jsonwebtoken");
-const factory = require("../factory");
-/**
- * コードをトークンに変換する
- */
-function getToken(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const jwtSetting = yield repos.jwtSetting.findDefault();
-        if (typeof params.project.id !== 'string' || params.project.id.length === 0) {
-            throw new factory.errors.ArgumentNull('project.id');
-        }
-        if (typeof params.code !== 'string' || params.code.length === 0) {
-            throw new factory.errors.ArgumentNull('code');
-        }
-        const authorization = yield repos.authorization.findValidOneByCode({
-            project: { id: params.project.id },
-            code: params.code
-        });
-        // if (typeof params.issuer !== 'string' || params.issuer.length === 0) {
-        //     throw new factory.errors.ArgumentNull('issuer');
-        // }
-        let subject;
-        let typ;
-        // jti必須化(2024-08-22~)
-        const { id } = yield repos.ticket.issueByTicketToken(Object.assign({ project: { id: params.project.id }, ticketToken: params.code }, (typeof ((_a = authorization.issuedBy) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { issuedBy: authorization.issuedBy } : undefined));
-        const jti = id;
-        // ロール承認の場合、subjectはメンバーID,typはメンバータイプ
-        if (authorization.object.typeOf === factory.role.RoleType.OrganizationRole) {
-            subject = authorization.object.member.id;
-            typ = `${jwtSetting.payloadTypPrefix}:${authorization.object.member.typeOf}`;
-        }
-        else {
-            // useJtiの場合、subject,typはagent(2024-05-09~)
-            subject = params.agent.id;
-            typ = `${jwtSetting.payloadTypPrefix}:${params.agent.typeOf}`;
-        }
-        const payload = {
-            token_use: 'access', // 拡張(2024-05-01~)
-            version: jwtSetting.version, // 拡張(2024-05-02~)
-            typ //  拡張(2024-05-07~)
-        };
-        const token = yield new Promise((resolve, reject) => {
-            // 所有権を暗号化する
-            jwt.sign(payload, jwtSetting.secret, {
-                algorithm: jwtSetting.algorithm, // 明示的に指定(2024-05-05~)
-                issuer: jwtSetting.issuer, // 都度指定に変更(2024-05-05~)
-                expiresIn: params.expiresIn,
-                subject, // 拡張(2024-05-01~)
-                audience: jwtSetting.issuer, // 拡張(2024-05-02~)
-                jwtid: jti // 拡張(2024-05-08~)
-            }, (err, encoded) => {
-                if (err instanceof Error) {
-                    reject(err);
-                }
-                else {
-                    if (typeof encoded !== 'string') {
-                        reject(new factory.errors.Internal('authorization.object cannot be signed unexpectedly'));
-                    }
-                    else {
-                        resolve(encoded);
-                    }
-                }
-            });
-        });
-        return { token };
-    });
-}
+// import * as jwt from 'jsonwebtoken';
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned/factory.js

@@ -4,24 +4,22 @@ exports.createInformTasks = createInformTasks;
 exports.createOnOrderReturnedTasksByTransaction = createOnOrderReturnedTasksByTransaction;
 const factory = require("../../../../factory");
 function createInformTasks(order, returnOrderAction, setting) {
-    var _a, _b, _c;
+    var _a, _b;
     const taskRunsAt = new Date();
     const informOrder = (_a = setting === null || setting === void 0 ? void 0 : setting.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
-    const useInformReturnAction = ((_b = setting === null || setting === void 0 ? void 0 : setting.onOrderStatusChanged) === null || _b === void 0 ? void 0 : _b.useInformReturnAction) === true;
+    // const useInformReturnAction = (<any>setting)?.onOrderStatusChanged?.useInformReturnAction === true; // discontinue(2025-07-01~)
     const informTasks = [];
-    // support returnAction4inform(2025-01-22~)
-    let informObject;
     const informIdentifier = `${factory.order.OrderType.Order}:${order.orderNumber}:${factory.orderStatus.OrderReturned}`;
-    if (useInformReturnAction) {
-        informObject = createReturnAction4inform(returnOrderAction);
-    }
-    else {
-        informObject = createOrder4inform(order);
-    }
+    const informObject = createReturnAction4inform(returnOrderAction);
+    // if (useInformReturnAction) { // discontinue(2025-07-01~)
+    //     informObject = createReturnAction4inform(returnOrderAction);
+    // } else {
+    //     informObject = createOrder4inform(order);
+    // }
     if (Array.isArray(informOrder) && informOrder.length > 0) {
         let recipientId = '';
         recipientId = order.customer.id;
-        if (typeof ((_c = order.returner) === null || _c === void 0 ? void 0 : _c.id) === 'string') {
+        if (typeof ((_b = order.returner) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
             recipientId = order.returner.id;
         }
         informOrder.forEach((informOrderParams) => {
@@ -63,9 +61,19 @@ function createReturnAction4inform(returnOrderAction) {
     const { id, instrument, object, project, typeOf } = returnOrderAction;
     return Object.assign({ id, object, project, typeOf }, (Array.isArray(instrument)) ? { instrument } : undefined);
 }
-function createOrder4inform(order) {
-    return Object.assign(Object.assign({ project: order.project, typeOf: order.typeOf, orderNumber: order.orderNumber, orderStatus: factory.orderStatus.OrderReturned }, (order.dateReturned !== undefined) ? { dateReturned: order.dateReturned } : undefined), (typeof order.id === 'string') ? { id: order.id } : undefined);
-}
+// function createOrder4inform(
+//     order: IReturnedOrder
+// ): IOrder4inform {
+//     return {
+//         project: order.project,
+//         typeOf: order.typeOf,
+//         orderNumber: order.orderNumber,
+//         orderStatus: factory.orderStatus.OrderReturned,
+//         ...(order.dateReturned !== undefined) ? { dateReturned: order.dateReturned } : undefined,
+//         // ↓hub側で使用している可能性もあるので念のため
+//         ...(typeof order.id === 'string') ? { id: order.id } : undefined
+//     };
+// }
 /**
  * 注文返品後のアクション
  */

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~)
@@ -86,7 +86,7 @@ function call(params) {
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),
-                    orderNumber: new orderNumber_1.OrderNumberRepo({ redisClient, connection }),
+                    orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                     project: new project_1.ProjectRepo(connection),
                     transaction: new transaction_1.TransactionRepo(connection),
                     reserveService,
@@ -104,7 +104,7 @@ function call(params) {
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),
-                    orderNumber: new orderNumber_1.OrderNumberRepo({ redisClient, connection }),
+                    orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                     project: new project_1.ProjectRepo(connection),
                     transaction: new transaction_1.TransactionRepo(connection),
                     reserveService,
@@ -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 });
         }
     });
 }