@chevre/domain 21.18.0-alpha.13 → 21.18.0-alpha.15

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/repo/place.js

@@ -625,7 +625,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     searchScreeningRoomSections(searchConditions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } }];
             const projectIdEq = (_b = (_a = searchConditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -722,17 +722,21 @@ class MongoRepository {
                 { $unwind: '$containsPlace' },
                 ...matchStages,
                 {
-                    $project: Object.assign({ _id: 0, typeOf: '$containsPlace.typeOf', branchCode: '$containsPlace.branchCode', name: '$containsPlace.name', containedInPlace: {
-                            typeOf: '$typeOf',
-                            branchCode: '$branchCode',
-                            name: '$name',
+                    $project: Object.assign(Object.assign({ _id: 0, typeOf: '$containsPlace.typeOf', branchCode: '$containsPlace.branchCode', name: '$containsPlace.name', additionalProperty: '$containsPlace.additionalProperty' }, (((_p = searchConditions.$projection) === null || _p === void 0 ? void 0 : _p.containedInPlace) === 1)
+                        ? {
                             containedInPlace: {
-                                id: '$containedInPlace.id',
-                                typeOf: '$containedInPlace.typeOf',
-                                branchCode: '$containedInPlace.branchCode',
-                                name: '$containedInPlace.name'
+                                typeOf: '$typeOf',
+                                branchCode: '$branchCode',
+                                name: '$name',
+                                containedInPlace: {
+                                    id: '$containedInPlace.id',
+                                    typeOf: '$containedInPlace.typeOf',
+                                    branchCode: '$containedInPlace.branchCode',
+                                    name: '$containedInPlace.name'
+                                }
                             }
-                        }, additionalProperty: '$containsPlace.additionalProperty' }, (((_p = searchConditions.$projection) === null || _p === void 0 ? void 0 : _p.seatCount) === 1)
+                        }
+                        : undefined), (((_q = searchConditions.$projection) === null || _q === void 0 ? void 0 : _q.seatCount) === 1)
                         ? {
                             seatCount: {
                                 $cond: {

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.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: []
             });
             // プロジェクト条件検証

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/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.344.0",
+    "@chevre/factory": "4.345.0",
     "@cinerino/sdk": "5.3.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -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.13"
+  "version": "21.18.0-alpha.15"
 }