@chevre/domain 21.5.0-alpha.2 → 21.5.0-alpha.4

package/lib/chevre/repo/assetTransaction.js

@@ -24,7 +24,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24;
         const andConditions = [
             {
                 typeOf: params.typeOf
@@ -176,7 +176,11 @@ class MongoRepository {
             case factory.assetTransactionType.CancelReservation:
                 break;
             case factory.assetTransactionType.Reserve:
-                const objectReservationForIdEq = (_y = (_x = (_w = params.object) === null || _w === void 0 ? void 0 : _w.reservationFor) === null || _x === void 0 ? void 0 : _x.id) === null || _y === void 0 ? void 0 : _y.$eq;
+                const objectProviderIdEq = (_y = (_x = (_w = params.object) === null || _w === void 0 ? void 0 : _w.provider) === null || _x === void 0 ? void 0 : _x.id) === null || _y === void 0 ? void 0 : _y.$eq;
+                if (typeof objectProviderIdEq === 'string') {
+                    andConditions.push({ 'object.provider.id': { $exists: true, $eq: objectProviderIdEq } });
+                }
+                const objectReservationForIdEq = (_1 = (_0 = (_z = params.object) === null || _z === void 0 ? void 0 : _z.reservationFor) === null || _0 === void 0 ? void 0 : _0.id) === null || _1 === void 0 ? void 0 : _1.$eq;
                 if (typeof objectReservationForIdEq === 'string') {
                     andConditions.push({
                         'object.reservationFor.id': {
@@ -185,7 +189,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const objectReservationNumberIn = (_0 = (_z = params.object) === null || _z === void 0 ? void 0 : _z.reservationNumber) === null || _0 === void 0 ? void 0 : _0.$in;
+                const objectReservationNumberIn = (_3 = (_2 = params.object) === null || _2 === void 0 ? void 0 : _2.reservationNumber) === null || _3 === void 0 ? void 0 : _3.$in;
                 if (Array.isArray(objectReservationNumberIn)) {
                     andConditions.push({
                         'object.reservationNumber': {
@@ -194,7 +198,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const objectReservationNumberEq = (_2 = (_1 = params.object) === null || _1 === void 0 ? void 0 : _1.reservationNumber) === null || _2 === void 0 ? void 0 : _2.$eq;
+                const objectReservationNumberEq = (_5 = (_4 = params.object) === null || _4 === void 0 ? void 0 : _4.reservationNumber) === null || _5 === void 0 ? void 0 : _5.$eq;
                 if (typeof objectReservationNumberEq === 'string') {
                     andConditions.push({
                         'object.reservationNumber': {
@@ -203,7 +207,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const objectSubReservationIdIn = (_5 = (_4 = (_3 = params.object) === null || _3 === void 0 ? void 0 : _3.reservations) === null || _4 === void 0 ? void 0 : _4.id) === null || _5 === void 0 ? void 0 : _5.$in;
+                const objectSubReservationIdIn = (_8 = (_7 = (_6 = params.object) === null || _6 === void 0 ? void 0 : _6.reservations) === null || _7 === void 0 ? void 0 : _7.id) === null || _8 === void 0 ? void 0 : _8.$in;
                 if (Array.isArray(objectSubReservationIdIn)) {
                     andConditions.push({
                         'object.subReservation.id': {
@@ -238,7 +242,7 @@ class MongoRepository {
                         }
                     }
                 }
-                const objectUnderNameIdEq = (_8 = (_7 = (_6 = params.object) === null || _6 === void 0 ? void 0 : _6.underName) === null || _7 === void 0 ? void 0 : _7.id) === null || _8 === void 0 ? void 0 : _8.$eq;
+                const objectUnderNameIdEq = (_11 = (_10 = (_9 = params.object) === null || _9 === void 0 ? void 0 : _9.underName) === null || _10 === void 0 ? void 0 : _10.id) === null || _11 === void 0 ? void 0 : _11.$eq;
                 if (typeof objectUnderNameIdEq === 'string') {
                     andConditions.push({
                         'object.underName.id': {
@@ -247,7 +251,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const objectSubReservationSeatNumberEq = (_13 = (_12 = (_11 = (_10 = (_9 = params.object) === null || _9 === void 0 ? void 0 : _9.reservations) === null || _10 === void 0 ? void 0 : _10.reservedTicket) === null || _11 === void 0 ? void 0 : _11.ticketedSeat) === null || _12 === void 0 ? void 0 : _12.seatNumber) === null || _13 === void 0 ? void 0 : _13.$eq;
+                const objectSubReservationSeatNumberEq = (_16 = (_15 = (_14 = (_13 = (_12 = params.object) === null || _12 === void 0 ? void 0 : _12.reservations) === null || _13 === void 0 ? void 0 : _13.reservedTicket) === null || _14 === void 0 ? void 0 : _14.ticketedSeat) === null || _15 === void 0 ? void 0 : _15.seatNumber) === null || _16 === void 0 ? void 0 : _16.$eq;
                 if (typeof objectSubReservationSeatNumberEq === 'string') {
                     andConditions.push({
                         'object.subReservation.reservedTicket.ticketedSeat.seatNumber': {
@@ -258,7 +262,7 @@ class MongoRepository {
                 }
                 break;
             case factory.assetTransactionType.RegisterService:
-                const objectItemOfferedServiceOutputIdentifierEq = (_17 = (_16 = (_15 = (_14 = params.object) === null || _14 === void 0 ? void 0 : _14.itemOffered) === null || _15 === void 0 ? void 0 : _15.serviceOutput) === null || _16 === void 0 ? void 0 : _16.identifier) === null || _17 === void 0 ? void 0 : _17.$eq;
+                const objectItemOfferedServiceOutputIdentifierEq = (_20 = (_19 = (_18 = (_17 = params.object) === null || _17 === void 0 ? void 0 : _17.itemOffered) === null || _18 === void 0 ? void 0 : _18.serviceOutput) === null || _19 === void 0 ? void 0 : _19.identifier) === null || _20 === void 0 ? void 0 : _20.$eq;
                 if (typeof objectItemOfferedServiceOutputIdentifierEq === 'string') {
                     andConditions.push({
                         'object.itemOffered.serviceOutput.identifier': {
@@ -267,7 +271,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const objectItemOfferedServiceOutputIdentifierIn = (_21 = (_20 = (_19 = (_18 = params.object) === null || _18 === void 0 ? void 0 : _18.itemOffered) === null || _19 === void 0 ? void 0 : _19.serviceOutput) === null || _20 === void 0 ? void 0 : _20.identifier) === null || _21 === void 0 ? void 0 : _21.$in;
+                const objectItemOfferedServiceOutputIdentifierIn = (_24 = (_23 = (_22 = (_21 = params.object) === null || _21 === void 0 ? void 0 : _21.itemOffered) === null || _22 === void 0 ? void 0 : _22.serviceOutput) === null || _23 === void 0 ? void 0 : _23.identifier) === null || _24 === void 0 ? void 0 : _24.$in;
                 if (Array.isArray(objectItemOfferedServiceOutputIdentifierIn)) {
                     andConditions.push({
                         'object.itemOffered.serviceOutput.identifier': {

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

@@ -202,6 +202,31 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<import("mongodb").DeleteResult>;
+    deleteManyByScreeningRoom(params: {
+        project: {
+            id: string;
+        };
+        location: {
+            /**
+             * ルームコード
+             */
+            branchCode: string;
+            containedInPlace: {
+                /**
+                 * 施設ID
+                 */
+                id: string;
+            };
+        };
+    }): Promise<import("mongodb").DeleteResult>;
+    deleteManyBySuperEventId(params: {
+        project: {
+            id: string;
+        };
+        superEvent: {
+            id: string;
+        };
+    }): Promise<import("mongodb").DeleteResult>;
     deleteManyBySuperEventLocationId(params: {
         project: {
             id: string;

package/lib/chevre/repo/event.js

@@ -926,6 +926,25 @@ class MongoRepository {
                 .exec();
         });
     }
+    deleteManyByScreeningRoom(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.eventModel.deleteMany({
+                'project.id': { $eq: params.project.id },
+                'location.branchCode': { $exists: true, $eq: params.location.branchCode },
+                'superEvent.location.id': { $exists: true, $eq: params.location.containedInPlace.id }
+            })
+                .exec();
+        });
+    }
+    deleteManyBySuperEventId(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.eventModel.deleteMany({
+                'project.id': { $eq: params.project.id },
+                'superEvent.id': { $exists: true, $eq: params.superEvent.id }
+            })
+                .exec();
+        });
+    }
     deleteManyBySuperEventLocationId(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.eventModel.deleteMany({

package/lib/chevre/repo/mongoose/schemas/assetTransaction.js

@@ -99,6 +99,12 @@ schema.index({ 'object.paymentMethodId': 1, startDate: -1 }, {
         'object.paymentMethodId': { $exists: true }
     }
 });
+schema.index({ 'object.provider.id': 1, startDate: -1 }, {
+    name: 'searchByObjectProviderId',
+    partialFilterExpression: {
+        'object.provider.id': { $exists: true }
+    }
+});
 schema.index({ 'object.subReservation.id': 1, startDate: -1 }, {
     name: 'searchByObjectSubReservationsId',
     partialFilterExpression: {

package/lib/chevre/service/assetTransaction/cancelReservation.d.ts

@@ -18,15 +18,23 @@ export type ITransactionOperation<T> = (repos: {
 /**
  * 取引開始
  */
-export declare function start(params: factory.assetTransaction.cancelReservation.IStartParamsWithoutDetail): IStartOperation<factory.assetTransaction.cancelReservation.ITransaction>;
+export declare function start(params: factory.assetTransaction.cancelReservation.IStartParamsWithoutDetail & {
+    seller: {
+        id?: string;
+    };
+}): IStartOperation<factory.assetTransaction.cancelReservation.ITransaction>;
 /**
  * 取引確定
  */
 export declare function confirm(params: factory.assetTransaction.cancelReservation.IConfirmParams): ITransactionOperation<void>;
 /**
- * 取引開始
+ * 取引開始&確定
  */
-export declare function startAndConfirm(params: factory.assetTransaction.cancelReservation.IStartParamsWithoutDetail & {}): IStartOperation<factory.assetTransaction.cancelReservation.ITransaction>;
+export declare function startAndConfirm(params: factory.assetTransaction.cancelReservation.IStartParamsWithoutDetail & {
+    seller: {
+        id?: string;
+    };
+}): IStartOperation<factory.assetTransaction.cancelReservation.ITransaction>;
 /**
  * 取引タスク出力
  */

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

@@ -18,16 +18,17 @@ const factory = require("../../factory");
 const factory_1 = require("./cancelReservation/factory");
 function validateStartParams(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c, _d;
         let reserveTransaction;
         let reservations;
+        const sellerId = (_a = params.seller) === null || _a === void 0 ? void 0 : _a.id;
         // 予約番号で取引存在確認
-        if (typeof ((_a = params.object.reservation) === null || _a === void 0 ? void 0 : _a.reservationNumber) === 'string') {
+        if (typeof ((_b = params.object.reservation) === null || _b === void 0 ? void 0 : _b.reservationNumber) === 'string') {
             const transactions = yield repos.assetTransaction.search({
                 limit: 1,
                 page: 1,
                 typeOf: factory.assetTransactionType.Reserve,
-                object: { reservationNumber: { $eq: params.object.reservation.reservationNumber } }
+                object: Object.assign({ reservationNumber: { $eq: params.object.reservation.reservationNumber } }, (typeof sellerId === 'string') ? { provider: { id: { $eq: sellerId } } } : undefined)
             });
             reserveTransaction = transactions.shift();
             // ここでReservationConfirmedでない予約をスルーしても、
@@ -48,15 +49,21 @@ function validateStartParams(params) {
         // 取引指定が確認できなければ、予約指定を確認
         if (reserveTransaction === undefined) {
             // 予約存在確認
-            if (typeof ((_b = params.object.reservation) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
+            if (typeof ((_c = params.object.reservation) === null || _c === void 0 ? void 0 : _c.id) === 'string') {
                 const reservation = yield repos.reservation.findById({
                     id: params.object.reservation.id
                 });
-                reservations = [reservation];
+                // 販売者検証(2023-08-01~)
+                if (typeof sellerId === 'string') {
+                    if (((_d = reservation.provider) === null || _d === void 0 ? void 0 : _d.id) !== sellerId) {
+                        throw new factory.errors.NotFound(factory.reservationType.EventReservation);
+                    }
+                }
                 // 予約ステータス確認
                 if (reservation.reservationStatus !== factory.reservationStatusType.ReservationConfirmed) {
                     throw new factory.errors.Argument('object.reservation.id', `Reservation ${reservation.id} not confirmed`);
                 }
+                reservations = [reservation];
             }
         }
         if (reserveTransaction === undefined && reservations === undefined) {
@@ -125,7 +132,7 @@ function confirm(params) {
 }
 exports.confirm = confirm;
 /**
- * 取引開始
+ * 取引開始&確定
  */
 function startAndConfirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.js

@@ -16,6 +16,19 @@ function onResourceDeleted(params) {
         const isDeleted = params.isDeleted === true;
         if (isDeleted) {
             switch (params.typeOf) {
+                case factory.eventType.ScreeningEventSeries:
+                    yield deleteResourcesByScreeningEventSeries({
+                        project: { id: params.project.id },
+                        ids: params.id
+                    })(repos);
+                    break;
+                case factory.placeType.ScreeningRoom:
+                    yield deleteResourcesByScreeningRoom({
+                        project: { id: params.project.id },
+                        branchCode: params.branchCode,
+                        containedInPlace: { id: params.containedInPlace.id }
+                    })(repos);
+                    break;
                 case factory.placeType.MovieTheater:
                     yield deleteResourcesByMovieTheater({
                         project: { id: params.project.id },
@@ -35,6 +48,76 @@ function onResourceDeleted(params) {
     });
 }
 exports.onResourceDeleted = onResourceDeleted;
+function deleteResourcesByScreeningEventSeries(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (params.ids.length !== 1) {
+            throw new factory.errors.Argument('id', 'id.length must be 1');
+        }
+        for (const eventId of params.ids) {
+            const deleteActionAttributes = {
+                agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+                object: { id: eventId, typeOf: factory.eventType.ScreeningEventSeries },
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                typeOf: factory.actionType.DeleteAction
+            };
+            let deleteResult;
+            const action = yield repos.action.start(deleteActionAttributes);
+            try {
+                // イベント削除
+                const deleteScreeningEventResult = yield repos.event.deleteManyBySuperEventId({
+                    project: { id: params.project.id },
+                    superEvent: { id: eventId }
+                });
+                deleteResult = { deleteScreeningEventResult };
+            }
+            catch (error) {
+                try {
+                    const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                    yield repos.action.giveUp({ typeOf: deleteActionAttributes.typeOf, id: action.id, error: actionError });
+                }
+                catch (_) {
+                    // no op
+                }
+                throw error;
+            }
+            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+        }
+    });
+}
+function deleteResourcesByScreeningRoom(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const deleteActionAttributes = {
+            agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+            object: { branchCode: params.branchCode, containedInPlace: params.containedInPlace, typeOf: factory.placeType.ScreeningRoom },
+            project: { id: params.project.id, typeOf: factory.organizationType.Project },
+            typeOf: factory.actionType.DeleteAction
+        };
+        let deleteResult;
+        const action = yield repos.action.start(deleteActionAttributes);
+        try {
+            // イベント削除
+            const deleteScreeningEventResult = yield repos.event.deleteManyByScreeningRoom({
+                project: { id: params.project.id },
+                location: {
+                    branchCode: params.branchCode,
+                    containedInPlace: { id: params.containedInPlace.id }
+                }
+            });
+            deleteResult = { deleteScreeningEventResult };
+        }
+        catch (error) {
+            try {
+                const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                yield repos.action.giveUp({ typeOf: deleteActionAttributes.typeOf, id: action.id, error: actionError });
+            }
+            catch (_) {
+                // no op
+            }
+            throw error;
+        }
+        yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+    });
+}
 function deleteResourcesByMovieTheater(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         if (params.ids.length !== 1) {

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

@@ -117,7 +117,8 @@ function processCancelReservation4chevre(params) {
             },
             expires: moment()
                 .add(1, 'minutes')
-                .toDate()
+                .toDate(),
+            seller: {} // 販売者条件必要なし
         })(repos);
     });
 }

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.319.0",
-    "@cinerino/sdk": "3.162.0-alpha.6",
+    "@chevre/factory": "4.321.0",
+    "@cinerino/sdk": "3.162.0-alpha.7",
     "@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.5.0-alpha.2"
+  "version": "21.5.0-alpha.4"
 }