@chevre/domain 20.2.0-alpha.8 → 20.2.0

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

@@ -10,9 +10,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
+const product_1 = require("../../repo/product");
+const project_1 = require("../../repo/project");
+const seller_1 = require("../../repo/seller");
+const task_1 = require("../../repo/task");
 const PayTransactionService = require("../assetTransaction/pay");
 /**
  * タスク実行関数
@@ -22,6 +28,12 @@ function call(data) {
         const actionRepo = new action_1.MongoRepository(settings.connection);
         const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
         const orderRepo = new order_1.MongoRepository(settings.connection);
+        const accountingReportRepo = new accountingReport_1.MongoRepository(settings.connection);
+        const eventRepo = new event_1.MongoRepository(settings.connection);
+        const productRepo = new product_1.MongoRepository(settings.connection);
+        const projectRepo = new project_1.MongoRepository(settings.connection);
+        const sellerRepo = new seller_1.MongoRepository(settings.connection);
+        const taskRepo = new task_1.MongoRepository(settings.connection);
         // アクション開始
         const action = yield actionRepo.start(data);
         try {
@@ -38,8 +50,15 @@ function call(data) {
                         }
                     }
                 })({
+                    action: actionRepo,
+                    accountingReport: accountingReportRepo,
                     assetTransaction: assetTransactionRepo,
-                    order: orderRepo
+                    event: eventRepo,
+                    order: orderRepo,
+                    product: productRepo,
+                    project: projectRepo,
+                    seller: sellerRepo,
+                    task: taskRepo
                 });
             }
         }

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

@@ -3,6 +3,8 @@ import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import { MongoRepository as OrderRepo } from '../../repo/order';
+import { MongoRepository as ReservationRepo } from '../../repo/reservation';
+import { MongoRepository as TaskRepo } from '../../repo/task';
 /**
  * タスク実行関数
  */
@@ -14,4 +16,6 @@ export declare function confirmReserveTransaction(params: factory.action.interac
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
+    reservation: ReservationRepo;
+    task: TaskRepo;
 }) => Promise<void>;

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

@@ -15,6 +15,8 @@ const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const order_1 = require("../../repo/order");
+const reservation_1 = require("../../repo/reservation");
+const task_1 = require("../../repo/task");
 const ReserveTransactionService = require("../assetTransaction/reserve");
 const credentials_1 = require("../../credentials");
 const coaAuthClient = new COA.auth.RefreshToken({
@@ -29,7 +31,9 @@ function call(data) {
         yield confirmReserveTransaction(data)({
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
-            order: new order_1.MongoRepository(settings.connection)
+            order: new order_1.MongoRepository(settings.connection),
+            reservation: new reservation_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
         });
     });
 }
