@chevre/domain 21.2.0-alpha.109 → 21.2.0-alpha.110

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

@@ -1,3 +1,4 @@
+import { BulkWriteResult as BulkWriteOpResultObject } from 'mongodb';
 import { Connection, UpdateWriteOpResult } from 'mongoose';
 import * as factory from '../factory';
 export interface IUpdatePartiallyParams {
@@ -38,13 +39,20 @@ export declare class MongoRepository {
         broker?: factory.reservation.IBroker<factory.reservationType>;
         issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;
     }): Promise<void>;
-    confirmByIdIfNotExist(params: {
+    confirmByIdIfNotExist__(params: {
         reservation: factory.assetTransaction.reserve.IObjectSubReservation;
         reservationFor: factory.assetTransaction.reserve.IReservationFor;
         underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
         broker?: factory.reservation.IBroker<factory.reservationType>;
         issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;
     }): Promise<void>;
+    confirmManyIfNotExist(params: {
+        subReservation: factory.assetTransaction.reserve.IObjectSubReservation[];
+        reservationFor: factory.assetTransaction.reserve.IReservationFor;
+        underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+        broker?: factory.reservation.IBroker<factory.reservationType>;
+        issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;
+    }): Promise<BulkWriteOpResultObject | void>;
     /**
      * 予約取消
      */

package/lib/chevre/repo/reservation.js

@@ -10,11 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
-const createDebug = require("debug");
 const reservation_1 = require("./mongoose/schemas/reservation");
 const factory = require("../factory");
 const settings_1 = require("../settings");
-const debug = createDebug('chevre-domain:repo');
 /**
  * 予約リポジトリ
  */
@@ -915,15 +913,37 @@ class MongoRepository {
                 .exec();
         });
     }
-    confirmByIdIfNotExist(params) {
+    confirmByIdIfNotExist__(params) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const confirmedReservation = yield this.reservationModel.findOneAndUpdate({ _id: { $eq: params.reservation.id } }, {
+            yield this.reservationModel.findOneAndUpdate({ _id: { $eq: params.reservation.id } }, {
                 $setOnInsert: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, params.reservation), { _id: params.reservation.id, reservationFor: params.reservationFor, reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }), (params.underName !== undefined) ? { underName: params.underName } : undefined), (typeof ((_a = params.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_b = params.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { issuedThrough: params.issuedThrough } : undefined)
             }, { upsert: true, new: true })
                 .select({ _id: 1 })
                 .exec();
-            debug('confirmByIdIfNotExist processed.confirmedReservation:', confirmedReservation);
+        });
+    }
+    confirmManyIfNotExist(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const modifiedTime = new Date();
+            const bulkWriteOps = [];
+            if (Array.isArray(params)) {
+                params.subReservation.forEach((subReservation) => {
+                    var _a, _b;
+                    bulkWriteOps.push({
+                        updateOne: {
+                            filter: { _id: { $eq: subReservation.id } },
+                            update: {
+                                $setOnInsert: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, subReservation), { _id: subReservation.id, reservationFor: params.reservationFor, reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime }), (params.underName !== undefined) ? { underName: params.underName } : undefined), (typeof ((_a = params.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_b = params.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { issuedThrough: params.issuedThrough } : undefined)
+                            },
+                            upsert: true
+                        }
+                    });
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                return this.reservationModel.bulkWrite(bulkWriteOps, { ordered: false });
+            }
         });
     }
     /**

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

@@ -37,7 +37,7 @@ export declare class MongoRepository {
      */
     findById(conditions: {
         id: string;
-    }, projection?: any): Promise<ISeller>;
+    }, inclusion: string[], exclusion: string[]): Promise<ISeller>;
     /**
      * 販売者を保管する
      */

package/lib/chevre/repo/seller.js

