@chevre/domain 21.18.0-alpha.9 → 21.18.0

package/lib/chevre/service/offer/product.d.ts

@@ -1,13 +1,13 @@
 import * as factory from '../../factory';
 import type { MongoRepository as AccountRepo } from '../../repo/account';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
-import type { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/action/registerServiceInProgress';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { MongoRepository as OfferRepo } from '../../repo/offer';
 import type { MongoRepository as OfferCatalogRepo } from '../../repo/offerCatalog';
 import type { RedisRepository as OrderNumberRepo } from '../../repo/orderNumber';
 import type { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
+import type { MongoRepository as ProductOfferRepo } from '../../repo/productOffer';
 import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as ServiceOutputRepo } from '../../repo/serviceOutput';
 import type { RedisRepository as ServiceOutputIdentifierRepo } from '../../repo/serviceOutputIdentifier';
@@ -22,8 +22,8 @@ export interface IAuthorizeOperationRepos {
     orderNumber: OrderNumberRepo;
     ownershipInfo: OwnershipInfoRepo;
     product: ProductRepo;
+    productOffer: ProductOfferRepo;
     project: ProjectRepo;
-    registerActionInProgress: RegisterServiceInProgressRepo;
     serviceOutput: ServiceOutputRepo;
     serviceOutputIdentifier: ServiceOutputIdentifierRepo;
     transaction: TransactionRepo;
@@ -63,9 +63,10 @@ export declare function search(params: {
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
     product: ProductRepo;
+    productOffer: ProductOfferRepo;
 }) => Promise<{
     offers: factory.product.ITicketOffer[];
-    product: factory.product.IProduct;
+    product: Omit<factory.product.IProduct, "offers">;
 }>;
 export type IAuthorizeOfferAction = factory.action.authorize.offer.product.IAction;
 /**
@@ -94,17 +95,5 @@ export declare function authorize(params: {
 export declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidRegisterServiceTransaction>): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
-    registerActionInProgress: RegisterServiceInProgressRepo;
     transaction: TransactionRepo;
 }) => Promise<void>;
-export declare function processUnlockRegisterMembershipService(params: {
-    agent: {
-        id: string;
-    };
-    product: {
-        id: string;
-    };
-    purpose: factory.action.authorize.offer.product.IPurpose;
-}): (repos: {
-    registerActionInProgress: RegisterServiceInProgressRepo;
-}) => Promise<void>;

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processUnlockRegisterMembershipService = exports.voidTransaction = exports.authorize = exports.search = exports.ERROR_MESSAGE_ALREADY_REGISTERED = void 0;
+exports.voidTransaction = exports.authorize = exports.search = exports.ERROR_MESSAGE_ALREADY_REGISTERED = void 0;
 const moment = require("moment");
 const factory = require("../../factory");
 const accountTransactionIdentifier_1 = require("../../factory/accountTransactionIdentifier");
@@ -26,7 +26,7 @@ function search(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const now = moment();
-        const searchProductsResult = yield repos.product.search({
+        const searchProductsResult = yield repos.product.searchProducts({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -39,14 +39,20 @@ function search(params) {
         // 販売者指定の場合、検証
         if (product.typeOf === factory.product.ProductType.MembershipService
             || product.typeOf === factory.product.ProductType.PaymentCard) {
-            if (typeof ((_a = params.seller) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-                const productOffers = product.offers;
-                if (!Array.isArray(productOffers)) {
-                    return { offers: [], product };
-                }
+            const sellerId = (_a = params.seller) === null || _a === void 0 ? void 0 : _a.id;
+            if (typeof sellerId === 'string') {
+                // const productOffers = product.offers;
+                // if (!Array.isArray(productOffers)) {
+                //     return { offers: [], product };
+                // }
+                const productOffers = yield repos.productOffer.search({
+                    project: { id: { $eq: params.project.id } },
+                    itemOffered: { id: { $eq: params.itemOffered.id } },
+                    seller: { id: { $eq: sellerId } }
+                });
                 const hasValidOffer = productOffers.some((o) => {
-                    var _a, _b;
-                    return ((_a = o.seller) === null || _a === void 0 ? void 0 : _a.id) === ((_b = params.seller) === null || _b === void 0 ? void 0 : _b.id)
+                    var _a;
+                    return ((_a = o.seller) === null || _a === void 0 ? void 0 : _a.id) === sellerId
                         && o.validFrom !== undefined
                         && moment(o.validFrom)
                             .isSameOrBefore(now)
@@ -111,7 +117,7 @@ function authorize(params) {
             availableOffers,
             seller: transaction.seller,
             orderNumber
-        })();
+        })(repos);
         acceptedOffer = yield createServiceOutputIdentifier({ acceptedOffer, product })(repos);
         let requestBody;
         let responseBody;
@@ -129,11 +135,12 @@ function authorize(params) {
         try {
             // 会員の場合のみ排他ロック
             if (params.agent.typeOf === factory.personType.Person) {
-                yield processLockRegisterMembershipService({
-                    agent: params.agent,
-                    product: product,
-                    purpose: { typeOf: transaction.typeOf, id: transaction.id }
-                })(repos);
+                // 廃止(2023-12-07~)
+                // await processLockRegisterMembershipService({
+                //     agent: params.agent,
+                //     product: product,
+                //     purpose: { typeOf: transaction.typeOf, id: transaction.id }
+                // })(repos);
             }
             // サービス登録開始
             const startParams = (0, factory_1.createRegisterServiceStartParams)({
@@ -155,11 +162,12 @@ function authorize(params) {
                 // no op
             }
             try {
-                yield processUnlockRegisterMembershipService({
-                    agent: params.agent,
-                    product: { id: String(product.id) },
-                    purpose: { typeOf: transaction.typeOf, id: transaction.id }
-                })(repos);
+                // 廃止(2023-12-07~)
+                // await processUnlockRegisterMembershipService({
+                //     agent: params.agent,
+                //     product: { id: String(product.id) },
+                //     purpose: { typeOf: transaction.typeOf, id: transaction.id }
+                // })(repos);
             }
             catch (error) {
                 // 失敗したら仕方ない
@@ -176,7 +184,7 @@ function fixProductAndOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         const productId = String((_b = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.id);
-        const searchProductsResult = yield repos.product.search({
+        const searchProductsResult = yield repos.product.searchProducts({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -233,11 +241,12 @@ function voidTransaction(params) {
             var _b, _c;
             const productId = (_c = (_b = action.object[0]) === null || _b === void 0 ? void 0 : _b.itemOffered) === null || _c === void 0 ? void 0 : _c.id;
             if (typeof productId === 'string') {
-                yield processUnlockRegisterMembershipService({
-                    agent: { id: transaction.agent.id },
-                    product: { id: productId },
-                    purpose: params.purpose
-                })(repos);
+                // 廃止(2023-12-07~)
+                // await processUnlockRegisterMembershipService({
+                //     agent: { id: transaction.agent.id },
+                //     product: { id: productId },
+                //     purpose: params.purpose
+                // })(repos);
             }
             yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
             yield processVoidRegisterServiceTransaction({
@@ -275,7 +284,7 @@ function processVoidRegisterServiceTransaction(params) {
  * 受け入れらたオファーの内容を検証
  */
 function validateAcceptedOffers(params) {
-    return () => __awaiter(this, void 0, void 0, function* () {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         let acceptedOfferWithoutDetail = params.object;
         if (!Array.isArray(acceptedOfferWithoutDetail)) {
             acceptedOfferWithoutDetail = [acceptedOfferWithoutDetail];
@@ -290,10 +299,15 @@ function validateAcceptedOffers(params) {
             typeOf: params.seller.typeOf
         };
         // 販売者を検証
-        const productOffers = params.product.offers;
-        if (!Array.isArray(productOffers)) {
-            throw new factory.errors.Argument('Product', 'Product offers undefined');
-        }
+        // const productOffers = params.product.offers;
+        // if (!Array.isArray(productOffers)) {
+        //     throw new factory.errors.Argument('Product', 'Product offers undefined');
+        // }
+        const productOffers = yield repos.productOffer.search({
+            project: { id: { $eq: params.product.project.id } },
+            itemOffered: { id: { $eq: String(params.product.id) } },
+            seller: { id: { $eq: params.seller.id } }
+        });
         const hasValidOffer = productOffers.some((o) => {
             var _a;
             return ((_a = o.seller) === null || _a === void 0 ? void 0 : _a.id) === params.seller.id;
@@ -382,29 +396,43 @@ function createServiceOutputIdentifier(params) {
         })));
     });
 }
-function processLockRegisterMembershipService(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        if (params.product.typeOf === factory.product.ProductType.MembershipService) {
-            yield repos.registerActionInProgress.lock({
-                agent: { id: params.agent.id },
-                product: { id: String(params.product.id) }
-            }, params.purpose.id);
-        }
-    });
-}
-function processUnlockRegisterMembershipService(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // 登録ロックIDが取引IDであればロック解除
-        const holder = yield repos.registerActionInProgress.getHolder({
-            agent: { id: params.agent.id },
-            product: { id: params.product.id }
-        });
-        if (holder === params.purpose.id) {
-            yield repos.registerActionInProgress.unlock({
-                agent: { id: params.agent.id },
-                product: { id: params.product.id }
-            });
-        }
-    });
-}
-exports.processUnlockRegisterMembershipService = processUnlockRegisterMembershipService;
+// function processLockRegisterMembershipService(params: {
+//     agent: { id: string };
+//     product: factory.product.IProduct;
+//     purpose: factory.action.authorize.offer.product.IPurpose;
+// }) {
+//     return async (repos: {
+//         registerActionInProgress: RegisterServiceInProgressRepo;
+//     }) => {
+//         if (params.product.typeOf === factory.product.ProductType.MembershipService) {
+//             await repos.registerActionInProgress.lock(
+//                 {
+//                     agent: { id: params.agent.id },
+//                     product: { id: String(params.product.id) }
+//                 },
+//                 params.purpose.id
+//             );
+//         }
+//     };
+// }
+// export function processUnlockRegisterMembershipService(params: {
+//     agent: { id: string };
+//     product: { id: string };
+//     purpose: factory.action.authorize.offer.product.IPurpose;
+// }) {
+//     return async (repos: {
+//         registerActionInProgress: RegisterServiceInProgressRepo;
+//     }) => {
+//         // 登録ロックIDが取引IDであればロック解除
+//         const holder = await repos.registerActionInProgress.getHolder({
+//             agent: { id: params.agent.id },
+//             product: { id: params.product.id }
+//         });
+//         if (holder === params.purpose.id) {
+//             await repos.registerActionInProgress.unlock({
+//                 agent: { id: params.agent.id },
+//                 product: { id: params.product.id }
+//             });
+//         }
+//     };
+// }

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

