@chevre/domain 28.0.0-alpha.9 → 28.1.0-alpha.0

package/lib/chevre/service/transaction/returnOrder/potentialActions/sendEmailMessage.d.ts

@@ -1,12 +1,15 @@
 import { IOrderAsCreateEmailParams } from '../../../../emailMessageBuilder';
 import { factory } from '../../../../factory';
-import type { ISetting } from '../../../../repo/setting';
 type IPotentialSendEmailMessageAction = factory.action.transfer.returnAction.order.IPotentialSendEmailMessageAction;
 export declare function createSendEmailMessaegActionsOnReturn(params: {
     order: IOrderAsCreateEmailParams;
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
-}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
-    emailMessagesOnReturn: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
+}): Promise<{
+    emailMessagesOnReturn: (Pick<factory.action.transfer.send.message.email.IObjectAsEmailMessage, 'about' | 'identifier' | 'name' | 'text' | 'toRecipient' | 'typeOf'> & {
+        sender: Pick<factory.action.transfer.send.message.email.IObjectAsEmailMessage['sender'], 'name' | 'typeOf'> & {
+            email?: never;
+        };
+    })[];
     sendEmailMessaegActionsOnReturn: IPotentialSendEmailMessageAction[];
 }>;
 export {};

package/lib/chevre/service/transaction/returnOrder/potentialActions/sendEmailMessage.js

@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessaegActionsOnReturn = createSendEmailMessaegActionsOnReturn;
 const emailMessageBuilder_1 = require("../../../../emailMessageBuilder");
 const factory_1 = require("../../../../factory");
