@chevre/domain 25.2.0-alpha.33 → 25.2.0-alpha.35

package/lib/chevre/repo/stockHolder.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StockHolderRepo = void 0;
-// import type { RedisClientType } from 'redis';
 const factory_1 = require("../factory");
 const pendingReservation_1 = require("./pendingReservation");
 const SEARCH_OFFERS_MAX_LENGTH = 100;
@@ -9,36 +8,11 @@ const SEARCH_OFFERS_MAX_LENGTH = 100;
  * 保留予約リポジトリ
  */
 class StockHolderRepo {
-    // public static KEY_PREFIX_NEW: string = 'stockHolder';
-    // private readonly redisClient: RedisClientType | undefined;
     pendingReservationRepo;
     constructor(params) {
         const { connection } = params;
-        // this.redisClient = redisClient;
         this.pendingReservationRepo = new pendingReservation_1.PendingReservationRepo(connection);
     }
-    // private static offer2field(params: IOffer, hasTicketedSeat: boolean) {
-    //     if (hasTicketedSeat) {
-    //         return `${params.seatSection}:${params.seatNumber}`;
-    //     } else {
-    //         // 予約IDをfieldにする場合
-    //         const serviceOutputId = params.itemOffered?.serviceOutput?.id;
-    //         if (typeof serviceOutputId === 'string') {
-    //             return serviceOutputId;
-    //         } else {
-    //             throw new factory.errors.Internal('offer2field requires itemOffered.serviceOutput.id');
-    //         }
-    //     }
-    // }
-    // private static createKey(params: {
-    //     eventId: string;
-    //     startDate: Date;
-    // }): string {
-    //     if (!(params.startDate instanceof Date)) {
-    //         throw new factory.errors.Argument('startDate', 'must be Date');
-    //     }
-    //     return `${StockHolderRepo.KEY_PREFIX_NEW}:${params.eventId}`;
-    // }
     /**
      * 座席をロックする(maxキャパシティチェック有)
      */
@@ -54,16 +28,6 @@ class StockHolderRepo {
         }
         else {
             throw new factory_1.factory.errors.NotImplemented('useRedis discontinued.');
-            // if (this.redisClient === undefined) {
-            //     throw new factory.errors.Internal('redisClient required');
-            // }
-            // const key = StockHolderRepo.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
-            // await this.redisClient.watch(key);
-            // const hashCount = await this.redisClient.hLen(key);
-            // if (hashCount + lockKey.offers.length > maximum) {
-            //     throw new factory.errors.Argument('Event', 'maximumAttendeeCapacity exceeded');
-            // }
-            // await this.lock(lockKey);
         }
     }
     /**
@@ -79,59 +43,11 @@ class StockHolderRepo {
             startDate: lockKey.startDate,
             hasTicketedSeat: lockKey.hasTicketedSeat
         });
-        // const key = StockHolderRepo.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
-        // await this.checkIfConflicted({ key, eventId: lockKey.eventId, useMongoose });
         if (useMongoose) {
             return this.pendingReservationRepo.lock(lockKey);
         }
         else {
             throw new factory_1.factory.errors.NotImplemented('useRedis discontinued.');
-            // if (this.redisClient === undefined) {
-            //     throw new factory.errors.Internal('redisClient required');
-            // }
-            // const value = lockKey.holder;
-            // const multi = this.redisClient.multi();
-            // const fields = lockKey.offers.map((offer) => StockHolderRepo.offer2field(offer, lockKey.hasTicketedSeat));
-            // // check uniqueness(2025-04-20~)
-            // const uniqueFields = [...new Set(fields)];
-            // if (uniqueFields.length !== fields.length) {
-            //     throw new factory.errors.Argument('offers', 'offers must be unique');
-            // }
-            // fields.forEach((field) => {
-            //     multi.hSetNX(key, field, value);
-            // });
-            // const results = await multi.expireAt(
-            //     key,
-            //     moment(lockKey.expires)
-            //         .unix()
-            // )
-            //     .exec();
-            // const lockedFields: string[] = [];
-            // if (Array.isArray(results)) {
-            //     results.slice(0, fields.length)
-            //         .forEach((r, index) => {
-            //             if (r === 1 || (<any>r) === true) {
-            //                 lockedFields.push(fields[index]);
-            //             }
-            //         });
-            // }
-            // const lockedAll = lockedFields.length === fields.length;
-            // // expireAtReplyの検証も追加する(2023-04-19~)
-            // const expiredAll = results.slice(fields.length)
-            //     .every((r) => (r === 1 || (<any>r) === true));
-            // if (!lockedAll || !expiredAll) {
-            //     if (lockedFields.length > 0) {
-            //         // 全て仮押さえできなければ仮押さえできたものは解除
-            //         await this.redisClient.multi()
-            //             .hDel(key, lockedFields)
-            //             .exec();
-            //     }
-            //     if (!lockedAll) {
-            //         throw new factory.errors.AlreadyInUse(factory.reservationType.EventReservation, ['ticketedSeat'], 'Already hold');
-            //     } else {
-            //         throw new factory.errors.Internal('timeout cannot be set unexpectedly');
-            //     }
-            // }
         }
     }
     /**
@@ -144,20 +60,11 @@ class StockHolderRepo {
             startDate: params.startDate,
             hasTicketedSeat: params.hasTicketedSeat
         });
-        // const key = StockHolderRepo.createKey({ eventId: params.eventId, startDate: params.startDate });
-        // await this.checkIfConflicted({ key, eventId: params.eventId, useMongoose });
         if (useMongoose) {
             return this.pendingReservationRepo.unlock(params);
         }
         else {
             throw new factory_1.factory.errors.NotImplemented('useRedis discontinued.');
-            // if (this.redisClient === undefined) {
-            //     throw new factory.errors.Internal('redisClient required');
-            // }
-            // const field = StockHolderRepo.offer2field(params.offer, params.hasTicketedSeat);
-            // await this.redisClient.multi()
-            //     .hDel(key, field)
-            //     .exec();
         }
     }
     /**
@@ -174,16 +81,6 @@ class StockHolderRepo {
         }
         else {
             throw new factory_1.factory.errors.NotImplemented('useRedis discontinued.');
-            // if (this.redisClient === undefined) {
-            //     throw new factory.errors.Internal('redisClient required');
-            // }
-            // const key = StockHolderRepo.createKey({ eventId: params.event.id, startDate: params.event.startDate });
-            // const reply = await this.redisClient.hLen(key);
-            // let fieldCount: number = 0;
-            // if (typeof reply === 'number') {
-            //     fieldCount = Number(reply);
-            // }
-            // return fieldCount;
         }
     }
     /**
@@ -200,12 +97,6 @@ class StockHolderRepo {
         }
         else {
             throw new factory_1.factory.errors.NotImplemented('useRedis discontinued.');
-            // if (this.redisClient === undefined) {
-            //     throw new factory.errors.Internal('redisClient required');
-            // }
-            // const key = StockHolderRepo.createKey({ eventId: params.eventId, startDate: params.startDate });
-            // const field = StockHolderRepo.offer2field(params.offer, params.hasTicketedSeat);
-            // return this.redisClient.hGet(key, field);
         }
     }
     async searchHolders(params) {
@@ -223,32 +114,8 @@ class StockHolderRepo {
         }
         else {
             throw new factory_1.factory.errors.NotImplemented('useRedis discontinued.');
-            // if (this.redisClient === undefined) {
-            //     throw new factory.errors.Internal('redisClient required');
-            // }
-            // const key = StockHolderRepo.createKey({ eventId: params.eventId, startDate: params.startDate });
-            // const fields = params.offers.map((o) => {
-            //     return StockHolderRepo.offer2field(o, params.hasTicketedSeat);
-            // });
-            // // Array reply: list of values associated with the given fields, in the same order as they are requested.
-            // const result = await this.redisClient.hmGet(key, fields);
-            // if (!Array.isArray(result)) {
-            //     throw new factory.errors.Internal(`searchAvailability got non-array: ${typeof result}`);
-            // }
-            // // そのまま返却(2023-04-17~)
-            // return result;
         }
     }
-    // public async checkIfConflicted(params: {
-    //     eventId: string;
-    //     startDate: Date;
-    // }): Promise<void> {
-    //     const redisKeyExists = await this.redisKeyExists(params);
-    //     const mongoDocExists = await this.pendingReservationRepo.docExists(params);
-    //     if (redisKeyExists && mongoDocExists) {
-    //         throw new factory.errors.Internal(`repository conflicted. eventId:${params.eventId}`);
-    //     }
-    // }
     /**
      * 新リポジトリを使用するかどうか
      */
