npm - @chevre/domain - Versions diffs - 21.2.0-alpha.97 → 21.2.0-alpha.99 - Mend

@chevre/domain 21.2.0-alpha.97 → 21.2.0-alpha.99

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 (23) hide show

package/example/src/chevre/processPay.ts CHANGED Viewed

@@ -63,8 +63,11 @@ async function main() {
                 name: 'xx'
             }
         },
-        true,
-        false
+        {
+            useCheckMovieTicketBeforePay: true,
+            useCheckByIdentifierIfNotYet: true,
+            searchTrade4accountId: false
+        }
     )({
         accountingReport: accountingReportRepo,
         action: actionRepo,

package/example/src/chevre/searchActions.ts ADDED Viewed

@@ -0,0 +1,33 @@
+// tslint:disable:no-implicit-dependencies no-console
+import { chevre } from '../../../lib/index';
+import * as  mongoose from 'mongoose';
+// const project = { id: String(process.env.PROJECT_ID) };
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+    const actionRepo = new chevre.repository.Action(mongoose.connection);
+    const actions = await actionRepo.search(
+        {
+            typeOf: { $eq: chevre.factory.actionType.CheckAction },
+            // project: { id: { $eq: project.id } },
+            object: {
+                movieTickets: {
+                    identifier: { $eq: '0947524082' },
+                    serviceOutput: { reservationFor: { id: { $eq: 'clhvvbpyn' } } }
+                }
+            }
+        },
+        ['_id'],
+        []
+    );
+    console.log('actions:', actions);
+}
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

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

@@ -21,7 +21,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, _54, _55, _56, _57;
+        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 +75,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 +104,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 +113,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 +124,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectReservationNumberEq = (_v = (_u = params.object) === null || _u === void 0 ? void 0 : _u.reservationNumber) === null || _v === void 0 ? void 0 : _v.$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': {
@@ -115,7 +133,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectReservationNumberIn = (_x = (_w = params.object) === null || _w === void 0 ? void 0 : _w.reservationNumber) === null || _x === void 0 ? void 0 : _x.$in;
+        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': {
@@ -124,7 +142,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPaymentMethodAccountIdEq = (_0 = (_z = (_y = params.object) === null || _y === void 0 ? void 0 : _y.paymentMethod) === null || _z === void 0 ? void 0 : _z.accountId) === null || _0 === void 0 ? void 0 : _0.$eq;
+        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') {
@@ -135,7 +153,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPaymentMethodPaymentMethodIdEq = (_3 = (_2 = (_1 = params.object) === null || _1 === void 0 ? void 0 : _1.paymentMethod) === null || _2 === void 0 ? void 0 : _2.paymentMethodId) === null || _3 === void 0 ? void 0 : _3.$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') {
@@ -146,7 +164,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPaymentMethodPaymentMethodIdIn = (_6 = (_5 = (_4 = params.object) === null || _4 === void 0 ? void 0 : _4.paymentMethod) === null || _5 === void 0 ? void 0 : _5.paymentMethodId) === null || _6 === void 0 ? void 0 : _6.$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': {
@@ -155,7 +173,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPaymentMethodTypeOfEq = (_9 = (_8 = (_7 = params.object) === null || _7 === void 0 ? void 0 : _7.paymentMethod) === null || _8 === void 0 ? void 0 : _8.typeOf) === null || _9 === void 0 ? void 0 : _9.$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') {
@@ -166,7 +184,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectTypeOfEq = (_11 = (_10 = params.object) === null || _10 === void 0 ? void 0 : _10.typeOf) === null || _11 === void 0 ? void 0 : _11.$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') {
@@ -177,7 +195,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectTypeOfIn = (_13 = (_12 = params.object) === null || _12 === void 0 ? void 0 : _12.typeOf) === null || _13 === void 0 ? void 0 : _13.$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': {
@@ -186,7 +204,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectIdEq = (_15 = (_14 = params.object) === null || _14 === void 0 ? void 0 : _14.id) === null || _15 === void 0 ? void 0 : _15.$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') {
@@ -197,7 +215,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectIdIn = (_17 = (_16 = params.object) === null || _16 === void 0 ? void 0 : _16.id) === null || _17 === void 0 ? void 0 : _17.$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': {
@@ -206,7 +224,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectOrderNumberIn = (_19 = (_18 = params.object) === null || _18 === void 0 ? void 0 : _18.orderNumber) === null || _19 === void 0 ? void 0 : _19.$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': {
@@ -215,7 +233,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectEventIdIn = (_22 = (_21 = (_20 = params.object) === null || _20 === void 0 ? void 0 : _20.event) === null || _21 === void 0 ? void 0 : _21.id) === null || _22 === void 0 ? void 0 : _22.$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': {
@@ -224,7 +242,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectAcceptedOfferSeatNumberIn = (_29 = (_28 = (_27 = (_26 = (_25 = (_24 = (_23 = params.object) === null || _23 === void 0 ? void 0 : _23.acceptedOffer) === null || _24 === void 0 ? void 0 : _24.itemOffered) === null || _25 === void 0 ? void 0 : _25.serviceOutput) === null || _26 === void 0 ? void 0 : _26.reservedTicket) === null || _27 === void 0 ? void 0 : _27.ticketedSeat) === null || _28 === void 0 ? void 0 : _28.seatNumber) === null || _29 === void 0 ? void 0 : _29.$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': {
@@ -241,7 +259,7 @@ class MongoRepository {
             });
         }
         else {
-            const typeOfEq = (_30 = params.typeOf) === null || _30 === void 0 ? void 0 : _30.$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') {
@@ -250,7 +268,7 @@ class MongoRepository {
                 });
             }
         }
-        const actionStatusIn = (_31 = params.actionStatus) === null || _31 === void 0 ? void 0 : _31.$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)) {
@@ -281,7 +299,7 @@ class MongoRepository {
                 startDate: { $lte: startDateLte }
             });
         }
-        const fromLocationTypeOfIn = (_33 = (_32 = params.fromLocation) === null || _32 === void 0 ? void 0 : _32.typeOf) === null || _33 === void 0 ? void 0 : _33.$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': {
@@ -290,7 +308,7 @@ class MongoRepository {
                 }
             });
         }
-        const fromLocationAccountNumberIn = (_35 = (_34 = params.fromLocation) === null || _34 === void 0 ? void 0 : _34.accountNumber) === null || _35 === void 0 ? void 0 : _35.$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': {
@@ -299,7 +317,7 @@ class MongoRepository {
                 }
             });
         }
-        const fromLocationAccountTypeIn = (_37 = (_36 = params.fromLocation) === null || _36 === void 0 ? void 0 : _36.accountType) === null || _37 === void 0 ? void 0 : _37.$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': {
@@ -308,7 +326,7 @@ class MongoRepository {
                 }
             });
         }
-        const toLocationTypeOfIn = (_39 = (_38 = params.toLocation) === null || _38 === void 0 ? void 0 : _38.typeOf) === null || _39 === void 0 ? void 0 : _39.$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': {
@@ -317,7 +335,7 @@ class MongoRepository {
                 }
             });
         }
-        const toLocationAccountNumberIn = (_41 = (_40 = params.toLocation) === null || _40 === void 0 ? void 0 : _40.accountNumber) === null || _41 === void 0 ? void 0 : _41.$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': {
@@ -326,7 +344,7 @@ class MongoRepository {
                 }
             });
         }
-        const toLocationAccountTypeIn = (_43 = (_42 = params.toLocation) === null || _42 === void 0 ? void 0 : _42.accountType) === null || _43 === void 0 ? void 0 : _43.$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': {
@@ -335,7 +353,7 @@ class MongoRepository {
                 }
             });
         }
-        const purposeTypeOfIn = (_45 = (_44 = params.purpose) === null || _44 === void 0 ? void 0 : _44.typeOf) === null || _45 === void 0 ? void 0 : _45.$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': {
@@ -344,7 +362,7 @@ class MongoRepository {
                 }
             });
         }
-        const purposeIdIn = (_47 = (_46 = params.purpose) === null || _46 === void 0 ? void 0 : _46.id) === null || _47 === void 0 ? void 0 : _47.$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': {
@@ -353,7 +371,7 @@ class MongoRepository {
                 }
             });
         }
-        const purposeOrderNumberIn = (_49 = (_48 = params.purpose) === null || _48 === void 0 ? void 0 : _48.orderNumber) === null || _49 === void 0 ? void 0 : _49.$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': {
@@ -362,7 +380,7 @@ class MongoRepository {
                 }
             });
         }
-        const resultTypeOfIn = (_51 = (_50 = params.result) === null || _50 === void 0 ? void 0 : _50.typeOf) === null || _51 === void 0 ? void 0 : _51.$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': {
@@ -371,7 +389,7 @@ class MongoRepository {
                 }
             });
         }
-        const resultIdIn = (_53 = (_52 = params.result) === null || _52 === void 0 ? void 0 : _52.id) === null || _53 === void 0 ? void 0 : _53.$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': {
@@ -380,7 +398,7 @@ class MongoRepository {
                 }
             });
         }