-async function createSendEmailMessaegActionsOnReturn(params, 
-// settings: Settings
-setting) {
+async function createSendEmailMessaegActionsOnReturn(params) {
     const order = params.order;
     // 返品後のEメール送信アクション
     const emailMessagesOnReturn = [];
@@ -17,10 +15,7 @@ setting) {
                 order,
                 index,
                 ...(sendEmailMessageParams.object !== undefined) ? { email: sendEmailMessageParams.object } : undefined,
-                // ...(params.emailMessageOnOrderReturned !== undefined)
-                //     ? { emailMessage: params.emailMessageOnOrderReturned }
-                //     : undefined
-            }, setting);
+            });
             emailMessagesOnReturn.push(emailMessage);
             return {
                 object: {

package/lib/chevre/service/transaction/returnOrder/potentialActions.d.ts

@@ -1,13 +1,16 @@
 import { factory } from '../../../factory';
-import type { ISetting } from '../../../repo/setting';
 type IReturningOrder4potentialActions = Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'project' | 'seller' | 'typeOf'>;
 declare function createPotentialActions(params: {
     dateReturned: Date;
     orders: IReturningOrder4potentialActions[];
     potentialActions?: factory.transaction.returnOrder.IPotentialActionsParams;
     transaction: Pick<factory.transaction.returnOrder.ITransaction, 'agent' | 'object'>;
-}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
-    emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
+}): Promise<{
+    emailMessages: (Pick<factory.action.transfer.send.message.email.IObjectAsEmailMessage, 'about' | 'identifier' | 'name' | 'text' | 'toRecipient' | 'typeOf'> & {
+        sender: Pick<factory.action.transfer.send.message.email.IObjectAsEmailMessage['sender'], 'name' | 'typeOf'> & {
+            email?: never;
+        };
+    })[];
     potentialActions: factory.transaction.returnOrder.IPotentialActions;
 }>;
 export { createPotentialActions, IReturningOrder4potentialActions };

package/lib/chevre/service/transaction/returnOrder/potentialActions.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = createPotentialActions;
 const factory_1 = require("../../../factory");
+// import type { ISetting } from '../../../repo/setting';
 const returnPaymentMethod_1 = require("./potentialActions/returnPaymentMethod");
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
-async function createPotentialActions(params, setting) {
+async function createPotentialActions(params) {
     const emailMessages = [];
     const returnOrderActions = await Promise.all(params.orders.map(async (order) => {
         let returnOrderParams = params.potentialActions?.returnOrder;
@@ -18,14 +19,14 @@ async function createPotentialActions(params, setting) {
             ...params,
             order,
             ...(returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined
-        }, setting);
+        });
         emailMessages.push(...emailMessagesOnReturnInvoice);
         // 返品後のEメール送信アクション
         const { emailMessagesOnReturn, sendEmailMessaegActionsOnReturn } = await (0, sendEmailMessage_1.createSendEmailMessaegActionsOnReturn)({
             ...params,
             order,
             ...(returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined
-        }, setting);
+        });
         emailMessages.push(...emailMessagesOnReturn);
         const potentialActionsOnReturnOrder = {
             returnPaymentMethod: returnPaymentMethodActions,

package/lib/chevre/service/transaction/returnOrder/preStart/factory.d.ts

@@ -15,6 +15,6 @@ type ICustomSellerReturnPolicy = Pick<factory.sellerReturnPolicy.ISellerReturnPo
     applicablePaymentMethod?: never;
     merchantReturnDays?: never;
 };
-type IFixedAcceptedOffer = Pick<factory.order.IAcceptedOffer, 'id' | 'priceSpecification' | 'itemOffered'>;
+type IFixedAcceptedOffer = Pick<factory.acceptedOffer.IAcceptedOffer, 'id' | 'priceSpecification' | 'itemOffered'>;
 type IFixedOrder = Pick<factory.order.IOrder, 'confirmationNumber' | 'dateReturned' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'paymentMethods' | 'price' | 'project' | 'seller' | 'typeOf'>;
 export { IAvailableSellerReturnPolicy, ICustomSellerReturnPolicy, IFixedAcceptedOffer, IFixedOrder };

package/lib/chevre/service/transaction/returnOrder.d.ts

@@ -10,7 +10,6 @@ import type { ProjectRepo } from '../../repo/project';
 import type { ReservationRepo } from '../../repo/reservation';
 import type { SellerRepo } from '../../repo/seller';
 import type { SellerReturnPolicyRepo } from '../../repo/sellerReturnPolicy';
-import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { IStartedTransaction, ReturnOrderInProgressRepo } from '../../repo/transaction/returnOrderInProgress';
 import { preStart, IStartParamsWithoutDetail } from './returnOrder/preStart';
@@ -36,7 +35,6 @@ interface IConfirmRepos {
     acceptedOffer: AcceptedOfferRepo;
     message: MessageRepo;
     order: OrderRepo;
-    setting: SettingRepo;
     returnOrderInProgress: ReturnOrderInProgressRepo;
     task: TaskRepo;
 }

package/lib/chevre/service/transaction/returnOrder.js

@@ -86,17 +86,17 @@ function confirm(params) {
         if (orderStatus === factory_1.factory.orderStatus.OrderReturned) {
             throw new factory_1.factory.errors.Argument('orderNumber', `invalid orderStatus: ${orderStatus}`);
         }
-        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
-        if (typeof setting?.defaultSenderEmail !== 'string') {
-            throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
-        }
+        // defaultSenderEmail参照不要(2026-10-20~)
+        // const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']) as Pick<ISetting, 'defaultSenderEmail'> | null;
+        // if (typeof setting?.defaultSenderEmail !== 'string') {
+        //     throw new factory.errors.NotFound('setting.defaultSenderEmail');
+        // }
         const { emailMessages, potentialActions } = await (0, potentialActions_1.createPotentialActions)({
             dateReturned: params.object.order.dateReturned,
             orders: returningOrders,
             transaction: transaction,
             ...(params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined,
-            // ...(emailMessageOnOrderReturned !== undefined) ? { emailMessageOnOrderReturned } : undefined
-        }, setting);
+        });
         // save messages(2024-06-27~)
         await saveMessagesIfNeeded({
             project: { id: transaction.project.id },

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "11.0.0-alpha.3",
+    "@chevre/factory": "11.1.0",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.0.0-alpha.9"
+  "version": "28.1.0-alpha.0"
 }

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

@@ -1,28 +0,0 @@
-import type { Connection } from 'mongoose';
-import { factory } from '../factory';
-import { IModel } from './mongoose/schemas/accountTitle';
-/**
- * 科目リポジトリ
- */
-export declare class AccountTitleRepo {
-    readonly accountTitleModel: IModel;
-    constructor(connection: Connection);
-    deleteByProject(params: {
-        project: {
-            id: string;
-        };
-    }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, factory.accountTitle.IAccountTitle, import("./mongoose/virtuals").IVirtuals, {}> & factory.accountTitle.IAccountTitle & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }, import("mongoose").QueryOptions<factory.accountTitle.IAccountTitle>, (import("mongoose").Document<unknown, Record<string, never>, factory.accountTitle.IAccountTitle, import("./mongoose/virtuals").IVirtuals, {}> & factory.accountTitle.IAccountTitle & {
-        _id: import("mongoose").Types.ObjectId;
-    } & {
-        __v: number;
-    }) | null>;
-    unsetUnnecessaryFields(params: {
-        filter: any;
-        $unset: any;
-    }): Promise<import("mongoose").UpdateWriteOpResult>;
-}

package/lib/chevre/repo/accountTitle.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AccountTitleRepo = void 0;
-const factory_1 = require("../factory");
-const accountTitle_1 = require("./mongoose/schemas/accountTitle");
-/**
- * 科目リポジトリ
- */
-class AccountTitleRepo {
-    accountTitleModel;
-    constructor(connection) {
-        this.accountTitleModel = connection.model(accountTitle_1.modelName, (0, accountTitle_1.createSchema)());
-    }
-    async deleteByProject(params) {
-        await this.accountTitleModel.deleteMany({
-            'project.id': { $exists: true, $eq: params.project.id }
-        })
-            .exec();
-    }
-    getCursor(conditions, projection) {
-        return this.accountTitleModel.find(conditions, projection)
-            .sort({ codeValue: factory_1.factory.sortType.Descending })
-            .cursor();
-    }
-    async unsetUnnecessaryFields(params) {
-        return this.accountTitleModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
-            .exec();
-    }
-}
-exports.AccountTitleRepo = AccountTitleRepo;

package/lib/chevre/service/aggregation/project.d.ts

@@ -1,17 +0,0 @@
-import type { ProjectRepo } from '../../repo/project';
-import type { ReservationRepo } from '../../repo/reservation';
-import type { TaskRepo } from '../../repo/task';
-export type IAggregateOperation<T> = (repos: {
-    project: ProjectRepo;
-    reservation: ReservationRepo;
-    task: TaskRepo;
-}) => Promise<T>;
-export declare function aggregate(params: {
-    project: {
-        id: string;
-    };
-    reservationFor: {
-        startFrom: Date;
-        startThrough: Date;
-    };
-}): IAggregateOperation<void>;

package/lib/chevre/service/aggregation/project.js

@@ -1,98 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.aggregate = aggregate;
-/**
- * プロジェクト集計サービス
- */
-const debug_1 = __importDefault(require("debug"));
-const moment_1 = __importDefault(require("moment"));
-const factory_1 = require("../../factory");
-const debug = (0, debug_1.default)('chevre-domain:service');
-function aggregate(params) {
-    return async (repos) => {
-        const now = new Date();
-        // 集計対象プロジェクト検索
-        const project = await repos.project.findById({
-            id: params.project.id,
-            inclusion: ['typeOf']
-        });
-        // 予約集計
-        const { aggregateReservation } = await aggregateReservationOnProject({
-            aggregateDate: now,
-            project: { id: project.id, typeOf: project.typeOf },
-            reservationFor: {
-                startFrom: (0, moment_1.default)(params.reservationFor.startFrom)
-                    .toDate(),
-                startThrough: (0, moment_1.default)(params.reservationFor.startThrough)
-                    .toDate()
-            }
-        })(repos);
-        debug('aggregated. aggregateReservation:', aggregateReservation);
-        // 保管
-        await repos.project.updateAggregateReservation({
-            id: project.id,
-            aggregateReservation
-        });
-    };
-}
-function aggregateReservationOnProject(params) {
-    return async (repos) => {
-        let attendeeCount = 0;
-        let checkInCount = 0;
-        let reservationCount = 0;
-        const reservationForConditions = {
-            startFrom: (0, moment_1.default)(params.reservationFor.startFrom)
-                .add(-1, 'day')
-                .toDate()
-        };
-        while (reservationForConditions.startThrough === undefined
-            || (0, moment_1.default)(params.reservationFor.startThrough)
-                .isAfter((0, moment_1.default)(reservationForConditions.startThrough))) {
-            reservationForConditions.startFrom = (0, moment_1.default)(reservationForConditions.startFrom)
-                .add(1, 'day')
-                .toDate();
-            reservationForConditions.startThrough = (0, moment_1.default)(reservationForConditions.startFrom)
-                .add(1, 'day')
-                .add(-1, 'millisecond')
-                .toDate();
-            debug('counting...', reservationForConditions);
-            reservationCount += await repos.reservation.count({
-                project: { id: { $eq: params.project.id } },
-                typeOf: factory_1.factory.reservationType.EventReservation,
-                reservationFor: reservationForConditions,
-                reservationStatuses: [factory_1.factory.reservationStatusType.ReservationConfirmed]
-            });
-            attendeeCount += await repos.reservation.count({
-                project: { id: { $eq: params.project.id } },
-                typeOf: factory_1.factory.reservationType.EventReservation,
-                reservationFor: reservationForConditions,
-                // reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
-                attended: true
-            });
-            checkInCount += await repos.reservation.count({
-                project: { id: { $eq: params.project.id } },
-                typeOf: factory_1.factory.reservationType.EventReservation,
-                reservationFor: reservationForConditions,
-                // reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
-                checkedIn: true
-            });
-        }
-        return {
-            aggregateReservation: {
-                typeOf: 'AggregateReservation',
-                aggregateDate: params.aggregateDate,
-                reservationFor: {
-                    startDate: `${(0, moment_1.default)(params.reservationFor.startFrom)
-                        .toISOString()}/${(0, moment_1.default)(params.reservationFor.startThrough)
-                        .toISOString()}`
-                },
-                attendeeCount,
-                checkInCount,
-                reservationCount
-            }
-        };
-    };
-}

package/lib/chevre/service/delivery/factory.d.ts

@@ -1,16 +0,0 @@
-import { factory } from '../../factory';
-export type IOwnershipInfo = factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood>;
-/**
- * 注文から所有権を作成する
- */
-export declare function createOwnershipInfosFromOrder(params: {
-    order: Pick<factory.order.IOrder, 'orderDate' | 'project' | 'customer' | 'orderNumber' | 'seller'> & {
-        acceptedOffers: (Omit<factory.order.IAcceptedOffer, 'priceSpecification' | 'name'> & {
-            /**
-             * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
-             */
-            priceSpecification?: factory.order.ITicketPriceSpecification;
-        })[];
-    };
-    offerIndexBase: number;
-}): IOwnershipInfo[];

package/lib/chevre/service/delivery/factory.js

@@ -1,124 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createOwnershipInfosFromOrder = createOwnershipInfosFromOrder;
-const moment_timezone_1 = __importDefault(require("moment-timezone"));
-const util_1 = require("util");
-const factory_1 = require("../../factory");
-// import { createProductOwnershipInfo } from './product/factory';
-const factory_2 = require("./reservation/factory");
-/**
- * 注文から所有権を作成する
- */
-function createOwnershipInfosFromOrder(params) {
-    const ownershipInfos = [];
-    if (!Array.isArray(params.order.acceptedOffers)) {
-        throw new factory_1.factory.errors.ArgumentNull('order.acceptedOffers');
-    }
-    params.order.acceptedOffers.forEach((acceptedOffer, offerIndex) => {
-        const itemOffered = acceptedOffer.itemOffered;
-        let ownershipInfo;
-        const ownedFrom = (0, moment_timezone_1.default)(params.order.orderDate)
-            .toDate();
-        const identifier = createOwnershipInfoIdentifier({
-            order: params.order,
-            itemOffered,
-            offerIndex,
-            offerIndexBase: params.offerIndexBase
-        });
-        const acquiredFrom = createAcquiredFrom(params);
-        const ownedBy = createOwnedby(params);
-        // 所有者があれば所有権を作成する
-        if (ownedBy.length > 0) {
-            const itemOfferedType = itemOffered.typeOf;
-            switch (itemOfferedType) {
-                case factory_1.factory.reservationType.EventReservation: {
-                    const excludeCOAReservation = acceptedOffer.offeredThrough?.identifier === factory_1.factory.service.webAPI.Identifier.COA;
-                    if (excludeCOAReservation) {
-                        // bookingService:COAでは作成しない(2024-12-31~)
-                    }
-                    else {
-                        ownershipInfo = (0, factory_2.createReservationOwnershipInfo)({
-                            project: params.order.project,
-                            ownedBy: ownedBy,
-                            acceptedOffer,
-                            ownedFrom: ownedFrom,
-                            identifier: identifier,
-                            acquiredFrom: acquiredFrom
-                        });
-                    }
-                    break;
-                }
-                // case factory.permit.PermitType.Permit:
-                //     ownershipInfo = createProductOwnershipInfo({
-                //         project: params.order.project,
-                //         ownedBy: ownedBy,
-                //         acceptedOffer: { ...acceptedOffer, itemOffered },
-                //         ownedFrom: ownedFrom,
-                //         identifier: identifier,
-                //         acquiredFrom: acquiredFrom
-                //     });
-                //     break;
-                // case factory.actionType.MoneyTransfer:
-                //     // no op
-                //     // 所有権は発生しない
-                //     break;
-                default:
-                    throw new factory_1.factory.errors.NotImplemented(`Offered item type ${itemOfferedType} not implemented`);
-            }
-        }
-        if (ownershipInfo !== undefined) {
-            ownershipInfos.push(ownershipInfo);
-        }
-    });
-    return ownershipInfos;
-}
-function createOwnershipInfoIdentifier(params) {
-    return (0, util_1.format)('%s-%s-%s-%s', params.order.customer.id, params.itemOffered.typeOf, params.order.orderNumber, (params.offerIndexBase + params.offerIndex));
-}
-function createAcquiredFrom(params) {
-    // 最低限の情報に絞る
-    const seller = params.order.seller;
-    return {
-        // 最適化(2022-11-15~)
-        // project: { typeOf: params.order.project.typeOf, id: params.order.project.id },
-        id: seller.id,
-        typeOf: seller.typeOf,
-        name: (typeof seller.name === 'string')
-            ? seller.name
-            : String(seller.typeOf)
-    };
-}
-function createOwnedby(params) {
-    const customer = params.order.customer;
-    let owner;
-    // 顧客組織の場合
-    if (customer.typeOf === factory_1.factory.organizationType.Organization) {
-        // discontinue(2026-03-15~)
-        // const ownerAsOrganization: factory.ownershipInfo.IOwnerAsOrganization = {
-        //     // 個人情報排除するように
-        //     typeOf: customer.typeOf,
-        //     id: customer.id
-        // };
-        // owner = ownerAsOrganization;
-    }
-    else if (customer.typeOf === factory_1.factory.personType.Person) {
-        const ownerAsPerson = {
-            // 個人情報排除するように
-            typeOf: customer.typeOf,
-            id: customer.id
-        };
-        owner = ownerAsPerson;
-    }
-    else {
-        // discontinue(2026-03-15~)
-        // owner = {
-        //     // 個人情報排除するように
-        //     typeOf: customer.typeOf,
-        //     id: customer.id
-        // };
-    }
-    return (owner !== undefined) ? [owner] : [];
-}