@chevre/domain 22.11.0-alpha.9 → 22.12.0-alpha.0

package/lib/chevre/repo/transaction.js

@@ -323,7 +323,7 @@ class TransactionRepo {
                 .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} not found`);
             }
             return doc;
         });
@@ -371,7 +371,7 @@ class TransactionRepo {
                 .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
             }
             return doc;
         });
@@ -389,7 +389,7 @@ class TransactionRepo {
                 .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${factory.transactionType.PlaceOrder} ${factory.transactionStatusType.InProgress} not found`);
             }
             return doc.object.paymentMethods;
         });
@@ -407,7 +407,7 @@ class TransactionRepo {
                 .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${factory.transactionType.PlaceOrder} ${factory.transactionStatusType.InProgress} not found`);
             }
             return doc.object.orderNumber;
         });
@@ -425,7 +425,7 @@ class TransactionRepo {
                 .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${factory.transactionType.PlaceOrder} ${params.status.$in.join(' or ')} not found`);
             }
             return doc.object.confirmationNumber;
         });
@@ -448,7 +448,7 @@ class TransactionRepo {
                 .lean()
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
             }
         });
     }
@@ -471,7 +471,7 @@ class TransactionRepo {
                 .lean()
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
             }
         });
     }
@@ -494,7 +494,7 @@ class TransactionRepo {
                 .lean()
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
             }
         });
     }
@@ -538,7 +538,7 @@ class TransactionRepo {
                         .isSameOrBefore(moment(endDate))) {
                         throw new factory.errors.Argument('Transaction id', 'potentially expired');
                     }
-                    throw new factory.errors.NotFound(this.transactionModel.modelName);
+                    throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
                 }
             }
             transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