-        const resultOrderNumberIn = (_55 = (_54 = params.result) === null || _54 === void 0 ? void 0 : _54.orderNumber) === null || _55 === void 0 ? void 0 : _55.$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': {
@@ -389,7 +407,7 @@ class MongoRepository {
                 }
             });
         }
-        const resultCodeIn = (_57 = (_56 = params.result) === null || _56 === void 0 ? void 0 : _56.code) === null || _57 === void 0 ? void 0 : _57.$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': {

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

@@ -117,6 +117,18 @@ schema.index({ 'object.id': 1, startDate: -1 }, {
         'object.id': { $exists: true }
     }
 });
+schema.index({ 'object.movieTickets.identifier': 1, startDate: -1 }, {
+    name: 'searchByObjectMovieTicketsIdentifier',
+    partialFilterExpression: {
+        'object.movieTickets.identifier': { $exists: true }
+    }
+});
+schema.index({ 'object.movieTickets.serviceOutput.reservationFor.id': 1, startDate: -1 }, {
+    name: 'searchByObjectMovieTicketsServiceOutputReservationForId',
+    partialFilterExpression: {
+        'object.movieTickets.serviceOutput.reservationFor.id': { $exists: true }
+    }
+});
 schema.index({ 'object.paymentMethod.accountId': 1, startDate: -1 }, {
     name: 'searchByObjectPaymentMethodAccountId',
     partialFilterExpression: {

package/lib/chevre/service/assetTransaction/pay.d.ts CHANGED Viewed

@@ -96,7 +96,11 @@ export declare function check(params: factory.action.check.paymentMethod.movieTi
 /**
  * 取引開始
  */
-export declare function start(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, useCheckMovieTicketBeforePay: boolean, searchTrade4accountId: boolean): IStartOperation<factory.assetTransaction.pay.ITransaction>;
+export declare function start(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, options: {
+    useCheckMovieTicketBeforePay: boolean;
+    useCheckByIdentifierIfNotYet: boolean;
+    searchTrade4accountId: boolean;
+}): IStartOperation<factory.assetTransaction.pay.ITransaction>;
 /**
  * 取引確定
  */

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

@@ -106,7 +106,7 @@ exports.check = check;
 /**
  * 取引開始
  */
-function start(params, useCheckMovieTicketBeforePay, searchTrade4accountId) {
+function start(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // 金額をfix
@@ -138,11 +138,11 @@ function start(params, useCheckMovieTicketBeforePay, searchTrade4accountId) {
                 break;
             case factory.service.paymentService.PaymentServiceType.CreditCard:
                 transaction =
-                    yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), searchTrade4accountId)(repos);
+                    yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), options.searchTrade4accountId)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.MovieTicket:
                 transaction =
-                    yield processAuthorizeMovieTicket(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), useCheckMovieTicketBeforePay)(repos);
+                    yield processAuthorizeMovieTicket(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), options.useCheckMovieTicketBeforePay, options.useCheckByIdentifierIfNotYet)(repos);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
@@ -271,9 +271,9 @@ function processAuthorizeCreditCard(params, transaction, paymentServiceId, searc
         })(repos);
     });
 }