@@ -124,9 +124,29 @@ class MongoRepository {
     /**
      * 特定販売者検索
      */
-    findById(conditions, projection) {
+    findById(conditions, 
+    // projection?: any
+    inclusion, exclusion) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.organizationModel.findOne({ _id: conditions.id }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            const doc = yield this.organizationModel.findOne({ _id: conditions.id }, projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.organizationModel.modelName);

package/lib/chevre/service/assetTransaction/pay/account/validation.js

@@ -28,7 +28,7 @@ function validateAccount(params) {
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const seller = yield repos.seller.findById({ id: sellerId });
+        const seller = yield repos.seller.findById({ id: sellerId }, ['paymentAccepted'], []);
         const paymentAccepted = (_d = seller.paymentAccepted) === null || _d === void 0 ? void 0 : _d.some((a) => a.paymentMethodType === paymentMethodType);
         if (paymentAccepted !== true) {
             throw new factory.errors.Argument('recipient', `payment not accepted`);

package/lib/chevre/service/assetTransaction/pay.js

@@ -210,7 +210,7 @@ function validateSeller(params) {
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const seller = yield repos.seller.findById({ id: sellerId });
+        const seller = yield repos.seller.findById({ id: sellerId }, ['paymentAccepted'], []);
         const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.typeOf;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');

package/lib/chevre/service/event.js

@@ -771,7 +771,13 @@ function updateEvent4ttts(params) {
         }
         // アクション完了
         yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: { id: event.id } });
-        yield (0, offer_1.onEventChanged)({ event, isNew: false, useInform: true })({
+        yield (0, offer_1.onEventChanged)({
+            id: [event.id],
+            project: { id: event.project.id },
+            typeOf: event.typeOf,
+            isNew: false,
+            useInform: true
+        })({
             event: repos.event,
             project: repos.project,
             task: repos.task

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

@@ -47,12 +47,15 @@ export declare function searchEventSeatOffersWithPaging(params: {
     stockHolder: StockHolderRepo;
     place: PlaceRepo;
 }) => Promise<factory.place.seat.IPlaceWithOffer[]>;
-type IChangedEvent = factory.task.onEventChanged.IChangedEvent;
 /**
  * イベント変更時処理
  */
 export declare function onEventChanged(params: {
-    event: IChangedEvent | IChangedEvent[];
+    id: string[];
+    typeOf: factory.eventType;
+    project: {
+        id: string;
+    };
     isNew: boolean;
     useInform?: boolean;
 }): (repos: {

package/lib/chevre/service/offer.js

@@ -119,19 +119,20 @@ function searchEventSeatOffersWithPaging(params) {
     });
 }
 exports.searchEventSeatOffersWithPaging = searchEventSeatOffersWithPaging;
+// type IChangedEvent = factory.task.onEventChanged.IChangedEvent;
 /**
  * イベント変更時処理
  */
 function onEventChanged(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const changedEvents = (Array.isArray(params.event)) ? params.event : [params.event];
-        if (changedEvents.length > 0) {
+        // const changedEvents = (Array.isArray(params.event)) ? params.event : [params.event];
+        if (params.id.length > 0) {
             // ScreeningEventであれば集計タスク
-            if (changedEvents[0].typeOf === factory.eventType.ScreeningEvent) {
+            if (params.typeOf === factory.eventType.ScreeningEvent) {
                 yield createAggregateScreeningEventIfNotExist({
-                    project: { id: changedEvents[0].project.id },
-                    reservationFor: changedEvents.map((changedEvent) => {
-                        return { id: changedEvent.id };
+                    project: { id: params.project.id },
+                    reservationFor: params.id.map((id) => {
+                        return { id };
                     }),
                     // 新規作成の場合は強制的に集計
                     force: params.isNew
@@ -140,9 +141,9 @@ function onEventChanged(params) {
             // 通知タスク作成(2023-06-08~)
             if (params.useInform === true) {
                 yield createInformTasks({
-                    project: { id: changedEvents[0].project.id },
-                    ids: changedEvents.map((changedEvent) => changedEvent.id),
-                    typeOf: changedEvents[0].typeOf
+                    project: { id: params.project.id },
+                    ids: params.id,
+                    typeOf: params.typeOf
                 })(repos);
             }
         }
@@ -218,6 +219,8 @@ function createInformTasks(params) {
                 const informUrl = String((_a = informEvent.recipient) === null || _a === void 0 ? void 0 : _a.url);
                 events4inform.forEach((event4inform) => {
                     var _a;
+                    // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
+                    delete event4inform._id;
                     const informActionAttributes = {
                         agent: event4inform.project,
                         object: event4inform,

package/lib/chevre/service/payment/creditCard.js

@@ -521,7 +521,7 @@ function processChangeTransaction(params) {
 function getGMOInfoFromSeller(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
-        const seller = yield repos.seller.findById({ id: String(params.seller.id) });
+        const seller = yield repos.seller.findById({ id: String(params.seller.id) }, ['paymentAccepted', 'project'], []);
         const paymentAccepted = (_a = seller.paymentAccepted) === null || _a === void 0 ? void 0 : _a.some((a) => a.paymentMethodType === params.paymentMethodType);
         if (paymentAccepted !== true) {
             throw new factory.errors.Argument('transaction', 'payment not accepted');

package/lib/chevre/service/payment/movieTicket/checkByIdentifier.d.ts

@@ -8,7 +8,7 @@ interface ICheckResult {
 }
 interface ICheckByIdentifierParams {
     movieTickets: factory.action.check.paymentMethod.movieTicket.IMovieTicket[];
-    seller: factory.seller.ISeller;
+    seller: Pick<factory.seller.ISeller, 'id' | 'project'>;
     screeningEvent: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     paymentServiceId: string;
 }

package/lib/chevre/service/payment/movieTicket/factory.d.ts

@@ -6,7 +6,7 @@ export declare function createSeatInfoSyncIn(params: {
     movieTickets: factory.action.trade.pay.IMovieTicket[];
     event: factory.event.screeningEvent.IEvent;
     purpose: factory.action.trade.pay.IPurpose;
-    seller: factory.seller.ISeller;
+    seller: Pick<factory.seller.ISeller, 'paymentAccepted'>;
     credentials: {
         kgygishCd: string;
         stCd: string;

package/lib/chevre/service/payment/movieTicket/getCredentials.d.ts

@@ -2,7 +2,7 @@ import { MongoRepository as ProductRepo } from '../../../repo/product';
 import * as factory from '../../../factory';
 declare function getCredentials(params: {
     paymentMethodType: string;
-    seller: factory.seller.ISeller;
+    seller: Pick<factory.seller.ISeller, 'id' | 'project'>;
     paymentServiceId: string;
 }): (repos: {
     product: ProductRepo;

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -47,7 +47,7 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const seller = yield repos.seller.findById({ id: sellerId });
+        const seller = yield repos.seller.findById({ id: sellerId }, ['paymentAccepted', 'project'], []);
         const paymentAccepted = (_d = seller.paymentAccepted) === null || _d === void 0 ? void 0 : _d.some((a) => a.paymentMethodType === paymentMethodType);
         if (paymentAccepted !== true) {
             throw new factory.errors.Argument('recipient', 'payment not accepted');

package/lib/chevre/service/payment/movieTicket.js

@@ -58,7 +58,7 @@ function checkMovieTicket(params) {
                 id: eventIds[0]
             });
             // ショップ情報取得
-            const seller = yield repos.seller.findById({ id: (_e = params.object[0]) === null || _e === void 0 ? void 0 : _e.seller.id });
+            const seller = yield repos.seller.findById({ id: (_e = params.object[0]) === null || _e === void 0 ? void 0 : _e.seller.id }, ['paymentAccepted', 'project'], []);
             const paymentAccepted = (_f = seller.paymentAccepted) === null || _f === void 0 ? void 0 : _f.some((a) => a.paymentMethodType === paymentMethodType);
             if (paymentAccepted !== true) {
                 throw new factory.errors.Argument('transactionId', 'payment not accepted');
@@ -302,7 +302,7 @@ function payActionParams2seatInfoSyncIn(params) {
         // イベント取得属性最適化(2023-01-23~)
         // const event = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: eventIds[0] });
         const event = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] });
-        const seller = yield repos.seller.findById({ id: String((_d = params.recipient) === null || _d === void 0 ? void 0 : _d.id) });
+        const seller = yield repos.seller.findById({ id: String((_d = params.recipient) === null || _d === void 0 ? void 0 : _d.id) }, ['paymentAccepted', 'project'], []);
         // 全購入管理番号のMovieTicketをマージ
         const movieTickets = params.object.reduce((a, b) => [...a, ...(Array.isArray(b.movieTickets)) ? b.movieTickets : []], []);
         const sellerCredentials = yield (0, getCredentials_1.getCredentials)({ paymentMethodType, seller, paymentServiceId })(repos);

package/lib/chevre/service/reserve/confirmReservation.js

@@ -97,17 +97,25 @@ function reserveIfNotYet(params, options) {
                     if (reserveTransaction.object.disablePendingReservations === true) {
                         const reservationFor = reserveTransaction.object.reservationFor;
                         const subReservations = reserveTransaction.object.subReservation;
-                        if (Array.isArray(subReservations)
-                            && typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.typeOf) === 'string') {
-                            yield Promise.all(subReservations.map((subReservation) => __awaiter(this, void 0, void 0, function* () {
-                                yield repos.reservation.confirmByIdIfNotExist({
-                                    reservation: subReservation,
-                                    reservationFor,
-                                    underName,
-                                    broker: reserveTransaction.object.broker,
-                                    issuedThrough: reserveTransaction.object.issuedThrough
-                                });
-                            })));
+                        if (Array.isArray(subReservations) && typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.typeOf) === 'string') {
+                            // confirmManyに変更(2023-06-13~)
+                            const confirmManyIfNotExistResult = yield repos.reservation.confirmManyIfNotExist({
+                                subReservation: subReservations,
+                                reservationFor,
+                                underName,
+                                broker: reserveTransaction.object.broker,
+                                issuedThrough: reserveTransaction.object.issuedThrough
+                            });
+                            debug('confirmManyIfNotExistResult:', confirmManyIfNotExistResult, 'reservationNumber:', reservationPackage.reservationNumber);
+                            // await Promise.all(subReservations.map(async (subReservation) => {
+                            //     await repos.reservation.confirmByIdIfNotExist({
+                            //         reservation: subReservation,
+                            //         reservationFor,
+                            //         underName,
+                            //         broker: reserveTransaction.object.broker,
+                            //         issuedThrough: reserveTransaction.object.issuedThrough
+                            //     });
+                            // }));
                         }
                     }
                     else {

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

@@ -1,2 +1,2 @@
 import * as factory from '../../../factory';
-export declare function createStartParams(params: factory.transaction.moneyTransfer.IStartParamsWithoutDetail, passport: factory.waiter.passport.IPassport | undefined, seller: factory.seller.ISeller, amount: factory.monetaryAmount.IMonetaryAmount, fromLocation: factory.assetTransaction.moneyTransfer.IFromLocationBeforeStart, toLocation: factory.transaction.moneyTransfer.IToLocation, transactionNumber: string): factory.transaction.IStartParams<factory.transactionType.MoneyTransfer>;
+export declare function createStartParams(params: factory.transaction.moneyTransfer.IStartParamsWithoutDetail, passport: factory.waiter.passport.IPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf'>, amount: factory.monetaryAmount.IMonetaryAmount, fromLocation: factory.assetTransaction.moneyTransfer.IFromLocationBeforeStart, toLocation: factory.transaction.moneyTransfer.IToLocation, transactionNumber: string): factory.transaction.IStartParams<factory.transactionType.MoneyTransfer>;

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

@@ -28,7 +28,7 @@ const CodeService = require("../code");
  */
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const seller = yield repos.seller.findById({ id: params.seller.id });
+        const seller = yield repos.seller.findById({ id: params.seller.id }, ['name', 'typeOf'], []);
         const passport = yield (0, validation_1.validateWaiterPassport)(params);
         // 金額をfix
         const amount = params.object.amount;

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

@@ -29,10 +29,12 @@ exports.POINT_AWARD_IDENTIFIER_NAME = 'pointAwardIdentifiers';
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const seller = yield repos.seller.findById({ id: params.seller.id }, {
-            hasMerchantReturnPolicy: 0,
-            paymentAccepted: 0
-        });
+        const seller = yield repos.seller.findById({ id: params.seller.id }, ['name', 'project', 'typeOf', 'makesOffer'], []
+        // {
+        //     hasMerchantReturnPolicy: 0,
+        //     paymentAccepted: 0
+        // }
+        );
         let makesOfferFromClient;
         // 販売者オファー検証(2022-10-14~)
         if (params.validateSeller === true) {

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

@@ -29,7 +29,9 @@ function start(params) {
         const now = new Date();
         const { acceptedOffers, eventIds, offerIds, orders } = yield fixOrders(params)(repos);
         // sellerはorderから自動取得
-        const seller = yield repos.seller.findById({ id: String(orders[0].seller.id) }, { additionalProperty: 0, paymentAccepted: 0 });
+        const seller = yield repos.seller.findById({ id: String(orders[0].seller.id) }, ['name', 'project', 'hasMerchantReturnPolicy', 'typeOf'], []
+        // { additionalProperty: 0, paymentAccepted: 0 }
+        );
         yield validateOrder({ orders })(repos);
         let offers = [];
         if (offerIds.length > 0) {

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.109"
+  "version": "21.2.0-alpha.110"
 }