@chevre/domain 26.0.0-alpha.23 → 26.0.0-alpha.25

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

@@ -5,33 +5,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendOrder = sendOrder;
 const debug_1 = __importDefault(require("debug"));
-// import { createMaskedCustomer } from '../../factory/order';
-const factory_1 = require("../delivery/factory");
-// import { findPlaceOrderTransaction } from './findPlaceOrderTransaction';
+// import { createOwnershipInfosFromOrder } from '../delivery/factory';
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
-const factory_2 = require("../../factory");
+const factory_1 = require("../../factory");
 const debug = (0, debug_1.default)('chevre-domain:service:order');
 /**
  * 注文を配送する
  */
 function sendOrder(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
+    return async (repos) => {
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
-            throw new factory_2.factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
+            throw new factory_1.factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
         if (typeof params.object.acceptedOffers?.limit !== 'number') {
-            throw new factory_2.factory.errors.Argument('object.acceptedOffers.limit', 'must be number');
+            throw new factory_1.factory.errors.Argument('object.acceptedOffers.limit', 'must be number');
         }
         if (typeof params.object.acceptedOffers?.page !== 'number') {
-            throw new factory_2.factory.errors.Argument('object.acceptedOffers.page', 'must be number');
+            throw new factory_1.factory.errors.Argument('object.acceptedOffers.page', 'must be number');
         }
         if (params.object.acceptedOffers.limit <= 0) {
-            throw new factory_2.factory.errors.Argument('object.acceptedOffers.limit', 'must be greater than 1');
+            throw new factory_1.factory.errors.Argument('object.acceptedOffers.limit', 'must be greater than 1');
         }
         if (params.object.acceptedOffers.page <= 0) {
-            throw new factory_2.factory.errors.Argument('object.acceptedOffers.page', 'must be greater than 1');
+            throw new factory_1.factory.errors.Argument('object.acceptedOffers.page', 'must be greater than 1');
         }
         try {
             const orderNumber = params.object.orderNumber;
@@ -49,24 +45,16 @@ function sendOrder(params) {
             });
             // プロジェクト条件検証
             if (order.project.id !== params.project.id) {
-                throw new factory_2.factory.errors.NotFound('Order');
+                throw new factory_1.factory.errors.NotFound('Order');
             }
             // 確認番号検証
             if (order.confirmationNumber !== confirmationNumber) {
-                throw new factory_2.factory.errors.NotFound('Order');
+                throw new factory_1.factory.errors.NotFound('Order');
             }
             // const maskedCustomer = createMaskedCustomer(order, { noProfile: true });
             const simpleOrder = {
                 typeOf: order.typeOf,
-                // seller: {
-                //     id: order.seller.id,
-                //     typeOf: order.seller.typeOf,
-                //     name: order.seller.name
-                // }, // 廃止(2024-03-06~)
-                // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
                 orderNumber: order.orderNumber,
-                // price: order.price,
-                // priceCurrency: order.priceCurrency,
                 orderDate: order.orderDate
             };
             const { limit, page } = params.object.acceptedOffers;
@@ -77,24 +65,24 @@ function sendOrder(params) {
             const sendOrderActionAttributes = {
                 agent: (typeof params.agent?.typeOf === 'string') ? params.agent : order.project,
                 object: sendOrderObject,
-                // potentialActions: {},
                 project: order.project,
                 recipient: { id: order.customer.id, typeOf: order.customer.typeOf },
-                typeOf: factory_2.factory.actionType.SendAction
+                typeOf: factory_1.factory.actionType.SendAction
             };
             const action = await repos.action.start(sendOrderActionAttributes);
-            let creatingOwnershipInfos = [];
-            let createdOwnershipInfos = [];
+            // let creatingOwnershipInfos: IOwnershipInfo[] = [];
+            const createdOwnershipInfos = [];
             let allOffersDelivered = false;
             let acceptedOffers;
-            // 所有権生成を最小化(2024-03-01~)
-            let createOwnerships = false;
-            switch (order.customer.typeOf) {
-                case factory_2.factory.personType.Person:
-                    createOwnerships = true; // Personのみに限定(2026-03-15~)
-                    break;
-                default:
-            }
+            // 所有権管理はひとまず廃止(2026-08-10~)
+            // // 所有権生成を最小化(2024-03-01~)
+            // let createOwnerships = false;
+            // switch (order.customer.typeOf) {
+            //     case factory.personType.Person:
+            //         createOwnerships = true; // Personのみに限定(2026-03-15~)
+            //         break;
+            //     default:
+            // }
             try {
                 const offerIndexBase = (limit * (page - 1));
                 const searchSlicedAcceptedOffersResult = await repos.acceptedOffer.searchSlicedAcceptedOffersByOrderNumber({
@@ -104,29 +92,27 @@ function sendOrder(params) {
                 });
                 acceptedOffers = searchSlicedAcceptedOffersResult.acceptedOffers;
                 debug('delivering...', order.orderNumber, params.object.acceptedOffers, 'offerIndexBase:', offerIndexBase);
-                // 所有権作成
-                if (createOwnerships) {
-                    creatingOwnershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
-                        order: { ...order, acceptedOffers },
-                        offerIndexBase
-                    });
-                    createdOwnershipInfos = await Promise.all(creatingOwnershipInfos.map(async (creatingOwnershipInfo) => {
-                        const { id } = await repos.ownershipInfo.createIfNotExistByIdentifier(creatingOwnershipInfo);
-                        return {
-                            id,
-                            ...(typeof creatingOwnershipInfo.identifier === 'string')
-                                ? { identifier: creatingOwnershipInfo.identifier }
-                                : undefined
-                        };
-                    }));
-                }
-                // const deliveredCount = limit * page;
-                // debug(deliveredCount, 'delivered.', order.orderNumber, params.object.acceptedOffers);
+                // 所有権管理はひとまず廃止(2026-08-10~)
+                // if (createOwnerships) {
+                //     creatingOwnershipInfos = createOwnershipInfosFromOrder({
+                //         order: { ...order, acceptedOffers },
+                //         offerIndexBase
+                //     });
+                //     createdOwnershipInfos = await Promise.all(creatingOwnershipInfos.map(async (creatingOwnershipInfo) => {
+                //         const { id } = await repos.ownershipInfo.createIfNotExistByIdentifier(creatingOwnershipInfo);
+                //         return {
+                //             id,
+                //             ...(typeof creatingOwnershipInfo.identifier === 'string')
+                //                 ? { identifier: creatingOwnershipInfo.identifier }
+                //                 : undefined
+                //         };
+                //     }));
+                // }
                 if (acceptedOffers.length === 0) {
                     order = await repos.order.changeStatus({
                         project: { id: order.project.id },
                         orderNumber,
-                        orderStatus: factory_2.factory.orderStatus.OrderDelivered,
+                        orderStatus: factory_1.factory.orderStatus.OrderDelivered,
                         previousOrderStatus: params.object.previousOrderStatus
                     });
                     allOffersDelivered = true;
@@ -154,7 +140,7 @@ function sendOrder(params) {
                             orderNumber: order.orderNumber,
                             project: order.project,
                             typeOf: order.typeOf,
-                            orderStatus: factory_2.factory.orderStatus.OrderDelivered,
+                            orderStatus: factory_1.factory.orderStatus.OrderDelivered,
                             price: order.price,
                             priceCurrency: order.priceCurrency
                         }
@@ -180,7 +166,7 @@ function sendOrder(params) {
                 project: { id: params.project.id },
                 inclusion: ['orderStatus']
             });
-            if (currentOrder?.orderStatus === factory_2.factory.orderStatus.OrderReturned) {
+            if (currentOrder?.orderStatus === factory_1.factory.orderStatus.OrderReturned) {
                 throwsError = false;
             }
             if (throwsError) {

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

@@ -7,7 +7,7 @@ const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
 const order_1 = require("../../repo/order");
-const ownershipInfo_1 = require("../../repo/ownershipInfo");
+// import { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 const reservation_1 = require("../../repo/reservation");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
@@ -23,7 +23,7 @@ function call(params) {
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             code: new authorization_1.AuthorizationRepo(connection),
             order: new order_1.OrderRepo(connection),
-            ownershipInfo: new ownershipInfo_1.OwnershipInfoRepo(connection),
+            // ownershipInfo: new OwnershipInfoRepo(connection),
             reservation: new reservation_1.ReservationRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection)

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

@@ -4,7 +4,6 @@ exports.call = call;
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
 const order_1 = require("../../repo/order");
-const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
 const returnOrder_1 = require("../../repo/transaction/returnOrder");
@@ -22,12 +21,10 @@ function call(params) {
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             action: new action_1.ActionRepo(connection),
             order: new order_1.OrderRepo(connection),
-            ownershipInfo: new ownershipInfo_1.OwnershipInfoRepo(connection),
+            // ownershipInfo: new OwnershipInfoRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
             returnOrder: new returnOrder_1.ReturnOrderRepo(connection)
-        }
-        // settings
-        );
+        });
     };
 }

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

@@ -5,7 +5,7 @@ const factory_1 = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
 const order_1 = require("../../repo/order");
-const ownershipInfo_1 = require("../../repo/ownershipInfo");
+// import { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
@@ -32,7 +32,7 @@ function call(params) {
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             action: new action_1.ActionRepo(connection),
             order: new order_1.OrderRepo(connection),
-            ownershipInfo: new ownershipInfo_1.OwnershipInfoRepo(connection),
+            // ownershipInfo: new OwnershipInfoRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
             placeOrder: new placeOrder_1.PlaceOrderRepo(connection)

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.3.0-alpha.1",
+    "@chevre/factory": "10.3.0-alpha.2",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.0.0-alpha.23"
+  "version": "26.0.0-alpha.25"
 }