@chevre/domain 21.4.0-alpha.3 → 21.4.0-alpha.30

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

@@ -23,22 +23,15 @@ function cancelPendingReservation(actionAttributes) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const now = new Date();
-        let canceledReservations = [];
+        const canceledReservations = [];
         const { reserveTransaction } = yield cancelPengindIfNotYet(actionAttributes, now)(repos);
         if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
             if (reserveTransaction.object.disablePendingReservations === true) {
                 // Pendingが存在しない場合は検索しても無駄(2023-06-05~)
             }
             else {
-                canceledReservations = yield repos.reservation.search({
-                    reservationNumber: { $eq: actionAttributes.object.reservationNumber },
-                    typeOf: factory.reservationType.EventReservation
-                });
-                canceledReservations = canceledReservations.map((r) => {
-                    // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
-                    delete r._id;
-                    return r;
-                });
+                // 完全廃止(2023-07-19~)
+                throw new factory.errors.NotImplemented('disablePendingReservations must be true');
             }
         }
         yield (0, onReservationCanceled_1.onReservationCanceled)(canceledReservations, false, {
@@ -48,7 +41,7 @@ function cancelPendingReservation(actionAttributes) {
     });
 }
 exports.cancelPendingReservation = cancelPendingReservation;
-function cancelPengindIfNotYet(params, now) {
+function cancelPengindIfNotYet(params, __) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const actionAttributes = params;
@@ -83,7 +76,7 @@ function cancelPengindIfNotYet(params, now) {
             // アクション開始
             const action = yield repos.action.start(actionAttributes);
             const actionObject = actionAttributes.object;
-            let cancelResult;
+            // let cancelResult: ICancelResult | undefined;
             try {
                 if (reserveTransaction !== undefined) {
                     const reservationFor = reserveTransaction.object.reservationFor;
@@ -126,12 +119,8 @@ function cancelPengindIfNotYet(params, now) {
                             // disablePendingReservationsの場合は処理不要(2023-06-05~)
                         }
                         else {
-                            // 予約番号単位でキャンセル状態に変更する
-                            cancelResult = yield repos.reservation.cancelByReservationNumber({
-                                reservationNumber: actionObject.reservationNumber,
-                                previousReservationStatus: actionObject.reservationStatus,
-                                modifiedTime: now
-                            });
+                            // 完全廃止(2023-07-19~)
+                            throw new factory.errors.NotImplemented('disablePendingReservations must be true');
                         }
                     }
                     else {
@@ -152,17 +141,15 @@ function cancelPengindIfNotYet(params, now) {
                 throw error;
             }
             // アクション完了
-            const actionResult = Object.assign({}, (cancelResult !== undefined) ? {
-                cancelResult: {
-                    // n: cancelResult.n,
-                    // nModified: cancelResult.nModified,
-                    // ok: cancelResult.ok,
-                    matchedCount: cancelResult.matchedCount,
-                    modifiedCount: cancelResult.modifiedCount
-                }
-            } : undefined
+            const actionResult = {
+            // ...(cancelResult !== undefined) ? {
+            //     cancelResult: {
+            //         matchedCount: cancelResult.matchedCount,
+            //         modifiedCount: cancelResult.modifiedCount
+            //     }
+            // } : undefined
             // canceledReservationId: canceledReservation?.id
-            );
+            };
             yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
         return { reserveTransaction };

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

@@ -51,7 +51,7 @@ exports.confirmReservation = confirmReservation;
 function reserveIfNotYet(params, options) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const reservationPackage = params.object;
         // 冪等性を担保(2023-05-31~)
         debug('searching completed reserveAction... byTask:', options === null || options === void 0 ? void 0 : options.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
@@ -97,50 +97,34 @@ 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') {
+                        const issuedThrough = reserveTransaction.object.issuedThrough;
+                        if (Array.isArray(subReservations)
+                            && typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.typeOf) === 'string'
+                            && typeof (issuedThrough === null || issuedThrough === void 0 ? void 0 : issuedThrough.typeOf) === 'string') {
                             // confirmManyに変更(2023-06-13~)
                             const confirmManyIfNotExistResult = yield repos.reservation.confirmManyIfNotExist({
+                                provider: (typeof ((_b = reserveTransaction.object.provider) === null || _b === void 0 ? void 0 : _b.id) === 'string')
+                                    ? reserveTransaction.object.provider
+                                    : { id: reserveTransaction.agent.id, typeOf: factory.organizationType.Corporation },
                                 subReservation: subReservations,
+                                issuedThrough,
                                 reservationFor,
                                 underName,
-                                broker: reserveTransaction.object.broker,
-                                issuedThrough: reserveTransaction.object.issuedThrough
+                                broker: reserveTransaction.object.broker
                             });
                             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 {
-                        // 予約を確定状態に変更する
-                        yield repos.reservation.confirmByReservationNumber({
-                            reservationNumber: reservationPackage.reservationNumber,
-                            previousReservationStatus: reservationPackage.reservationStatus,
-                            underName,
-                            broker: reserveTransaction.object.broker,
-                            issuedThrough: reserveTransaction.object.issuedThrough
-                        });
+                        // 旧予約取引に対して本処理が走る可能性がなくはないが、
+                        // それらについては実質Confirmedの予約はすでに存在するはずなので、何もしない
+                        // 完全廃止(2023-07-19~)
+                        // throw new factory.errors.NotImplemented('disablePendingReservations must be true');
                     }
                 }
                 else {
                     // 廃止(2023-01-18)
                     throw new factory.errors.Forbidden(`${reservationPackage.typeOf} not acceptable`);
-                    // 予約を確定状態に変更する
-                    // await repos.reservation.confirm<factory.reservationType.EventReservation>({
-                    //     id: reservation.id,
-                    //     previousReservationStatus: reservation.reservationStatus,
-                    //     underName: reservation.underName
-                    // });
-                    // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
-                    // delete (<any>reservation)._id;
-                    // confirmedReservations.push(reservation);
                 }
             }
             catch (error) {

package/lib/chevre/service/reserve/verifyToken4reservation.d.ts

@@ -7,6 +7,9 @@ export declare function verifyToken4reservation(params: {
     project: {
         id: string;
     };
+    seller?: {
+        id?: string;
+    };
     agent: factory.action.check.token.IAgent;
     reservationId: string;
     token: string;

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

@@ -26,8 +26,10 @@ function verifyToken4reservation(params) {
             case factory.order.OrderType.Order:
                 // reservationIdを含む注文の存在を確認するだけでよい(2023-01-31~)
                 const order = yield repos.order.findByOrderNumberAndReservationId({
+                    project: { id: params.project.id },
                     orderNumber: payload.orderNumber,
-                    reservationId: params.reservationId
+                    reservationId: params.reservationId,
+                    seller: params.seller
                 });
                 // ステータス検証
                 switch (order.orderStatus) {

package/lib/chevre/service/task/{syncScreeningRooms.d.ts → createEvent.d.ts}

@@ -4,4 +4,4 @@ export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.syncScreeningRooms.IData): IOperation<void>;
+export declare function call(data: factory.task.createEvent.IData): IOperation<void>;

package/lib/chevre/service/task/{syncScreeningRooms.js → createEvent.js}

@@ -10,14 +10,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const action_1 = require("../../repo/action");
+const event_1 = require("../../repo/event");
 const place_1 = require("../../repo/place");
+const task_1 = require("../../repo/task");
+const EventService = require("../event");
 /**
  * タスク実行関数
  */
 function call(data) {
-    return (connectionSettings) => __awaiter(this, void 0, void 0, function* () {
-        const placeRepo = new place_1.MongoRepository(connectionSettings.connection);
-        yield placeRepo.syncScreeningRooms({ id: data.id });
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        yield EventService.createEvent(data)({
+            action: new action_1.MongoRepository(settings.connection),
+            event: new event_1.MongoRepository(settings.connection),
+            place: new place_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
+        });
     });
 }
 exports.call = call;

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

@@ -56,6 +56,7 @@ function onAuthorizationCreated(params) {
                     // 最適化(2023-01-28~)
                     const order = yield repos.order.findByOrderNumber({
                         orderNumber,
+                        project: { id: params.project.id },
                         inclusion: ['acceptedOffers'],
                         exclusion: []
                     });

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

@@ -68,6 +68,7 @@ function returnPayTransaction(params) {
         }
         const order = yield repos.order.findByOrderNumber({
             orderNumber,
+            project: { id: returnOrderTransaction.project.id },
             inclusion: ['seller', 'project', 'dateReturned'],
             exclusion: []
         });

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

@@ -28,7 +28,15 @@ 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 }, ['name', 'typeOf'], []);
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: params.seller.id }
+        }, ['name', 'typeOf'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         const passport = yield (0, validation_1.validateWaiterPassport)(params);
         // 金額をfix
         const amount = params.object.amount;

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

@@ -112,7 +112,7 @@ function getCreditCardPaymentServiceChannel(params) {
             throw new factory.errors.NotFound('PaymentService');
         }
         // IDで検索いないとavailableChannelを取得できない
-        const paymentService = yield repos.product.findById({ id: String(paymentServiceSetting.id) });
+        const paymentService = yield repos.product.findById({ id: String(paymentServiceSetting.id) }, ['availableChannel'], []);
         const availableChannel = paymentService === null || paymentService === void 0 ? void 0 : paymentService.availableChannel;
         if (typeof (availableChannel === null || availableChannel === void 0 ? void 0 : availableChannel.serviceUrl) !== 'string') {
             throw new factory.errors.NotFound('paymentService.availableChannel.serviceUrl');

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

@@ -29,12 +29,15 @@ 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 }, ['name', 'project', 'typeOf', 'makesOffer'], []
-        // {
-        //     hasMerchantReturnPolicy: 0,
-        //     paymentAccepted: 0
-        // }
-        );
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: params.seller.id }
+        }, ['name', 'project', 'typeOf', 'makesOffer'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         let makesOfferFromClient;
         // 販売者オファー検証(2022-10-14~)
         if (params.validateSeller === true) {

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

@@ -29,9 +29,15 @@ 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) }, ['name', 'project', 'hasMerchantReturnPolicy', 'typeOf'], []
-        // { additionalProperty: 0, paymentAccepted: 0 }
-        );
+        const sellers = yield repos.seller.search({
+            limit: 1,
+            page: 1,
+            id: { $eq: String(orders[0].seller.id) }
+        }, ['name', 'project', 'hasMerchantReturnPolicy', 'typeOf'], []);
+        const seller = sellers.shift();
+        if (seller === undefined) {
+            throw new factory.errors.NotFound(factory.organizationType.Corporation);
+        }
         yield validateOrder({ orders })(repos);
         let offers = [];
         if (offerIds.length > 0) {

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.314.0",
-    "@cinerino/sdk": "3.157.1",
+    "@chevre/factory": "4.316.0-alpha.6",
+    "@cinerino/sdk": "3.162.0-alpha.1",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.4.0-alpha.3"
+  "version": "21.4.0-alpha.30"
 }

package/example/src/chevre/findByOrderNumberAndReservationId.ts

@@ -1,20 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const orderRepo = new chevre.repository.Order(mongoose.connection);
-
-    const order = await orderRepo.findByOrderNumberAndReservationId({
-        orderNumber: 'CIN9-4783801-1618274',
-        reservationId: '139787058570943-0'
-    });
-    console.log('order found', order);
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/findScreeningRoomsByBranchCode.ts

@@ -1,27 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const placeRepo = new chevre.repository.Place(mongoose.connection);
-
-    const screeningRoom = await placeRepo.findScreeningRoomsByBranchCode({
-        branchCode: {
-            $eq: '20'
-        },
-        containedInPlace: {
-            id: {
-                $eq: '5bfb841d5a78d7948369979a'
-            }
-        }
-    });
-    console.log('room found', screeningRoom);
-
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);

