@chevre/domain 21.18.0-alpha.14 → 21.18.0-alpha.16

package/example/src/chevre/searchOrders.ts

@@ -14,10 +14,10 @@ async function main() {
         orderNumber: 'CIN4-3943271-4221863',
         project: { id: project.id },
         inclusion: [
-            'project', 'typeOf', 'orderNumber', 'dateReturned', 'id',
-            'customer', 'returner', 'seller', 'price', 'priceCurrency', 'orderDate'
+            // 'project', 'typeOf', 'orderNumber', 'dateReturned', 'id',
+            // 'customer', 'returner', 'seller', 'price', 'priceCurrency', 'orderDate'
         ],
-        exclusion: []
+        exclusion: ['acceptedOffers']
     });
     console.log(order);
 

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

@@ -47,7 +47,7 @@ export declare class MongoRepository {
         orderNumber: string;
         orderStatus: factory.orderStatus;
         previousOrderStatus: factory.orderStatus;
-    }): Promise<factory.order.IOrder>;
+    }): Promise<Omit<factory.order.IOrder, 'acceptedOffers'>>;
     /**
      * 注文を返品する
      */
@@ -104,7 +104,7 @@ export declare class MongoRepository {
             id?: string;
         };
         inclusion: IKeyOfProjection[];
-        exclusion: IKeyOfProjection[];
+        exclusion: (IKeyOfProjection | 'acceptedOffers')[];
     }): Promise<factory.order.IOrder>;
     findByOrderNumberAndReservationId(params: {
         project: {

package/lib/chevre/repo/order.js

@@ -697,7 +697,8 @@ class MongoRepository {
                 projection: {
                     __v: 0,
                     createdAt: 0,
-                    updatedAt: 0
+                    updatedAt: 0,
+                    acceptedOffers: 0 // 除外(2023-12-08~)
                 }
             })
                 .exec();
@@ -707,7 +708,9 @@ class MongoRepository {
                     orderNumber: params.orderNumber,
                     project: { id: params.project.id },
                     inclusion: [],
-                    exclusion: []
+                    exclusion: [
+                        'acceptedOffers' // 除外(2023-12-08~)
+                    ]
                 });
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore next */

package/lib/chevre/service/delivery/factory.d.ts

@@ -4,5 +4,7 @@ export type IOwnershipInfo = factory.ownershipInfo.IOwnershipInfo<factory.owners
  * 注文から所有権を作成する
  */
 export declare function createOwnershipInfosFromOrder(params: {
-    order: Pick<factory.order.IOrder, 'acceptedOffers' | 'orderDate' | 'project' | 'customer' | 'orderNumber' | 'seller'>;
+    order: Pick<factory.order.IOrder, 'orderDate' | 'project' | 'customer' | 'orderNumber' | 'seller'> & {
+        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    };
 }): IOwnershipInfo[];

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

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

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

@@ -50,7 +50,11 @@ function deleteOrder(params) {
 exports.deleteOrder = deleteOrder;
 function deleteReservationsByOrder(order) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            orderNumber: { $eq: order.orderNumber },
+            project: { id: { $eq: order.project.id } }
+        });
+        // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
         const reservationIds = acceptedOffers.filter((o) => {
             return o.itemOffered.typeOf === factory.reservationType.EventReservation;
         })
@@ -66,7 +70,12 @@ function deleteOwnershipInfosByOrder(order) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
         // 所有権作成