@@ -258,19 +125,6 @@ class StockHolderRepo {
         }
         // always use mongo(2025-08-17~)
         return true;
-        // let useMongoose = false;
-        // const redisKeyExists = await this.redisKeyExists(params);
-        // if (redisKeyExists) {
-        //     useMongoose = false;
-        // } else {
-        //     // redis keyが存在しなければmongo利用
-        //     useMongoose = true;
-        // }
-        // // check confliction for test
-        // if (USE_STOCK_HOLDER_CHECK_CONFLICT) {
-        //     await this.checkIfConflicted(params);
-        // }
-        // return useMongoose;
     }
 }
 exports.StockHolderRepo = StockHolderRepo;

package/lib/chevre/repo/transactionNumberCounter.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionNumberCounterRepo = void 0;
-// import { RedisClientType } from 'redis';
 const errorHandler_1 = require("../errorHandler");
 const factory_1 = require("../factory");
 const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
@@ -10,44 +9,11 @@ const MAX_RETRY_INCREMENT = 1;
  * 取引番号カウンターリポジトリ
  */
 class TransactionNumberCounterRepo {
-    // private readonly redisClient: RedisClientType;
     transactionNumberModel;
     constructor(params) {
         const { connection } = params;
-        // this.redisClient = redisClient;
         this.transactionNumberModel = connection.model(transactionNumber_1.modelName, (0, transactionNumber_1.createSchema)());
     }
-    // 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;
-    // }
     async incrementByMongo(params) {
         const now = new Date();
         const dataFeedExpires = params.expires;

package/lib/chevre/repo/transactionProcess.js

@@ -16,10 +16,8 @@ const DEFAULT_LOCK_EXPIRES = 120;
 class TransactionProcessRepo {
     concurrentLockRepo;
     options;
-    // private readonly redisClient: RedisClientType;
     constructor(redisClient, options) {
         this.concurrentLockRepo = new concurrentLock_1.ConcurrentLockRepo({ redisClient });
-        // this.redisClient = redisClient;
         this.options = options;
     }
     static CREATE_REDIS_KEY(params) {
@@ -44,16 +42,6 @@ class TransactionProcessRepo {
         catch (_error) {
             throw new factory_1.factory.errors.AlreadyInUse(params.typeOf, [], 'Another transaction process in progress');
         }
-        // const results = await this.redisClient.multi()
-        //     .setNX(key, '1')
-        //     .expire(key, ttl)
-        //     .exec();
-        // debug('locked,', params.id, results);
-        // if (Array.isArray(results) && (results[0] === 1 || (<any>results)[0] === true)) {
-        //     return;
-        // } else {
-        //     throw new factory.errors.AlreadyInUse(params.typeOf, [], 'Another transaction process in progress');
-        // }
     }
     async unlock(params) {
         const key = TransactionProcessRepo.CREATE_REDIS_KEY(params);
@@ -62,7 +50,6 @@ class TransactionProcessRepo {
             about: { identifier: key, typeOf: 'Thing' },
             audience: { identifier: '1', typeOf: 'Audience' }
         });
-        // await this.redisClient.del([key]);
     }
 }
 exports.TransactionProcessRepo = TransactionProcessRepo;

package/lib/chevre/service/reserve/adminFindReservations.d.ts

@@ -0,0 +1,15 @@
+import { factory } from '../../factory';
+import type { IKeyOfProjection, ReservationRepo } from '../../repo/reservation';
+/**
+ * 予約検索レスポンスとしての予約
+ */
+type IReservationAsFindResult = Pick<factory.reservation.eventReservation.IReservation, 'additionalTicketText' | 'attended' | 'bookingTime' | 'checkedIn' | 'id' | 'reservationFor' | 'reservationNumber' | 'reservationStatus' | 'reservedTicket'>;
+/**
+ * 管理者による予約検索
+ */
+export declare function adminFindReservations(params: factory.reservation.eventReservation.ISearchConditions, options: {
+    inclusion: Partial<Record<IKeyOfProjection, 1>>;
+}): (repos: {
+    reservation: ReservationRepo;
+}) => Promise<IReservationAsFindResult[]>;
+export {};

package/lib/chevre/service/reserve/adminFindReservations.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.adminFindReservations = adminFindReservations;
+/**
+ * 管理者による予約検索
+ */
+function adminFindReservations(params, options) {
+    return async (repos) => {
+        const { inclusion } = options;
+        const rawReservations = await repos.reservation.findReservations(params, inclusion);
+        if (rawReservations.length === 0) {
+            return [];
+        }
+        else {
+            // const requireUnderName = Object.keys(inclusion).includes('underName');
+            // const requireReservedTicket = Object.keys(inclusion).includes('reservedTicket');
+            // const requireReservationFor = Object.keys(inclusion).includes('reservationFor');
+            // const reservationIds = rawReservations.map(({ id }) => id);
+            // const subReservations = await repos.assetTransaction.reserve.findSubReservationsById({
+            //     ids: reservationIds
+            // });
+            return rawReservations.map((reservation) => {
+                // const subReservationByTransaction = subReservations.find((s) => s.id === reservation.id);
+                // const underNameByTransaction = subReservationByTransaction?.underName;
+                const { reservationFor, issuedThrough: _issuedThrough, priceCurrency: _priceCurrency, numSeats: _numSeats, reservedTicket, ...rawReservation4result } = reservation;
+                return {
+                    ...rawReservation4result, // 予約ドキュメントはそのまま返す
+                    reservedTicket, // 予約検索レスポンスからticketTypeは廃止(2026-06-01~)
+                    reservationFor // 予約検索レスポンスのreservationForはそのまま返す(2026-06-01~)
+                    // ...(requireUnderName && underNameByTransaction !== undefined) ? { underName: underNameByTransaction } : undefined, // underNameがあれば上書き
+                };
+            });
+        }
+    };
+}

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

@@ -5,7 +5,7 @@ import { cancelPendingReservation, cancelReservation } from './reserve/cancelRes
 import { checkInReservation } from './reserve/checkInReservation';
 import { confirmReservation } from './reserve/confirmReservation';
 import { findByCode } from './reserve/findByCode';
-import { findReservations } from './reserve/findReservations';
+import { adminFindReservations } from './reserve/adminFindReservations';
 import { searchByOrder } from './reserve/searchByOrder';
 import { verifyToken4reservation } from './reserve/verifyToken4reservation';
-export { cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, findByCode, findReservations, searchByOrder, verifyToken4reservation };
+export { cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, findByCode, adminFindReservations, searchByOrder, verifyToken4reservation };

package/lib/chevre/service/reserve.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyToken4reservation = exports.searchByOrder = exports.findReservations = exports.findByCode = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = void 0;
+exports.verifyToken4reservation = exports.searchByOrder = exports.adminFindReservations = exports.findByCode = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = void 0;
 /**
  * 予約サービス
  */
@@ -13,8 +13,8 @@ const confirmReservation_1 = require("./reserve/confirmReservation");
 Object.defineProperty(exports, "confirmReservation", { enumerable: true, get: function () { return confirmReservation_1.confirmReservation; } });
 const findByCode_1 = require("./reserve/findByCode");
 Object.defineProperty(exports, "findByCode", { enumerable: true, get: function () { return findByCode_1.findByCode; } });
-const findReservations_1 = require("./reserve/findReservations");
-Object.defineProperty(exports, "findReservations", { enumerable: true, get: function () { return findReservations_1.findReservations; } });
+const adminFindReservations_1 = require("./reserve/adminFindReservations");
+Object.defineProperty(exports, "adminFindReservations", { enumerable: true, get: function () { return adminFindReservations_1.adminFindReservations; } });
 const searchByOrder_1 = require("./reserve/searchByOrder");
 Object.defineProperty(exports, "searchByOrder", { enumerable: true, get: function () { return searchByOrder_1.searchByOrder; } });
 const verifyToken4reservation_1 = require("./reserve/verifyToken4reservation");

package/lib/chevre/service/transaction/placeOrder/start.d.ts

@@ -9,7 +9,7 @@ import type { ProjectMakesOfferRepo } from '../../../repo/projectMakesOffer';
 import type { SellerRepo } from '../../../repo/seller';
 import type { IStartedPlaceOrder, PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { IStartPlaceOrderParams } from './start/factory';
-interface IStartOperationRepos {
+export interface IStartOperationRepos {
     issuer: IssuerRepo;
     member: MemberRepo;
     memberProgram: MemberProgramRepo;

package/lib/chevre/service/transaction/placeOrder/updateAgent/fixCustomer.d.ts

@@ -0,0 +1,20 @@
+import { factory } from '../../../../factory';
+import type { OrderInTransactionRepo } from '../../../../repo/orderInTransaction';
+export interface IFixCustomerRepos {
+    orderInTransaction: OrderInTransactionRepo;
+}
+export type IProfileByRequest = Pick<factory.order.ICustomer, 'additionalProperty' | 'address' | 'age' | 'email' | 'familyName' | 'gender' | 'givenName' | 'name' | 'telephone' | 'url'> & {
+    telephoneRegion?: string;
+};
+/**
+ * 進行中取引からカスタマー属性を決定する
+ */
+export declare function fixCustomer(params: {
+    /**
+     * 注文取引ID
+     */
+    id: string;
+    profileByRequest: IProfileByRequest;
+}): (repos: IFixCustomerRepos) => Promise<{
+    customer: factory.order.ICustomer;
+}>;

package/lib/chevre/service/transaction/placeOrder/updateAgent/fixCustomer.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixCustomer = fixCustomer;
+const libphonenumber_js_1 = require("libphonenumber-js");
+const factory_1 = require("../../../../factory");
+/**
+ * 進行中取引からカスタマー属性を決定する
+ */
+function fixCustomer(params) {
+    return async (repos) => {
+        const { profileByRequest } = params;
+        let formattedTelephone;
+        try {
+            const phoneNumber = (0, libphonenumber_js_1.parsePhoneNumberFromString)(String(profileByRequest.telephone), profileByRequest.telephoneRegion);
+            if (phoneNumber === undefined || !phoneNumber.isValid()) {
+                throw new factory_1.factory.errors.Argument('telephone', 'Invalid phone number');
+            }
+            formattedTelephone = phoneNumber.format('E.164');
+            // if (useLibphonenumber) {
+            //     const phoneNumber = parsePhoneNumberFromString(String(params.agent.telephone), params.agent.telephoneRegion as CountryCode | undefined);
+            //     if (phoneNumber === undefined || !phoneNumber.isValid()) {
+            //         throw new factory.errors.Argument('telephone', 'Invalid phone number');
+            //     }
+            //     formattedTelephone = phoneNumber.format('E.164');
+            // } else {
+            //     const phoneUtil = PhoneNumberUtil.getInstance();
+            //     const phoneNumber = phoneUtil.parse(params.agent.telephone, params.agent.telephoneRegion);
+            //     if (!phoneUtil.isValidNumber(phoneNumber)) {
+            //         throw new factory.errors.Argument('telephone', 'Invalid phone number');
+            //     }
+            //     formattedTelephone = phoneUtil.format(phoneNumber, PhoneNumberFormat.E164);
+            // }
+        }
+        catch (error) {
+            throw new factory_1.factory.errors.Argument('telephone', (error instanceof Error) ? error.message : /* istanbul ignore next */ String(error));
+        }
+        // orderInTransaction.customer?.typeOfは取引開始時にセットされている前提で再実装(2026-06-24~)
+        const customerByTransaction = await repos.orderInTransaction.findCustomerByOrderIdentifier({ identifier: params.id });
+        const customerName = (typeof profileByRequest.name === 'string' && profileByRequest.name !== '')
+            ? profileByRequest.name
+            : /* istanbul ignore next */ (typeof profileByRequest.givenName === 'string' && typeof profileByRequest.familyName === 'string'
+                && profileByRequest.givenName !== '' && profileByRequest.familyName !== '')
+                ? `${profileByRequest.givenName} ${profileByRequest.familyName}`
+                : undefined;
+        const identifier = (Array.isArray(customerByTransaction.identifier)) ? customerByTransaction.identifier : /* istanbul ignore next */ [];
+        const customer = {
+            typeOf: customerByTransaction.typeOf, // 取引開始時で固定
+            id: customerByTransaction.id, // 取引開始時で固定
+            identifier, // 取引開始時で固定
+            ...((Array.isArray(profileByRequest.additionalProperty)) && { additionalProperty: profileByRequest.additionalProperty }),
+            ...((typeof profileByRequest.age === 'string') && { age: profileByRequest.age }),
+            ...((typeof profileByRequest.address === 'string') && { address: profileByRequest.address }),
+            ...((typeof profileByRequest.email === 'string') && { email: profileByRequest.email }),
+            ...((typeof profileByRequest.familyName === 'string') && { familyName: profileByRequest.familyName }),
+            ...((typeof profileByRequest.gender === 'string') && { gender: profileByRequest.gender }),
+            ...((typeof profileByRequest.givenName === 'string') && { givenName: profileByRequest.givenName }),
+            ...((typeof customerName === 'string') && { name: customerName }),
+            ...((typeof formattedTelephone === 'string') && { telephone: formattedTelephone }),
+            ...((typeof profileByRequest.url === 'string') && { url: profileByRequest.url })
+        };
+        return { customer };
+    };
+}

package/lib/chevre/service/transaction/placeOrder/updateAgent.d.ts

@@ -5,7 +5,6 @@ import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
  * 取引人プロフィール更新
  */
 export declare function updateAgent(params: {
-    typeOf: factory.transactionType.PlaceOrder;
     /**
      * 取引ID
      */
@@ -13,8 +12,6 @@ export declare function updateAgent(params: {
     agent: factory.order.ICustomer & {
         telephoneRegion?: string;
     };
-}, options: {
-    useLibphonenumber: boolean;
 }): (repos: {
     orderInTransaction: OrderInTransactionRepo;
     placeOrder: PlaceOrderRepo;

package/lib/chevre/service/transaction/placeOrder/updateAgent.js

@@ -1,33 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateAgent = updateAgent;
-const google_libphonenumber_1 = require("google-libphonenumber");
-const libphonenumber_js_1 = require("libphonenumber-js");
 const factory_1 = require("../../../factory");
-function fixCustomer(params, options) {
+const fixCustomer_1 = require("./updateAgent/fixCustomer");
+/**
+ * 取引人プロフィール更新
+ */
+function updateAgent(params) {
     return async (repos) => {
-        const { useLibphonenumber } = options;
-        let formattedTelephone;
-        try {
-            if (useLibphonenumber) {
-                const phoneNumber = (0, libphonenumber_js_1.parsePhoneNumberFromString)(String(params.agent.telephone), params.agent.telephoneRegion);
-                if (phoneNumber === undefined || !phoneNumber.isValid()) {
-                    throw new factory_1.factory.errors.Argument('telephone', 'Invalid phone number');
-                }
-                formattedTelephone = phoneNumber.format('E.164');
-            }
-            else {
-                const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
-                const phoneNumber = phoneUtil.parse(params.agent.telephone, params.agent.telephoneRegion);
-                if (!phoneUtil.isValidNumber(phoneNumber)) {
-                    throw new factory_1.factory.errors.Argument('telephone', 'Invalid phone number');
-                }
-                formattedTelephone = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.E164);
-            }
-        }
-        catch (error) {
-            throw new factory_1.factory.errors.Argument('telephone', (error instanceof Error) ? error.message : String(error));
-        }
         const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory_1.factory.transactionType.PlaceOrder,
             id: params.id
@@ -35,76 +15,17 @@ function fixCustomer(params, options) {
         if (transaction.agent.id !== params.agent.id) {
             throw new factory_1.factory.errors.Forbidden('Transaction not yours');
         }
-        // 注文取引の場合、object.customerにも適用
-        let customer;
-        if (transaction.typeOf === factory_1.factory.transactionType.PlaceOrder) {
-            // orderInTransaction.customer?.typeOfは取引開始時にセットされている前提で再実装(2026-06-24~)
-            const customerByTransaction = await repos.orderInTransaction.findCustomerByOrderIdentifier({
-                identifier: params.id,
-                // project: { id: transaction.project.id }
-            });
-            // // いったんtransaction.object.customer?.typeOfは取引開始時にセットされている前提
-            // const customerByTransaction = transaction.object.customer;
-            if (typeof customerByTransaction?.typeOf === 'string') {
-                customer = {
-                    typeOf: customerByTransaction.typeOf,
-                    id: customerByTransaction.id,
-                    ...(Array.isArray(customerByTransaction.identifier))
-                        ? { identifier: customerByTransaction.identifier }
-                        : /* istanbul ignore next */ undefined,
-                    ...(Array.isArray(params.agent.additionalProperty))
-                        ? { additionalProperty: params.agent.additionalProperty }
-                        : /* istanbul ignore next */ undefined,
-                    ...(typeof params.agent.age === 'string') ? { age: params.agent.age }
-                        : /* istanbul ignore next */ undefined,
-                    ...(typeof params.agent.address === 'string') ? { address: params.agent.address }
-                        : /* istanbul ignore next */ undefined,
-                    ...(typeof params.agent.email === 'string') ? { email: params.agent.email }
-                        : /* istanbul ignore next */ undefined,
-                    ...(typeof params.agent.familyName === 'string') ? { familyName: params.agent.familyName }
-                        : /* istanbul ignore next */ undefined,
-                    ...(typeof params.agent.gender === 'string') ? { gender: params.agent.gender }
-                        : /* istanbul ignore next */ undefined,
-                    ...(typeof params.agent.givenName === 'string') ? { givenName: params.agent.givenName }
-                        : /* istanbul ignore next */ undefined,
-                    ...(typeof params.agent.name === 'string') ? { name: params.agent.name } : /* istanbul ignore next */ undefined,
-                    ...(typeof formattedTelephone === 'string') ? { telephone: formattedTelephone } : /* istanbul ignore next */ undefined,
-                    ...(typeof params.agent.url === 'string') ? { url: params.agent.url } : /* istanbul ignore next */ undefined
-                };
-            }
-        }
-        return { customer, transaction };
-    };
-}
-/**
- * 取引人プロフィール更新
- */
-function updateAgent(params, options) {
-    return async (repos) => {
-        const { customer, transaction } = await fixCustomer(params, options)(repos);
-        // also save in orderInTransaction(2024-06-20~)
-        if (customer !== undefined) {
-            // // 注文ドキュメントを参照(2026-06-24~)
-            // const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
-            //     identifier: params.id,
-            //     project: { id: transaction.project.id },
-            // }, { onlyPlaceOrder: true });
-            const customerName = (typeof customer.name === 'string' && customer.name !== '')
-                ? customer.name
-                : (typeof customer.givenName === 'string' && typeof customer.familyName === 'string'
-                    && customer.givenName !== '' && customer.familyName !== '')
-                    ? `${customer.givenName} ${customer.familyName}`
-                    : undefined;
-            const customerInOrder = {
-                ...customer,
-                identifier: (Array.isArray(customer.identifier)) ? customer.identifier : [],
-                ...(typeof customerName === 'string') ? { name: customerName } : undefined
-            };
-            await repos.orderInTransaction.setCustomerByIdentifier({
-                project: transaction.project,
-                identifier: params.id,
-                customer: customerInOrder
-            });
-        }
+        const { id: _id, typeOf: _typeOf, ...profileByRequest } = params.agent;
+        const { customer } = await (0, fixCustomer_1.fixCustomer)({ id: params.id, profileByRequest })(repos);
+        // // 注文ドキュメントを参照(2026-06-24~)
+        // const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
+        //     identifier: params.id,
+        //     project: { id: transaction.project.id },
+        // }, { onlyPlaceOrder: true });
+        await repos.orderInTransaction.setCustomerByIdentifier({
+            project: transaction.project,
+            identifier: params.id,
+            customer
+        });
     };
 }