package/example/src/chevre/migrateEventOffersItemOfferedAvailableChannel.ts

@@ -1,90 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-
-    const cursor = eventRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            'project.id': { $ne: EXCLUDED_PROJECT_ID },
-            typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
-            startDate: {
-                $gte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-6, 'months')
-                    .toDate()
-            }
-            // _id: { $eq: 'al6aff83w' }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('events found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const event: chevre.factory.event.screeningEvent.IEvent = doc.toObject();
-
-        const eventOffers = <chevre.factory.event.screeningEvent.IOffer | undefined>event.offers;
-        if (eventOffers === undefined) {
-            throw new Error('event.offers undefined');
-        }
-
-        const availableChannel = eventOffers.itemOffered.availableChannel;
-
-        const alreadyMigrated = availableChannel?.typeOf === 'ServiceChannel';
-
-        if (alreadyMigrated) {
-            console.log(
-                'already exist...', event.project.id, event.id, event.startDate, availableChannel.serviceLocation.branchCode, i);
-        } else {
-            const newAvailableChannel: chevre.factory.reservation.IServiceChannel = {
-                typeOf: 'ServiceChannel',
-                serviceLocation: {
-                    typeOf: event.location.typeOf,
-                    branchCode: event.location.branchCode,
-                    name: event.location.name,
-                    containedInPlace: {
-                        typeOf: event.superEvent.location.typeOf,
-                        id: event.superEvent.location.id,
-                        branchCode: event.superEvent.location.branchCode,
-                        name: event.superEvent.location.name
-                    }
-                }
-            };
-            console.log(
-                'updating seller...', event.project.id, event.id, event.startDate, newAvailableChannel.serviceLocation.branchCode, i);
-            await eventRepo.updatePartiallyById({
-                id: event.id,
-                attributes: <any>{
-                    typeOf: event.typeOf,
-                    'offers.itemOffered.availableChannel': newAvailableChannel
-                }
-            });
-            updateCount += 1;
-            console.log(
-                'updated...', event.project.id, event.id, event.startDate, i);
-        }
-    });
-
-    console.log(i, 'events checked');
-    console.log(updateCount, 'events updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/migrateEventOffersItemOfferedTypeOf.ts

@@ -1,75 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-
-    const cursor = eventRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            'project.id': { $ne: EXCLUDED_PROJECT_ID },
-            typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
-            startDate: {
-                $gte: moment()
-                    .add(-1, 'month')
-                    .toDate()
-            }
-            // _id: { $eq: 'al6aff83w' }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('events found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const event: chevre.factory.event.screeningEvent.IEvent = doc.toObject();
-
-        // IAMメンバー検索
-        const eventOffers = <chevre.factory.event.screeningEvent.IOffer | undefined>event.offers;
-        if (eventOffers === undefined) {
-            throw new Error('event.offers undefined');
-        }
-
-        const itemOfferedTypeOf = eventOffers.itemOffered.typeOf;
-
-        const alreadyMigrated = itemOfferedTypeOf === chevre.factory.product.ProductType.EventService;
-
-        if (alreadyMigrated) {
-            console.log(
-                'already exist...', event.project.id, event.id, event.startDate, itemOfferedTypeOf, i);
-        } else {
-            console.log(
-                'updating seller...', event.project.id, event.id, event.startDate, i);
-            await eventRepo.updatePartiallyById({
-                id: event.id,
-                attributes: <any>{
-                    typeOf: event.typeOf,
-                    'offers.itemOffered.typeOf': chevre.factory.product.ProductType.EventService
-                }
-            });
-            updateCount += 1;
-            console.log(
-                'updated...', event.project.id, event.id, event.startDate, i);
-        }
-    });
-
-    console.log(i, 'events checked');
-    console.log(updateCount, 'events updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/migrateSSKTEventCOAEndpoint.ts

@@ -1,64 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-const DELETING_PROPERTY_NAME: string = 'COA_ENDPOINT';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-
-    const cursor = eventRepo.getCursor(
-        {
-            'project.id': { $eq: project.id },
-            typeOf: { $eq: chevre.factory.eventType.ScreeningEventSeries }
-            // typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
-            // startDate: { $gte: new Date() }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('events found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const event: chevre.factory.event.IEvent<chevre.factory.eventType> = doc.toObject();
-
-        const coaEndpointPropert = event.additionalProperty?.find((p) => p.name === DELETING_PROPERTY_NAME);
-
-        if (coaEndpointPropert !== undefined) {
-            const newAdditionalProperty: chevre.factory.propertyValue.IPropertyValue<string>[] =
-                (Array.isArray(event.additionalProperty))
-                    ? event.additionalProperty.filter((p) => {
-                        return p.name !== DELETING_PROPERTY_NAME;
-                    })
-                    : [];
-            console.log(
-                'updating event...', event.project.id, event.id, event.startDate, coaEndpointPropert.value, newAdditionalProperty, i);
-            await eventRepo.updatePartiallyById({
-                id: event.id,
-                attributes: <any>{
-                    typeOf: event.typeOf,
-                    additionalProperty: newAdditionalProperty
-                }
-            });
-            updateCount += 1;
-            console.log('event updated', event.project.id, event.id, event.startDate, i);
-        } else {
-            console.log('no property...', event.project.id, event.id, event.startDate, i);
-        }
-    });
-
-    console.log(i, 'events checked');
-    console.log(updateCount, 'events updated');
-}
-
-main()
-    .then()
-    .catch(console.error);