@chevre/domain 25.2.0-alpha.5 → 25.2.0-alpha.50

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

@@ -1,22 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateAgent = updateAgent;
-const google_libphonenumber_1 = require("google-libphonenumber");
 const factory_1 = require("../../../factory");
-function fixCustomer(params) {
+const fixCustomer_1 = require("./updateAgent/fixCustomer");
+/**
+ * 取引人プロフィール更新
+ */
+function updateAgent(params) {
     return async (repos) => {
-        let formattedTelephone;
-        try {
-            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
@@ -24,77 +15,17 @@ function fixCustomer(params) {
         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) {
-    return async (repos) => {
-        const { customer, transaction } = await fixCustomer(params)(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
-            });
-        }
-        // return newAgent;
+        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/lib/chevre/service/transaction/returnOrder/preStart.js

@@ -28,7 +28,7 @@ function preStart(params) {
         await validateOrder({ orders })();
         let offers = [];
         if (offerIds.length > 0) {
-            offers = await repos.offer.search({
+            offers = await repos.offer.findUnitPriceOffers({
                 id: { $in: offerIds }
             });
         }

package/lib/chevre/service.d.ts

@@ -17,6 +17,7 @@ import type * as AnyPaymentService from './service/payment/any';
 import type * as ProjectService from './service/project';
 import type * as ReserveService from './service/reserve';
 import type * as TaskService from './service/task';
+import type * as AsyncActionService from './service/asyncAction';
 import type * as TransactionService from './service/transaction';
 export declare namespace aggregation {
     function createService(): Promise<typeof AggregationService>;
@@ -53,6 +54,9 @@ export declare namespace reserve {
 export declare namespace task {
     function createService(): Promise<typeof TaskService>;
 }
+export declare namespace asyncAction {
+    function createService(): Promise<typeof AsyncActionService>;
+}
 export declare namespace transaction {
     function createService(): Promise<typeof TransactionService>;
 }

package/lib/chevre/service.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.factory = exports.transaction = exports.task = exports.reserve = exports.project = exports.payment = exports.order = exports.offer = exports.notification = exports.iam = exports.event = exports.assetTransaction = exports.aggregation = void 0;
+exports.factory = exports.transaction = exports.asyncAction = exports.task = exports.reserve = exports.project = exports.payment = exports.order = exports.offer = exports.notification = exports.iam = exports.event = exports.assetTransaction = exports.aggregation = void 0;
 /* eslint-disable @typescript-eslint/no-namespace */
 /**
  * service module
@@ -167,6 +167,17 @@ var task;
     }
     task.createService = createService;
 })(task || (exports.task = task = {}));
+var asyncAction;
+(function (asyncAction) {
+    let service;
+    async function createService() {
+        if (service === undefined) {
+            service = await import('./service/asyncAction.js');
+        }
+        return service;
+    }
+    asyncAction.createService = createService;
+})(asyncAction || (exports.asyncAction = asyncAction = {}));
 var transaction;
 (function (transaction) {
     let service;

package/lib/chevre/taskSettings.d.ts

@@ -24,13 +24,11 @@ interface IExecuteOptions {
     executeById: boolean;
     executeByName: boolean;
 }
-type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;
 type IOperationExecute<T> = (settings: IExecuteSettings, options: IExecuteOptions) => Promise<T>;
 type ICallResult = void | Pick<factory.task.IExecutionResult, 'error'>;
-type ICallableTaskOperationSimple = (taskData: factory.task.IData<factory.taskName>) => IOperation<void>;
 type ICallableTaskOperation = (task: IExecutableTask<factory.taskName>) => IOperationExecute<ICallResult>;
 type IExecutableTaskKeys = 'data' | 'id' | 'name' | 'status' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'expires';
 type IExecutableTask<T extends factory.taskName> = Pick<factory.task.ITask<T>, IExecutableTaskKeys> & {
     status: factory.taskStatus.Running;
 };
-export { ICallableTaskOperation, ICallableTaskOperationSimple, ICallResult, IExecutableTask, IExecutableTaskKeys, IExecuteSettings, IExecuteOptions, IOperationExecute, AggregationSettings };
+export { ICallableTaskOperation, ICallResult, IExecutableTask, IExecutableTaskKeys, IExecuteSettings, IExecuteOptions, IOperationExecute, AggregationSettings };

package/package.json

@@ -9,24 +9,24 @@
     }
   ],
   "dependencies": {
-    "@aws-sdk/client-cognito-identity-provider": "3.600.0",
-    "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "9.5.0-alpha.3",
+    "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
+    "@aws-sdk/credential-providers": "3.1090.0",
+    "@chevre/factory": "10.1.0-alpha.1",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
     "@surfrock/sdk": "2.0.0",
     "debug": "4.4.3",
-    "google-libphonenumber": "^3.2.18",
     "http-status": "2.1.0",
     "jsonwebtoken": "9.0.0",
+    "libphonenumber-js": "1.13.8",
     "lodash.difference": "^4.5.0",
     "moment": "^2.29.1",
     "moment-timezone": "^0.5.33",
     "node-fpe": "2.0.4",
     "pug": "3.0.3",
     "uniqid": "5.4.0",
-    "uuid": "^3.4.0"
+    "uuid": "11.1.1"
   },
   "devDependencies": {
     "@eslint/js": "9.39.4",
@@ -34,21 +34,18 @@
     "@sendgrid/helpers": "8.0.0",
     "@size-limit/preset-big-lib": "12.0.0",
     "@types/debug": "4.1.13",
-    "@types/google-libphonenumber": "^7.4.19",
     "@types/jsonwebtoken": "9.0.1",
     "@types/lodash.difference": "^4.5.6",
     "@types/node": "22.19.7",
     "@types/pug": "2.0.10",
     "@types/uniqid": "^4.1.3",
-    "@types/uuid": "^3.4.10",
     "@vitest/coverage-v8": "4.0.18",
     "@vitest/ui": "4.0.18",
     "csvtojson": "^2.0.10",
     "dependency-cruiser": "17.3.8",
     "eslint": "9.39.2",
-    "mongodb": "6.20.0",
     "mongoose": "8.23.0",
-    "redis": "4.6.5",
+    "redis": "4.7.1",
     "rimraf": "6.1.3",
     "size-limit": "12.0.0",
     "typescript": "5.9.3",
@@ -57,7 +54,7 @@
   },
   "peerDependencies": {
     "mongoose": "^8.23.0",
-    "redis": "^4.6.5"
+    "redis": "^4.7.1"
   },
   "engines": {
     "node": ">=22.0.0",
@@ -91,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.2.0-alpha.5"
+  "version": "25.2.0-alpha.50"
 }

package/lib/chevre/service/order/findConfirmedPlaceOrder.d.ts

@@ -1,13 +0,0 @@
-import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
-import { factory } from '../../factory';
-type ITransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'potentialActions' | 'project' | 'typeOf'>;
-export declare function findConfirmedPlaceOrder(params: {
-    project: {
-        id: string;
-    };
-    confirmationNumber: string;
-    orderNumber: string;
-}): (repos: {
-    placeOrder: PlaceOrderRepo;
-}) => Promise<ITransaction>;
-export {};

package/lib/chevre/service/order/findConfirmedPlaceOrder.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findConfirmedPlaceOrder = findConfirmedPlaceOrder;
-const factory_1 = require("../../factory");
-function findConfirmedPlaceOrder(params) {
-    return async (repos) => {
-        const placeOrderTransactions = await repos.placeOrder.findPlaceOrderTransactions({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: params.project.id } },
-            typeOf: factory_1.factory.transactionType.PlaceOrder,
-            statuses: [factory_1.factory.transactionStatusType.Confirmed],
-            // resultではなくobjectで参照するように変更(2026-06-16~)
-            object: {
-                confirmationNumber: { $eq: params.confirmationNumber },
-                orderNumber: { $eq: params.orderNumber },
-            },
-            // result: {
-            //     order: {
-            //         confirmationNumber: { $eq: params.confirmationNumber },
-            //         orderNumbers: [params.orderNumber]
-            //     }
-            // },
-            inclusion: ['potentialActions', 'project', 'typeOf']
-        });
-        const placeOrderTransaction = placeOrderTransactions.shift();
-        if (placeOrderTransaction === undefined) {
-            throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.PlaceOrder);
-        }
-        return placeOrderTransaction;
-    };
-}

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~)
-                };
-            });
-        }
-    };
-}