@chevre/domain 28.0.0-alpha.39 → 28.0.0-alpha.40

package/lib/chevre/emailMessageBuilder.js

@@ -71,7 +71,7 @@ function createEmailMessageSender(params, setting) {
         name: (typeof params.email?.sender?.name === 'string')
             ? params.email.sender.name
             : defaultSellerName,
-        email: setting.defaultSenderEmail
+        email: setting.defaultSenderEmail // 送信元未指定であればタスクで自動設定されるがとりあえず指定(2026-10-20~)
     };
 }
 /**

package/lib/chevre/repo/mongoose/schemas/project.d.ts

@@ -3,7 +3,6 @@ import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
 type IDocType = Pick<factory.project.IProject, 'alternateName' | 'hasMerchantReturnPolicy' | 'logo' | 'name' | 'settings' | 'subscription' | 'typeOf'> & {
     _id: string;
-    aggregateReservation?: any;
     makesOffer?: factory.project.IMakesOffer[];
 };
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;

package/lib/chevre/repo/mongoose/schemas/project.js

@@ -9,7 +9,7 @@ const modelName = 'Project';
 exports.modelName = modelName;
 const schemaDefinition = {
     _id: String,
-    aggregateReservation: mongoose_1.SchemaTypes.Mixed,
+    // aggregateReservation: SchemaTypes.Mixed, // discontinue(2026-10-20~)
     alternateName: String,
     logo: String,
     hasMerchantReturnPolicy: mongoose_1.SchemaTypes.Mixed,

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

@@ -40,16 +40,11 @@ export declare class ProjectRepo {
         id: string;
         makesOffer: factory.project.IMakesOffer[];
     }): Promise<void>;
-    updateAggregateReservation(params: {
-        id: string;
-        aggregateReservation?: any;
-    }): Promise<void>;
     deleteById(params: {
         id: string;
     }): Promise<void>;
     getCursor(conditions: FilterQuery<factory.project.IProject>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.project.IProject, "name" | "typeOf" | "logo" | "alternateName" | "hasMerchantReturnPolicy" | "settings" | "subscription"> & {
         _id: string;
-        aggregateReservation?: any;
         makesOffer?: factory.project.IMakesOffer[];
     } & Required<{
         _id: string;
@@ -57,7 +52,6 @@ export declare class ProjectRepo {
         __v: number;
     }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.project.IProject, "name" | "typeOf" | "logo" | "alternateName" | "hasMerchantReturnPolicy" | "settings" | "subscription"> & {
         _id: string;
-        aggregateReservation?: any;
         makesOffer?: factory.project.IMakesOffer[];
     } & Required<{
         _id: string;

package/lib/chevre/repo/project.js

@@ -5,7 +5,6 @@ const project_1 = require("./mongoose/schemas/project");
 const factory_1 = require("../factory");
 const settings_1 = require("../settings");
 const AVAILABLE_PROJECT_FIELDS = [
-    // 'aggregateReservation',
     'alternateName',
     'logo',
     'hasMerchantReturnPolicy',
@@ -157,17 +156,6 @@ class ProjectRepo {
         }, { projection: { _id: 1 } })
             .exec();
     }
-    async updateAggregateReservation(params) {
-        await this.projectModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
-            $set: {
-                ...(params.aggregateReservation !== undefined) ? { aggregateReservation: params.aggregateReservation } : undefined
-            }
-            // $unset: {
-            //     noExistingAttributeName: 1 // $unsetは空だとエラーになるので
-            // }
-        }, { new: true, projection: { _id: 1 } })
-            .exec();
-    }
     async deleteById(params) {
         await this.projectModel.deleteOne({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
             .exec();

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

@@ -2,8 +2,6 @@
  * 集計サービス
  */
 import * as EventAggregation from './aggregation/event';
-import * as ProjectAggregation from './aggregation/project';
 import * as SystemAggregation from './aggregation/system';
 export import event = EventAggregation;
-export import project = ProjectAggregation;
 export import system = SystemAggregation;

package/lib/chevre/service/aggregation.js

@@ -33,13 +33,11 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.system = exports.project = exports.event = void 0;
+exports.system = exports.event = void 0;
 /**
  * 集計サービス
  */
 const EventAggregation = __importStar(require("./aggregation/event"));