@@ -5,7 +5,6 @@ import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { MongoRepository as EventRepo } from '../../repo/event';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
-import type { MongoRepository as ProductRepo } from '../../repo/product';
 import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
@@ -16,7 +15,6 @@ declare function confirmPayTransaction(data: factory.task.IData<factory.taskName
     order: OrderRepo;
     accountingReport: AccountingReportRepo;
     event: EventRepo;
-    product: ProductRepo;
     project: ProjectRepo;
     task: TaskRepo;
     transaction: TransactionRepo;

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

@@ -36,7 +36,6 @@ function confirmPayTransaction(data) {
                     assetTransaction: repos.assetTransaction,
                     event: repos.event,
                     order: repos.order,
-                    product: repos.product,
                     project: repos.project,
                     task: repos.task
                 });

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

@@ -1,5 +1,7 @@
 import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import * as factory from '../../factory';
-export declare function createAccountingReportIfNotExist(params: factory.order.IOrder): (repos: {
+export declare function createAccountingReportIfNotExist(params: factory.order.IOrder & {
+    acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+}): (repos: {
     accountingReport: AccountingReportRepo;
 }) => Promise<void>;

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

@@ -28,7 +28,10 @@ exports.createAccountingReportIfNotExist = createAccountingReportIfNotExist;
 // 最適化(2023-06-30~)
 function createOrder4report(params) {
     var _a;
-    const numItems = (Array.isArray(params.acceptedOffers)) ? params.acceptedOffers.length : 0;
+    if (!Array.isArray(params.acceptedOffers)) {
+        throw new factory.errors.ArgumentNull('order.acceptedOffers');
+    }
+    const numItems = params.acceptedOffers.length;
     // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
     const acceptedOffers = (Array.isArray(params.acceptedOffers))
         ? params.acceptedOffers.map((o) => {

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

@@ -1,3 +1,4 @@
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as EventRepo } from '../../repo/event';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
@@ -11,6 +12,7 @@ import * as factory from '../../factory';
 declare function deleteOrder(params: {
     object: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'confirmationNumber' | 'orderDate' | 'orderNumber'>;
 }): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
     event: EventRepo;
     order: OrderRepo;

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

@@ -21,7 +21,7 @@ function deleteOrder(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const orders = yield repos.order.search({
             orderNumbers: [params.object.orderNumber]
-        });
+        }, { orderDate: 1, project: 1, customer: 1, orderNumber: 1, seller: 1 });
         const order = orders.shift();
         if (order === undefined) {
             // すでに削除済
@@ -50,7 +50,10 @@ function deleteOrder(params) {
 exports.deleteOrder = deleteOrder;
 function deleteReservationsByOrder(order) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            orderNumber: { $eq: order.orderNumber },
+            project: { id: { $eq: order.project.id } }
+        });
         const reservationIds = acceptedOffers.filter((o) => {
             return o.itemOffered.typeOf === factory.reservationType.EventReservation;
         })
@@ -66,7 +69,12 @@ function deleteOwnershipInfosByOrder(order) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
         // 所有権作成
-        const ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({ order });
+        const ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
+            order: Object.assign(Object.assign({}, order), { acceptedOffers: yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                    orderNumber: { $eq: order.orderNumber },
+                    project: { id: { $eq: order.project.id } }
+                }) })
+        });
         const ownershipIdentifiers = ownershipInfos.map((o) => String(o.identifier));
         if (ownershipIdentifiers.length > 0) {
             yield repos.ownershipInfo.deleteExpiredByIdentifiers({
@@ -81,7 +89,10 @@ function deleteOwnershipInfosByOrder(order) {
 function deleteEventsByOrder(order) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
-        const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            orderNumber: { $eq: order.orderNumber },
+            project: { id: { $eq: order.project.id } }
+        });
         const reservationForIds = acceptedOffers.filter((o) => {
             return (o.itemOffered.typeOf === factory.reservationType.EventReservation
                 || o.itemOffered.typeOf === factory.reservationType.BusReservation)

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

@@ -1,5 +1,6 @@
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
 import * as factory from '../../factory';
+type ITransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'potentialActions' | 'project' | 'typeOf'>;
 export declare function findPlaceOrderTransaction(params: {
     project: {
         id: string;
@@ -8,4 +9,5 @@ export declare function findPlaceOrderTransaction(params: {
     orderNumber: string;
 }): (repos: {
     transaction: TransactionRepo;
-}) => Promise<factory.transaction.placeOrder.ITransaction>;
+}) => Promise<ITransaction>;
+export {};

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

@@ -13,7 +13,6 @@ exports.findPlaceOrderTransaction = void 0;
 const factory = require("../../factory");
 function findPlaceOrderTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // 注文取引検索
         const placeOrderTransactions = yield repos.transaction.search({
             limit: 1,
             page: 1,
@@ -26,7 +25,7 @@ function findPlaceOrderTransaction(params) {
                     orderNumbers: [params.orderNumber]
                 }
             },
-            inclusion: [],
+            inclusion: ['id', 'potentialActions', 'project', 'typeOf'],
             exclusion: []
         });
         const placeOrderTransaction = placeOrderTransactions.shift();

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

@@ -1,9 +1,11 @@
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
 import * as factory from '../../factory';
 declare function onAssetTransactionStatusChanged(params: factory.task.IData<factory.taskName.OnAssetTransactionStatusChanged>): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
     task: TaskRepo;
@@ -17,6 +19,7 @@ declare function paymentDue2Processing(params: {
     orderNumber: string;
     useOnOrderStatusChanged: boolean;
 }): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     order: OrderRepo;
     task: TaskRepo;
     transaction: TransactionRepo;

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

@@ -138,7 +138,7 @@ function paymentDue2Processing(params) {
             orderNumber: params.orderNumber,
             project: { id: params.project.id },
             inclusion: [],
-            exclusion: []
+            exclusion: ['acceptedOffers']
         });
         try {
             order = yield repos.order.changeStatus({
@@ -155,7 +155,7 @@ function paymentDue2Processing(params) {
                 orderNumber: params.orderNumber,
                 project: { id: params.project.id },
                 inclusion: [],
-                exclusion: []
+                exclusion: ['acceptedOffers']
             });
             if (order.orderStatus === factory.orderStatus.OrderDelivered
                 || order.orderStatus === factory.orderStatus.OrderReturned) {
@@ -166,8 +166,13 @@ function paymentDue2Processing(params) {
             }
         }
         if (params.useOnOrderStatusChanged) {
+            // 全acceptedOffersを検索(2023-12-08~)
+            const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                orderNumber: { $eq: order.orderNumber },
+                project: { id: { $eq: params.project.id } }
+            });
             yield (0, onOrderStatusChanged_1.onOrderProcessing)({
-                order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
+                order: Object.assign(Object.assign({}, order), { acceptedOffers, orderStatus: factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
                  }),
                 placeOrderTransaction
             })({
@@ -212,8 +217,11 @@ function cancelOrderIfExist(params) {
             }
             if (params.useOnOrderStatusChanged) {
                 yield (0, onOrderStatusChanged_1.onOrderCancelled)({
-                    order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderCancelled // 強制的にOrderCancelledとして処理する
-                     }),
+                    order: {
+                        orderDate: order.orderDate,
+                        orderNumber: order.orderNumber,
+                        orderStatus: factory.orderStatus.OrderCancelled // 強制的にOrderCancelledとして処理する
+                    },
                     placeOrderTransaction
                 })({
                     task: repos.task

package/lib/chevre/service/order/onOrderStatusChanged/onOrderCancelled/factory.d.ts

@@ -6,6 +6,6 @@ import * as factory from '../../../../factory';
  * 注文中止時のアクション
  */
 declare function createOnOrderCancelledTasksByTransaction(params: {
-    transaction?: factory.transaction.placeOrder.ITransaction;
+    transaction?: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf'>;
 }): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
 export { createOnOrderCancelledTasksByTransaction };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderCancelled.d.ts

@@ -1,8 +1,8 @@
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
-type IPlaceOrderTransaction = factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
+type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf'>;
 declare function onOrderCancelled(params: {
-    order: factory.order.IOrder;
+    order: Pick<factory.order.IOrder, 'orderNumber' | 'orderDate' | 'orderStatus'>;
     placeOrderTransaction?: IPlaceOrderTransaction;
 }): (repos: {
     task: TaskRepo;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDelivered/factory.d.ts

@@ -1,5 +1,5 @@
 import * as factory from '../../../../factory';
-type IDeliveredOrder = factory.order.IOrder & {
+type IDeliveredOrder = Pick<factory.order.IOrder, 'id' | 'customer' | 'orderNumber' | 'project' | 'typeOf'> & {
     orderStatus: factory.orderStatus.OrderDelivered;
 };
 declare function createInformTasks(order: IDeliveredOrder): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDelivered.d.ts

@@ -1,14 +1,12 @@
-import type { RedisRepository as RegisterServiceInProgressRepo } from '../../../repo/action/registerServiceInProgress';
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
-type IPlaceOrderTransaction = factory.transaction.ITransaction<factory.transactionType.PlaceOrder>;
+type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'potentialActions'>;
 declare function onOrderDelivered(params: {
-    order: Omit<factory.order.IOrder, 'orderStatus'> & {
+    order: Pick<factory.order.IOrder, 'id' | 'customer' | 'orderDate' | 'orderNumber' | 'project' | 'typeOf'> & {
         orderStatus: factory.orderStatus.OrderDelivered;
     };
     placeOrderTransaction?: IPlaceOrderTransaction;
 }): (repos: {
-    registerActionInProgress: RegisterServiceInProgressRepo;
     task: TaskRepo;
 }) => Promise<void>;
 export { onOrderDelivered };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDelivered.js

@@ -15,7 +15,6 @@ exports.onOrderDelivered = void 0;
  */
 const createDebug = require("debug");
 const factory = require("../../../factory");
-const product_1 = require("../../offer/product");
 const factory_1 = require("./onOrderDelivered/factory");
 const debug = createDebug('chevre-domain:service:order');
 function onOrderDelivered(params) {
@@ -23,20 +22,6 @@ function onOrderDelivered(params) {
         var _a, _b, _c, _d, _e;
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
-        // const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
-        // const simpleOrder: factory.order.ISimpleOrder = {
-        //     typeOf: params.order.typeOf,
-        //     seller: {
-        //         id: params.order.seller.id,
-        //         typeOf: params.order.seller.typeOf,
-        //         name: params.order.seller.name
-        //     },
-        //     customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
-        //     orderNumber: params.order.orderNumber,
-        //     price: params.order.price,
-        //     priceCurrency: params.order.priceCurrency,
-        //     orderDate: params.order.orderDate
-        // };
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderDelivered:
                 tasks = [
@@ -50,24 +35,20 @@ function onOrderDelivered(params) {
                 try {
                     const placeOrderTransaction = params.placeOrderTransaction;
                     if (typeof (placeOrderTransaction === null || placeOrderTransaction === void 0 ? void 0 : placeOrderTransaction.id) === 'string') {
+                        // 廃止(2023-12-07~)
                         // プロダクト登録プロセスロック解除(orderからproductIdを抽出する)
-                        if (Array.isArray(params.order.acceptedOffers)) {
-                            const productIds4unlock = params.order.acceptedOffers
-                                .filter((o) => {
-                                var _a;
-                                return o.itemOffered.typeOf === factory.permit.PermitType.Permit
-                                    && typeof ((_a = o.itemOffered.issuedThrough) === null || _a === void 0 ? void 0 : _a.id) === 'string'
-                                    && o.itemOffered.issuedThrough.id.length > 0;
-                            })
-                                .map((o) => { var _a; return String((_a = o.itemOffered.issuedThrough) === null || _a === void 0 ? void 0 : _a.id); });
-                            yield Promise.all(productIds4unlock.map((productId) => __awaiter(this, void 0, void 0, function* () {
-                                yield (0, product_1.processUnlockRegisterMembershipService)({
-                                    agent: { id: String(params.order.customer.id) },
-                                    product: { id: productId },
-                                    purpose: { typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id }
-                                })(repos);
-                            })));
-                        }
+                        // const productIds4unlock = params.order.acceptedOffers
+                        //     .filter((o) => o.itemOffered.typeOf === factory.permit.PermitType.Permit
+                        //         && typeof o.itemOffered.issuedThrough?.id === 'string'
+                        //         && o.itemOffered.issuedThrough.id.length > 0)
+                        //     .map((o) => String((<factory.order.IPermit>o.itemOffered).issuedThrough?.id));
+                        // await Promise.all(productIds4unlock.map(async (productId) => {
+                        //     await processUnlockRegisterMembershipService({
+                        //         agent: { id: String(params.order.customer.id) },
+                        //         product: { id: productId },
+                        //         purpose: { typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id }
+                        //     })(repos);
+                        // }));
                     }
                 }
                 catch (error) {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.d.ts

@@ -1,7 +1,7 @@
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 declare function onOrderPaymentDue(params: {
-    order: Omit<factory.order.IOrder, 'orderStatus'> & {
+    order: Pick<factory.order.IOrder, 'paymentMethods' | 'project' | 'orderNumber' | 'confirmationNumber' | 'customer' | 'orderDate' | 'seller' | 'typeOf' | 'price' | 'priceCurrency'> & {
         orderStatus: factory.orderStatus.OrderPaymentDue;
     };
 }): (repos: {