@chevre/domain 21.20.0-alpha.2 → 21.20.0-alpha.20

package/lib/chevre/repo/order.js

@@ -24,7 +24,9 @@ class MongoRepository {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24;
-        const andConditions = [];
+        const andConditions = [
+            { typeOf: { $eq: factory.order.OrderType.Order } }
+        ];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
@@ -663,7 +665,13 @@ class MongoRepository {
     createIfNotExist(order) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                yield this.orderModel.findOneAndUpdate({ orderNumber: order.orderNumber }, { $setOnInsert: order }, { new: true, upsert: true })
+                // 存在しなければ上書き
+                // updateOneに変更(2024-01-14~)
+                // await this.orderModel.findOneAndUpdate(
+                yield this.orderModel.updateOne({ orderNumber: order.orderNumber }, { $setOnInsert: order }, {
+                    // new: true,
+                    upsert: true
+                })
                     .exec();
             }
             catch (error) {
@@ -688,7 +696,8 @@ class MongoRepository {
             const doc = yield this.orderModel.findOneAndUpdate({
                 orderNumber: { $eq: params.orderNumber },
                 orderStatus: { $eq: params.previousOrderStatus },
-                'project.id': { $eq: params.project.id }
+                'project.id': { $eq: params.project.id },
+                typeOf: { $eq: factory.order.OrderType.Order }
             }, {
                 previousOrderStatus: params.previousOrderStatus,
                 orderStatus: params.orderStatus
@@ -735,7 +744,8 @@ class MongoRepository {
             const doc = yield this.orderModel.findOneAndUpdate({
                 orderNumber: { $eq: params.orderNumber },
                 orderStatus: { $eq: factory.orderStatus.OrderDelivered },
-                'project.id': { $eq: params.project.id }
+                'project.id': { $eq: params.project.id },
+                typeOf: { $eq: factory.order.OrderType.Order }
             }, {
                 previousOrderStatus: factory.orderStatus.OrderDelivered,
                 orderStatus: factory.orderStatus.OrderReturned,
@@ -785,7 +795,8 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.orderModel.findOneAndUpdate({
                 orderNumber: { $eq: params.orderNumber },
-                'project.id': { $eq: params.project.id }
+                'project.id': { $eq: params.project.id },
+                typeOf: { $eq: factory.order.OrderType.Order }
             }, {
                 $set: Object.assign(Object.assign({}, (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined), (typeof params.name === 'string') ? { name: params.name } : undefined)
             }, {
@@ -810,6 +821,7 @@ class MongoRepository {
             const doc = yield this.orderModel.findOneAndUpdate({
                 orderNumber: { $eq: params.orderNumber },
                 'project.id': { $eq: params.project.id },
+                typeOf: { $eq: factory.order.OrderType.Order },
                 'paymentMethods.paymentMethodId': { $exists: true, $eq: params.invoice.paymentMethodId }
             }, {
                 $set: {
@@ -854,7 +866,10 @@ class MongoRepository {
                     });
                 }
             }
-            const doc = yield this.orderModel.findById({ _id: params.id }, projection)
+            const doc = yield this.orderModel.findOne({
+                _id: params.id,
+                typeOf: { $eq: factory.order.OrderType.Order }
+            }, projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.orderModel.modelName);
@@ -890,7 +905,8 @@ class MongoRepository {
             }
             const doc = yield this.orderModel.findOne({
                 orderNumber: { $eq: params.orderNumber },
-                'project.id': { $eq: params.project.id }
+                'project.id': { $eq: params.project.id },
+                typeOf: { $eq: factory.order.OrderType.Order }
             }, projection)
                 .exec();
             if (doc === null) {
@@ -908,7 +924,7 @@ class MongoRepository {
                 orderNumber: 1,
                 _id: 0
             };
-            const doc = yield this.orderModel.findOne(Object.assign({ orderNumber: { $eq: params.orderNumber }, 'project.id': { $eq: params.project.id }, acceptedOffers: {
+            const doc = yield this.orderModel.findOne(Object.assign({ orderNumber: { $eq: params.orderNumber }, 'project.id': { $eq: params.project.id }, typeOf: { $eq: factory.order.OrderType.Order }, acceptedOffers: {
                     $elemMatch: {
                         'itemOffered.typeOf': { $in: [factory.reservationType.BusReservation, factory.reservationType.EventReservation] },
                         'itemOffered.id': { $eq: params.reservationId }
@@ -928,7 +944,10 @@ class MongoRepository {
      */
     deleteByOrderNumber(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.orderModel.deleteOne({ orderNumber: params.orderNumber })
+            yield this.orderModel.deleteOne({
+                orderNumber: params.orderNumber,
+                typeOf: { $eq: factory.order.OrderType.Order }
+            })
                 .exec();
         });
     }

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

@@ -0,0 +1,27 @@
+import type { Connection } from 'mongoose';
+import * as factory from '../factory';
+type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'> & {
+    typeOf: factory.transactionType.PlaceOrder;
+    acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+};
+/**
+ * 取引中注文リポジトリ
+ */
+export declare class MongoRepository {
+    private readonly orderModel;
+    constructor(connection: Connection);
+    /**
+     * 注文を受注する
+     */
+    placeOrder(order: factory.order.IOrder): Promise<void>;
+    acceptOffer(params: Pick<IOrderInTransaction, 'acceptedOffers' | 'orderNumber' | 'project'>): Promise<import("mongodb").UpdateResult | undefined>;
+    voidAcceptedOfferByReservationNumber(params: {
+        orderNumber: string;
+        acceptedOffers: {
+            reservationNumber: {
+                $in: string[];
+            };
+        };
+    }): Promise<import("mongodb").UpdateResult>;
+}
+export {};

package/lib/chevre/repo/orderInTransaction.js

@@ -0,0 +1,77 @@
+"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.MongoRepository = void 0;
+const factory = require("../factory");
+const order_1 = require("./mongoose/schemas/order");
+/**
+ * 取引中注文リポジトリ
+ */
+class MongoRepository {
+    constructor(connection) {
+        this.orderModel = connection.model(order_1.modelName, (0, order_1.createSchema)());
+    }
+    /**
+     * 注文を受注する
+     */
+    placeOrder(order) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // typeOf:PlaceOrderのドキュメントが存在すれば、typeOf:Orderに変更する
+            yield this.orderModel.updateOne({
+                orderNumber: { $eq: order.orderNumber },
+                typeOf: { $eq: factory.transactionType.PlaceOrder }
+            }, { $set: order }, {})
+                .exec();
+        });
+    }
+    acceptOffer(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!Array.isArray(params.acceptedOffers) || params.acceptedOffers.length === 0) {
+                return;
+            }
+            return this.orderModel.updateOne({
+                typeOf: { $eq: factory.transactionType.PlaceOrder },
+                orderNumber: { $eq: params.orderNumber }
+            }, {
+                $setOnInsert: {
+                    typeOf: factory.transactionType.PlaceOrder,
+                    orderNumber: params.orderNumber,
+                    project: params.project
+                },
+                $push: {
+                    acceptedOffers: {
+                        $each: params.acceptedOffers
+                    }
+                }
+            }, { upsert: true })
+                .exec();
+        });
+    }
+    voidAcceptedOfferByReservationNumber(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.orderModel.updateOne({
+                typeOf: { $eq: factory.transactionType.PlaceOrder },
+                orderNumber: { $eq: params.orderNumber }
+            }, {
+                $pull: {
+                    acceptedOffers: {
+                        'itemOffered.reservationNumber': {
+                            $exists: true,
+                            $in: params.acceptedOffers.reservationNumber.$in
+                        }
+                    }
+                }
+            })
+                .exec();
+        });
+    }
+}
+exports.MongoRepository = MongoRepository;

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

@@ -39,9 +39,7 @@ export declare class MongoRepository {
      * 取引削除タスク冪等作成
      */
     createDeleteTransactionTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.DeleteTransaction>, options: IOptionOnCreate): Promise<void>;
-    createConfirmReserveTransactionTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.ConfirmReserveTransaction>, options: IOptionOnCreate): Promise<void>;
     createOnAssetTransactionStatusChangedTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.OnAssetTransactionStatusChanged>, options: IOptionOnCreate): Promise<void>;
-    createSendOrderTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.SendOrder>, options: IOptionOnCreate): Promise<void>;
     executeById(params: {
         id: string;
         executor: {

package/lib/chevre/repo/task.js

@@ -243,31 +243,36 @@ class MongoRepository {
             }
         });
     }
-    createConfirmReserveTransactionTaskIfNotExist(params, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const createdTask = yield this.taskModel.findOneAndUpdate({
-                'project.id': { $eq: params.project.id },
-                name: { $eq: params.name },
-                'data.object.transactionNumber': {
-                    $exists: true,
-                    $eq: String(params.data.object.transactionNumber)
-                },
-                'data.purpose.orderNumber': {
-                    $exists: true,
-                    $eq: String(params.data.purpose.orderNumber)
-                }
-            }, { $setOnInsert: params }, { new: true, upsert: true })
-                .select({ _id: 1 })
-                .exec();
-            if (options.emitImmediately) {
-                task_2.taskEventEmitter.emitTaskStatusChanged({
-                    id: createdTask.id,
-                    name: params.name,
-                    status: factory.taskStatus.Ready
-                });
-            }
-        });
-    }
+    // public async createConfirmReserveTransactionTaskIfNotExist(
+    //     params: factory.task.IAttributes<factory.taskName.ConfirmReserveTransaction>,
+    //     options: IOptionOnCreate
+    // ): Promise<void> {
+    //     const createdTask = await this.taskModel.findOneAndUpdate(
+    //         {
+    //             'project.id': { $eq: params.project.id },
+    //             name: { $eq: params.name },
+    //             'data.object.transactionNumber': {
+    //                 $exists: true,
+    //                 $eq: String(params.data.object.transactionNumber)
+    //             },
+    //             'data.purpose.orderNumber': {
+    //                 $exists: true,
+    //                 $eq: String(params.data.purpose.orderNumber)
+    //             }
+    //         },
+    //         { $setOnInsert: params },
+    //         { new: true, upsert: true }
+    //     )
+    //         .select({ _id: 1 })
+    //         .exec();
+    //     if (options.emitImmediately) {
+    //         taskEventEmitter.emitTaskStatusChanged({
+    //             id: createdTask.id,
+    //             name: params.name,
+    //             status: factory.taskStatus.Ready
+    //         });
+    //     }
+    // }
     createOnAssetTransactionStatusChangedTaskIfNotExist(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const createdTask = yield this.taskModel.findOneAndUpdate({
@@ -293,27 +298,32 @@ class MongoRepository {
             }
         });
     }
-    createSendOrderTaskIfNotExist(params, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const createdTask = yield this.taskModel.findOneAndUpdate({
-                'project.id': { $eq: params.project.id },
-                name: { $eq: params.name },
-                'data.object.orderNumber': {
-                    $exists: true,
-                    $eq: String(params.data.object.orderNumber)
-                }
-            }, { $setOnInsert: params }, { new: true, upsert: true })
-                .select({ _id: 1 })
-                .exec();
-            if (options.emitImmediately) {
-                task_2.taskEventEmitter.emitTaskStatusChanged({
-                    id: createdTask.id,
-                    name: params.name,
-                    status: factory.taskStatus.Ready
-                });
-            }
-        });
-    }
+    // public async createSendOrderTaskIfNotExist(
+    //     params: factory.task.IAttributes<factory.taskName.SendOrder>,
+    //     options: IOptionOnCreate
+    // ): Promise<void> {
+    //     const createdTask = await this.taskModel.findOneAndUpdate(
+    //         {
+    //             'project.id': { $eq: params.project.id },
+    //             name: { $eq: params.name },
+    //             'data.object.orderNumber': {
+    //                 $exists: true,
+    //                 $eq: String(params.data.object.orderNumber)
+    //             }
+    //         },
+    //         { $setOnInsert: params },
+    //         { new: true, upsert: true }
+    //     )
+    //         .select({ _id: 1 })
+    //         .exec();
+    //     if (options.emitImmediately) {
+    //         taskEventEmitter.emitTaskStatusChanged({
+    //             id: createdTask.id,
+    //             name: params.name,
+    //             status: factory.taskStatus.Ready
+    //         });
+    //     }
+    // }
     // public async createOnOrderPaymentCompletedTaskIfNotExist(
     //     params: factory.task.IAttributes<factory.taskName.OnOrderPaymentCompleted>,
     //     options: IOptionOnCreate

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

@@ -24,7 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import type { Connection } from 'mongoose';
 import * as factory from '../factory';
-type IKeyOfProjection<T extends factory.transactionType> = keyof factory.transaction.ITransaction<T> | '_id' | '__v' | 'createdAt' | 'updatedAt';
+type IKeyOfProjection<T extends factory.transactionType> = keyof factory.transaction.ITransaction<T> | '_id' | '__v' | 'createdAt' | 'updatedAt' | 'object.orderNumber';
 interface IAggregationByStatus {
     transactionCount: number;
     avgDuration: number;

package/lib/chevre/repository.d.ts

@@ -25,6 +25,7 @@ import type { MongoRepository as OfferCatalogRepo } from './repo/offerCatalog';
 import type { MongoRepository as OfferCatalogItemRepo } from './repo/offerCatalogItem';
 import type { MongoRepository as OfferItemConditionRepo } from './repo/offerItemCondition';
 import type { MongoRepository as OrderRepo } from './repo/order';
+import type { MongoRepository as OrderInTransactionRepo } from './repo/orderInTransaction';
 import type { MongoRepository as OwnershipInfoRepo } from './repo/ownershipInfo';
 import type { MongoRepository as PaymentServiceRepo } from './repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from './repo/paymentServiceProvider';
@@ -152,6 +153,10 @@ export type Order = OrderRepo;
 export declare namespace Order {
     function createInstance(...params: ConstructorParameters<typeof OrderRepo>): Promise<OrderRepo>;
 }
+export type OrderInTransaction = OrderInTransactionRepo;
+export declare namespace OrderInTransaction {
+    function createInstance(...params: ConstructorParameters<typeof OrderInTransactionRepo>): Promise<OrderInTransactionRepo>;
+}
 export type OrderNumber = OrderNumberRepo;
 export declare namespace OrderNumber {
     function createInstance(...params: ConstructorParameters<typeof OrderNumberRepo>): Promise<OrderNumberRepo>;

package/lib/chevre/repository.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.ProductOffer = exports.Product = exports.PriceSpecification = exports.place = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.PaymentService = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
-exports.rateLimit = void 0;
+exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.ProductOffer = exports.Product = exports.PriceSpecification = exports.place = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.PaymentService = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
+exports.rateLimit = exports.Trip = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -336,6 +336,19 @@ var Order;
     }
     Order.createInstance = createInstance;
 })(Order = exports.Order || (exports.Order = {}));
+var OrderInTransaction;
+(function (OrderInTransaction) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/orderInTransaction'))).MongoRepository;
+            }
+            return new repo(...params);
+        });
+    }
+    OrderInTransaction.createInstance = createInstance;
+})(OrderInTransaction = exports.OrderInTransaction || (exports.OrderInTransaction = {}));
 var OrderNumber;
 (function (OrderNumber) {
     let repo;

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -13,7 +13,6 @@ import type { MongoRepository as PaymentServiceRepo } from '../../repo/paymentSe
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
 import type { CognitoRepository as PersonRepo } from '../../repo/person';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
-import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import * as CreditCardPayment from '../payment/creditCard';
@@ -27,17 +26,12 @@ export interface IStartOperationRepos {
     paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
     product: ProductRepo;
-    project: ProjectRepo;
     assetTransaction: AssetTransactionRepo;
     task: TaskRepo;
 }
 export type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 export interface ICancelRepos {
-    action: ActionRepo;
-    accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;
-    project: ProjectRepo;
-    task: TaskRepo;
 }
 export type ICancelOperation<T> = (repos: ICancelRepos) => Promise<T>;
 export interface IConfirmRepos {
@@ -47,7 +41,6 @@ export interface IConfirmRepos {
     assetTransaction: AssetTransactionRepo;
     event: EventRepo;
     order: OrderRepo;
-    project: ProjectRepo;
     task: TaskRepo;
 }
 export type IConfirmOperation<T> = (repos: IConfirmRepos) => Promise<T>;
@@ -61,14 +54,12 @@ export type ICheckOperation<T> = (repos: {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
 }) => Promise<T>;
 export type IPublishPaymentUrlOperation<T> = (repos: {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
-    project: ProjectRepo;
 }) => Promise<T>;
 export type IInvalidatePaymentUrlOperation<T> = (repos: {
     accountingReport: AccountingReportRepo;
@@ -76,7 +67,6 @@ export type IInvalidatePaymentUrlOperation<T> = (repos: {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<T>;

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

@@ -40,7 +40,7 @@ function publishPaymentUrl(params) {
         let result;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, { searchTrade4accountId: false })(repos);
+                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, { searchTrade4accountId: false, processPublishPaymentUrl: true })(repos);
                 let paymentUrl;
                 // 3DS拡張(2024-01-02~)
                 const retUrl = (_c = params.object.paymentMethod.creditCard) === null || _c === void 0 ? void 0 : _c.retUrl;
@@ -79,7 +79,7 @@ function invalidatePaymentUrl(params) {
         const paymentServiceType = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                yield CreditCardPayment.refundCreditCard(params, false)(repos);
+                yield CreditCardPayment.refundCreditCard(params, { requirePayAction: false })(repos);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
@@ -304,7 +304,7 @@ function processAuthorizeAccount(params, transaction, paymentServiceId) {
 }
 function processAuthorizeCreditCard(params, transaction, paymentServiceId, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, Object.assign({ searchTrade4accountId: options.searchTrade4accountId }, (options.pendingPaymentAgencyTransaction !== undefined)
+        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, Object.assign({ processPublishPaymentUrl: false, searchTrade4accountId: options.searchTrade4accountId }, (options.pendingPaymentAgencyTransaction !== undefined)
             ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
             : undefined))(repos);
         return saveAuthorizeResult({
@@ -471,7 +471,7 @@ function exportTasksById(params) {
             purpose: {
                 confirmationNumber: '',
                 orderNumber: '',
-                typeOf: 'Order'
+                typeOf: factory.order.OrderType.Order
             },
             useOnOrderStatusChanged: true
         };

package/lib/chevre/service/code.js

@@ -103,7 +103,7 @@ function verifyToken(params) {
             throw error;
         }
         if (repos.action !== undefined && action !== undefined) {
-            yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+            yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         }
         return result;
     });

package/lib/chevre/service/delivery.js

@@ -63,7 +63,7 @@ function givePointAward(params) {
         }
         // アクション完了
         const actionResult = {};
-        yield repos.action.complete({ typeOf: params.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: params.typeOf, id: action.id, result: actionResult });
     });
 }
 exports.givePointAward = givePointAward;
@@ -140,7 +140,7 @@ function returnPointAward(params) {
         const actionResult = {
             moneyTransferTransaction: moneyTransferTransactions
         };
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     });
 }
 exports.returnPointAward = returnPointAward;

package/lib/chevre/service/event/createEvent.js

@@ -80,7 +80,7 @@ function createEvent(params) {
             }
             throw error;
         }
-        yield repos.action.complete({
+        yield repos.action.completeWithVoid({
             typeOf: action.typeOf,
             id: action.id,
             result: (Array.isArray(eventIds))

package/lib/chevre/service/event.js

@@ -193,7 +193,7 @@ function importFromCOA(params) {
         }
         // アクション完了
         const actionResult = { savedScreeningEventsCount, savedScreeningEventSeriesCount };
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     });
 }
 exports.importFromCOA = importFromCOA;
@@ -807,7 +807,7 @@ function updateEvent4ttts(params) {
             throw error;
         }
         // アクション完了
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: { id: event.id } });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: { id: event.id } });
         yield (0, offer_1.onEventChanged)({
             id: [event.id],
             project: { id: event.project.id },

package/lib/chevre/service/moneyTransfer.js

@@ -439,7 +439,7 @@ function moneyTransfer(params) {
             throw error;
         }
         const actionResult = {};
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     });
 }
 exports.moneyTransfer = moneyTransfer;