-const ProjectAggregation = __importStar(require("./aggregation/project"));
 const SystemAggregation = __importStar(require("./aggregation/system"));
 exports.event = EventAggregation;
-exports.project = ProjectAggregation;
 exports.system = SystemAggregation;

package/lib/chevre/service/notification/sendEmailMessage.js

@@ -14,6 +14,28 @@ function createSendEmailMessageActionAttributes(params) {
         ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
     };
 }
+/**
+ * 送信元アドレスを決定する
+ */
+function fixSenderEmail(project, emailMessage) {
+    return async (repos) => {
+        let serderEmail = emailMessage.sender.email;
+        if (typeof serderEmail !== 'string' || serderEmail === '') {
+            // 指定がなければ、強制的にグローバル設定を適用(2026-10-19~)
+            const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
+            if (typeof setting?.defaultSenderEmail !== 'string') {
+                throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
+            }
+            serderEmail = setting.defaultSenderEmail;
+        }
+        // プロジェクト設定対応(2023-08-21~)
+        const senderEmailByProjectSettings = project.settings?.sendEmailMessage?.sender?.email;
+        if (typeof senderEmailByProjectSettings === 'string' && senderEmailByProjectSettings !== '') {
+            serderEmail = senderEmailByProjectSettings;
+        }
+        return serderEmail;
+    };
+}
 function createMailData(params) {
     return async (repos) => {
         const project = await repos.project.findById({
@@ -41,20 +63,10 @@ function createMailData(params) {
                 project: { id: project.id }
             });
         }
-        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
-        if (typeof setting?.defaultSenderEmail !== 'string') {
-            throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
-        }
         const emailMessageFrom = {
             name: emailMessage.sender.name,
-            // email: emailMessage.sender.email // 指定されたsenderEmailを適用しない(2026-10-19~)
-            email: setting.defaultSenderEmail // 強制的にグローバル設定を適用(2026-10-19~)
+            email: await fixSenderEmail(project, emailMessage)(repos)
         };
-        // プロジェクト設定対応(2023-08-21~)
-        const senderEmailByProjectSettings = project.settings?.sendEmailMessage?.sender?.email;
-        if (typeof senderEmailByProjectSettings === 'string' && senderEmailByProjectSettings.length > 0) {
-            emailMessageFrom.email = senderEmailByProjectSettings;
-        }
         const subject = emailMessage.about.name;
         const emailDatas = (Array.isArray(emailMessage.toRecipient))
             ? emailMessage.toRecipient.map((toRecipient) => {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.d.ts

@@ -3,7 +3,7 @@ import type { TaskRepo } from '../../../../repo/task';
 import { factory } from '../../../../factory';
 declare function createSendEmailMessageTaskIfNotExist(params: {
     sendEmailMessage?: {
-        object: factory.action.transfer.send.message.email.IOptimizedObject;
+        object: factory.action.transfer.send.message.email.IObjectByIdentifier;
     }[];
     order: Pick<factory.order.IOrder, 'customer' | 'orderDate' | 'orderNumber' | 'price' | 'priceCurrency' | 'project' | 'typeOf'>;
 }): (repos: {

package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions.d.ts

@@ -19,6 +19,5 @@ export declare function createPotentialActions(params: {
     paymentMethods: factory.order.IReferencedInvoice[];
     potentialActions?: IPotentialActionsParams;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
-    potentialActions?: never;
-    emailMessages: factory.creativeWork.message.email.ICreativeWork[];
+    emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
 }>;

package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions.js

@@ -10,10 +10,5 @@ async function createPotentialActions(params, setting) {
     const { emailMessages } = await (0, sendEmailMessage_1.createSendEmailMessageActions)(params, setting);
     return {
         emailMessages,
-        // potentialActions: {
-        //     order: {
-        //         onOrderProcessing: { sendEmailMessage: sendEmailMessageActions } // optimize(2024-06-29~)
-        //     }
-        // }
     };
 }

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.1.0-alpha.8",
+    "@chevre/factory": "11.1.0-alpha.9",
     "@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.39"
+  "version": "28.0.0-alpha.40"
 }

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