@@ -44,9 +48,6 @@ function confirmReserveTransaction(params) {
         const action = yield repos.action.start(confirmActionAttributes);
         try {
             let object = confirmActionAttributes.object;
-            // if (params.instrument === undefined) {
-            //     params.instrument = { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre };
-            // }
             switch (params.instrument.identifier) {
                 case factory.service.webAPI.Identifier.COA:
                     // COA本予約
@@ -72,7 +73,6 @@ function confirmReserveTransaction(params) {
                     object = object;
                     yield ReserveTransactionService.confirm({
                         transactionNumber: object.transactionNumber,
-                        // object: object.object,
                         potentialActions: object.potentialActions
                     })(repos);
             }

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

@@ -14,6 +14,7 @@ const action_1 = require("../../repo/action");
 const categoryCode_1 = require("../../repo/categoryCode");
 const event_1 = require("../../repo/event");
 const place_1 = require("../../repo/place");
+const seller_1 = require("../../repo/seller");
 const EventService = require("../event");
 /**
  * タスク実行関数
@@ -24,7 +25,8 @@ function call(data) {
             action: new action_1.MongoRepository(settings.connection),
             categoryCode: new categoryCode_1.MongoRepository(settings.connection),
             event: new event_1.MongoRepository(settings.connection),
-            place: new place_1.MongoRepository(settings.connection)
+            place: new place_1.MongoRepository(settings.connection),
+            seller: new seller_1.MongoRepository(settings.connection)
         });
     });
 }

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

@@ -64,7 +64,11 @@ function returnPayTransaction(params) {
         if (typeof paymentServiceType !== 'string' || paymentServiceType.length === 0) {
             throw new factory.errors.ArgumentNull('object.issuedThrough.typeOf');
         }
-        const order = yield repos.order.findByOrderNumber({ orderNumber });
+        const order = yield repos.order.findByOrderNumber({
+            orderNumber,
+            inclusion: ['seller', 'project', 'dateReturned'],
+            exclusion: []
+        });
         const action = yield repos.action.start(refundActionAttributes);
         let refundTransaction;
         try {
@@ -213,8 +217,10 @@ function onRefund(refundActionAttributes) {
             });
         }
         // タスク保管
-        yield Promise.all(taskAttributes.map((taskAttribute) => __awaiter(this, void 0, void 0, function* () {
-            return repos.task.save(taskAttribute);
-        })));
+        // saveManyに変更(2023-02-01~)
+        yield repos.task.saveMany(taskAttributes);
+        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
+        //     return repos.task.save(taskAttribute);
+        // }));
     });
 }

package/lib/chevre/service/task.js

@@ -113,16 +113,13 @@ function abort(params) {
 exports.abort = abort;
 function notifyAbortedTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let abortedTasks = yield repos.task.search({
-            statuses: [factory.taskStatus.Aborted],
-            dateAborted: {
-                $gte: params.dateAbortedGte
-            }
-        });
+        const abortedTasks = yield repos.task.search(Object.assign({ statuses: [factory.taskStatus.Aborted], dateAborted: { $gte: params.dateAbortedGte } }, (settings_1.ABORTED_TASKS_WITHOUT_REPORT.length > 0)
+            ? { name: { $nin: settings_1.ABORTED_TASKS_WITHOUT_REPORT } }
+            : undefined));
         // 中止を報告しないタスク以外にフィルター
-        abortedTasks = abortedTasks.filter((task) => {
-            return !settings_1.ABORTED_TASKS_WITHOUT_REPORT.includes(task.name);
-        });
+        // abortedTasks = abortedTasks.filter((task) => {
+        //     return !ABORTED_TASKS_WITHOUT_REPORT.includes(task.name);
+        // });
         if (abortedTasks.length > 0) {
             // 開発者へ報告
             const message = (0, factory_1.tasks2lineNotify)({ tasks: abortedTasks });

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -386,6 +386,12 @@ function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
                 agent: { id: project.id, typeOf: factory.organizationType.Project },
                 token: fromLocation
             })({ action: repos.action });
+            if (paymentCardOwnershipInfo.typeOf !== 'OwnershipInfo') {
+                throw new factory.errors.Argument('fromLocation', 'must be OwnershipInfo');
+            }
+            if (paymentCardOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
+                throw new factory.errors.Argument('fromLocation', 'must be Permit');
+            }
             fromLocation = {
                 typeOf: paymentCardOwnershipInfo.typeOfGood.typeOf,
                 identifier: paymentCardOwnershipInfo.typeOfGood.identifier,
@@ -576,7 +582,9 @@ function exportTasksById(params) {
             transaction,
             runsAt: taskRunsAt
         });
-        yield Promise.all(taskAttributes.map((a) => __awaiter(this, void 0, void 0, function* () { return repos.task.save(a); })));
+        // saveManyに変更(2023-02-01~)
+        yield repos.task.saveMany(taskAttributes);
+        // await Promise.all(taskAttributes.map(async (a) => repos.task.save(a)));
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/transaction/orderProgramMembership/findPaymentCardPermit.d.ts

@@ -23,4 +23,4 @@ export declare function findPaymentCardPermit(params: {
 }): (repos: {
     ownershipInfo: OwnershipInfoRepo;
     product: ProductRepo;
-}) => Promise<factory.ownershipInfo.IPermit>;
+}) => Promise<factory.ownershipInfo.IPermitAsGood>;

package/lib/chevre/service/transaction/orderProgramMembership.js

@@ -144,6 +144,7 @@ function processPlaceOrder(params) {
         }
         // 注文番号を先に発行
         const orderNumber = yield TransactionService.placeOrderInProgress.publishOrderNumberIfNotExist({
+            project: { id: transaction.project.id },
             id: transaction.id,
             object: { orderDate: now }
         })(repos);
@@ -193,9 +194,7 @@ function processPlaceOrder(params) {
                     orderDate: new Date()
                 }
             },
-            potentialActions: params.potentialActions,
-            createConfirmPayActions: false,
-            createConfirmReserveActions: false
+            potentialActions: params.potentialActions
         })(repos);
     });
 }
@@ -218,7 +217,8 @@ function processAuthorizeProductOffer(params) {
             project: { id: params.project.id },
             itemOffered: { id: params.product.id },
             seller: { id: String(seller.id) },
-            onlyValid: true
+            onlyValid: true,
+            sort: false // ソート不要(2023-01-27~)
         })(repos);
         const acceptedProductOffer = offers.find((o) => o.identifier === acceptedOffer.identifier);
         if (acceptedProductOffer === undefined) {
@@ -317,8 +317,8 @@ function processAuthorizeCreditCard(params) {
                 issuedThrough: { id: String(creditCardPaymentService.id) }
             },
             purpose: params.purpose,
-            paymentServiceType: factory.service.paymentService.PaymentServiceType.CreditCard
-            // iss: params.iss
+            paymentServiceType: factory.service.paymentService.PaymentServiceType.CreditCard,
+            useCancelPayTransactionOnFailed: false
         })(repos);
     });
 }

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

@@ -36,9 +36,11 @@ function exportTasksById(params) {
             transaction,
             runsAt: taskRunsAt
         });
-        yield Promise.all(taskAttributes.map((taskAttribute) => __awaiter(this, void 0, void 0, function* () {
-            yield repos.task.save(taskAttribute);
-        })));
+        // saveManyに変更(2023-02-01~)
+        yield repos.task.saveMany(taskAttributes);
+        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
+        //     await repos.task.save(taskAttribute);
+        // }));
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/transaction/placeOrderInProgress/factory.d.ts

@@ -1,2 +1,2 @@
 import * as factory from '../../../factory';
-export declare function createStartParams(params: factory.transaction.placeOrder.IStartParamsWithoutDetail, passport: factory.waiter.passport.IPassport | undefined, seller: factory.seller.ISeller, broker?: factory.order.IBroker): factory.transaction.placeOrder.IStartParams;
+export declare function createStartParams(params: factory.transaction.placeOrder.IStartParamsWithoutDetail, passport: factory.waiter.passport.IPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project'>, broker?: factory.order.IBroker): factory.transaction.placeOrder.IStartParams;

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions.d.ts

@@ -7,6 +7,4 @@ export declare function createPotentialActions(params: {
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
     transaction: factory.transaction.placeOrder.ITransaction;
     emailMessage?: factory.creativeWork.message.email.ICreativeWork;
-    createConfirmPayActions: boolean;
-    createConfirmReserveActions: boolean;
 }): Promise<factory.transaction.placeOrder.IPotentialActions>;

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions.js

@@ -10,8 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = void 0;
-const confirmPay_1 = require("./potentialActions/confirmPay");
-// import { createConfirmReservationActions } from './potentialActions/confirmReservation';
 const givePointAward_1 = require("./potentialActions/givePointAward");
 const moneyTransfer_1 = require("./potentialActions/moneyTransfer");
 const registerService_1 = require("./potentialActions/registerService");
@@ -23,13 +21,9 @@ const order_1 = require("../../../factory/order");
  */
 function createPotentialActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
-        // 予約確定アクション
-        // const confirmReservationActions = await createConfirmReservationActions(params);
         const registerServiceActions = yield (0, registerService_1.createRegisterServiceActions)(params);
         // 通貨転送アクション
         const moneyTransferActions = yield (0, moneyTransfer_1.createMoneyTransferActions)(params);
-        // 決済確定アクション
-        const confirmPayActions = yield (0, confirmPay_1.createConfirmPayActions)(params);
         // ポイントインセンティブに対する承認アクションの分だけ、ポイントインセンティブ付与アクションを作成する
         const givePointAwardActions = yield (0, givePointAward_1.createGivePointAwardActions)(params);
         // 注文配送メール送信設定
@@ -53,16 +47,13 @@ function createPotentialActions(params) {
             typeOf: factory.actionType.SendAction,
             // 取引から注文作成するように変更したのでminimizeする(2022-04-18~)
             object: simpleOrder,
-            // agentをプロジェクトに変更(2022-05-18~)
             agent: params.transaction.project,
-            // agent: params.transaction.seller,
             recipient: {
                 typeOf: params.order.customer.typeOf,
                 id: params.order.customer.id,
                 name: String(params.order.customer.name)
             },
             potentialActions: {
-                // confirmReservation: confirmReservationActions,
                 moneyTransfer: moneyTransferActions,
                 registerService: registerServiceActions,
                 sendEmailMessage: sendEmailMessageActions
@@ -75,10 +66,10 @@ function createPotentialActions(params) {
                 // 取引から注文作成するように変更したのでminimizeする(2022-04-18~)
                 object: simpleOrder,
                 agent: params.transaction.project,
-                // agent: params.transaction.agent,
                 potentialActions: {
                     givePointAward: givePointAwardActions,
-                    pay: confirmPayActions,
+                    // 完全廃止(2023-02-03~)
+                    // pay: confirmPayActions,
                     sendOrder: sendOrderActionAttributes
                 },
                 purpose: {

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateSeller.d.ts

@@ -1,6 +1,6 @@
 import * as factory from '../../../../factory';
 export declare function validateSeller(params: {
-    seller: factory.seller.ISeller;
+    seller: Pick<factory.seller.ISeller, 'makesOffer'>;
     clientUser?: factory.clientUser.IClientUser;
 }): {
     makesOfferFromClient: factory.seller.IMakesOffer;

package/lib/chevre/service/transaction/placeOrderInProgress.d.ts

@@ -60,14 +60,6 @@ export declare type IConfirmParams = factory.transaction.placeOrder.IConfirmPara
     result: {
         order: IResultOrderParams;
     };
-    /**
-     * confirmPayActionをchevreへ完全移行後に廃止
-     */
-    createConfirmPayActions: boolean;
-    /**
-     * confirmReserveActionをchevreへ完全移行後に廃止
-     */
-    createConfirmReserveActions: boolean;
 };
 /**
  * 注文取引を確定する
@@ -92,6 +84,9 @@ export declare function publishConfirmationNumberIfNotExist(params: {
  * 未発行であれば、注文番号を発行して取引に保管する
  */
 export declare function publishOrderNumberIfNotExist(params: {
+    project: {
+        id: string;
+    };
     /**
      * 取引ID
      */