@@ -914,7 +914,7 @@ class TransactionRepo {
                     throw new factory.errors.Argument('Transaction id', 'Confirmed transaction unable to cancel');
                 }
                 else {
-                    throw new factory.errors.NotFound(this.transactionModel.modelName);
+                    throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
                 }
             }
             transaction_1.transactionEventEmitter.emitTransactionStatusChanged({

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -28,7 +28,7 @@ function aggregateScreeningEvent(params) {
     ) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         // 集計対象イベント検索
-        const event = yield repos.event.projectEventFieldsById({ id: params.id }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.id', 'superEvent.location.id', 'offers.itemOffered']);
+        const event = yield repos.event.projectEventFieldsById({ id: params.id }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.id', 'superEvent.location.id', 'offers.itemOffered', 'maximumPhysicalAttendeeCapacity']);
         // プロジェクト設定検索
         const project = yield repos.project.findById({
             id: event.project.id,
@@ -66,7 +66,7 @@ function aggregateScreeningEvent(params) {
                         startFrom: startFrom,
                         startThrough: startThrough,
                         location: { branchCode: { $eq: event.location.branchCode } }
-                    }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered']);
+                    }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered', 'maximumPhysicalAttendeeCapacity']);
                 }
                 else if (event.typeOf === factory.eventType.ScreeningEvent) {
                     aggregatingEvents = yield repos.event.projectEventFields({
@@ -78,7 +78,7 @@ function aggregateScreeningEvent(params) {
                         startFrom: startFrom,
                         startThrough: startThrough,
                         location: { branchCode: { $eq: event.location.branchCode } }
-                    }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered']);
+                    }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered', 'maximumPhysicalAttendeeCapacity']);
                 }
                 // ID指定されたイベントについてはEventScheduledでなくても集計したいので、集計対象を調整
                 aggregatingEvents = aggregatingEvents.filter((e) => e.id !== event.id);
@@ -234,7 +234,10 @@ function aggregateReservationByEvent(params) {
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed]
         });
         // maximumAttendeeCapacityを決定
-        const eventLocationMaximumAttendeeCapacity = params.event.location.maximumAttendeeCapacity;
+        let eventLocationMaximumAttendeeCapacity = params.event.location.maximumAttendeeCapacity;
+        if (typeof params.event.maximumPhysicalAttendeeCapacity === 'number') {
+            eventLocationMaximumAttendeeCapacity = params.event.maximumPhysicalAttendeeCapacity;
+        }
         if (typeof eventLocationMaximumAttendeeCapacity === 'number') {
             maximumAttendeeCapacity = eventLocationMaximumAttendeeCapacity;
         }

package/lib/chevre/service/assetTransaction/cancelReservation/start.d.ts

@@ -18,7 +18,7 @@ export declare function validateStartParams(params: IStartParams): (repos: {
     assetTransaction: AssetTransactionRepo;
 }) => Promise<{
     reserveTransaction: import("@chevre/factory/lib/assetTransaction/reserve").ITransaction | undefined;
-    reservations: (Pick<import("@chevre/factory/lib/reservation/event").IReservation, "id" | "typeOf" | "reservationNumber" | "issuedThrough"> & {
+    reservations: (Pick<import("@chevre/factory/lib/reservation/event").IReservation, "id" | "typeOf" | "issuedThrough" | "reservationNumber"> & {
         reservationFor: Pick<factory.reservation.IReservationFor<factory.reservationType.EventReservation>, "id" | "typeOf">;
     })[] | undefined;
 }>;

package/lib/chevre/service/assetTransaction/registerService.js

@@ -56,6 +56,10 @@ function start(params) {
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }
+        if (product.typeOf !== factory.product.ProductType.MembershipService
+            && product.typeOf !== factory.product.ProductType.PaymentCard) {
+            throw new factory.errors.Argument('object.itemOffered.id', `invalid product type: ${product.typeOf}`);
+        }
         const transactionNumber = params.transactionNumber;
         if (typeof transactionNumber !== 'string' || transactionNumber.length === 0) {
             throw new factory.errors.ArgumentNull('transactionNumber');

package/lib/chevre/service/assetTransaction/reserve/start/createSubReservations.js

@@ -187,22 +187,25 @@ function searchAvailableAddOns(params) {
                 const { offers, product } = yield OfferService.product.search(Object.assign({ ids: params.ids, project: { id: params.project.id }, itemOffered: { id: addOnProductId }, onlyValid: true, addSortIndex: false, includedInDataCatalog: { id: '' }, useIncludeInDataCatalog: false }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                     ? { availableAt: { id: params.availableAtOrFrom.id } }
                     : undefined))(repos);
-                availableAddOns.push(...offers.map((o) => {
-                    const itemOffered4addOn = {
-                        description: product.description,
-                        id: product.id,
-                        name: product.name,
-                        productID: product.productID,
-                        typeOf: product.typeOf
-                    };
-                    const unitPriceSpec = o.priceSpecification.priceComponent.find((component) => {
-                        return component.typeOf === factory.priceSpecificationType.UnitPriceSpecification;
-                    });
-                    if ((unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.typeOf) !== factory.priceSpecificationType.UnitPriceSpecification) {
-                        throw new factory.errors.NotFound('UnitPriceSpecification of an addOn');
-                    }
-                    return Object.assign(Object.assign({ alternateName: o.alternateName, availability: o.availability, description: o.description, id: String(o.id), identifier: o.identifier, itemOffered: itemOffered4addOn, name: o.name, priceCurrency: o.priceCurrency, priceSpecification: unitPriceSpec, typeOf: o.typeOf }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined);
-                }));
+                const productType = product.typeOf;
+                if (productType === factory.product.ProductType.Product) {
+                    availableAddOns.push(...offers.map((o) => {
+                        const itemOffered4addOn = {
+                            description: product.description,
+                            id: product.id,
+                            name: product.name,
+                            productID: product.productID,
+                            typeOf: productType
+                        };
+                        const unitPriceSpec = o.priceSpecification.priceComponent.find((component) => {
+                            return component.typeOf === factory.priceSpecificationType.UnitPriceSpecification;
+                        });
+                        if ((unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.typeOf) !== factory.priceSpecificationType.UnitPriceSpecification) {
+                            throw new factory.errors.NotFound('UnitPriceSpecification of an addOn');
+                        }
+                        return Object.assign(Object.assign({ alternateName: o.alternateName, availability: o.availability, description: o.description, id: String(o.id), identifier: o.identifier, itemOffered: itemOffered4addOn, name: o.name, priceCurrency: o.priceCurrency, priceSpecification: unitPriceSpec, typeOf: o.typeOf }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined);
+                    }));
+                }
             }
         }
         return availableAddOns;

package/lib/chevre/service/assetTransaction/reserve/start.js

@@ -100,7 +100,7 @@ function fixEvent(params) {
             // additionalProperty, // discontinue(2024-07-20~)
             'name', 'doorTime', 'endDate', 'eventStatus',
             'location', 'startDate', 'superEvent',
-            'offers'
+            'offers', 'maximumPhysicalAttendeeCapacity'
             // 'coaInfo', // discontinue(2024-07-24~)
             // 'identifier' // discontinue(2024-07-24~)
         ]);
@@ -504,6 +504,7 @@ function processLockOfferRateLimit(params) {
 /**
  * 座席ロックプロセス
  */
+// tslint:disable-next-line:max-func-body-length
 function processLockSeats(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
@@ -554,6 +555,9 @@ function processLockSeats(params) {
         const bookingTime = params.transaction.startDate; // fix as transactionNumber(2024-07-02~)
         const hasTicketedSeat = ((_d = (_c = (_b = params.event.offers.itemOffered.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservedTicket) === null || _c === void 0 ? void 0 : _c.ticketedSeat) === null || _d === void 0 ? void 0 : _d.typeOf) === factory.placeType.Seat;
         let maximumAttendeeCapacity4event = (_e = params.event.location) === null || _e === void 0 ? void 0 : _e.maximumAttendeeCapacity;
+        if (typeof params.event.maximumPhysicalAttendeeCapacity === 'number') {
+            maximumAttendeeCapacity4event = params.event.maximumPhysicalAttendeeCapacity;
+        }
         // 座席無の場合デフォルトmaximumAttendeeCapacityを適用(2025-04-20~)
         if (!hasTicketedSeat) {
             if (typeof maximumAttendeeCapacity4event !== 'number') {

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

@@ -1,31 +1,8 @@
-import type { AuthorizationRepo } from '../repo/authorization';
-import type { JWTSettingRepo } from '../repo/setting/jwt';
-import type { TicketRepo } from '../repo/ticket';
-import * as factory from '../factory';
-type IToken = string;
-interface IPayload extends Pick<factory.clientUser.IClientUser, 'aud' | 'exp' | 'iat' | 'iss' | 'sub' | 'token_use' | 'typ' | 'version'> {
-    version: string;
-    typ: string;
-    jti?: string;
-}
+/**
+ * 承認サービス
+ * ひとまず不要なので廃止(2025-07-18~)
+ */
 /**
  * コードをトークンに変換する
  */
-declare function getToken(params: {
-    agent: {
-        id: string;
-        typeOf: factory.creativeWorkType.SoftwareApplication | factory.creativeWorkType.WebApplication | factory.personType.Person;
-    };
-    project: {
-        id: string;
-    };
-    code: string;
-    expiresIn: number;
-}): (repos: {
-    authorization: AuthorizationRepo;
-    jwtSetting: JWTSettingRepo;
-    ticket: TicketRepo;
-}) => Promise<{
-    token: IToken;
-}>;
-export { IPayload, getToken };
+export {};

package/lib/chevre/service/code.js

@@ -1,83 +1,7 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getToken = getToken;
 /**
  * 承認サービス
+ * ひとまず不要なので廃止(2025-07-18~)
  */
-const jwt = require("jsonwebtoken");
-const factory = require("../factory");
-/**
- * コードをトークンに変換する
- */
-function getToken(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const jwtSetting = yield repos.jwtSetting.findDefault();
-        if (typeof params.project.id !== 'string' || params.project.id.length === 0) {
-            throw new factory.errors.ArgumentNull('project.id');
-        }
-        if (typeof params.code !== 'string' || params.code.length === 0) {
-            throw new factory.errors.ArgumentNull('code');
-        }
-        const authorization = yield repos.authorization.findValidOneByCode({
-            project: { id: params.project.id },
-            code: params.code
-        });
-        // if (typeof params.issuer !== 'string' || params.issuer.length === 0) {
-        //     throw new factory.errors.ArgumentNull('issuer');
-        // }
-        let subject;
-        let typ;
-        // jti必須化(2024-08-22~)
-        const { id } = yield repos.ticket.issueByTicketToken(Object.assign({ project: { id: params.project.id }, ticketToken: params.code }, (typeof ((_a = authorization.issuedBy) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { issuedBy: authorization.issuedBy } : undefined));
-        const jti = id;
-        // ロール承認の場合、subjectはメンバーID,typはメンバータイプ
-        if (authorization.object.typeOf === factory.role.RoleType.OrganizationRole) {
-            subject = authorization.object.member.id;
-            typ = `${jwtSetting.payloadTypPrefix}:${authorization.object.member.typeOf}`;
-        }
-        else {
-            // useJtiの場合、subject,typはagent(2024-05-09~)
-            subject = params.agent.id;
-            typ = `${jwtSetting.payloadTypPrefix}:${params.agent.typeOf}`;
-        }
-        const payload = {
-            token_use: 'access', // 拡張(2024-05-01~)
-            version: jwtSetting.version, // 拡張(2024-05-02~)
-            typ //  拡張(2024-05-07~)
-        };
-        const token = yield new Promise((resolve, reject) => {
-            // 所有権を暗号化する
-            jwt.sign(payload, jwtSetting.secret, {
-                algorithm: jwtSetting.algorithm, // 明示的に指定(2024-05-05~)
-                issuer: jwtSetting.issuer, // 都度指定に変更(2024-05-05~)
-                expiresIn: params.expiresIn,
-                subject, // 拡張(2024-05-01~)
-                audience: jwtSetting.issuer, // 拡張(2024-05-02~)
-                jwtid: jti // 拡張(2024-05-08~)
-            }, (err, encoded) => {
-                if (err instanceof Error) {
-                    reject(err);
-                }
-                else {
-                    if (typeof encoded !== 'string') {
-                        reject(new factory.errors.Internal('authorization.object cannot be signed unexpectedly'));
-                    }
-                    else {
-                        resolve(encoded);
-                    }
-                }
-            });
-        });
-        return { token };
-    });
-}
+// import * as jwt from 'jsonwebtoken';
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -8,7 +8,7 @@ export type IPermission = string;
 /**
  * プロジェクトメンバーの権限を検索する
  */
-export declare function searchPermissions(params: {
+export declare function findProjectPermissionsByMember(params: {
     project: {
         id: string;
     };
@@ -23,10 +23,20 @@ export declare function searchPermissions(params: {
     member: MemberRepo;
     role: RoleRepo;
 }) => Promise<{
-    hasRole: {
-        roleName: string;
-    }[];
-    permissions: {
-        _id: string;
-    }[];
+    roleNames: string[];
+    permissions: string[];
+}>;
+/**
+ * グローバル権限を検索する
+ */
+export declare function findGloablPermissionsByMember(params: {
+    member: {
+        id: string;
+    };
+}): (repos: {
+    member: MemberRepo;
+    role: RoleRepo;
+}) => Promise<{
+    roleNames: string[];
+    permissions: string[];
 }>;

package/lib/chevre/service/iam.js

@@ -9,14 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.searchPermissions = searchPermissions;
+exports.findProjectPermissionsByMember = findProjectPermissionsByMember;
+exports.findGloablPermissionsByMember = findGloablPermissionsByMember;
 /**
  * プロジェクトメンバーの権限を検索する
  */
-function searchPermissions(params) {
+function findProjectPermissionsByMember(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let permissions = [];
-        const hasRole = yield repos.member.aggregateRoleNames({
+        // const hasRole = await repos.member.aggregateRoleNames({
+        const roleNames = yield repos.member.findRoleNamesByMember({
             project: { id: { $eq: params.project.id } },
             member: {
                 id: { $eq: params.member.id },
@@ -26,9 +28,27 @@ function searchPermissions(params) {
                 }
             }
         });
-        if (hasRole.length > 0) {
-            permissions = yield repos.role.aggregatePermissions({ roleName: { $in: hasRole.map((r) => r.roleName) } });
+        if (roleNames.length > 0) {
+            // permissions = await repos.role.aggregatePermissions({ roleName: { $in: hasRole.map((r) => r.roleName) } });
+            permissions = yield repos.role.findUniquePermissionsByRoleName({ roleName: { $in: roleNames } });
         }
-        return { hasRole, permissions };
+        return { roleNames, permissions };
+    });
+}
+/**
+ * グローバル権限を検索する
+ */
+function findGloablPermissionsByMember(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let permissions = [];
+        const roleNames = yield repos.member.findGlobalRoleNamesByMember({
+            member: {
+                id: { $eq: params.member.id }
+            }
+        });
+        if (roleNames.length > 0) {
+            permissions = yield repos.role.findUniquePermissionsByRoleName({ roleName: { $in: roleNames } });
+        }
+        return { roleNames, permissions };
     });
 }

package/lib/chevre/service/notification/notifyAbortedTasksByEmail.d.ts

@@ -0,0 +1,15 @@
+import { SendGridCredentials } from '../../credentials/sendGrid';
+import type { TaskRepo } from '../../repo/task';
+import { Settings } from '../../settings';
+/**
+ * 中止されたタスクリストをEメールで通知する
+ * add(2025-03-13~)
+ */
+declare function notifyAbortedTasksByEmail(params: {
+    dateAbortedGte: Date;
+}): (repos: {
+    task: TaskRepo;
+}, settings: Pick<Settings, "abortedTasksWithoutReport">, credentials: {
+    sendGrid: SendGridCredentials;
+}) => Promise<void>;
+export { notifyAbortedTasksByEmail };

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

@@ -0,0 +1,38 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.notifyAbortedTasksByEmail = notifyAbortedTasksByEmail;
+const createDebug = require("debug");
+const factory = require("../../factory");
+const factory_1 = require("./factory");
+const notifyByEmail_1 = require("./notifyByEmail");
+const debug = createDebug('chevre-domain:service:notification');
+/**
+ * 中止されたタスクリストをEメールで通知する
+ * add(2025-03-13~)
+ */
+function notifyAbortedTasksByEmail(params) {
+    return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
+        const { abortedTasksWithoutReport } = settings;
+        const abortedTasks = yield repos.task.projectFields(Object.assign({ status: { $eq: factory.taskStatus.Aborted }, dateAborted: { $gte: params.dateAbortedGte } }, (abortedTasksWithoutReport.length > 0)
+            ? { name: { $nin: abortedTasksWithoutReport } }
+            : undefined), []);
+        if (abortedTasks.length > 0) {
+            // 開発者へ報告
+            const message = (0, factory_1.tasks2lineNotify)({ tasks: abortedTasks });
+            const notifyResult = yield (0, notifyByEmail_1.notifyByEmail)({
+                subject: message.subject, content: message.content,
+                logLevel: 'error'
+            })({}, credentials);
+            debug('notifyResult:', notifyResult);
+        }
+    });
+}

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

@@ -1,4 +1,5 @@
+import { notifyAbortedTasksByEmail } from './notification/notifyAbortedTasksByEmail';
 import { notifyByEmail } from './notification/notifyByEmail';
 import { sendEmailMessage } from './notification/sendEmailMessage';
 import { triggerWebhook } from './notification/triggerWebhook';
-export { notifyByEmail, sendEmailMessage, triggerWebhook };
+export { notifyAbortedTasksByEmail, notifyByEmail, sendEmailMessage, triggerWebhook };

package/lib/chevre/service/notification.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.triggerWebhook = exports.sendEmailMessage = exports.notifyByEmail = void 0;
+exports.triggerWebhook = exports.sendEmailMessage = exports.notifyByEmail = exports.notifyAbortedTasksByEmail = void 0;
+const notifyAbortedTasksByEmail_1 = require("./notification/notifyAbortedTasksByEmail");
+Object.defineProperty(exports, "notifyAbortedTasksByEmail", { enumerable: true, get: function () { return notifyAbortedTasksByEmail_1.notifyAbortedTasksByEmail; } });
 const notifyByEmail_1 = require("./notification/notifyByEmail");
 Object.defineProperty(exports, "notifyByEmail", { enumerable: true, get: function () { return notifyByEmail_1.notifyByEmail; } });
 const sendEmailMessage_1 = require("./notification/sendEmailMessage");

package/lib/chevre/service/offer/product.js

@@ -189,6 +189,10 @@ function fixProductAndOffers(params) {
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }
+        if (product.typeOf !== factory.product.ProductType.MembershipService
+            && product.typeOf !== factory.product.ProductType.PaymentCard) {
+            throw new factory.errors.Argument('object.itemOffered.id', `invalid product type: ${product.typeOf}`);
+        }
         const { offers } = yield search(Object.assign({ ids: params.object.map((o) => String(o.id)), project: { id: params.project.id }, itemOffered: { id: String(product.id) }, onlyValid: true, includedInDataCatalog: { id: '' }, addSortIndex: false, useIncludeInDataCatalog: false }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { availableAt: { id: params.location.id } } : undefined))(repos);
         return { product, availableOffers: offers };
     });

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

@@ -8,7 +8,12 @@ import type { OrderRepo } from '../../repo/order';
 import type { ProjectRepo } from '../../repo/project';
 import type { TaskRepo } from '../../repo/task';
 import type { TransactionRepo } from '../../repo/transaction';
-declare function confirmPayTransaction(data: factory.task.IData<factory.taskName.ConfirmPayTransaction>, options: {}): (repos: {
+declare function confirmPayTransaction(data: factory.task.IData<factory.taskName.ConfirmPayTransaction> & {
+    project: {
+        id: string;
+        typeOf: factory.organizationType.Project;
+    };
+}, options: {}): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/processOrder.js

@@ -60,14 +60,14 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
         }
         yield Promise.all(confirmObjects.map((confirmObject) => __awaiter(this, void 0, void 0, function* () {
             const data = {
-                project: order.project,
+                // project: order.project, // discontinue(2025-08-20~)
                 typeOf: factory.actionType.ConfirmAction,
                 object: confirmObject,
-                agent: order.project,
+                // agent: order.project, // discontinue(2025-08-20~)
                 purpose: simpleOrder
                 // instrument廃止(2024-03-13~)
             };
-            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmReserveTransaction, data.purpose.typeOf, data.purpose.orderNumber, data.object.typeOf, data.object.transactionNumber);
+            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', order.project.id, factory.taskName.ConfirmReserveTransaction, data.purpose.typeOf, data.purpose.orderNumber, data.object.typeOf, data.object.transactionNumber);
             const confirmReserveTransactionTask = {
                 alternateName: taskIdentifier,
                 identifier: taskIdentifier,

package/lib/chevre/service/task/acceptCOAOffer.d.ts

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

package/lib/chevre/service/task/aggregateOffers.d.ts

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

package/lib/chevre/service/task/aggregateOffers.js

@@ -32,7 +32,7 @@ function call(data) {
         yield (0, aggregateOffers_1.aggregateOffers)(data)({
             aggregateReservation: new aggregateReservation_1.AggregateReservationRepo(connection),
             event: new event_1.EventRepo(connection),
-            stockHolder: new stockHolder_1.StockHolderRepo(redisClient, connection),
+            stockHolder: new stockHolder_1.StockHolderRepo({ connection }),
             offer: new unitPriceInCatalog_1.OfferRepo(connection),
             offerCatalog: new offerCatalog_1.OfferCatalogRepo(connection),
             offerRateLimit: new offer_1.OfferRateLimitRepo(redisClient),

package/lib/chevre/service/task/aggregateOnSystem.d.ts

@@ -1,3 +1,5 @@
 import * as factory from '../../factory';
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
-export declare function call(params: Pick<factory.task.aggregateOnSystem.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
+export declare function call(params: Pick<factory.task.aggregateOnSystem.ITask, IExecutableTaskKeys> & {
+    status: factory.taskStatus.Running;
+}): IOperationExecute<ICallResult>;

package/lib/chevre/service/task/aggregateScreeningEvent.d.ts

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

package/lib/chevre/service/task/aggregateScreeningEvent.js

@@ -32,7 +32,7 @@ function call(data) {
         }
         yield AggregationService.event.aggregateScreeningEvent(data)({
             event: new event_1.EventRepo(connection),
-            stockHolder: new stockHolder_1.StockHolderRepo(redisClient, connection),
+            stockHolder: new stockHolder_1.StockHolderRepo({ connection }),
             offer: new unitPriceInCatalog_1.OfferRepo(connection),
             offerCatalog: new offerCatalog_1.OfferCatalogRepo(connection),
             offerRateLimit: new offer_1.OfferRateLimitRepo(redisClient),

package/lib/chevre/service/task/authorizePayment.d.ts

@@ -1,4 +1,4 @@
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

package/lib/chevre/service/task/cancelMoneyTransfer.d.ts

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

package/lib/chevre/service/task/cancelPendingReservation.d.ts

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */