npm - @chevre/domain - Versions diffs - 21.2.0-alpha.13 → 21.2.0-alpha.131 - Mend

@chevre/domain 21.2.0-alpha.13 → 21.2.0-alpha.131

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (296) hide show

package/lib/chevre/repo/accountTransaction.js CHANGED Viewed

@@ -13,6 +13,7 @@ exports.MongoRepository = void 0;
 const moment = require("moment");
 const accountTransaction_1 = require("./mongoose/schemas/accountTransaction");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * 口座取引リポジトリ
  */
@@ -229,7 +230,7 @@ class MongoRepository {
             // ステータスと期限を見て更新
             yield this.transactionModel.updateMany({
                 status: factory.transactionStatusType.InProgress,
-                expires: { $lt: params.expires }
+                expires: { $lt: params.expires.$lt }
             }, {
                 status: factory.transactionStatusType.Expired,
                 endDate: new Date()
@@ -260,7 +261,7 @@ class MongoRepository {
             if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.startDate) !== undefined) {
                 query.sort({ startDate: params.sort.startDate });
             }
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });

package/lib/chevre/repo/action.d.ts CHANGED Viewed

@@ -82,7 +82,18 @@ export declare class MongoRepository {
         typeOf?: T;
         purpose: {
             typeOf: factory.transactionType;
-            id?: string;
+            id: string;
+        };
+        object?: {
+            typeOf?: {
+                $eq?: factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation | factory.action.authorize.paymentMethod.any.ResultType.Payment;
+            };
+            paymentMethodId?: {
+                $eq?: string;
+            };
+        };
+        actionStatus?: {
+            $eq?: factory.actionStatusType;
         };
         sort?: factory.action.ISortOrder;
     }): Promise<IAction<T>[]>;
@@ -122,6 +133,23 @@ export declare class MongoRepository {
     deleteEndDatePassedCertainPeriod(params: {
         $lt: Date;
     }): Promise<void>;
+    /**
+     * 取引からアクションを削除する
+     */
+    deleteByPurpose(params: {
+        project: {
+            id: string;
+        };
+        purpose: {
+            typeOf: factory.transactionType;
+            id: string;
+        };
+        typeOf: {
+            $in: factory.actionType[];
+        };
+    }): Promise<{
+        deletedCount?: number;
+    } | null>;
     aggregateAuthorizeEventServiceOfferAction(params: {
         project?: {
             id?: {
@@ -152,7 +180,19 @@ export declare class MongoRepository {
         startThrough: Date;
         typeOf: factory.actionType;
     }): Promise<IAggregateAction>;
-    aggregateUseAction(params: {
+    aggregateCancelReservationAction(params: {
+        project?: {
+            id?: {
+                $ne?: string;
+            };
+        };
+        startFrom: Date;
+        startThrough: Date;
+    }): Promise<IAggregateAction>;
+    /**
+     * アクションタイプによる汎用的な集計
+     */
+    aggregateByTypeOf(params: {
         project?: {
             id?: {
                 $ne?: string;

package/lib/chevre/repo/action.js CHANGED Viewed

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const factory = require("../factory");
 const action_1 = require("./mongoose/schemas/action");
+const settings_1 = require("../settings");
 /**
  * アクションリポジトリ
  */
@@ -21,7 +22,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, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53;
+        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, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, _65;
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
@@ -75,9 +76,27 @@ class MongoRepository {
                 }
             });
         }
+        const objectMovieTicketsIdentifierEq = (_o = (_m = (_l = params.object) === null || _l === void 0 ? void 0 : _l.movieTickets) === null || _m === void 0 ? void 0 : _m.identifier) === null || _o === void 0 ? void 0 : _o.$eq;
+        if (typeof objectMovieTicketsIdentifierEq === 'string') {
+            andConditions.push({
+                'object.movieTickets.identifier': {
+                    $exists: true,
+                    $eq: objectMovieTicketsIdentifierEq
+                }
+            });
+        }
+        const objectMovieTicketsServiceOutputReservationForIdEq = (_t = (_s = (_r = (_q = (_p = params.object) === null || _p === void 0 ? void 0 : _p.movieTickets) === null || _q === void 0 ? void 0 : _q.serviceOutput) === null || _r === void 0 ? void 0 : _r.reservationFor) === null || _s === void 0 ? void 0 : _s.id) === null || _t === void 0 ? void 0 : _t.$eq;
+        if (typeof objectMovieTicketsServiceOutputReservationForIdEq === 'string') {
+            andConditions.push({
+                'object.movieTickets.serviceOutput.reservationFor.id': {
+                    $exists: true,
+                    $eq: objectMovieTicketsServiceOutputReservationForIdEq
+                }
+            });
+        }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
-        const objectPaymentMethodIdEq = (_m = (_l = params.object) === null || _l === void 0 ? void 0 : _l.paymentMethodId) === null || _m === void 0 ? void 0 : _m.$eq;
+        const objectPaymentMethodIdEq = (_v = (_u = params.object) === null || _u === void 0 ? void 0 : _u.paymentMethodId) === null || _v === void 0 ? void 0 : _v.$eq;
         if (typeof objectPaymentMethodIdEq === 'string') {
             andConditions.push({
                 'object.paymentMethodId': {
@@ -86,7 +105,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectObjectPaymentMethodIdEq = (_q = (_p = (_o = params.object) === null || _o === void 0 ? void 0 : _o.object) === null || _p === void 0 ? void 0 : _p.paymentMethodId) === null || _q === void 0 ? void 0 : _q.$eq;
+        const objectObjectPaymentMethodIdEq = (_y = (_x = (_w = params.object) === null || _w === void 0 ? void 0 : _w.object) === null || _x === void 0 ? void 0 : _x.paymentMethodId) === null || _y === void 0 ? void 0 : _y.$eq;
         if (typeof objectObjectPaymentMethodIdEq === 'string') {
             andConditions.push({
                 'object.object.paymentMethodId': {
@@ -95,7 +114,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectReservationForIdEq = (_t = (_s = (_r = params.object) === null || _r === void 0 ? void 0 : _r.reservationFor) === null || _s === void 0 ? void 0 : _s.id) === null || _t === void 0 ? void 0 : _t.$eq;
+        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;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof objectReservationForIdEq === 'string') {
@@ -106,7 +125,25 @@ class MongoRepository {
                 }
             });
         }
-        const objectPaymentMethodAccountIdEq = (_w = (_v = (_u = params.object) === null || _u === void 0 ? void 0 : _u.paymentMethod) === null || _v === void 0 ? void 0 : _v.accountId) === null || _w === void 0 ? void 0 : _w.$eq;
+        const objectReservationNumberEq = (_3 = (_2 = params.object) === null || _2 === void 0 ? void 0 : _2.reservationNumber) === null || _3 === void 0 ? void 0 : _3.$eq;
+        if (typeof objectReservationNumberEq === 'string') {
+            andConditions.push({
+                'object.reservationNumber': {
+                    $exists: true,
+                    $eq: objectReservationNumberEq
+                }
+            });
+        }
+        const objectReservationNumberIn = (_5 = (_4 = params.object) === null || _4 === void 0 ? void 0 : _4.reservationNumber) === null || _5 === void 0 ? void 0 : _5.$in;
+        if (Array.isArray(objectReservationNumberIn)) {
+            andConditions.push({
+                'object.reservationNumber': {
+                    $exists: true,
+                    $in: objectReservationNumberIn
+                }
+            });
+        }
+        const objectPaymentMethodAccountIdEq = (_8 = (_7 = (_6 = params.object) === null || _6 === void 0 ? void 0 : _6.paymentMethod) === null || _7 === void 0 ? void 0 : _7.accountId) === null || _8 === void 0 ? void 0 : _8.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof objectPaymentMethodAccountIdEq === 'string') {
@@ -117,7 +154,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPaymentMethodPaymentMethodIdEq = (_z = (_y = (_x = params.object) === null || _x === void 0 ? void 0 : _x.paymentMethod) === null || _y === void 0 ? void 0 : _y.paymentMethodId) === null || _z === void 0 ? void 0 : _z.$eq;
+        const objectPaymentMethodPaymentMethodIdEq = (_11 = (_10 = (_9 = params.object) === null || _9 === void 0 ? void 0 : _9.paymentMethod) === null || _10 === void 0 ? void 0 : _10.paymentMethodId) === null || _11 === void 0 ? void 0 : _11.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof objectPaymentMethodPaymentMethodIdEq === 'string') {
@@ -128,7 +165,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPaymentMethodPaymentMethodIdIn = (_2 = (_1 = (_0 = params.object) === null || _0 === void 0 ? void 0 : _0.paymentMethod) === null || _1 === void 0 ? void 0 : _1.paymentMethodId) === null || _2 === void 0 ? void 0 : _2.$in;
+        const objectPaymentMethodPaymentMethodIdIn = (_14 = (_13 = (_12 = params.object) === null || _12 === void 0 ? void 0 : _12.paymentMethod) === null || _13 === void 0 ? void 0 : _13.paymentMethodId) === null || _14 === void 0 ? void 0 : _14.$in;
         if (Array.isArray(objectPaymentMethodPaymentMethodIdIn)) {
             andConditions.push({
                 'object.paymentMethod.paymentMethodId': {
@@ -137,7 +174,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPaymentMethodTypeOfEq = (_5 = (_4 = (_3 = params.object) === null || _3 === void 0 ? void 0 : _3.paymentMethod) === null || _4 === void 0 ? void 0 : _4.typeOf) === null || _5 === void 0 ? void 0 : _5.$eq;
+        const objectPaymentMethodTypeOfEq = (_17 = (_16 = (_15 = params.object) === null || _15 === void 0 ? void 0 : _15.paymentMethod) === null || _16 === void 0 ? void 0 : _16.typeOf) === null || _17 === void 0 ? void 0 : _17.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof objectPaymentMethodTypeOfEq === 'string') {
@@ -148,7 +185,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectTypeOfEq = (_7 = (_6 = params.object) === null || _6 === void 0 ? void 0 : _6.typeOf) === null || _7 === void 0 ? void 0 : _7.$eq;
+        const objectTypeOfEq = (_19 = (_18 = params.object) === null || _18 === void 0 ? void 0 : _18.typeOf) === null || _19 === void 0 ? void 0 : _19.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof objectTypeOfEq === 'string') {
@@ -159,7 +196,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectTypeOfIn = (_9 = (_8 = params.object) === null || _8 === void 0 ? void 0 : _8.typeOf) === null || _9 === void 0 ? void 0 : _9.$in;
+        const objectTypeOfIn = (_21 = (_20 = params.object) === null || _20 === void 0 ? void 0 : _20.typeOf) === null || _21 === void 0 ? void 0 : _21.$in;
         if (Array.isArray(objectTypeOfIn)) {
             andConditions.push({
                 'object.typeOf': {
@@ -168,7 +205,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectIdEq = (_11 = (_10 = params.object) === null || _10 === void 0 ? void 0 : _10.id) === null || _11 === void 0 ? void 0 : _11.$eq;
+        const objectIdEq = (_23 = (_22 = params.object) === null || _22 === void 0 ? void 0 : _22.id) === null || _23 === void 0 ? void 0 : _23.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof objectIdEq === 'string') {
@@ -179,7 +216,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectIdIn = (_13 = (_12 = params.object) === null || _12 === void 0 ? void 0 : _12.id) === null || _13 === void 0 ? void 0 : _13.$in;
+        const objectIdIn = (_25 = (_24 = params.object) === null || _24 === void 0 ? void 0 : _24.id) === null || _25 === void 0 ? void 0 : _25.$in;
         if (Array.isArray(objectIdIn)) {
             andConditions.push({
                 'object.id': {
@@ -188,7 +225,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectOrderNumberIn = (_15 = (_14 = params.object) === null || _14 === void 0 ? void 0 : _14.orderNumber) === null || _15 === void 0 ? void 0 : _15.$in;
+        const objectOrderNumberIn = (_27 = (_26 = params.object) === null || _26 === void 0 ? void 0 : _26.orderNumber) === null || _27 === void 0 ? void 0 : _27.$in;
         if (Array.isArray(objectOrderNumberIn)) {
             andConditions.push({
                 'object.orderNumber': {
@@ -197,7 +234,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectEventIdIn = (_18 = (_17 = (_16 = params.object) === null || _16 === void 0 ? void 0 : _16.event) === null || _17 === void 0 ? void 0 : _17.id) === null || _18 === void 0 ? void 0 : _18.$in;
+        const objectEventIdIn = (_30 = (_29 = (_28 = params.object) === null || _28 === void 0 ? void 0 : _28.event) === null || _29 === void 0 ? void 0 : _29.id) === null || _30 === void 0 ? void 0 : _30.$in;
         if (Array.isArray(objectEventIdIn)) {
             andConditions.push({
                 'object.event.id': {
@@ -206,7 +243,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectAcceptedOfferSeatNumberIn = (_25 = (_24 = (_23 = (_22 = (_21 = (_20 = (_19 = params.object) === null || _19 === void 0 ? void 0 : _19.acceptedOffer) === null || _20 === void 0 ? void 0 : _20.itemOffered) === null || _21 === void 0 ? void 0 : _21.serviceOutput) === null || _22 === void 0 ? void 0 : _22.reservedTicket) === null || _23 === void 0 ? void 0 : _23.ticketedSeat) === null || _24 === void 0 ? void 0 : _24.seatNumber) === null || _25 === void 0 ? void 0 : _25.$in;
+        const objectAcceptedOfferSeatNumberIn = (_37 = (_36 = (_35 = (_34 = (_33 = (_32 = (_31 = params.object) === null || _31 === void 0 ? void 0 : _31.acceptedOffer) === null || _32 === void 0 ? void 0 : _32.itemOffered) === null || _33 === void 0 ? void 0 : _33.serviceOutput) === null || _34 === void 0 ? void 0 : _34.reservedTicket) === null || _35 === void 0 ? void 0 : _35.ticketedSeat) === null || _36 === void 0 ? void 0 : _36.seatNumber) === null || _37 === void 0 ? void 0 : _37.$in;
         if (Array.isArray(objectAcceptedOfferSeatNumberIn)) {
             andConditions.push({
                 'object.acceptedOffer.itemOffered.serviceOutput.reservedTicket.ticketedSeat.seatNumber': {
@@ -223,7 +260,7 @@ class MongoRepository {
             });
         }
         else {
-            const typeOfEq = (_26 = params.typeOf) === null || _26 === void 0 ? void 0 : _26.$eq;
+            const typeOfEq = (_38 = params.typeOf) === null || _38 === void 0 ? void 0 : _38.$eq;
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
             if (typeof typeOfEq === 'string') {
@@ -232,7 +269,7 @@ class MongoRepository {
                 });
             }
         }
-        const actionStatusIn = (_27 = params.actionStatus) === null || _27 === void 0 ? void 0 : _27.$in;
+        const actionStatusIn = (_39 = params.actionStatus) === null || _39 === void 0 ? void 0 : _39.$in;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (Array.isArray(actionStatusIn)) {
@@ -263,7 +300,7 @@ class MongoRepository {
                 startDate: { $lte: startDateLte }
             });
         }
-        const fromLocationTypeOfIn = (_29 = (_28 = params.fromLocation) === null || _28 === void 0 ? void 0 : _28.typeOf) === null || _29 === void 0 ? void 0 : _29.$in;
+        const fromLocationTypeOfIn = (_41 = (_40 = params.fromLocation) === null || _40 === void 0 ? void 0 : _40.typeOf) === null || _41 === void 0 ? void 0 : _41.$in;
         if (Array.isArray(fromLocationTypeOfIn)) {
             andConditions.push({
                 'fromLocation.typeOf': {
@@ -272,7 +309,7 @@ class MongoRepository {
                 }
             });
         }
-        const fromLocationAccountNumberIn = (_31 = (_30 = params.fromLocation) === null || _30 === void 0 ? void 0 : _30.accountNumber) === null || _31 === void 0 ? void 0 : _31.$in;
+        const fromLocationAccountNumberIn = (_43 = (_42 = params.fromLocation) === null || _42 === void 0 ? void 0 : _42.accountNumber) === null || _43 === void 0 ? void 0 : _43.$in;
         if (Array.isArray(fromLocationAccountNumberIn)) {
             andConditions.push({
                 'fromLocation.accountNumber': {
@@ -281,7 +318,7 @@ class MongoRepository {
                 }
             });
         }
-        const fromLocationAccountTypeIn = (_33 = (_32 = params.fromLocation) === null || _32 === void 0 ? void 0 : _32.accountType) === null || _33 === void 0 ? void 0 : _33.$in;
+        const fromLocationAccountTypeIn = (_45 = (_44 = params.fromLocation) === null || _44 === void 0 ? void 0 : _44.accountType) === null || _45 === void 0 ? void 0 : _45.$in;
         if (Array.isArray(fromLocationAccountTypeIn)) {
             andConditions.push({
                 'fromLocation.accountType': {
@@ -290,7 +327,7 @@ class MongoRepository {
                 }
             });
         }
-        const toLocationTypeOfIn = (_35 = (_34 = params.toLocation) === null || _34 === void 0 ? void 0 : _34.typeOf) === null || _35 === void 0 ? void 0 : _35.$in;
+        const toLocationTypeOfIn = (_47 = (_46 = params.toLocation) === null || _46 === void 0 ? void 0 : _46.typeOf) === null || _47 === void 0 ? void 0 : _47.$in;
         if (Array.isArray(toLocationTypeOfIn)) {
             andConditions.push({
                 'toLocation.typeOf': {
@@ -299,7 +336,7 @@ class MongoRepository {
                 }
             });
         }
-        const toLocationAccountNumberIn = (_37 = (_36 = params.toLocation) === null || _36 === void 0 ? void 0 : _36.accountNumber) === null || _37 === void 0 ? void 0 : _37.$in;
+        const toLocationAccountNumberIn = (_49 = (_48 = params.toLocation) === null || _48 === void 0 ? void 0 : _48.accountNumber) === null || _49 === void 0 ? void 0 : _49.$in;
         if (Array.isArray(toLocationAccountNumberIn)) {
             andConditions.push({
                 'toLocation.accountNumber': {
@@ -308,7 +345,7 @@ class MongoRepository {
                 }
             });
         }
-        const toLocationAccountTypeIn = (_39 = (_38 = params.toLocation) === null || _38 === void 0 ? void 0 : _38.accountType) === null || _39 === void 0 ? void 0 : _39.$in;
+        const toLocationAccountTypeIn = (_51 = (_50 = params.toLocation) === null || _50 === void 0 ? void 0 : _50.accountType) === null || _51 === void 0 ? void 0 : _51.$in;
         if (Array.isArray(toLocationAccountTypeIn)) {
             andConditions.push({
                 'toLocation.accountType': {
@@ -317,7 +354,7 @@ class MongoRepository {
                 }
             });
         }
-        const purposeTypeOfIn = (_41 = (_40 = params.purpose) === null || _40 === void 0 ? void 0 : _40.typeOf) === null || _41 === void 0 ? void 0 : _41.$in;
+        const purposeTypeOfIn = (_53 = (_52 = params.purpose) === null || _52 === void 0 ? void 0 : _52.typeOf) === null || _53 === void 0 ? void 0 : _53.$in;
         if (Array.isArray(purposeTypeOfIn)) {
             andConditions.push({
                 'purpose.typeOf': {
@@ -326,7 +363,7 @@ class MongoRepository {
                 }
             });
         }
-        const purposeIdIn = (_43 = (_42 = params.purpose) === null || _42 === void 0 ? void 0 : _42.id) === null || _43 === void 0 ? void 0 : _43.$in;
+        const purposeIdIn = (_55 = (_54 = params.purpose) === null || _54 === void 0 ? void 0 : _54.id) === null || _55 === void 0 ? void 0 : _55.$in;
         if (Array.isArray(purposeIdIn)) {
             andConditions.push({
                 'purpose.id': {
@@ -335,7 +372,7 @@ class MongoRepository {
                 }
             });
         }
-        const purposeOrderNumberIn = (_45 = (_44 = params.purpose) === null || _44 === void 0 ? void 0 : _44.orderNumber) === null || _45 === void 0 ? void 0 : _45.$in;
+        const purposeOrderNumberIn = (_57 = (_56 = params.purpose) === null || _56 === void 0 ? void 0 : _56.orderNumber) === null || _57 === void 0 ? void 0 : _57.$in;
         if (Array.isArray(purposeOrderNumberIn)) {
             andConditions.push({
                 'purpose.orderNumber': {
@@ -344,7 +381,7 @@ class MongoRepository {
                 }
             });
         }
-        const resultTypeOfIn = (_47 = (_46 = params.result) === null || _46 === void 0 ? void 0 : _46.typeOf) === null || _47 === void 0 ? void 0 : _47.$in;
+        const resultTypeOfIn = (_59 = (_58 = params.result) === null || _58 === void 0 ? void 0 : _58.typeOf) === null || _59 === void 0 ? void 0 : _59.$in;
         if (Array.isArray(resultTypeOfIn)) {
             andConditions.push({
                 'result.typeOf': {
@@ -353,7 +390,7 @@ class MongoRepository {
                 }
             });
         }
-        const resultIdIn = (_49 = (_48 = params.result) === null || _48 === void 0 ? void 0 : _48.id) === null || _49 === void 0 ? void 0 : _49.$in;
+        const resultIdIn = (_61 = (_60 = params.result) === null || _60 === void 0 ? void 0 : _60.id) === null || _61 === void 0 ? void 0 : _61.$in;
         if (Array.isArray(resultIdIn)) {
             andConditions.push({
                 'result.id': {
@@ -362,7 +399,7 @@ class MongoRepository {
                 }
             });
         }
-        const resultOrderNumberIn = (_51 = (_50 = params.result) === null || _50 === void 0 ? void 0 : _50.orderNumber) === null || _51 === void 0 ? void 0 : _51.$in;
+        const resultOrderNumberIn = (_63 = (_62 = params.result) === null || _62 === void 0 ? void 0 : _62.orderNumber) === null || _63 === void 0 ? void 0 : _63.$in;
         if (Array.isArray(resultOrderNumberIn)) {
             andConditions.push({
                 'result.orderNumber': {
@@ -371,7 +408,7 @@ class MongoRepository {
                 }
             });
         }
-        const resultCodeIn = (_53 = (_52 = params.result) === null || _52 === void 0 ? void 0 : _52.code) === null || _53 === void 0 ? void 0 : _53.$in;
+        const resultCodeIn = (_65 = (_64 = params.result) === null || _64 === void 0 ? void 0 : _64.code) === null || _65 === void 0 ? void 0 : _65.$in;
         if (Array.isArray(resultCodeIn)) {
             andConditions.push({
                 'result.code': {
@@ -420,7 +457,7 @@ class MongoRepository {
             }
             // const explainResult = await (<any>query).explain();
             // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
@@ -528,32 +565,16 @@ class MongoRepository {
      * 取引に対するアクション検索時などに使用
      */
     searchByPurpose(params) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
-            const conditions = {
-                'purpose.typeOf': {
-                    $exists: true,
-                    $eq: params.purpose.typeOf
-                }
-            };
-            if (params.typeOf !== undefined) {
-                conditions.typeOf = params.typeOf;
-            }
-            if (params.purpose.id !== undefined) {
-                conditions['purpose.id'] = {
-                    $exists: true,
-                    $eq: params.purpose.id
-                };
-            }
-            const query = this.actionModel.find(conditions)
-                .select({ __v: 0, createdAt: 0, updatedAt: 0 });
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.startDate) !== undefined) {
-                query.sort({ startDate: params.sort.startDate });
-            }
-            return query.exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+            return this.search(Object.assign(Object.assign(Object.assign({ purpose: {
+                    id: { $in: [params.purpose.id] },
+                    typeOf: { $in: [params.purpose.typeOf] }
+                }, object: Object.assign(Object.assign({}, (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.typeOf) === null || _b === void 0 ? void 0 : _b.$eq) === 'string')
+                    ? { typeOf: { $eq: params.object.typeOf.$eq } }
+                    : undefined), (typeof ((_d = (_c = params.object) === null || _c === void 0 ? void 0 : _c.paymentMethodId) === null || _d === void 0 ? void 0 : _d.$eq) === 'string')
+                    ? { paymentMethodId: { $eq: params.object.paymentMethodId.$eq } }
+                    : undefined) }, (typeof ((_e = params.actionStatus) === null || _e === void 0 ? void 0 : _e.$eq) === 'string') ? { actionStatus: { $in: [params.actionStatus.$eq] } } : undefined), (typeof params.typeOf === 'string') ? { typeOf: { $eq: params.typeOf } } : undefined), (typeof ((_f = params.sort) === null || _f === void 0 ? void 0 : _f.startDate) === 'number') ? { sort: params.sort } : undefined), [], []);
         });
     }
     /**
@@ -691,6 +712,29 @@ class MongoRepository {
                 .exec();
         });
     }
+    /**
+     * 取引からアクションを削除する
+     */
+    deleteByPurpose(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.actionModel.deleteMany({
+                'project.id': { $eq: params.project.id },
+                typeOf: { $in: params.typeOf.$in },
+                'purpose.id': { $exists: true, $eq: params.purpose.id },
+                'purpose.typeOf': { $exists: true, $eq: params.purpose.typeOf }
+            })
+                .exec()
+                .then((result) => {
+                return {
+                    // n: result?.n,
+                    // opTime: result.opTime,
+                    // ok: result?.ok,
+                    // operationTime,
+                    deletedCount: result === null || result === void 0 ? void 0 : result.deletedCount
+                };
+            });
+        });
+    }
     aggregateAuthorizeEventServiceOfferAction(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([
@@ -757,7 +801,36 @@ class MongoRepository {
             return { statuses };
         });
     }
-    aggregateUseAction(params) {
+    aggregateCancelReservationAction(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const statuses = yield Promise.all([
+                factory.actionStatusType.CompletedActionStatus,
+                factory.actionStatusType.CanceledActionStatus,
+                factory.actionStatusType.FailedActionStatus
+            ].map((actionStatus) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                const matchConditions = Object.assign({ startDate: {
+                        $gte: params.startFrom,
+                        $lte: params.startThrough
+                    }, typeOf: { $eq: factory.actionType.CancelAction }, actionStatus: { $eq: actionStatus }, 'object.typeOf': {
+                        $exists: true,
+                        $in: [
+                            factory.reservationType.BusReservation,
+                            factory.reservationType.EventReservation,
+                            factory.reservationType.ReservationPackage
+                        ]
+                    } }, (typeof ((_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$ne) === 'string')
+                    ? { 'project.id': { $ne: params.project.id.$ne } }
+                    : undefined);
+                return this.agggregateByStatus({ matchConditions, actionStatus });
+            })));
+            return { statuses };
+        });
+    }
+    /**
+     * アクションタイプによる汎用的な集計
+     */
+    aggregateByTypeOf(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([
                 factory.actionStatusType.CompletedActionStatus,

package/lib/chevre/repo/additionalProperty.js CHANGED Viewed

@@ -23,6 +23,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const additionalProperty_1 = require("./mongoose/schemas/additionalProperty");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * 追加特性リポジトリ
  */
@@ -145,7 +146,7 @@ class MongoRepository {
             if (params.sort !== undefined) {
                 query.sort(params.sort);
             }
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });

package/lib/chevre/repo/aggregation.d.ts CHANGED Viewed

@@ -4,12 +4,15 @@ export declare enum AggregationType {
     AggregateAuthorizeEventServiceOfferAction = "AggregateAuthorizeEventServiceOfferAction",
     AggregateAuthorizeOrderAction = "AggregateAuthorizeOrderAction",
     AggregateAuthorizePaymentAction = "AggregateAuthorizePaymentAction",
+    AggregateCancelReservationAction = "AggregateCancelReservationAction",
     AggregateCheckMovieTicketAction = "AggregateCheckMovieTicketAction",
     AggregateEvent = "AggregateEvent",
+    AggregateOrderAction = "AggregateOrderAction",
     AggregatePay = "AggregatePay",
     AggregatePayMovieTicketAction = "AggregatePayMovieTicketAction",
     AggregatePlaceOrder = "AggregatePlaceOrder",
     AggregateReserve = "AggregateReserve",
+    AggregateReserveAction = "AggregateReserveAction",
     AggregateTask = "AggregateTask",
     AggregateUseAction = "AggregateUseAction"
 }

package/lib/chevre/repo/aggregation.js CHANGED Viewed

@@ -27,12 +27,15 @@ var AggregationType;
     AggregationType["AggregateAuthorizeEventServiceOfferAction"] = "AggregateAuthorizeEventServiceOfferAction";
     AggregationType["AggregateAuthorizeOrderAction"] = "AggregateAuthorizeOrderAction";
     AggregationType["AggregateAuthorizePaymentAction"] = "AggregateAuthorizePaymentAction";
+    AggregationType["AggregateCancelReservationAction"] = "AggregateCancelReservationAction";
     AggregationType["AggregateCheckMovieTicketAction"] = "AggregateCheckMovieTicketAction";
     AggregationType["AggregateEvent"] = "AggregateEvent";
+    AggregationType["AggregateOrderAction"] = "AggregateOrderAction";
     AggregationType["AggregatePay"] = "AggregatePay";
     AggregationType["AggregatePayMovieTicketAction"] = "AggregatePayMovieTicketAction";
     AggregationType["AggregatePlaceOrder"] = "AggregatePlaceOrder";
     AggregationType["AggregateReserve"] = "AggregateReserve";
+    AggregationType["AggregateReserveAction"] = "AggregateReserveAction";
     AggregationType["AggregateTask"] = "AggregateTask";
     AggregationType["AggregateUseAction"] = "AggregateUseAction";
 })(AggregationType = exports.AggregationType || (exports.AggregationType = {}));