@chevre/domain 24.0.0-alpha.1 → 24.0.0-alpha.11

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

@@ -41,64 +41,58 @@ function notifyByEmail(params) {
         const message = util.format('\n%s\n%s\n%s\n%s\n%s\n\n%s', `[${logLevel}] ${shortSubject}`, `now:${(new Date()).toISOString()}`, `pid:${process.pid}`, `GAE_APPLICATION:${process.env.GAE_APPLICATION}`, 
         // `GAE_INSTANCE:${process.env.GAE_INSTANCE}`,
         `GAE_SERVICE:${process.env.GAE_SERVICE}`, params.content);
-        let result = {};
-        try {
-            const apiKey = credentials.sendGrid.apiKey;
-            if (typeof apiKey !== 'string') {
-                throw new factory.errors.Internal('API Key not found');
-            }
-            const senderName = credentials.sendGrid.alert?.sender?.name;
-            const senderEmail = credentials.sendGrid.alert?.sender?.email;
-            const toRecipientEmail = (Array.isArray(credentials.sendGrid.alert?.toRecipient))
-                ? credentials.sendGrid.alert?.toRecipient.at(0)?.email
-                : undefined;
-            if (typeof senderName !== 'string') {
-                throw new factory.errors.Internal('senderName not found');
-            }
-            if (typeof senderEmail !== 'string') {
-                throw new factory.errors.Internal('senderEmail not found');
-            }
-            if (typeof toRecipientEmail !== 'string') {
-                throw new factory.errors.Internal('toRecipientEmail not found');
-            }
-            const emailMessageFrom = {
-                name: senderName,
-                email: senderEmail
-            };
-            const subject = `[${logLevel}] ${shortSubject}`;
-            const emailDatas = [{
-                    name: 'developers',
-                    email: toRecipientEmail
-                }];
-            const sgClient = new client_1.Client();
-            sgClient.setApiKey(apiKey);
-            // const response = await sgMail.sendMultiple(msg);
-            const response = await sgClient.request({
-                body: {
-                    content: [{ type: 'text/plain', value: message }],
-                    from: emailMessageFrom,
-                    personalizations: [{ to: emailDatas }],
-                    subject,
-                    custom_args: {
-                        emailMessage: subject
-                        // actionId: action.id,
-                        // projectId: project.id
-                    }
-                },
-                method: 'POST',
-                url: '/v3/mail/send'
-            });
-            // check the response.
-            if (response[0].statusCode !== http_status_1.ACCEPTED) {
-                throw new factory.errors.Internal(`sendgrid request not accepted. response is ${util.inspect(response)}`);
-            }
-            const { statusCode } = response[0];
-            // const statusMessage = response[1];
-            result = { statusCode };
+        const apiKey = credentials.sendGrid.apiKey;
+        if (typeof apiKey !== 'string') {
+            throw new factory.errors.Internal('API Key not found');
         }
-        catch (error) {
-            throw error;
+        const senderName = credentials.sendGrid.alert?.sender?.name;
+        const senderEmail = credentials.sendGrid.alert?.sender?.email;
+        const toRecipientEmail = (Array.isArray(credentials.sendGrid.alert?.toRecipient))
+            ? credentials.sendGrid.alert?.toRecipient.at(0)?.email
+            : undefined;
+        if (typeof senderName !== 'string') {
+            throw new factory.errors.Internal('senderName not found');
         }
+        if (typeof senderEmail !== 'string') {
+            throw new factory.errors.Internal('senderEmail not found');
+        }
+        if (typeof toRecipientEmail !== 'string') {
+            throw new factory.errors.Internal('toRecipientEmail not found');
+        }
+        const emailMessageFrom = {
+            name: senderName,
+            email: senderEmail
+        };
+        const subject = `[${logLevel}] ${shortSubject}`;
+        const emailDatas = [{
+                name: 'developers',
+                email: toRecipientEmail
+            }];
+        const sgClient = new client_1.Client();
+        sgClient.setApiKey(apiKey);
+        // const response = await sgMail.sendMultiple(msg);
+        const response = await sgClient.request({
+            body: {
+                content: [{ type: 'text/plain', value: message }],
+                from: emailMessageFrom,
+                personalizations: [{ to: emailDatas }],
+                subject,
+                custom_args: {
+                    emailMessage: subject
+                    // actionId: action.id,
+                    // projectId: project.id
+                }
+            },
+            method: 'POST',
+            url: '/v3/mail/send'
+        });
+        // check the response.
+        if (response[0].statusCode !== http_status_1.ACCEPTED) {
+            throw new factory.errors.Internal(`sendgrid request not accepted. response is ${util.inspect(response)}`);
+        }
+        const { statusCode } = response[0];
+        // const statusMessage = response[1];
+        const result = { statusCode };
         return { result };
     };
 }

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

@@ -43,7 +43,6 @@ function createMailData(params) {
             id: params.project.id,
             inclusion: ['settings']
         });
