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

package/lib/chevre/factory/customerTelephone2COATelNum.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.customerTelephone2COATelNum = customerTelephone2COATelNum;
-// import { PhoneNumberFormat, PhoneNumberUtil } from 'google-libphonenumber';
 const libphonenumber_js_1 = require("libphonenumber-js");
 const factory_1 = require("../factory");
 function customerTelephone2COATelNum(params) {

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/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
+        });
     };
 }

package/package.json

@@ -17,7 +17,6 @@
     "@sendgrid/client": "8.1.4",
     "@surfrock/sdk": "2.0.0",
     "debug": "4.4.3",
-    "google-libphonenumber": "3.2.35",
     "http-status": "2.1.0",
     "jsonwebtoken": "9.0.0",
     "libphonenumber-js": "1.13.8",
@@ -35,7 +34,6 @@
     "@sendgrid/helpers": "8.0.0",
     "@size-limit/preset-big-lib": "12.0.0",
     "@types/debug": "4.1.13",
-    "@types/google-libphonenumber": "7.4.30",
     "@types/jsonwebtoken": "9.0.1",
     "@types/lodash.difference": "^4.5.6",
     "@types/node": "22.19.7",
@@ -92,5 +90,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.2.0-alpha.33"
+  "version": "25.2.0-alpha.34"
 }

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

@@ -1,33 +0,0 @@
-import { factory } from '../../factory';
-import type { ReserveTransactionRepo } from '../../repo/assetTransaction/reserve';
-import type { IKeyOfProjection, ReservationRepo } from '../../repo/reservation';
-/**
- * 予約検索レスポンスとしての予約
- * 予約ドキュメントに予約取引の情報を補完する
- */
-type IReservationAsFindResult = Omit<factory.reservation.eventReservation.IReservation, 'underName' | 'reservedTicket' | 'reservationFor'> & {
-    underName?: factory.assetTransaction.reserve.IUnderName;
-    reservedTicket?: factory.reservation.eventReservation.IReservedTicket | factory.assetTransaction.reserve.IObjectSubReservation['reservedTicket'];
-    reservationFor?: factory.reservation.eventReservation.IReservationForMinimized | factory.assetTransaction.reserve.IReservationFor;
-    price?: never;
-};
-/**
- * 予約を検索する
- */
-export declare function findReservations(params: factory.reservation.eventReservation.ISearchConditions, options: {
-    inclusion: Partial<Record<IKeyOfProjection | 'underName', 1>>;
-    /**
-     * reservationForを予約ドキュメントそのままで返すかどうか
-     */
-    minimizeReservationFor: boolean;
-    /**
-     * reservedTicketからticketTypeを除外するかどうか
-     */
-    minimizeReservedTicket: boolean;
-}): (repos: {
-    assetTransaction: {
-        reserve: ReserveTransactionRepo;
-    };
-    reservation: ReservationRepo;
-}) => Promise<IReservationAsFindResult[]>;
-export {};

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

@@ -1,61 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findReservations = findReservations;
-/**
- * 予約を検索する
- */
-function findReservations(params, options) {
-    return async (repos) => {
-        const { inclusion, minimizeReservationFor, minimizeReservedTicket } = 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 ticketTypeByTransaction = subReservationByTransaction?.reservedTicket?.ticketType;
-                const reservationForByTransaction = subReservationByTransaction?.reservationFor;
-                const { reservationFor, issuedThrough: _issuedThrough, priceCurrency: _priceCurrency, numSeats: _numSeats, reservedTicket, ...rawReservation4result } = reservation;
-                return {
-                    ...rawReservation4result, // 予約ドキュメントはそのまま返す
-                    ...(requireUnderName && underNameByTransaction !== undefined) ? { underName: underNameByTransaction } : undefined, // underNameがあれば上書き
-                    ...(requireReservedTicket)
-                        ? (!minimizeReservedTicket && ticketTypeByTransaction !== undefined)
-                            ? {
-                                reservedTicket: {
-                                    ...reservedTicket, // 予約ドキュメントのreservedTicketはそのまま返す
-                                    ticketType: ticketTypeByTransaction
-                                }
-                            }
-                            : { reservedTicket } // 予約検索レスポンスからticketTypeは廃止(2026-06-01~)
-                        : undefined,
-                    ...(requireReservationFor)
-                        ? (!minimizeReservationFor && reservationForByTransaction !== undefined)
-                            ? { reservationFor: reservationForByTransaction }
-                            : { reservationFor } // 予約検索レスポンスのreservationForはそのまま返す(2026-06-01~)
-                        : undefined,
-                    // ...(requireReservedTicket && ticketTypeByTransaction !== undefined) // ticketTypeがあれば上書き
-                    //     ? {
-                    //         reservedTicket: {
-                    //             ...reservedTicket, // 予約ドキュメントのreservedTicketはそのまま返す
-                    //             ticketType: ticketTypeByTransaction
-                    //         }
-                    //     }
-                    //     : undefined,
-                    // ...(requireReservationFor && reservationForByTransaction !== undefined)
-                    //     ? { reservationFor: reservationForByTransaction }
-                    //     : undefined, // reservationForがあれば上書き(2026-04-06~)
-                };
-            });
-        }
-    };
-}