-function processAuthorizeMovieTicket(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay) {
+function processAuthorizeMovieTicket(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const { accountId, payAction, accountsReceivablesByServiceType } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay)(repos);
+        const { accountId, payAction, accountsReceivablesByServiceType } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet)(repos);
         return saveAuthorizeResult({
             id: transaction.id,
             update: {

package/lib/chevre/service/assetTransaction/reserve/factory.d.ts CHANGED Viewed

@@ -50,7 +50,7 @@ export declare function createReservationFor(params: factory.event.screeningEven
 export declare function createIssuedThrough(params: {
     reservationFor: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
 }): {
-    issuedThrough: factory.reservation.busReservation.IIssuedThrough | factory.reservation.eventReservation.IIssuedThrough;
+    issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
 };
 export declare function createReservation(params: {
     project: {
@@ -60,7 +60,6 @@ export declare function createReservation(params: {
     id: string;
     reserveDate: Date;
     agent: factory.assetTransaction.reserve.IAgent;
-    broker?: factory.reservation.IBroker<factory.reservationType.EventReservation>;
     reservationNumber: string;
     reservationFor: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
     reservedTicket: factory.reservation.ITicket;

package/lib/chevre/service/assetTransaction/reserve/factory.js CHANGED Viewed

@@ -394,7 +394,7 @@ function createIssuedThrough(params) {
 exports.createIssuedThrough = createIssuedThrough;
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createReservation(params) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b;
     // 適用メンバーシップ確認
     validateEligibleMembershipType({
         availableOffer: params.availableOffer,
@@ -409,27 +409,36 @@ function createReservation(params) {
     }
     // priceを最適化
     const price4reservation = (0, price_1.createPrice)(params);
-    const eventOffers = params.reservationFor.offers;
-    // offersは必ず存在するはず
-    if (eventOffers === undefined) {
-        throw new factory.errors.NotFound('reservationFor.offers');
-    }
-    const serviceTypeOfIssuedThrough = (typeof ((_a = eventOffers.itemOffered.serviceType) === null || _a === void 0 ? void 0 : _a.codeValue) === 'string')
-        ? {
-            codeValue: eventOffers.itemOffered.serviceType.codeValue,
-            inCodeSet: {
-                typeOf: 'CategoryCodeSet',
-                identifier: factory.categoryCode.CategorySetIdentifier.ServiceType
-            },
-            typeOf: 'CategoryCode'
-        }
-        : undefined;
-    const availableChannel = eventOffers.itemOffered.availableChannel;
+    // const eventOffers = <factory.event.screeningEvent.IOffer | undefined>params.reservationFor.offers;
+    // // offersは必ず存在するはず
+    // if (eventOffers === undefined) {
+    //     throw new factory.errors.NotFound('reservationFor.offers');
+    // }
+    // const serviceTypeOfIssuedThrough: factory.reservation.eventReservation.IServiceTypeOfIssuedThrough | undefined
+    //     = (typeof eventOffers.itemOffered.serviceType?.codeValue === 'string')
+    //         ? {
+    //             codeValue: eventOffers.itemOffered.serviceType.codeValue,
+    //             inCodeSet: {
+    //                 typeOf: 'CategoryCodeSet',
+    //                 identifier: factory.categoryCode.CategorySetIdentifier.ServiceType
+    //             },
+    //             typeOf: 'CategoryCode'
+    //         }
+    //         : undefined;
+    // const availableChannel: factory.reservation.IServiceChannel = eventOffers.itemOffered.availableChannel;
     if (params.reservationFor.typeOf === factory.eventType.ScreeningEvent) {
-        const issuedThrough = Object.assign({ typeOf: factory.product.ProductType.EventService,
-            // 興行IDを追加(2022-09-08~)
-            id: eventOffers.itemOffered.id, availableChannel }, (typeof (serviceTypeOfIssuedThrough === null || serviceTypeOfIssuedThrough === void 0 ? void 0 : serviceTypeOfIssuedThrough.typeOf) === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined);
-        return Object.assign(Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.EventReservation, id: params.id, issuedThrough, additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, reservedTicket: params.reservedTicket,
+        // const issuedThrough: factory.reservation.eventReservation.IIssuedThrough = {
+        //     typeOf: factory.product.ProductType.EventService,
+        //     // 興行IDを追加(2022-09-08~)
+        //     id: eventOffers.itemOffered.id,
+        //     availableChannel,
+        //     // issuedThrough.serviceTypeを連携
+        //     ...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined
+        // };
+        return Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.EventReservation, id: params.id,
+            // reservationPackage保管に移行(2023-06-06~)
+            // issuedThrough,
+            additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, reservedTicket: params.reservedTicket,
             // 最適化(2022-12-19~)
             underName: {
                 typeOf: params.agent.typeOf,
@@ -445,15 +454,23 @@ function createReservation(params) {
                     };
                 })
             }
-            : undefined), (typeof ((_b = params.broker) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_c = params.programMembershipUsed) === null || _c === void 0 ? void 0 : _c.identifier) === 'string')
+            : undefined), (typeof ((_a = params.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
             ? { programMembershipUsed: params.programMembershipUsed }
             : undefined);
     }
     else {
-        const issuedThrough = Object.assign({ typeOf: factory.product.ProductType.Transportation,
-            // 興行IDを追加(2022-09-08~)
-            id: eventOffers.itemOffered.id, availableChannel }, (typeof (serviceTypeOfIssuedThrough === null || serviceTypeOfIssuedThrough === void 0 ? void 0 : serviceTypeOfIssuedThrough.typeOf) === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined);
-        return Object.assign(Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.BusReservation, id: params.id, issuedThrough, additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, reservedTicket: params.reservedTicket, underName: {
+        // const issuedThrough: factory.reservation.busReservation.IIssuedThrough = {
+        //     typeOf: factory.product.ProductType.Transportation,
+        //     // 興行IDを追加(2022-09-08~)
+        //     id: eventOffers.itemOffered.id,
+        //     availableChannel,
+        //     // issuedThrough.serviceTypeを連携
+        //     ...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined
+        // };
+        return Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.reservationType.BusReservation, id: params.id,
+            // reservationPackage保管に移行(2023-06-06~)
+            // issuedThrough,
+            additionalProperty: params.additionalProperty, bookingTime: params.reserveDate, modifiedTime: params.reserveDate, numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, reservationNumber: params.reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, reservedTicket: params.reservedTicket, underName: {
                 typeOf: params.agent.typeOf,
                 name: params.agent.name
             }, checkedIn: false, attended: false }, (typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined), (Array.isArray(params.subReservation))
@@ -467,7 +484,7 @@ function createReservation(params) {
                     };
                 })
             }
-            : undefined), (typeof ((_d = params.broker) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string') ? { broker: params.broker } : undefined), (typeof ((_e = params.programMembershipUsed) === null || _e === void 0 ? void 0 : _e.identifier) === 'string')
+            : undefined), (typeof ((_b = params.programMembershipUsed) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
             ? { programMembershipUsed: params.programMembershipUsed }
             : undefined);
     }

package/lib/chevre/service/assetTransaction/reserve.d.ts CHANGED Viewed

@@ -102,6 +102,7 @@ export declare function start(params: IStartParams & {
 }): IStartOperation<{
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
     objectSubReservations: IObjectSubReservation[];
+    issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
 }>;
 /**
  * 取引確定

package/lib/chevre/service/assetTransaction/reserve.js CHANGED Viewed

@@ -27,7 +27,7 @@ const validateStartRequest_1 = require("./reserve/validateStartRequest");
  */
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         const now = new Date();
         // 自動発行廃止(2022-05-17~)
         const reservationNumber = params.transactionNumber;
@@ -35,7 +35,8 @@ function start(params) {
             throw new factory.errors.ArgumentNull('transactionNumber');
         }
         // eventをfix
-        if (typeof ((_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id) !== 'string' || params.object.reservationFor.id.length === 0) {
+        const reservationForId = (_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id;
+        if (typeof reservationForId !== 'string' || reservationForId.length === 0) {
             throw new factory.errors.ArgumentNull('object.reservationFor.id');
         }
         let event;
@@ -43,7 +44,7 @@ function start(params) {
             event = params.preSearchedEvent;
         }
         else {
-            event = yield repos.event.findMinimizedIndividualEventById({ id: params.object.reservationFor.id });
+            event = yield repos.event.findMinimizedIndividualEventById({ id: reservationForId });
         }
         // validationを承認アクション開始前から移行(2023-01-27~)
         (0, validateStartRequest_1.validateStartRequest)({
@@ -64,22 +65,23 @@ function start(params) {
             throw error;
         }
         let objectSubReservations = [];
-        // 指定があれば予約追加
-        if (typeof ((_d = params.object.reservationFor) === null || _d === void 0 ? void 0 : _d.id) === 'string') {
-            const addReservationsResult = yield addReservations({
-                id: transaction.id,
-                object: params.object,
-                event,
-                preSearchedTicketOffers: params.preSearchedTicketOffers,
-                preSearchedUnitPriceOffers: params.preSearchedUnitPriceOffers,
-                availableAtOrFrom: { id: (_e = params.availableAtOrFrom) === null || _e === void 0 ? void 0 : _e.id },
-                validateAppliesToMovieTicket: params.validateAppliesToMovieTicket,
-                stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
-            })(repos);
-            transaction = addReservationsResult.transaction;
-            objectSubReservations = addReservationsResult.objectSubReservations;
-        }
-        return { transaction, objectSubReservations };
+        const addReservationsResult = yield addReservations({
+            id: transaction.id,
+            object: params.object,
+            event,
+            preSearchedTicketOffers: params.preSearchedTicketOffers,
+            preSearchedUnitPriceOffers: params.preSearchedUnitPriceOffers,
+            availableAtOrFrom: { id: (_d = params.availableAtOrFrom) === null || _d === void 0 ? void 0 : _d.id },
+            validateAppliesToMovieTicket: params.validateAppliesToMovieTicket,
+            stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
+        })(repos);
+        transaction = addReservationsResult.transaction;
+        objectSubReservations = addReservationsResult.objectSubReservations;
+        return {
+            transaction,
+            objectSubReservations,
+            issuedThrough: addReservationsResult.issuedThrough
+        };
     });
 }
 exports.start = start;
@@ -195,7 +197,7 @@ function addReservations(params) {
         }
         // ストックホルダー処理(stockHolderで残席数を集計しているので必要)
         yield onReservationsCreated({ event })(repos);
-        return { transaction, objectSubReservations };
+        return { transaction, objectSubReservations, issuedThrough };
     });
 }
 /**
@@ -412,7 +414,7 @@ function createReservations4transactionObject(params) {
                 id: reservationId,
                 reserveDate: params.now,
                 agent: params.transaction.agent,
-                broker: params.transaction.object.broker,
+                // broker: params.transaction.object.broker,
                 reservationNumber: reservationNumber,
                 reservationFor: params.event,
                 reservedTicket: reservedTicket,

package/lib/chevre/service/offer/event/authorize.js CHANGED Viewed

@@ -169,6 +169,7 @@ function processStartReserve4chevre(params) {
         responseBody = startReserveTransactionResult.transaction;
         // 予約取引からオファー情報を生成する
         acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
+            issuedThrough: startReserveTransactionResult.issuedThrough,
             objectSubReservations: startReserveTransactionResult.objectSubReservations,
             responseBody: responseBody,
             event: event,

package/lib/chevre/service/offer/event/factory.d.ts CHANGED Viewed

@@ -26,6 +26,7 @@ export declare function acceptedOffers2amount(params: {
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 type IResultAcceptedOffer = factory.action.authorize.offer.seatReservation.IResultAcceptedOffer;
 export declare function responseBody2acceptedOffers4result(params: {
+    issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
     objectSubReservations: IObjectSubReservation[];
     responseBody: factory.assetTransaction.reserve.ITransaction;
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;

package/lib/chevre/service/offer/event/factory.js CHANGED Viewed

@@ -157,7 +157,12 @@ function responseBody2acceptedOffers4result(params) {
     if (Array.isArray(params.objectSubReservations)) {
         acceptedOffers4result = params.objectSubReservations.map((itemOffered) => {
             var _a;
-            const reservation = createReservation({ project: params.project, itemOffered, event: params.event });
+            const reservation = createReservation({
+                project: params.project,
+                itemOffered,
+                event: params.event,
+                issuedThrough: params.issuedThrough
+            });
             // appliesToMovieTicketがArrayでないケースは廃止(2022-09-12~)
             const priceSpecification = itemOffered.price;
             const priceComponent = priceSpecification.priceComponent.map((c) => {
@@ -244,7 +249,10 @@ function createReservation(params) {
             // 最適化(2022-05-31~)
             superEvent: Object.assign(Object.assign({ typeOf: event.superEvent.typeOf, id: event.superEvent.id, kanaName: event.superEvent.kanaName, location: event.superEvent.location, name: event.superEvent.name, soundFormat: event.superEvent.soundFormat, videoFormat: event.superEvent.videoFormat, workPerformed }, (typeof event.superEvent.duration === 'string') ? { duration: event.superEvent.duration } : undefined), (event.superEvent.headline !== undefined) ? { headline: event.superEvent.headline } : undefined)
         };
-        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: itemOffered.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
+        if (params.issuedThrough.typeOf !== factory.product.ProductType.EventService) {
+            throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.EventService}`);
+        }
+        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
             reservedTicket }, (typeof ((_a = itemOffered.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
             ? { programMembershipUsed: itemOffered.programMembershipUsed }
             : undefined);
@@ -269,7 +277,10 @@ function createReservation(params) {
             busNumber: tripByEvent.busNumber,
             identifier: tripByEvent.identifier
         };
-        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: itemOffered.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
+        if (params.issuedThrough.typeOf !== factory.product.ProductType.Transportation) {
+            throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.Transportation}`);
+        }
+        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
             reservedTicket }, (typeof ((_d = itemOffered.programMembershipUsed) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
             ? { programMembershipUsed: itemOffered.programMembershipUsed }
             : undefined);

package/lib/chevre/service/payment/any.d.ts CHANGED Viewed

@@ -108,11 +108,14 @@ declare function authorize(params: {
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     location?: factory.action.trade.pay.ILocation;
-    /**
-     * アクション失敗時に即時に決済取引を中止するかどうか
-     */
-    useCancelPayTransactionOnFailed: boolean;
-    useCheckMovieTicketBeforePay: boolean;
-    useSearchTrade4accountId: boolean;
+    options: {
+        /**
+         * アクション失敗時に即時に決済取引を中止するかどうか
+         */
+        useCancelPayTransactionOnFailed: boolean;
+        useCheckMovieTicketBeforePay: boolean;
+        useCheckByIdentifierIfNotYet: boolean;
+        useSearchTrade4accountId: boolean;
+    };
 }): IAuthorizeOperation<IAuthorizePaymentAction>;
 export { onPaymentStatusChanged, authorize, invalidatePaymentUrl, voidPayTransaction, person2username, processVoidPayTransaction, publishPaymentUrl };

package/lib/chevre/service/payment/any.js CHANGED Viewed

@@ -314,7 +314,11 @@ function authorize(params) {
                 transactionNumber: transactionNumber,
                 location: params.location
             });
-            payTransaction = yield PayTransactionService.start(startParams, params.useCheckMovieTicketBeforePay, params.useSearchTrade4accountId)(repos);
+            payTransaction = yield PayTransactionService.start(startParams, {
+                useCheckMovieTicketBeforePay: params.options.useCheckMovieTicketBeforePay,
+                useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet,
+                searchTrade4accountId: params.options.useSearchTrade4accountId
+            })(repos);
         }
         catch (error) {
             try {
@@ -325,7 +329,7 @@ function authorize(params) {
                 // no op
             }
             // 即時に決済取引を中止するか？(2023-02-03~)
-            if (params.useCancelPayTransactionOnFailed) {
+            if (params.options.useCancelPayTransactionOnFailed) {
                 // abortエラーの場合は状態不明なので即時中止しない(2023-06-01~)
                 // {
                 //     "type": "aborted",

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

@@ -6,16 +6,17 @@ interface ICheckResult {
     purchaseNumberAuthIn: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthIn;
     purchaseNumberAuthResult: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult;
 }
-/**
- * MovieTicket認証
- */
-declare function checkByIdentifier(params: {
+interface ICheckByIdentifierParams {
     movieTickets: factory.action.check.paymentMethod.movieTicket.IMovieTicket[];
     seller: factory.seller.ISeller;
     screeningEvent: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     paymentServiceId: string;
-}): (repos: {
+}
+/**
+ * MovieTicket認証
+ */
+declare function checkByIdentifier(params: ICheckByIdentifierParams): (repos: {
     product: ProductRepo;
     project: ProjectRepo;
 }) => Promise<ICheckResult>;
-export { ICheckResult, checkByIdentifier };
+export { ICheckByIdentifierParams, ICheckResult, checkByIdentifier };

package/lib/chevre/service/payment/movieTicket/validation.d.ts CHANGED Viewed

@@ -1,12 +1,11 @@
-/**
- * 決済取引サービス
- */
 import * as factory from '../../../factory';
+import { MongoRepository as ActionRepo } from '../../../repo/action';
 import { MongoRepository as EventRepo } from '../../../repo/event';
 import { MongoRepository as ProductRepo } from '../../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../../repo/project';
 import { MongoRepository as SellerRepo } from '../../../repo/seller';
-export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean): (repos: {
+export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean, useCheckByIdentifierIfNotYet: boolean): (repos: {
+    action: ActionRepo;
     event: EventRepo;
     product: ProductRepo;
     project: ProjectRepo;

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

@@ -10,12 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateMovieTicket = void 0;
-/**
- * 決済取引サービス
- */
+const createDebug = require("debug");
 const factory = require("../../../factory");
 const checkByIdentifier_1 = require("./checkByIdentifier");
-function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBeforePay) {
+const debug = createDebug('chevre-domain:service:payment');
+function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
@@ -33,6 +32,7 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
         if (movieTicketIdentifiers.length !== 1) {
             throw new factory.errors.Argument('movieTickets', 'Number of movie ticket identifiers must be 1');
         }
+        const movieTicketIdentifier = movieTicketIdentifiers[0];
         // ムビチケ系統の決済方法タイプは動的
         const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.typeOf;
         if (typeof paymentMethodType !== 'string') {
@@ -56,11 +56,13 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
         if (!useCheckMovieTicketBeforePay) {
             return { accountsReceivablesByServiceType: [] };
         }
-        const checkResult = yield (0, checkByIdentifier_1.checkByIdentifier)({
+        const checkResult = yield checkByIdentifierIfNotYet({
+            movieTicketIdentifier,
             movieTickets: movieTickets,
             seller: seller,
             screeningEvent: screeningEvent,
-            paymentServiceId
+            paymentServiceId,
+            useCheckByIdentifierIfNotYet
         })(repos);
         const accountsReceivablesByServiceType = [];
         // 券種ごとに枚数が足りているか
@@ -89,3 +91,35 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
     });
 }
 exports.validateMovieTicket = validateMovieTicket;
+function checkByIdentifierIfNotYet(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        let checkResult;
+        if (params.useCheckByIdentifierIfNotYet === true) {
+            // すでにCheckActionが存在すれば認証しない(2023-06-06~)
+            debug('searching alreadyCheckedActions...movieTicketIdentifier:', params.movieTicketIdentifier, 'screeningEvent.id:', params.screeningEvent.id, new Date());
+            const alreadyCheckedAction = yield repos.action.search({
+                limit: 1,
+                page: 1,
+                typeOf: { $eq: factory.actionType.CheckAction },
+                actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+                object: {
+                    typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
+                    movieTickets: {
+                        identifier: { $eq: params.movieTicketIdentifier },
+                        serviceOutput: {
+                            reservationFor: { id: { $eq: params.screeningEvent.id } }
+                        }
+                    }
+                }
+            }, ['result'], []);
+            checkResult = (_a = alreadyCheckedAction.shift()) === null || _a === void 0 ? void 0 : _a.result;
+            debug('checkResult found', checkResult, 'movieTicketIdentifier:', params.movieTicketIdentifier, 'screeningEvent.id:', params.screeningEvent.id, new Date());
+        }
+        if (checkResult === undefined) {
+            debug('checkByIdentifier processing because movieTickets not checked yet...', checkResult);
+            checkResult = yield (0, checkByIdentifier_1.checkByIdentifier)(params)(repos);
+        }
+        return checkResult;
+    });
+}

package/lib/chevre/service/payment/movieTicket.d.ts CHANGED Viewed

@@ -49,7 +49,7 @@ interface IAuthorizeResult {
  * MovieTicket承認
  * オーソリサービスが存在するわけではないので、実質着券する
  */
-declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, transaction: factory.assetTransaction.pay.ITransaction, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean): (repos: {
+declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, transaction: factory.assetTransaction.pay.ITransaction, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean, useCheckByIdentifierIfNotYet: boolean): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     event: EventRepo;

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

@@ -102,7 +102,7 @@ exports.checkMovieTicket = checkMovieTicket;
  * MovieTicket承認
  * オーソリサービスが存在するわけではないので、実質着券する
  */
-function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay) {
+function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         let accountId;
@@ -110,7 +110,7 @@ function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBef
         let accountsReceivablesByServiceType = [];
         try {
             // MovieTicket決済の場合、認証
-            const validateMovieTicketResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckMovieTicketBeforePay)(repos);
+            const validateMovieTicketResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet)(repos);
             accountsReceivablesByServiceType = validateMovieTicketResult.accountsReceivablesByServiceType;
             const paymentMethod = transaction.object.paymentMethod;
             const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf);

package/lib/chevre/service/transaction/orderProgramMembership.js CHANGED Viewed

@@ -338,9 +338,12 @@ function processAuthorizeCreditCard(params) {
             },
             purpose: params.purpose,
             paymentServiceType: factory.service.paymentService.PaymentServiceType.CreditCard,
-            useCancelPayTransactionOnFailed: false,
-            useCheckMovieTicketBeforePay: false,
-            useSearchTrade4accountId: false
+            options: {
+                useCancelPayTransactionOnFailed: false,
+                useCheckMovieTicketBeforePay: false,
+                useCheckByIdentifierIfNotYet: false,
+                useSearchTrade4accountId: false
+            }
         })(repos);
     });
 }

package/package.json CHANGED Viewed

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.26",
-    "@cinerino/sdk": "3.157.0-alpha.7",
+    "@chevre/factory": "4.313.0-alpha.28",
+    "@cinerino/sdk": "3.157.0-alpha.8",
     "@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.2.0-alpha.97"
+  "version": "21.2.0-alpha.99"
 }

package/example/src/chevre/searchAssetTransactions.ts DELETED Viewed

@@ -1,30 +0,0 @@
-// tslint:disable:no-implicit-dependencies no-console
-import { chevre } from '../../../lib/index';
-import * as  mongoose from 'mongoose';
-const project = { id: String(process.env.PROJECT_ID) };
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
-    const assetTransactionRepo = new chevre.repository.AssetTransaction(mongoose.connection);
-    const assetTransactions = await assetTransactionRepo.search(
-        {
-            typeOf: chevre.factory.assetTransactionType.Reserve,
-            project: { id: { $eq: project.id } },
-            object: {
-                reservations: { reservedTicket: { ticketedSeat: { seatNumber: { $eq: 'A-03' } } } }
-            }
-        },
-        ['_id', 'transactionNumber'],
-        []
-    );
-    console.log('assetTransactions:', assetTransactions);
-}
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);