-        const ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({ order });
+        const ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
+            order: Object.assign(Object.assign({}, order), { acceptedOffers: yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                    orderNumber: { $eq: order.orderNumber },
+                    project: { id: { $eq: order.project.id } }
+                }) })
+        });
         const ownershipIdentifiers = ownershipInfos.map((o) => String(o.identifier));
         if (ownershipIdentifiers.length > 0) {
             yield repos.ownershipInfo.deleteExpiredByIdentifiers({
@@ -81,7 +90,11 @@ function deleteOwnershipInfosByOrder(order) {
 function deleteEventsByOrder(order) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
-        const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            orderNumber: { $eq: order.orderNumber },
+            project: { id: { $eq: order.project.id } }
+        });
+        // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
         const reservationForIds = acceptedOffers.filter((o) => {
             return (o.itemOffered.typeOf === factory.reservationType.EventReservation
                 || o.itemOffered.typeOf === factory.reservationType.BusReservation)

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

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

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

@@ -138,7 +138,7 @@ function paymentDue2Processing(params) {
             orderNumber: params.orderNumber,
             project: { id: params.project.id },
             inclusion: [],
-            exclusion: []
+            exclusion: ['acceptedOffers']
         });
         try {
             order = yield repos.order.changeStatus({
@@ -151,12 +151,12 @@ function paymentDue2Processing(params) {
         catch (error) {
             let throwsError = true;
             // すでにステータスが煤でいた場合、OrderPaymentDue->OrderProcessingの処理自体は成功しているので、後処理を続行する
-            order = yield repos.order.findByOrderNumber({
+            order = (yield repos.order.findByOrderNumber({
                 orderNumber: params.orderNumber,
                 project: { id: params.project.id },
                 inclusion: [],
-                exclusion: []
-            });
+                exclusion: ['acceptedOffers']
+            }));
             if (order.orderStatus === factory.orderStatus.OrderDelivered
                 || order.orderStatus === factory.orderStatus.OrderReturned) {
                 throwsError = false;
@@ -166,8 +166,13 @@ function paymentDue2Processing(params) {
             }
         }
         if (params.useOnOrderStatusChanged) {
+            // 全acceptedOffersを検索(2023-12-08~)
+            const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                orderNumber: { $eq: order.orderNumber },
+                project: { id: { $eq: params.project.id } }
+            });
             yield (0, onOrderStatusChanged_1.onOrderProcessing)({
-                order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
+                order: Object.assign(Object.assign({}, order), { acceptedOffers, orderStatus: factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
                  }),
                 placeOrderTransaction
             })({

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

@@ -3,8 +3,9 @@ import * as factory from '../../../factory';
 import { IExternalOrder } from './onOrderProcessing/factory';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf' | 'potentialActions'>;
 declare function onOrderProcessing(params: {
-    order: Omit<factory.order.IOrder, 'orderStatus'> & {
+    order: Omit<factory.order.IOrder, 'acceptedOffers' | 'orderStatus'> & {
         orderStatus: factory.orderStatus.OrderProcessing;
+        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
     };
     placeOrderTransaction?: IPlaceOrderTransaction;
 }): (repos: {

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

@@ -1,3 +1,4 @@
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
@@ -6,6 +7,7 @@ import * as factory from '../../factory';
  * 注文を決済する
  */
 declare function payOrder(params: factory.task.IData<factory.taskName.OnOrderPaymentCompleted>): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     order: OrderRepo;
     task: TaskRepo;
     transaction: TransactionRepo;

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

@@ -1,3 +1,4 @@
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
@@ -34,6 +35,7 @@ declare function placeOrder(params: {
     };
     useOnOrderStatusChanged: boolean;
 }): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     order: OrderRepo;

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

@@ -1,3 +1,4 @@
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
@@ -5,6 +6,7 @@ import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
 import * as factory from '../../factory';
 type ISendOperation<T> = (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;

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

@@ -37,7 +37,7 @@ function sendOrder(params) {
             let order = yield repos.order.findByOrderNumber({
                 orderNumber,
                 project: { id: params.project.id },
-                inclusion: [],
+                inclusion: ['confirmationNumber', 'project', 'typeOf', 'seller', 'orderNumber', 'price', 'priceCurrency', 'orderDate', 'customer', '_id'],
                 exclusion: []
             });
             // プロジェクト条件検証
@@ -76,7 +76,12 @@ function sendOrder(params) {
             let ownershipInfos;
             try {
                 // 所有権作成
-                ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({ order });
+                ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
+                    order: Object.assign(Object.assign({}, order), { acceptedOffers: yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                            orderNumber: { $eq: order.orderNumber },
+                            project: { id: { $eq: order.project.id } }
+                        }) })
+                });
                 ownershipInfos = yield Promise.all(ownershipInfos.map((ownershipInfo) => __awaiter(this, void 0, void 0, function* () {
                     return repos.ownershipInfo.createIfNotExistByIdentifier(ownershipInfo);
                 })));

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

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
@@ -26,6 +27,7 @@ const TransactionService = require("../transaction");
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
         yield TransactionService.deleteTransaction(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             accountingReport: new accountingReport_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),

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

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const order_1 = require("../../repo/order");
 const task_1 = require("../../repo/task");
@@ -24,6 +25,7 @@ function call(data) {
         //     throw new factory.errors.Argument('settings', 'redisClient required');
         // }
         yield (0, onAssetTransactionStatusChanged_1.onAssetTransactionStatusChanged)(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
             task: new task_1.MongoRepository(settings.connection),

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

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const order_1 = require("../../repo/order");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
@@ -23,6 +24,7 @@ function call(data) {
         //     throw new factory.errors.Argument('settings', 'redisClient required');
         // }
         yield (0, payOrder_1.payOrder)(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
             task: new task_1.MongoRepository(settings.connection),
             transaction: new transaction_1.MongoRepository(settings.connection)

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

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const order_1 = require("../../repo/order");
@@ -25,6 +26,7 @@ function call(data) {
         //     throw new factory.errors.Argument('settings', 'redisClient required');
         // }
         yield OrderService.placeOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             accountingReport: new accountingReport_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),

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

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
@@ -24,17 +25,13 @@ function call(data) {
         // if (settings.redisClient === undefined) {
         //     throw new factory.errors.Argument('settings', 'redisClient required');
         // }
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const orderRepo = new order_1.MongoRepository(settings.connection);
-        const ownershipInfoRepo = new ownershipInfo_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
-        const transactionRepo = new transaction_1.MongoRepository(settings.connection);
         yield OrderService.sendOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
-            action: actionRepo,
-            order: orderRepo,
-            ownershipInfo: ownershipInfoRepo,
-            task: taskRepo,
-            transaction: transactionRepo
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
+            action: new action_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

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

@@ -1,4 +1,5 @@
 import * as factory from '../../factory';
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -13,6 +14,7 @@ import type { MongoRepository as TransactionRepo } from '../../repo/transaction'
  * 冪等性を確保すること
  */
 export declare function deleteTransaction(params: factory.task.IData<factory.taskName.DeleteTransaction>): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.18.0-alpha.14"
+  "version": "21.18.0-alpha.16"
 }