-        let mailData;
         let apiKey = credentials.sendGrid.apiKey;
         // プロジェクト固有のSendGrid設定があれば、そちらを使用
         if (typeof project.settings?.sendgridApiKey === 'string' && project.settings.sendgridApiKey.length > 0) {
@@ -82,7 +81,7 @@ function createMailData(params) {
                 };
             })
             : [];
-        mailData = {
+        const mailData = {
             to: emailDatas,
             from: emailMessageFrom,
             subject,
@@ -104,7 +103,7 @@ function sendEmailMessage(params) {
         });
         const startingAction = createSendEmailMessageActionAttributes(params);
         const action = await repos.action.start(startingAction, { recipe });
-        let result = {};
+        let result;
         try {
             mailData.customArgs = {
                 emailMessage: emailMessage.identifier,

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

@@ -171,45 +171,40 @@ function processInformAction(params, options) {
                     signature = signRequest({ requestBody, timestamp, secretKey });
                 }
                 if (useFetchAPI) {
-                    try {
-                        const headers = new Headers({ 'Content-Type': 'application/json' });
-                        if (typeof headerIdentifier === 'string' && headerIdentifier !== '') {
-                            headers.append(`X-${headerIdentifier}-Webhook-Timestamp`, String(timestamp));
-                            if (typeof signature === 'string') {
-                                headers.append(`X-${headerIdentifier}-Webhook-Signature`, signature);
-                            }
-                        }
-                        const res = await fetch(urlTemplate, {
-                            method: 'POST',
-                            headers,
-                            body: requestBody, // body data type must match "Content-Type" header
-                            ...(typeof timeout === 'number')
-                                ? { signal: AbortSignal.timeout(timeout) }
-                                : undefined
-                        });
-                        let body;
-                        try {
-                            body = await res.text();
-                        }
-                        catch (error) {
-                            // no op
-                        }
-                        switch (res.status) {
-                            case http_status_1.OK:
-                            case http_status_1.CREATED:
-                            case http_status_1.ACCEPTED:
-                            case http_status_1.NO_CONTENT:
-                                result = {
-                                    statusCode: res.status,
-                                    useFetchAPI
-                                };
-                                break;
-                            default:
-                                throw new factory.errors.Internal(`statusCode: ${res.status} body: ${body}`);
+                    const headers = new Headers({ 'Content-Type': 'application/json' });
+                    if (typeof headerIdentifier === 'string' && headerIdentifier !== '') {
+                        headers.append(`X-${headerIdentifier}-Webhook-Timestamp`, String(timestamp));
+                        if (typeof signature === 'string') {
+                            headers.append(`X-${headerIdentifier}-Webhook-Signature`, signature);
                         }
                     }
-                    catch (err) {
-                        throw err;
+                    const res = await fetch(urlTemplate, {
+                        method: 'POST',
+                        headers,
+                        body: requestBody, // body data type must match "Content-Type" header
+                        ...(typeof timeout === 'number')
+                            ? { signal: AbortSignal.timeout(timeout) }
+                            : undefined
+                    });
+                    let body;
+                    try {
+                        body = await res.text();
+                    }
+                    catch (error) {
+                        // no op
+                    }
+                    switch (res.status) {
+                        case http_status_1.OK:
+                        case http_status_1.CREATED:
+                        case http_status_1.ACCEPTED:
+                        case http_status_1.NO_CONTENT:
+                            result = {
+                                statusCode: res.status,
+                                useFetchAPI
+                            };
+                            break;
+                        default:
+                            throw new factory.errors.Internal(`statusCode: ${res.status} body: ${body}`);
                     }
                 }
                 else {

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre.js

@@ -35,7 +35,6 @@ function processStartReserve4chevre(params, options) {
     // }
     ) => {
         const { event, transaction, transactionNumber } = params;
-        let acceptedOffers4result = [];
         // 予約取引開始
         const startParams = (0, factory_1.createReserveTransactionStartParams)({
             project: transaction.project,
@@ -69,7 +68,7 @@ function processStartReserve4chevre(params, options) {
             // stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
         }, options)(repos, settings);
         // 予約取引結果から注文オファーを生成する
-        acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
+        const acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
             issuedThrough: startReserveTransactionResult.issuedThrough,
             reservationFor: startReserveTransactionResult.reservationFor,
             objectSubReservations: startReserveTransactionResult.objectSubReservations,

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -26,7 +26,7 @@ import type { SettingRepo } from '../../../repo/setting';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { TicketRepo } from '../../../repo/ticket';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../../repo/transactionNumber';
 interface IAuthorizeRepos {
     action: ActionRepo;
@@ -55,7 +55,7 @@ interface IAuthorizeRepos {
     setting: SettingRepo;
     task: TaskRepo;
     ticket: TicketRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     transactionNumber: TransactionNumberRepo;
 }
 type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings) => Promise<T>;

package/lib/chevre/service/offer/event/authorize.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = authorize;
 const factory = __importStar(require("../../../factory"));
-const publishOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 const any_1 = require("../any");
 const defaultOffer_1 = require("./authorize/defaultOffer");
 const factory_1 = require("./authorize/factory");
@@ -50,9 +50,9 @@ function authorize(params, options) {
             store: params.store,
             noOfferSpecified
         })(repos);
-        let acceptedOffers4result = [];
+        let acceptedOffers4result;
         const now = new Date();
-        const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
             project: { id: params.project.id },
             id: transaction.id,
             object: { orderDate: now }
@@ -106,7 +106,7 @@ function authorize(params, options) {
 }
 function validateCreateRequest(params) {
     return async (repos) => {
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['agent', 'expires', 'project', 'seller', 'typeOf', 'instrument']);

package/lib/chevre/service/offer/event/issueEventOfferTicket.d.ts

@@ -8,7 +8,7 @@ import type { MemberRepo } from '../../../repo/member';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
 import type { ProductOfferRepo } from '../../../repo/productOffer';
 import type { TicketRepo } from '../../../repo/ticket';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 declare function issueEventOfferTicket(params: {
     now: Date;
     audience: Pick<factory.action.authorize.offer.eventService.IPurpose, 'id'>;
@@ -41,7 +41,7 @@ declare function issueEventOfferTicket(params: {
     memberProgram: MemberProgramRepo;
     productOffer: ProductOfferRepo;
     ticket: TicketRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }) => Promise<{
     ticketToken: string;
 }>;

package/lib/chevre/service/offer/event/issueEventOfferTicket.js

@@ -86,7 +86,7 @@ function issueEventOfferTicket(params) {
     return async (repos) => {
         const { now, audience, eventId, eventOfferId, ticketedOffer, author, project, instrument } = params;
         // 取引は存在するか
-        const transaction = await repos.transaction.projectFieldsInProgressById({ typeOf: factory.transactionType.PlaceOrder, id: audience.id }, ['expires', 'typeOf', 'seller']);
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ typeOf: factory.transactionType.PlaceOrder, id: audience.id }, ['expires', 'typeOf', 'seller']);
         // イベントは存在するか
         const event = await repos.event.projectEventFieldsById({ id: eventId }, ['project', 'offers', 'identifier']);
         // 取引番号発行

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.d.ts

@@ -8,7 +8,6 @@ import type { ReservationRepo } from '../../../../repo/reservation';
 import type { SettingRepo } from '../../../../repo/setting';
 import type { StockHolderRepo } from '../../../../repo/stockHolder';
 import type { TaskRepo } from '../../../../repo/task';
-import type { TransactionRepo } from '../../../../repo/transaction';
 interface IVoidTransactionRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
@@ -18,7 +17,6 @@ interface IVoidTransactionRepos {
     reservation: ReservationRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
 }
 declare function processVoidTransaction4chevre(params: {
     action: factory.action.authorize.offer.eventService.IAction;

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processVoidTransaction4chevre = processVoidTransaction4chevre;
 const factory = __importStar(require("../../../../factory"));
+// import type { TransactionRepo } from '../../../../repo/transaction';
 const reserve_1 = require("../../../assetTransaction/reserve");
 function processVoidTransaction4chevre(params) {
     return async (repos, settings) => {

package/lib/chevre/service/offer/event/voidTransaction.d.ts

@@ -9,7 +9,7 @@ import type { ReservationRepo } from '../../../repo/reservation';
 import type { SettingRepo } from '../../../repo/setting';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IVoidTransactionRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
@@ -19,7 +19,7 @@ interface IVoidTransactionRepos {
     reservation: ReservationRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     /**
      * COAオファー承認取消の場合必須
      */

package/lib/chevre/service/offer/event/voidTransaction.js

@@ -45,7 +45,7 @@ function voidTransaction(params) {
             agent: { id: params.project.id, typeOf: factory.organizationType.Project },
             ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
         };
-        const transaction = await repos.transaction.projectFieldsById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'object']);
+        const transaction = await repos.placeOrder.findPlaceOrderById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'object']);
         // 興行オファー承認アクション検索
         let authorizeActions = await repos.action.searchByPurpose({
             typeOf: factory.actionType.AuthorizeAction,
@@ -124,7 +124,7 @@ function cancelAcceptActions(params) {
             agent: { id: params.project.id, typeOf: factory.organizationType.Project },
             ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
         };
-        const transaction = await repos.transaction.projectFieldsById({
+        const transaction = await repos.placeOrder.findPlaceOrderById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['typeOf', 'status']);

package/lib/chevre/service/offer/event/voidTransactionByActionId.d.ts

@@ -9,7 +9,7 @@ import type { ReservationRepo } from '../../../repo/reservation';
 import type { SettingRepo } from '../../../repo/setting';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IVoidTransactionByActionIdRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
@@ -19,7 +19,7 @@ interface IVoidTransactionByActionIdRepos {
     reservation: ReservationRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     /**
      * COAオファー承認取消の場合必須
      */

package/lib/chevre/service/offer/event/voidTransactionByActionId.js

@@ -42,14 +42,14 @@ function voidTransactionByActionId(params) {
             agent: { id: params.project.id, typeOf: factory.organizationType.Project },
             ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
         };
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['typeOf']);
         // if (transaction.agent.id !== params.agent.id) {
         //     throw new factory.errors.Forbidden('Transaction not yours');
         // }
-        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.purpose.id });
+        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.purpose.id });
         const action = await repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
         if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
             throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer/authorize.js

@@ -191,7 +191,6 @@ function offer2availableSalesTicket(params) {
     };
 }
 function availableSalesTicket2offerWithDetails(params) {
-    let offerWithDetails;
     const availableSalesTicket = params.availableSalesTicket;
     const offer = params.offer;
     const includeGlasses = (offer.ticketInfo.addGlasses > 0);
@@ -248,7 +247,7 @@ function availableSalesTicket2offerWithDetails(params) {
             ? availableSalesTicket.limitCount
             : 1
     };
-    offerWithDetails = {
+    const offerWithDetails = {
         // ticketCodeで照合するためidは不要(2023-03-22~)
         // id: params.offerId,
         // identifierはchevre/apiで自動補完(2023-03-10~)

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.d.ts

@@ -3,14 +3,14 @@ import type { ActionRepo } from '../../../repo/action';
 import type { EventRepo } from '../../../repo/event';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProjectRepo } from '../../../repo/project';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import * as factory from '../../../factory';
 interface IAcceptRepos {
     action: ActionRepo;
     event: EventRepo;
     orderNumber: OrderNumberRepo;
     project: ProjectRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     reserveService: COA.service.Reserve;
     masterService: COA.service.Master;
 }

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.js

@@ -27,7 +27,7 @@ exports.acceptOffer = acceptOffer;
 exports.reAcceptOffer = reAcceptOffer;
 const errorHandler_1 = require("../../../errorHandler");
 const factory = __importStar(require("../../../factory"));
-const publishOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 const authorize_1 = require("./acceptOffer/authorize");
 const factory_1 = require("./acceptOffer/factory");
 function findCOAInfo(params) {
@@ -58,12 +58,12 @@ function acceptOffer(params) {
         if (typeof params.sameAs.id !== 'string' || params.sameAs.id === '') {
             throw new factory.errors.ArgumentNull('sameAs.id');
         }
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['project', 'agent', 'typeOf']);
-        // publishOrderNumber(2025-03-11~)
-        await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        // issueOrderNumber(2025-03-11~)
+        await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
             project: { id: transaction.project.id },
             id: transaction.id,
             object: { orderDate: new Date() }
@@ -144,11 +144,11 @@ function reAcceptOffer(params) {
         if (typeof params.potentialActions?.id !== 'string' || params.potentialActions.id === '') {
             throw new factory.errors.ArgumentNull('potentialActions.id');
         }
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['project', 'agent', 'typeOf']);
-        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: transaction.id });
+        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: transaction.id });
         if (typeof orderNumber !== 'string') {
             // 事前に発行されているはず
             throw new factory.errors.NotFound('transaction.object.orderNumber');

package/lib/chevre/service/offer/eventServiceByCOA/authorize.d.ts

@@ -3,7 +3,7 @@ import type { CategoryCodeRepo } from '../../../repo/categoryCode';
 import type { EventRepo } from '../../../repo/event';
 import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { IRequestBody, IResponseBody } from './authorize/factory';
 import { IAcceptedOfferBeforeAuthorize4COA } from './authorize/validateAcceptedOffers';
 import * as factory from '../../../factory';
@@ -15,7 +15,7 @@ export interface IAuthorizeRepos {
     event: EventRepo;
     offer: OfferRepo;
     orderInTransaction: OrderInTransactionRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }
 export type IAuthorizeOperation<T> = (repos: IAuthorizeRepos) => Promise<T>;
 export type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction;

package/lib/chevre/service/offer/eventServiceByCOA/authorize.js

@@ -28,7 +28,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = authorize;
 const moment_1 = __importDefault(require("moment"));
-// import { publishOrderNumberIfNotExist } from '../../transaction/placeOrder/publishOrderNumberIfNotExist';
 const any_1 = require("../any");
 const factory_1 = require("./authorize/factory");
 const validateAcceptedOffers_1 = require("./authorize/validateAcceptedOffers");
@@ -38,7 +37,7 @@ const factory = __importStar(require("../../../factory"));
  */
 function authorize(params) {
     return async (repos) => {
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['agent', 'project', 'seller', 'typeOf', 'instrument']);
@@ -104,15 +103,9 @@ function authorize(params) {
             await repos.action.giveUp({ typeOf: failedAction.typeOf, id: failedAction.id, error });
             throw error;
         }
-        // const now = new Date();
-        // const orderNumber = await publishOrderNumberIfNotExist({
-        //     project: { id: transaction.project.id },
-        //     id: transaction.id,
-        //     object: { orderDate: now }
-        // })(repos);
-        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.transaction.id });
+        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.transaction.id });
         if (typeof orderNumber !== 'string') {
-            // 事前に発行されているはず
+            // 事前に発行されているはず(acceptCOAOfferにて)
             throw new factory.errors.NotFound('transaction.object.orderNumber');
         }
         let result;

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -37,14 +37,14 @@ const factory = __importStar(require("../../../factory"));
  */
 function changeOffers(params) {
     return async (repos) => {
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['typeOf', 'agent', 'project', 'seller']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
-        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.transaction.id });
+        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.transaction.id });
         if (typeof orderNumber !== 'string') {
             // 事前に発行されているはず
             throw new factory.errors.NotFound('transaction.object.orderNumber');

package/lib/chevre/service/offer/moneyTransfer/authorize.d.ts

@@ -5,7 +5,7 @@ import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProductRepo } from '../../../repo/product';
 import type { ProjectRepo } from '../../../repo/project';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../../repo/transactionNumber';
 interface IAuthorizeRepos {
     action: ActionRepo;
@@ -14,7 +14,7 @@ interface IAuthorizeRepos {
     assetTransaction: AssetTransactionRepo;
     orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     transactionNumber: TransactionNumberRepo;
 }
 type IAuthorizeOperation<T> = (repos: IAuthorizeRepos) => Promise<T>;