package/lib/chevre/service/notification.js

@@ -11,14 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.triggerWebhook = exports.report2developers = exports.sendEmailMessage = void 0;
 const sgMail = require("@sendgrid/mail");
-const createDebug = require("debug");
 const http_status_1 = require("http-status");
 const request = require("request");
 const util = require("util");
 const credentials_1 = require("../credentials");
 const settings_1 = require("../settings");
 const factory = require("../factory");
-const debug = createDebug('chevre-domain:service');
 /**
  * Eメールメッセージを送信する
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
@@ -110,8 +108,7 @@ function sendEmailMessage(params) {
             throw error;
         }
         // アクション完了
-        debug('ending action...');
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
     });
 }
 exports.sendEmailMessage = sendEmailMessage;
@@ -365,6 +362,6 @@ function processInformAction(params) {
                 throw error;
             }
         }
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
     });
 }

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

@@ -0,0 +1,29 @@
+import * as factory from '../../factory';
+import type { MongoRepository as OrderInTransactionRepo } from '../../repo/orderInTransaction';
+import type { RedisRepository as OrderNumberRepo } from '../../repo/orderNumber';
+import type { MongoRepository as ProjectRepo } from '../../repo/project';
+import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
+interface IAcceptOfferOperationRepos {
+    orderInTransaction: OrderInTransactionRepo;
+    orderNumber: OrderNumberRepo;
+    project: ProjectRepo;
+    transaction: TransactionRepo;
+}
+type IAcceptOfferOperation<T> = (repos: IAcceptOfferOperationRepos) => Promise<T>;
+type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
+export declare function acceptOffer(params: {
+    project: {
+        id: string;
+    };
+    purpose: {
+        id: string;
+    };
+    acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+}): IAcceptOfferOperation<void>;
+export declare function voidAcceptedOffer(params: {
+    authorizeActions: IAuthorizeOfferAction[];
+    orderNumber: string;
+}): (repos: {
+    orderInTransaction: OrderInTransactionRepo;
+}) => Promise<void>;
+export {};