npm - @chevre/domain - Versions diffs - 21.20.0-alpha.27 → 21.20.0-alpha.28 - Mend

@chevre/domain 21.20.0-alpha.27 → 21.20.0-alpha.28

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

package/lib/chevre/factory/order.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import * as factory from '../factory';
+export declare const POINT_AWARD_IDENTIFIER_NAME = "pointAwardIdentifiers";
 export declare const AWARD_ACCOUNTS_IDENTIFIER_NAME = "awardAccounts";
 export type IMaskedCustomer = factory.order.ICustomer | Pick<factory.order.ICustomer, 'id' | 'typeOf'>;
 /**

package/lib/chevre/factory/order.js CHANGED Viewed

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMaskedCustomer = exports.AWARD_ACCOUNTS_IDENTIFIER_NAME = void 0;
+exports.createMaskedCustomer = exports.AWARD_ACCOUNTS_IDENTIFIER_NAME = exports.POINT_AWARD_IDENTIFIER_NAME = void 0;
+exports.POINT_AWARD_IDENTIFIER_NAME = 'pointAwardIdentifiers';
 exports.AWARD_ACCOUNTS_IDENTIFIER_NAME = 'awardAccounts';
 const MASKED_PROFILE = '****';
 /**

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

@@ -142,6 +142,9 @@ export declare class MongoRepository {
         actionStatus?: {
             $eq?: factory.actionStatusType;
         };
+        id?: {
+            $nin?: string[];
+        };
         sort?: factory.action.ISortOrder;
     }): Promise<IAction<T>[]>;
     /**

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

@@ -22,9 +22,13 @@ 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, _58, _59, _60, _61, _62, _63, _64, _65;
+        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, _66;
         const andConditions = [];
-        const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        const idNin = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$nin;
+        if (Array.isArray(idNin)) {
+            andConditions.push({ _id: { $nin: idNin } });
+        }
+        const projectIdEq = (_c = (_b = params.project) === null || _b === void 0 ? void 0 : _b.id) === null || _c === void 0 ? void 0 : _c.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof projectIdEq === 'string') {
@@ -36,7 +40,7 @@ class MongoRepository {
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
-        const agentTypeOfIn = (_d = (_c = params.agent) === null || _c === void 0 ? void 0 : _c.typeOf) === null || _d === void 0 ? void 0 : _d.$in;
+        const agentTypeOfIn = (_e = (_d = params.agent) === null || _d === void 0 ? void 0 : _d.typeOf) === null || _e === void 0 ? void 0 : _e.$in;
         if (Array.isArray(agentTypeOfIn)) {
             andConditions.push({
                 'agent.typeOf': {
@@ -45,7 +49,7 @@ class MongoRepository {
                 }
             });
         }
-        const agentIdIn = (_f = (_e = params.agent) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$in;
+        const agentIdIn = (_g = (_f = params.agent) === null || _f === void 0 ? void 0 : _f.id) === null || _g === void 0 ? void 0 : _g.$in;
         if (Array.isArray(agentIdIn)) {
             andConditions.push({
                 'agent.id': {
@@ -54,7 +58,7 @@ class MongoRepository {
                 }
             });
         }
-        const locationIdEq = (_h = (_g = params.location) === null || _g === void 0 ? void 0 : _g.id) === null || _h === void 0 ? void 0 : _h.$eq;
+        const locationIdEq = (_j = (_h = params.location) === null || _h === void 0 ? void 0 : _h.id) === null || _j === void 0 ? void 0 : _j.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof locationIdEq === 'string') {
@@ -65,7 +69,7 @@ class MongoRepository {
                 }
             });
         }
-        const locationIdentifierEq = (_k = (_j = params.location) === null || _j === void 0 ? void 0 : _j.identifier) === null || _k === void 0 ? void 0 : _k.$eq;
+        const locationIdentifierEq = (_l = (_k = params.location) === null || _k === void 0 ? void 0 : _k.identifier) === null || _l === void 0 ? void 0 : _l.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof locationIdentifierEq === 'string') {
@@ -76,7 +80,7 @@ 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;
+        const objectMovieTicketsIdentifierEq = (_p = (_o = (_m = params.object) === null || _m === void 0 ? void 0 : _m.movieTickets) === null || _o === void 0 ? void 0 : _o.identifier) === null || _p === void 0 ? void 0 : _p.$eq;
         if (typeof objectMovieTicketsIdentifierEq === 'string') {
             andConditions.push({
                 'object.movieTickets.identifier': {
@@ -85,7 +89,7 @@ class MongoRepository {
                 }
             });
         }
-        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;
+        const objectMovieTicketsServiceOutputReservationForIdEq = (_u = (_t = (_s = (_r = (_q = params.object) === null || _q === void 0 ? void 0 : _q.movieTickets) === null || _r === void 0 ? void 0 : _r.serviceOutput) === null || _s === void 0 ? void 0 : _s.reservationFor) === null || _t === void 0 ? void 0 : _t.id) === null || _u === void 0 ? void 0 : _u.$eq;
         if (typeof objectMovieTicketsServiceOutputReservationForIdEq === 'string') {
             andConditions.push({
                 'object.movieTickets.serviceOutput.reservationFor.id': {
@@ -96,7 +100,7 @@ class MongoRepository {
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
-        const objectPaymentMethodIdEq = (_v = (_u = params.object) === null || _u === void 0 ? void 0 : _u.paymentMethodId) === null || _v === void 0 ? void 0 : _v.$eq;
+        const objectPaymentMethodIdEq = (_w = (_v = params.object) === null || _v === void 0 ? void 0 : _v.paymentMethodId) === null || _w === void 0 ? void 0 : _w.$eq;
         if (typeof objectPaymentMethodIdEq === 'string') {
             andConditions.push({
                 'object.paymentMethodId': {
@@ -105,7 +109,7 @@ class MongoRepository {
                 }
             });
         }
-        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;
+        const objectObjectPaymentMethodIdEq = (_z = (_y = (_x = params.object) === null || _x === void 0 ? void 0 : _x.object) === null || _y === void 0 ? void 0 : _y.paymentMethodId) === null || _z === void 0 ? void 0 : _z.$eq;
         if (typeof objectObjectPaymentMethodIdEq === 'string') {
             andConditions.push({
                 'object.object.paymentMethodId': {
@@ -114,7 +118,7 @@ class MongoRepository {
                 }
             });
         }
-        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;
+        const objectReservationForIdEq = (_2 = (_1 = (_0 = params.object) === null || _0 === void 0 ? void 0 : _0.reservationFor) === null || _1 === void 0 ? void 0 : _1.id) === null || _2 === void 0 ? void 0 : _2.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof objectReservationForIdEq === 'string') {
@@ -125,7 +129,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectReservationNumberEq = (_3 = (_2 = params.object) === null || _2 === void 0 ? void 0 : _2.reservationNumber) === null || _3 === void 0 ? void 0 : _3.$eq;
+        const objectReservationNumberEq = (_4 = (_3 = params.object) === null || _3 === void 0 ? void 0 : _3.reservationNumber) === null || _4 === void 0 ? void 0 : _4.$eq;
         if (typeof objectReservationNumberEq === 'string') {
             andConditions.push({
                 'object.reservationNumber': {
@@ -134,7 +138,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectReservationNumberIn = (_5 = (_4 = params.object) === null || _4 === void 0 ? void 0 : _4.reservationNumber) === null || _5 === void 0 ? void 0 : _5.$in;
+        const objectReservationNumberIn = (_6 = (_5 = params.object) === null || _5 === void 0 ? void 0 : _5.reservationNumber) === null || _6 === void 0 ? void 0 : _6.$in;
         if (Array.isArray(objectReservationNumberIn)) {
             andConditions.push({
                 'object.reservationNumber': {
@@ -143,7 +147,7 @@ class MongoRepository {
                 }
             });
         }
-        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;
+        const objectPaymentMethodAccountIdEq = (_9 = (_8 = (_7 = params.object) === null || _7 === void 0 ? void 0 : _7.paymentMethod) === null || _8 === void 0 ? void 0 : _8.accountId) === null || _9 === void 0 ? void 0 : _9.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof objectPaymentMethodAccountIdEq === 'string') {
@@ -154,7 +158,7 @@ class MongoRepository {
                 }
             });
         }
-        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;
+        const objectPaymentMethodPaymentMethodIdEq = (_12 = (_11 = (_10 = params.object) === null || _10 === void 0 ? void 0 : _10.paymentMethod) === null || _11 === void 0 ? void 0 : _11.paymentMethodId) === null || _12 === void 0 ? void 0 : _12.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof objectPaymentMethodPaymentMethodIdEq === 'string') {
@@ -165,7 +169,7 @@ class MongoRepository {
                 }
             });
         }
-        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;
+        const objectPaymentMethodPaymentMethodIdIn = (_15 = (_14 = (_13 = params.object) === null || _13 === void 0 ? void 0 : _13.paymentMethod) === null || _14 === void 0 ? void 0 : _14.paymentMethodId) === null || _15 === void 0 ? void 0 : _15.$in;
         if (Array.isArray(objectPaymentMethodPaymentMethodIdIn)) {
             andConditions.push({
                 'object.paymentMethod.paymentMethodId': {
@@ -174,7 +178,7 @@ class MongoRepository {
                 }
             });
         }
-        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;
+        const objectPaymentMethodTypeOfEq = (_18 = (_17 = (_16 = params.object) === null || _16 === void 0 ? void 0 : _16.paymentMethod) === null || _17 === void 0 ? void 0 : _17.typeOf) === null || _18 === void 0 ? void 0 : _18.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof objectPaymentMethodTypeOfEq === 'string') {
@@ -185,7 +189,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectTypeOfEq = (_19 = (_18 = params.object) === null || _18 === void 0 ? void 0 : _18.typeOf) === null || _19 === void 0 ? void 0 : _19.$eq;
+        const objectTypeOfEq = (_20 = (_19 = params.object) === null || _19 === void 0 ? void 0 : _19.typeOf) === null || _20 === void 0 ? void 0 : _20.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof objectTypeOfEq === 'string') {
@@ -196,7 +200,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectTypeOfIn = (_21 = (_20 = params.object) === null || _20 === void 0 ? void 0 : _20.typeOf) === null || _21 === void 0 ? void 0 : _21.$in;
+        const objectTypeOfIn = (_22 = (_21 = params.object) === null || _21 === void 0 ? void 0 : _21.typeOf) === null || _22 === void 0 ? void 0 : _22.$in;
         if (Array.isArray(objectTypeOfIn)) {
             andConditions.push({
                 'object.typeOf': {
@@ -205,7 +209,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectIdEq = (_23 = (_22 = params.object) === null || _22 === void 0 ? void 0 : _22.id) === null || _23 === void 0 ? void 0 : _23.$eq;
+        const objectIdEq = (_24 = (_23 = params.object) === null || _23 === void 0 ? void 0 : _23.id) === null || _24 === void 0 ? void 0 : _24.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof objectIdEq === 'string') {
@@ -216,7 +220,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectIdIn = (_25 = (_24 = params.object) === null || _24 === void 0 ? void 0 : _24.id) === null || _25 === void 0 ? void 0 : _25.$in;
+        const objectIdIn = (_26 = (_25 = params.object) === null || _25 === void 0 ? void 0 : _25.id) === null || _26 === void 0 ? void 0 : _26.$in;
         if (Array.isArray(objectIdIn)) {
             andConditions.push({
                 'object.id': {
@@ -225,7 +229,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectOrderNumberIn = (_27 = (_26 = params.object) === null || _26 === void 0 ? void 0 : _26.orderNumber) === null || _27 === void 0 ? void 0 : _27.$in;
+        const objectOrderNumberIn = (_28 = (_27 = params.object) === null || _27 === void 0 ? void 0 : _27.orderNumber) === null || _28 === void 0 ? void 0 : _28.$in;
         if (Array.isArray(objectOrderNumberIn)) {
             andConditions.push({
                 'object.orderNumber': {
@@ -234,7 +238,7 @@ class MongoRepository {
                 }
             });
         }
-        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;
+        const objectEventIdIn = (_31 = (_30 = (_29 = params.object) === null || _29 === void 0 ? void 0 : _29.event) === null || _30 === void 0 ? void 0 : _30.id) === null || _31 === void 0 ? void 0 : _31.$in;
         if (Array.isArray(objectEventIdIn)) {
             andConditions.push({
                 'object.event.id': {
@@ -243,7 +247,7 @@ class MongoRepository {
                 }
             });
         }
-        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;
+        const objectAcceptedOfferSeatNumberIn = (_38 = (_37 = (_36 = (_35 = (_34 = (_33 = (_32 = params.object) === null || _32 === void 0 ? void 0 : _32.acceptedOffer) === null || _33 === void 0 ? void 0 : _33.itemOffered) === null || _34 === void 0 ? void 0 : _34.serviceOutput) === null || _35 === void 0 ? void 0 : _35.reservedTicket) === null || _36 === void 0 ? void 0 : _36.ticketedSeat) === null || _37 === void 0 ? void 0 : _37.seatNumber) === null || _38 === void 0 ? void 0 : _38.$in;
         if (Array.isArray(objectAcceptedOfferSeatNumberIn)) {
             andConditions.push({
                 'object.acceptedOffer.itemOffered.serviceOutput.reservedTicket.ticketedSeat.seatNumber': {
@@ -260,7 +264,7 @@ class MongoRepository {
             });
         }
         else {
-            const typeOfEq = (_38 = params.typeOf) === null || _38 === void 0 ? void 0 : _38.$eq;
+            const typeOfEq = (_39 = params.typeOf) === null || _39 === void 0 ? void 0 : _39.$eq;
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
             if (typeof typeOfEq === 'string') {
@@ -269,7 +273,7 @@ class MongoRepository {
                 });
             }
         }
-        const actionStatusIn = (_39 = params.actionStatus) === null || _39 === void 0 ? void 0 : _39.$in;
+        const actionStatusIn = (_40 = params.actionStatus) === null || _40 === void 0 ? void 0 : _40.$in;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (Array.isArray(actionStatusIn)) {
@@ -300,7 +304,7 @@ class MongoRepository {
                 startDate: { $lte: startDateLte }
             });
         }
-        const fromLocationTypeOfIn = (_41 = (_40 = params.fromLocation) === null || _40 === void 0 ? void 0 : _40.typeOf) === null || _41 === void 0 ? void 0 : _41.$in;
+        const fromLocationTypeOfIn = (_42 = (_41 = params.fromLocation) === null || _41 === void 0 ? void 0 : _41.typeOf) === null || _42 === void 0 ? void 0 : _42.$in;
         if (Array.isArray(fromLocationTypeOfIn)) {
             andConditions.push({
                 'fromLocation.typeOf': {
@@ -309,7 +313,7 @@ class MongoRepository {
                 }
             });
         }
-        const fromLocationAccountNumberIn = (_43 = (_42 = params.fromLocation) === null || _42 === void 0 ? void 0 : _42.accountNumber) === null || _43 === void 0 ? void 0 : _43.$in;
+        const fromLocationAccountNumberIn = (_44 = (_43 = params.fromLocation) === null || _43 === void 0 ? void 0 : _43.accountNumber) === null || _44 === void 0 ? void 0 : _44.$in;
         if (Array.isArray(fromLocationAccountNumberIn)) {
             andConditions.push({
                 'fromLocation.accountNumber': {
@@ -318,7 +322,7 @@ class MongoRepository {
                 }
             });
         }
-        const fromLocationAccountTypeIn = (_45 = (_44 = params.fromLocation) === null || _44 === void 0 ? void 0 : _44.accountType) === null || _45 === void 0 ? void 0 : _45.$in;
+        const fromLocationAccountTypeIn = (_46 = (_45 = params.fromLocation) === null || _45 === void 0 ? void 0 : _45.accountType) === null || _46 === void 0 ? void 0 : _46.$in;
         if (Array.isArray(fromLocationAccountTypeIn)) {
             andConditions.push({
                 'fromLocation.accountType': {
@@ -327,7 +331,7 @@ class MongoRepository {
                 }
             });
         }
-        const toLocationTypeOfIn = (_47 = (_46 = params.toLocation) === null || _46 === void 0 ? void 0 : _46.typeOf) === null || _47 === void 0 ? void 0 : _47.$in;
+        const toLocationTypeOfIn = (_48 = (_47 = params.toLocation) === null || _47 === void 0 ? void 0 : _47.typeOf) === null || _48 === void 0 ? void 0 : _48.$in;
         if (Array.isArray(toLocationTypeOfIn)) {
             andConditions.push({
                 'toLocation.typeOf': {
@@ -336,7 +340,7 @@ class MongoRepository {
                 }
             });
         }
-        const toLocationAccountNumberIn = (_49 = (_48 = params.toLocation) === null || _48 === void 0 ? void 0 : _48.accountNumber) === null || _49 === void 0 ? void 0 : _49.$in;
+        const toLocationAccountNumberIn = (_50 = (_49 = params.toLocation) === null || _49 === void 0 ? void 0 : _49.accountNumber) === null || _50 === void 0 ? void 0 : _50.$in;
         if (Array.isArray(toLocationAccountNumberIn)) {
             andConditions.push({
                 'toLocation.accountNumber': {
@@ -345,7 +349,7 @@ class MongoRepository {
                 }
             });
         }
-        const toLocationAccountTypeIn = (_51 = (_50 = params.toLocation) === null || _50 === void 0 ? void 0 : _50.accountType) === null || _51 === void 0 ? void 0 : _51.$in;
+        const toLocationAccountTypeIn = (_52 = (_51 = params.toLocation) === null || _51 === void 0 ? void 0 : _51.accountType) === null || _52 === void 0 ? void 0 : _52.$in;
         if (Array.isArray(toLocationAccountTypeIn)) {
             andConditions.push({
                 'toLocation.accountType': {
@@ -354,7 +358,7 @@ class MongoRepository {
                 }
             });
         }
-        const purposeTypeOfIn = (_53 = (_52 = params.purpose) === null || _52 === void 0 ? void 0 : _52.typeOf) === null || _53 === void 0 ? void 0 : _53.$in;
+        const purposeTypeOfIn = (_54 = (_53 = params.purpose) === null || _53 === void 0 ? void 0 : _53.typeOf) === null || _54 === void 0 ? void 0 : _54.$in;
         if (Array.isArray(purposeTypeOfIn)) {
             andConditions.push({
                 'purpose.typeOf': {
@@ -363,7 +367,7 @@ class MongoRepository {
                 }
             });
         }
-        const purposeIdIn = (_55 = (_54 = params.purpose) === null || _54 === void 0 ? void 0 : _54.id) === null || _55 === void 0 ? void 0 : _55.$in;
+        const purposeIdIn = (_56 = (_55 = params.purpose) === null || _55 === void 0 ? void 0 : _55.id) === null || _56 === void 0 ? void 0 : _56.$in;
         if (Array.isArray(purposeIdIn)) {
             andConditions.push({
                 'purpose.id': {
@@ -372,7 +376,7 @@ class MongoRepository {
                 }
             });
         }
-        const purposeOrderNumberIn = (_57 = (_56 = params.purpose) === null || _56 === void 0 ? void 0 : _56.orderNumber) === null || _57 === void 0 ? void 0 : _57.$in;
+        const purposeOrderNumberIn = (_58 = (_57 = params.purpose) === null || _57 === void 0 ? void 0 : _57.orderNumber) === null || _58 === void 0 ? void 0 : _58.$in;
         if (Array.isArray(purposeOrderNumberIn)) {
             andConditions.push({
                 'purpose.orderNumber': {
@@ -381,7 +385,7 @@ class MongoRepository {
                 }
             });
         }
-        const resultTypeOfIn = (_59 = (_58 = params.result) === null || _58 === void 0 ? void 0 : _58.typeOf) === null || _59 === void 0 ? void 0 : _59.$in;
+        const resultTypeOfIn = (_60 = (_59 = params.result) === null || _59 === void 0 ? void 0 : _59.typeOf) === null || _60 === void 0 ? void 0 : _60.$in;
         if (Array.isArray(resultTypeOfIn)) {
             andConditions.push({
                 'result.typeOf': {
@@ -390,7 +394,7 @@ class MongoRepository {
                 }
             });
         }
-        const resultIdIn = (_61 = (_60 = params.result) === null || _60 === void 0 ? void 0 : _60.id) === null || _61 === void 0 ? void 0 : _61.$in;
+        const resultIdIn = (_62 = (_61 = params.result) === null || _61 === void 0 ? void 0 : _61.id) === null || _62 === void 0 ? void 0 : _62.$in;
         if (Array.isArray(resultIdIn)) {
             andConditions.push({
                 'result.id': {
@@ -399,7 +403,7 @@ class MongoRepository {
                 }
             });
         }
-        const resultOrderNumberIn = (_63 = (_62 = params.result) === null || _62 === void 0 ? void 0 : _62.orderNumber) === null || _63 === void 0 ? void 0 : _63.$in;
+        const resultOrderNumberIn = (_64 = (_63 = params.result) === null || _63 === void 0 ? void 0 : _63.orderNumber) === null || _64 === void 0 ? void 0 : _64.$in;
         if (Array.isArray(resultOrderNumberIn)) {
             andConditions.push({
                 'result.orderNumber': {
@@ -408,7 +412,7 @@ class MongoRepository {
                 }
             });
         }
-        const resultCodeIn = (_65 = (_64 = params.result) === null || _64 === void 0 ? void 0 : _64.code) === null || _65 === void 0 ? void 0 : _65.$in;
+        const resultCodeIn = (_66 = (_65 = params.result) === null || _65 === void 0 ? void 0 : _65.code) === null || _66 === void 0 ? void 0 : _66.$in;
         if (Array.isArray(resultCodeIn)) {
             andConditions.push({
                 'result.code': {
@@ -621,16 +625,16 @@ class MongoRepository {
      * 取引に対するアクション検索時などに使用
      */
     searchByPurpose(params) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function* () {
-            return this.search(Object.assign(Object.assign(Object.assign({ purpose: {
+            return this.search(Object.assign(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), [], []);
+                    : 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), (Array.isArray((_f = params.id) === null || _f === void 0 ? void 0 : _f.$nin)) ? { id: { $nin: (_g = params.id) === null || _g === void 0 ? void 0 : _g.$nin } } : undefined), (typeof ((_h = params.sort) === null || _h === void 0 ? void 0 : _h.startDate) === 'number') ? { sort: params.sort } : undefined), [], []);
         });
     }
     /**

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

@@ -21,6 +21,9 @@ export declare function acceptOffer(params: {
     acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
 }): IAcceptOfferOperation<void>;
 export declare function voidAcceptedOffer(params: {
+    /**
+     * 取消対象の承認アクション
+     */
     authorizeActions: IAuthorizeOfferAction[];
     orderNumber: string;
 }): (repos: {

package/lib/chevre/service/order/placeOrder.js CHANGED Viewed

@@ -8,25 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.placeOrderWithoutTransaction = exports.placeOrder = void 0;
+const createDebug = require("debug");
 const moment = require("moment");
 const order_1 = require("../../factory/order");
+// import { voidAcceptedOffer } from '../offer/any';
 const createAccountingReportIfNotExist_1 = require("./createAccountingReportIfNotExist");
 const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusChanged");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
+const debug = createDebug('chevre-domain:service:order');
 function createOrder(params) {
     // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
     const acceptedOffers = (Array.isArray(params.acceptedOffers))
@@ -112,8 +104,8 @@ function createOrderFromBody(params) {
             throw new factory.errors.NotFound('transaction.result.order');
         }
         order = createOrder(orderByTransaction);
-        const { result } = placeOrderTransactionWithResult, placeOrderTransaction = __rest(placeOrderTransactionWithResult, ["result"]);
-        return { order, placeOrderTransaction };
+        // const { result, ...placeOrderTransaction } = placeOrderTransactionWithResult;
+        return { order, placeOrderTransaction: placeOrderTransactionWithResult };
     });
 }
 /**
@@ -165,6 +157,33 @@ function placeOrderWithoutTransaction(params) {
     });
 }
 exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;
+function voidAcceptedOfferIfNecessary(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        // 取引に保管された承認アクション以外のアクションについて、オファーを除外する
+        const authorizeActionsAsResult = (_a = params.purpose.result) === null || _a === void 0 ? void 0 : _a.authorizeActions;
+        if (Array.isArray(authorizeActionsAsResult) && authorizeActionsAsResult.length > 0) {
+            const completedAuthorizeActionIds = authorizeActionsAsResult.map(({ id }) => id);
+            debug(completedAuthorizeActionIds.length, 'completedAuthorizeActionIds found from transaction', params.purpose.id);
+            const authorizeActions = yield repos.action.searchByPurpose({
+                typeOf: factory.actionType.AuthorizeAction,
+                purpose: {
+                    typeOf: factory.transactionType.PlaceOrder,
+                    id: params.purpose.id
+                },
+                object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } },
+                id: { $nin: completedAuthorizeActionIds }
+            });
+            debug('processing voidAcceptedOffer', authorizeActions.length, 'authorizeActions...', authorizeActions);
+            // tslint:disable-next-line:no-suspicious-comment
+            // TODO implement
+            // await voidAcceptedOffer({
+            //     authorizeActions,
+            //     orderNumber: params.object.orderNumber
+            // })(repos);
+        }
+    });
+}
 /**
  * 注文を作成する
  */
@@ -227,6 +246,11 @@ function placeOrder(params) {
         if (completedActions.length === 0) {
             const action = yield repos.action.start(orderActionAttributes);
             try {
+                // 冗長なオファーを除外する(念のため)
+                yield voidAcceptedOfferIfNecessary({
+                    object: { orderNumber: order.orderNumber },
+                    purpose: placeOrderTransaction
+                })(repos);
                 // orderInTransactionを考慮(2024-01-14~)
                 yield repos.orderInTransaction.placeOrder(order);
                 yield repos.order.createIfNotExist(order);

package/lib/chevre/service/transaction/placeOrderInProgress/confirm.d.ts ADDED Viewed

@@ -0,0 +1,23 @@
+import type { MongoRepository as ActionRepo } from '../../../repo/action';
+import type { RedisRepository as ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
+import type { MongoRepository as EmailMessageRepo } from '../../../repo/emailMessage';
+import type { RedisRepository as OrderNumberRepo } from '../../../repo/orderNumber';
+import type { MongoRepository as ProjectRepo } from '../../../repo/project';
+import type { MongoRepository as TransactionRepo } from '../../../repo/transaction';
+import * as factory from '../../../factory';
+import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
+interface IConfirmOperationRepos {
+    action: ActionRepo;
+    emailMessage?: EmailMessageRepo;
+    project: ProjectRepo;
+    transaction: TransactionRepo;
+    orderNumber: OrderNumberRepo;
+    confirmationNumber: ConfirmationNumberRepo;
+}
+type IConfirmOperation<T> = (repos: IConfirmOperationRepos) => Promise<T>;
+type IConfirmParams = PlaceOrderFactory.IConfirmParams;
+/**
+ * 注文取引を確定する
+ */
+declare function confirm(params: IConfirmParams): IConfirmOperation<factory.transaction.placeOrder.IResult>;
+export { confirm };

package/lib/chevre/service/transaction/placeOrderInProgress/confirm.js ADDED Viewed

@@ -0,0 +1,194 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.confirm = void 0;
+const moment = require("moment");
+const errorHandler_1 = require("../../../errorHandler");
+const factory = require("../../../factory");
+const potentialActions_1 = require("./potentialActions");
+const publishConfirmationNumberIfNotExist_1 = require("./publishConfirmationNumberIfNotExist");
+const publishOrderNumberIfNotExist_1 = require("./publishOrderNumberIfNotExist");
+const result_1 = require("./result");
+const validation_1 = require("./validation");
+/**
+ * 注文取引を確定する
+ */
+function confirm(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        // 確認番号を事前発行
+        yield (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
+            id: params.id,
+            object: { orderDate: params.result.order.orderDate }
+        })(repos);
+        const transaction = yield repos.transaction.findById({
+            typeOf: factory.transactionType.PlaceOrder,
+            id: params.id
+        });
+        if (transaction.status === factory.transactionStatusType.Confirmed) {
+            // すでに確定済の場合
+            return transaction.result;
+        }
+        else if (transaction.status === factory.transactionStatusType.Expired) {
+            throw new factory.errors.Argument('transactionId', 'Transaction already expired');
+        }
+        else if (transaction.status === factory.transactionStatusType.Canceled) {
+            throw new factory.errors.Argument('transactionId', 'Transaction already canceled');
+        }
+        if (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.id) === 'string' && transaction.agent.id !== params.agent.id) {
+            throw new factory.errors.Forbidden('Transaction not yours');
+        }
+        // 取引に対する全ての承認アクションをマージ
+        const completedAuthorizeActions = yield searchAuthorizeActions(params)(repos);
+        // 注文番号を発行
+        const orderNumber = yield (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+            project: { id: transaction.project.id },
+            id: transaction.id,
+            object: { orderDate: params.result.order.orderDate }
+        })(repos);
+        const result = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizeActions: completedAuthorizeActions }));
+        // デフォルトEメールメッセージを検索
+        let emailMessageOnOrderSent;
+        if (repos.emailMessage !== undefined) {
+            const searchEmailMessagesResult = yield repos.emailMessage.search({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: transaction.project.id } },
+                about: { identifier: { $eq: factory.creativeWork.message.email.AboutIdentifier.OnOrderSent } }
+            });
+            emailMessageOnOrderSent = searchEmailMessagesResult.shift();
+        }
+        // ポストアクションを作成
+        const potentialActions = yield (0, potentialActions_1.createPotentialActions)({
+            order: result.order,
+            potentialActions: params.potentialActions,
+            transaction: transaction,
+            emailMessage: emailMessageOnOrderSent,
+            authorizeActions: completedAuthorizeActions
+        });
+        // ステータス変更
+        try {
+            yield repos.transaction.confirm({
+                typeOf: transaction.typeOf,
+                id: transaction.id,
+                result: result,
+                potentialActions: potentialActions
+            });
+        }
+        catch (error) {
+            if (yield (0, errorHandler_1.isMongoError)(error)) {
+                // 万が一同一注文番号で確定しようとすると、MongoDBでE11000 duplicate key errorが発生する
+                // message: 'E11000 duplicate key error collection: prodttts.transactions index:result.order.orderNumber_1 dup key:...',
+                if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
+                    throw new factory.errors.AlreadyInUse('transaction', ['result.order.orderNumber']);
+                }
+            }
+            throw error;
+        }
+        // 万が一処理が想定通りでない場合orderNumberが存在しない
+        // if (typeof transaction.result?.order.typeOf !== 'string') {
+        //     throw new factory.errors.ServiceUnavailable('transaction.result not found');
+        // }
+        return result;
+    });
+}
+exports.confirm = confirm;
+function createResult(params) {
+    const transaction = params.transaction;
+    // 取引の確定条件が全て整っているかどうか確認
+    (0, validation_1.validateTransaction)(transaction, params.authorizeActions);
+    // 注文作成
+    const order = (0, result_1.createOrder)({
+        orderNumber: params.orderNumber,
+        transaction: transaction,
+        orderDate: params.result.order.orderDate,
+        // OrderPaymentDueオプションを追加(2023-08-25~)
+        // 注文作成時のステータスとなる
+        // orderStatus: (USE_ORDER_PAYMENT_DUE_ON_PLACED) ? factory.orderStatus.OrderPaymentDue : factory.orderStatus.OrderProcessing,
+        orderStatus: factory.orderStatus.OrderPaymentDue,
+        isGift: false,
+        authorizeActions: params.authorizeActions
+    });
+    (0, validation_1.validateEventOffers)({
+        transaction: transaction,
+        order: order,
+        authorizeActions: params.authorizeActions
+    });
+    // 注文アイテム数制限確認
+    (0, validation_1.validateNumItems)({
+        order: order,
+        result: params.result
+    });
+    (0, validation_1.validatePaymentMethods)({ order });
+    // 確認番号を発行
+    const { confirmationNumber, identifier, url } = createConfirmationNumber({
+        order: order,
+        transaction: transaction,
+        result: params.result
+    });
+    order.confirmationNumber = confirmationNumber;
+    order.identifier = identifier;
+    order.url = url;
+    const authorizeActions = params.authorizeActions.map(({ id }) => ({ id }));
+    return {
+        order,
+        authorizeActions,
+        numAcceptedOffers: order.acceptedOffers.length // 追加(2024-01-17~)
+    };
+}
+function searchAuthorizeActions(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // 取引に対する全ての承認アクションをマージ
+        let authorizeActions = yield repos.action.searchByPurpose({
+            typeOf: factory.actionType.AuthorizeAction,
+            purpose: {
+                typeOf: factory.transactionType.PlaceOrder,
+                id: params.id
+            },
+            // Completedに絞る(2023-05-16~)
+            actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
+        });
+        // 万が一このプロセス中に他処理が発生してもそれらを無視するように、endDateでフィルタリング
+        authorizeActions = authorizeActions.filter((a) => {
+            return (a.endDate instanceof Date) && moment(a.endDate)
+                .isBefore(moment(params.result.order.orderDate));
+        });
+        return authorizeActions;
+    });
+}
+function createConfirmationNumber(params) {
+    const confirmationNumber = params.transaction.object.confirmationNumber;
+    let url = '';
+    let identifier = [];
+    // 取引に確認番号が保管されていなければ、確認番号を発行
+    if (typeof confirmationNumber !== 'string') {
+        // 事前に発行済なはずなので、ありえないフロー
+        throw new factory.errors.ServiceUnavailable('object.confirmationNumber undefined');
+    }
+    // URLの指定があれば上書き
+    // tslint:disable-next-line:no-single-line-block-comment
+    /* istanbul ignore if */
+    if (typeof params.result.order.url === 'string') {
+        url = params.result.order.url;
+    }
+    else /* istanbul ignore next */ if (typeof params.result.order.url === 'function') {
+        // tslint:disable-next-line:no-single-line-block-comment
+        /* istanbul ignore next */
+        url = params.result.order.url(params.order);
+    }
+    // 識別子の指定があれば上書き
+    identifier = [
+        ...(Array.isArray(params.result.order.identifier)) ? params.result.order.identifier : [],
+        // 取引に指定があれば追加
+        ...(Array.isArray(params.transaction.object.identifier)) ? params.transaction.object.identifier : []
+    ];
+    return { confirmationNumber, url, identifier };
+}

package/lib/chevre/service/transaction/placeOrderInProgress/publishConfirmationNumberIfNotExist.d.ts ADDED Viewed

@@ -0,0 +1,18 @@
+import type { RedisRepository as ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
+import type { MongoRepository as TransactionRepo } from '../../../repo/transaction';
+/**
+ * 未発行であれば、注文の確認番号を発行して取引に保管する
+ */
+declare function publishConfirmationNumberIfNotExist(params: {
+    /**
+     * 取引ID
+     */
+    id: string;
+    object: {
+        orderDate: Date;
+    };
+}): (repos: {
+    transaction: TransactionRepo;
+    confirmationNumber: ConfirmationNumberRepo;
+}) => Promise<string>;
+export { publishConfirmationNumberIfNotExist };

package/lib/chevre/service/transaction/placeOrderInProgress/publishConfirmationNumberIfNotExist.js ADDED Viewed

@@ -0,0 +1,42 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.publishConfirmationNumberIfNotExist = void 0;
+const factory = require("../../../factory");
+/**
+ * 未発行であれば、注文の確認番号を発行して取引に保管する
+ */
+function publishConfirmationNumberIfNotExist(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // 最適化(2023-02-03~)
+        let confirmationNumber = yield repos.transaction.findInProgressConfirmationNumberById({ id: params.id });
+        // すでに発行済であれば何もしない
+        if (typeof confirmationNumber === 'string') {
+            return confirmationNumber;
+        }
+        // 確認番号を発行
+        confirmationNumber = yield repos.confirmationNumber.publish({ orderDate: params.object.orderDate });
+        // 取引に存在しなければ保管
+        yield repos.transaction.saveConfirmationNumberIfNotExist({
+            id: params.id,
+            confirmationNumber
+        });
+        // 確認番号を取引から再取得
+        // 最適化(2023-02-03~)
+        confirmationNumber = yield repos.transaction.findInProgressConfirmationNumberById({ id: params.id });
+        // 万が一処理が想定通りでない場合confirmationNumberが存在しない
+        if (typeof confirmationNumber !== 'string') {
+            throw new factory.errors.ServiceUnavailable('transaction.object.confirmationNumber not found');
+        }
+        return confirmationNumber;
+    });
+}
+exports.publishConfirmationNumberIfNotExist = publishConfirmationNumberIfNotExist;

package/lib/chevre/service/transaction/placeOrderInProgress/publishOrderNumberIfNotExist.d.ts ADDED Viewed

@@ -0,0 +1,23 @@
+import type { RedisRepository as OrderNumberRepo } from '../../../repo/orderNumber';
+import type { MongoRepository as ProjectRepo } from '../../../repo/project';
+import type { MongoRepository as TransactionRepo } from '../../../repo/transaction';
+/**
+ * 未発行であれば、注文番号を発行して取引に保管する
+ */
+declare function publishOrderNumberIfNotExist(params: {
+    project: {
+        id: string;
+    };
+    /**
+     * 取引ID
+     */
+    id: string;
+    object: {
+        orderDate: Date;
+    };
+}): (repos: {
+    project: ProjectRepo;
+    transaction: TransactionRepo;
+    orderNumber: OrderNumberRepo;
+}) => Promise<string>;
+export { publishOrderNumberIfNotExist };

package/lib/chevre/service/transaction/placeOrderInProgress/publishOrderNumberIfNotExist.js ADDED Viewed

@@ -0,0 +1,46 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.publishOrderNumberIfNotExist = void 0;
+const factory = require("../../../factory");
+/**
+ * 未発行であれば、注文番号を発行して取引に保管する
+ */
+function publishOrderNumberIfNotExist(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // 最適化(2023-02-03~)
+        let orderNumber = yield repos.transaction.findInProgressOrderNumberById({ id: params.id });
+        // すでに発行済であれば何もしない
+        if (typeof orderNumber === 'string') {
+            return orderNumber;
+        }
+        // 注文番号を発行
+        const { alternateName } = yield repos.project.findAlternateNameById({ id: params.project.id });
+        if (typeof alternateName !== 'string') {
+            throw new factory.errors.NotFound('project.alternateName');
+        }
+        orderNumber = yield repos.orderNumber.publishByTimestamp({
+            project: { alternateName },
+            orderDate: params.object.orderDate
+        });
+        // 取引に存在しなければ保管
+        yield repos.transaction.saveOrderNumberIfNotExist({ id: params.id, orderNumber });
+        // 注文番号を取引から再取得
+        // 最適化(2023-02-03~)
+        orderNumber = yield repos.transaction.findInProgressOrderNumberById({ id: params.id });
+        // 万が一処理が想定通りでない場合orderNumberが存在しない
+        if (typeof orderNumber !== 'string') {
+            throw new factory.errors.ServiceUnavailable('transaction.object.orderNumber not found');
+        }
+        return orderNumber;
+    });
+}
+exports.publishOrderNumberIfNotExist = publishOrderNumberIfNotExist;

package/lib/chevre/service/transaction/placeOrderInProgress.d.ts CHANGED Viewed

@@ -1,80 +1,30 @@
-import * as factory from '../../factory';
-import type { MongoRepository as ActionRepo } from '../../repo/action';
-import type { RedisRepository as ConfirmationNumberRepo } from '../../repo/confirmationNumber';
-import type { MongoRepository as EmailMessageRepo } from '../../repo/emailMessage';
-import type { RedisRepository as OrderNumberRepo } from '../../repo/orderNumber';
-import type { MongoRepository as ProjectRepo } from '../../repo/project';
+/**
+ * 進行中注文取引サービス
+ */
 import type { MongoRepository as SellerRepo } from '../../repo/seller';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
-import { IPassportValidator as IWaiterPassportValidator, placeOrder as PlaceOrderFactory } from '../../factory/transaction';
-export declare const POINT_AWARD_IDENTIFIER_NAME = "pointAwardIdentifiers";
-export interface IStartOperationRepos {
+import * as factory from '../../factory';
+import { POINT_AWARD_IDENTIFIER_NAME } from '../../factory/order';
+import { placeOrder as PlaceOrderFactory } from '../../factory/transaction';
+import { confirm } from './placeOrderInProgress/confirm';
+import { publishConfirmationNumberIfNotExist } from './placeOrderInProgress/publishConfirmationNumberIfNotExist';
+import { publishOrderNumberIfNotExist } from './placeOrderInProgress/publishOrderNumberIfNotExist';
+interface IStartOperationRepos {
     seller: SellerRepo;
     transaction: TransactionRepo;
 }
-export type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
-export interface IConfirmOperationRepos {
-    action: ActionRepo;
-    emailMessage?: EmailMessageRepo;
-    project: ProjectRepo;
-    transaction: TransactionRepo;
-    orderNumber: OrderNumberRepo;
-    confirmationNumber: ConfirmationNumberRepo;
-}
-export type IConfirmOperation<T> = (repos: IConfirmOperationRepos) => Promise<T>;
-export type IPassportValidator = IWaiterPassportValidator;
-export type IStartParams = PlaceOrderFactory.IStartParams & {
+type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
+type IStartParams = PlaceOrderFactory.IStartParams & {
     validateEligibleCustomerType: boolean;
 };
 /**
  * 取引開始
  */
-export declare function start(params: IStartParams): IStartOperation<factory.transaction.placeOrder.ITransaction>;
-export type IOrderURLGenerator = PlaceOrderFactory.IOrderURLGenerator;
-export type IResultOrderParams = PlaceOrderFactory.IResultOrderParams;
-export type IConfirmParams = PlaceOrderFactory.IConfirmParams;
-/**
- * 注文取引を確定する
- */
-export declare function confirm(params: IConfirmParams): IConfirmOperation<factory.transaction.placeOrder.IResult>;
-/**
- * 未発行であれば、注文の確認番号を発行して取引に保管する
- */
-export declare function publishConfirmationNumberIfNotExist(params: {
-    /**
-     * 取引ID
-     */
-    id: string;
-    object: {
-        orderDate: Date;
-    };
-}): (repos: {
-    transaction: TransactionRepo;
-    confirmationNumber: ConfirmationNumberRepo;
-}) => Promise<string>;
-/**
- * 未発行であれば、注文番号を発行して取引に保管する
- */
-export declare function publishOrderNumberIfNotExist(params: {
-    project: {
-        id: string;
-    };
-    /**
-     * 取引ID
-     */
-    id: string;
-    object: {
-        orderDate: Date;
-    };
-}): (repos: {
-    project: ProjectRepo;
-    transaction: TransactionRepo;
-    orderNumber: OrderNumberRepo;
-}) => Promise<string>;
+declare function start(params: IStartParams): IStartOperation<factory.transaction.placeOrder.ITransaction>;
 /**
  * インセンティブ承認
  */
-export declare function authorizeAward(params: {
+declare function authorizeAward(params: {
     transaction: {
         id: string;
     };
@@ -92,7 +42,7 @@ export declare function authorizeAward(params: {
 /**
  * インセンティブ承認を取り消す
  */
-export declare function voidAward(params: {
+declare function voidAward(params: {
     /**
      * 取引進行者
      */
@@ -108,3 +58,4 @@ export declare function voidAward(params: {
 }): (repos: {
     transaction: TransactionRepo;
 }) => Promise<void>;
+export { authorizeAward, confirm, POINT_AWARD_IDENTIFIER_NAME, publishConfirmationNumberIfNotExist, publishOrderNumberIfNotExist, start, voidAward };

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

@@ -9,27 +9,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.voidAward = exports.authorizeAward = exports.publishOrderNumberIfNotExist = exports.publishConfirmationNumberIfNotExist = exports.confirm = exports.start = exports.POINT_AWARD_IDENTIFIER_NAME = void 0;
-/**
- * 進行中注文取引サービス
- */
-const moment = require("moment");
+exports.voidAward = exports.start = exports.publishOrderNumberIfNotExist = exports.publishConfirmationNumberIfNotExist = exports.POINT_AWARD_IDENTIFIER_NAME = exports.confirm = exports.authorizeAward = void 0;
+const errorHandler_1 = require("../../errorHandler");
 const factory = require("../../factory");
+const order_1 = require("../../factory/order");
+Object.defineProperty(exports, "POINT_AWARD_IDENTIFIER_NAME", { enumerable: true, get: function () { return order_1.POINT_AWARD_IDENTIFIER_NAME; } });
+const confirm_1 = require("./placeOrderInProgress/confirm");
+Object.defineProperty(exports, "confirm", { enumerable: true, get: function () { return confirm_1.confirm; } });
 const factory_1 = require("./placeOrderInProgress/factory");
-const potentialActions_1 = require("./placeOrderInProgress/potentialActions");
-const result_1 = require("./placeOrderInProgress/result");
-const validation_1 = require("./placeOrderInProgress/validation");
+const publishConfirmationNumberIfNotExist_1 = require("./placeOrderInProgress/publishConfirmationNumberIfNotExist");
+Object.defineProperty(exports, "publishConfirmationNumberIfNotExist", { enumerable: true, get: function () { return publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist; } });
+const publishOrderNumberIfNotExist_1 = require("./placeOrderInProgress/publishOrderNumberIfNotExist");
+Object.defineProperty(exports, "publishOrderNumberIfNotExist", { enumerable: true, get: function () { return publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist; } });
 const validateSeller_1 = require("./placeOrderInProgress/validation/validateSeller");
-const validation_2 = require("./validation");
-const errorHandler_1 = require("../../errorHandler");
-exports.POINT_AWARD_IDENTIFIER_NAME = 'pointAwardIdentifiers';
+const validation_1 = require("./validation");
 /**
  * 取引開始
  */
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const { passport, customerType } = yield (0, validation_2.validateWaiterPassport)(params);
+        const { passport, customerType } = yield (0, validation_1.validateWaiterPassport)(params);
         const sellers = yield repos.seller.search({
             limit: 1,
             page: 1,
@@ -63,237 +63,6 @@ function start(params) {
     });
 }
 exports.start = start;
-/**
- * 注文取引を確定する
- */
-function confirm(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        // 確認番号を事前発行
-        yield publishConfirmationNumberIfNotExist({
-            id: params.id,
-            object: { orderDate: params.result.order.orderDate }
-        })(repos);
-        const transaction = yield repos.transaction.findById({
-            typeOf: factory.transactionType.PlaceOrder,
-            id: params.id
-        });
-        if (transaction.status === factory.transactionStatusType.Confirmed) {
-            // すでに確定済の場合
-            return transaction.result;
-        }
-        else if (transaction.status === factory.transactionStatusType.Expired) {
-            throw new factory.errors.Argument('transactionId', 'Transaction already expired');
-        }
-        else if (transaction.status === factory.transactionStatusType.Canceled) {
-            throw new factory.errors.Argument('transactionId', 'Transaction already canceled');
-        }
-        if (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.id) === 'string' && transaction.agent.id !== params.agent.id) {
-            throw new factory.errors.Forbidden('Transaction not yours');
-        }
-        // 取引に対する全ての承認アクションをマージ
-        const completedAuthorizeActions = yield searchAuthorizeActions(params)(repos);
-        // 注文番号を発行
-        const orderNumber = yield publishOrderNumberIfNotExist({
-            project: { id: transaction.project.id },
-            id: transaction.id,
-            object: { orderDate: params.result.order.orderDate }
-        })(repos);
-        const result = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizeActions: completedAuthorizeActions }));
-        // デフォルトEメールメッセージを検索
-        let emailMessageOnOrderSent;
-        if (repos.emailMessage !== undefined) {
-            const searchEmailMessagesResult = yield repos.emailMessage.search({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: transaction.project.id } },
-                about: { identifier: { $eq: factory.creativeWork.message.email.AboutIdentifier.OnOrderSent } }
-            });
-            emailMessageOnOrderSent = searchEmailMessagesResult.shift();
-        }
-        // ポストアクションを作成
-        const potentialActions = yield (0, potentialActions_1.createPotentialActions)({
-            order: result.order,
-            potentialActions: params.potentialActions,
-            transaction: transaction,
-            emailMessage: emailMessageOnOrderSent,
-            authorizeActions: completedAuthorizeActions
-        });
-        // ステータス変更
-        try {
-            yield repos.transaction.confirm({
-                typeOf: transaction.typeOf,
-                id: transaction.id,
-                result: result,
-                potentialActions: potentialActions
-            });
-        }
-        catch (error) {
-            if (yield (0, errorHandler_1.isMongoError)(error)) {
-                // 万が一同一注文番号で確定しようとすると、MongoDBでE11000 duplicate key errorが発生する
-                // message: 'E11000 duplicate key error collection: prodttts.transactions index:result.order.orderNumber_1 dup key:...',
-                if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
-                    throw new factory.errors.AlreadyInUse('transaction', ['result.order.orderNumber']);
-                }
-            }
-            throw error;
-        }
-        // 万が一処理が想定通りでない場合orderNumberが存在しない
-        // if (typeof transaction.result?.order.typeOf !== 'string') {
-        //     throw new factory.errors.ServiceUnavailable('transaction.result not found');
-        // }
-        return result;
-    });
-}
-exports.confirm = confirm;
-/**
- * 未発行であれば、注文の確認番号を発行して取引に保管する
- */
-function publishConfirmationNumberIfNotExist(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // 最適化(2023-02-03~)
-        let confirmationNumber = yield repos.transaction.findInProgressConfirmationNumberById({ id: params.id });
-        // すでに発行済であれば何もしない
-        if (typeof confirmationNumber === 'string') {
-            return confirmationNumber;
-        }
-        // 確認番号を発行
-        confirmationNumber = yield repos.confirmationNumber.publish({ orderDate: params.object.orderDate });
-        // 取引に存在しなければ保管
-        yield repos.transaction.saveConfirmationNumberIfNotExist({
-            id: params.id,
-            confirmationNumber
-        });
-        // 確認番号を取引から再取得
-        // 最適化(2023-02-03~)
-        confirmationNumber = yield repos.transaction.findInProgressConfirmationNumberById({ id: params.id });
-        // 万が一処理が想定通りでない場合confirmationNumberが存在しない
-        if (typeof confirmationNumber !== 'string') {
-            throw new factory.errors.ServiceUnavailable('transaction.object.confirmationNumber not found');
-        }
-        return confirmationNumber;
-    });
-}
-exports.publishConfirmationNumberIfNotExist = publishConfirmationNumberIfNotExist;
-/**
- * 未発行であれば、注文番号を発行して取引に保管する
- */
-function publishOrderNumberIfNotExist(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // 最適化(2023-02-03~)
-        let orderNumber = yield repos.transaction.findInProgressOrderNumberById({ id: params.id });
-        // すでに発行済であれば何もしない
-        if (typeof orderNumber === 'string') {
-            return orderNumber;
-        }
-        // 注文番号を発行
-        const { alternateName } = yield repos.project.findAlternateNameById({ id: params.project.id });
-        if (typeof alternateName !== 'string') {
-            throw new factory.errors.NotFound('project.alternateName');
-        }
-        orderNumber = yield repos.orderNumber.publishByTimestamp({
-            project: { alternateName },
-            orderDate: params.object.orderDate
-        });
-        // 取引に存在しなければ保管
-        yield repos.transaction.saveOrderNumberIfNotExist({ id: params.id, orderNumber });
-        // 注文番号を取引から再取得
-        // 最適化(2023-02-03~)
-        orderNumber = yield repos.transaction.findInProgressOrderNumberById({ id: params.id });
-        // 万が一処理が想定通りでない場合orderNumberが存在しない
-        if (typeof orderNumber !== 'string') {
-            throw new factory.errors.ServiceUnavailable('transaction.object.orderNumber not found');
-        }
-        return orderNumber;
-    });
-}
-exports.publishOrderNumberIfNotExist = publishOrderNumberIfNotExist;
-function createResult(params) {
-    const transaction = params.transaction;
-    // 取引の確定条件が全て整っているかどうか確認
-    (0, validation_1.validateTransaction)(transaction, params.authorizeActions);
-    // 注文作成
-    const order = (0, result_1.createOrder)({
-        orderNumber: params.orderNumber,
-        transaction: transaction,
-        orderDate: params.result.order.orderDate,
-        // OrderPaymentDueオプションを追加(2023-08-25~)
-        // 注文作成時のステータスとなる
-        // orderStatus: (USE_ORDER_PAYMENT_DUE_ON_PLACED) ? factory.orderStatus.OrderPaymentDue : factory.orderStatus.OrderProcessing,
-        orderStatus: factory.orderStatus.OrderPaymentDue,
-        isGift: false,
-        authorizeActions: params.authorizeActions
-    });
-    (0, validation_1.validateEventOffers)({
-        transaction: transaction,
-        order: order,
-        authorizeActions: params.authorizeActions
-    });
-    // 注文アイテム数制限確認
-    (0, validation_1.validateNumItems)({
-        order: order,
-        result: params.result
-    });
-    (0, validation_1.validatePaymentMethods)({ order });
-    // 確認番号を発行
-    const { confirmationNumber, identifier, url } = createConfirmationNumber({
-        order: order,
-        transaction: transaction,
-        result: params.result
-    });
-    order.confirmationNumber = confirmationNumber;
-    order.identifier = identifier;
-    order.url = url;
-    return { order };
-}
-function searchAuthorizeActions(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // 取引に対する全ての承認アクションをマージ
-        let authorizeActions = yield repos.action.searchByPurpose({
-            typeOf: factory.actionType.AuthorizeAction,
-            purpose: {
-                typeOf: factory.transactionType.PlaceOrder,
-                id: params.id
-            },
-            // Completedに絞る(2023-05-16~)
-            actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
-        });
-        // 万が一このプロセス中に他処理が発生してもそれらを無視するように、endDateでフィルタリング
-        authorizeActions = authorizeActions.filter((a) => {
-            return (a.endDate instanceof Date) && moment(a.endDate)
-                .isBefore(moment(params.result.order.orderDate));
-        });
-        return authorizeActions;
-    });
-}
-function createConfirmationNumber(params) {
-    const confirmationNumber = params.transaction.object.confirmationNumber;
-    let url = '';
-    let identifier = [];
-    // 取引に確認番号が保管されていなければ、確認番号を発行
-    if (typeof confirmationNumber !== 'string') {
-        // 事前に発行済なはずなので、ありえないフロー
-        throw new factory.errors.ServiceUnavailable('object.confirmationNumber undefined');
-    }
-    // URLの指定があれば上書き
-    // tslint:disable-next-line:no-single-line-block-comment
-    /* istanbul ignore if */
-    if (typeof params.result.order.url === 'string') {
-        url = params.result.order.url;
-    }
-    else /* istanbul ignore next */ if (typeof params.result.order.url === 'function') {
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore next */
-        url = params.result.order.url(params.order);
-    }
-    // 識別子の指定があれば上書き
-    identifier = [
-        ...(Array.isArray(params.result.order.identifier)) ? params.result.order.identifier : [],
-        // 取引に指定があれば追加
-        ...(Array.isArray(params.transaction.object.identifier)) ? params.transaction.object.identifier : []
-    ];
-    return { confirmationNumber, url, identifier };
-}
 /**
  * インセンティブ承認
  */
@@ -325,7 +94,7 @@ function authorizeAward(params) {
                         'object.potentialActions.givePointAward': givePointAwardParams
                     },
                     // order.identifierに入金識別子を保管する
-                    $push: { 'object.identifier': { name: exports.POINT_AWARD_IDENTIFIER_NAME, value: JSON.stringify(pointAwardIdentifiers) } }
+                    $push: { 'object.identifier': { name: order_1.POINT_AWARD_IDENTIFIER_NAME, value: JSON.stringify(pointAwardIdentifiers) } }
                 }
             });
         }
@@ -352,7 +121,7 @@ function voidAward(params) {
                 $unset: {
                     'object.potentialActions.givePointAward': 1
                 },
-                $pull: { 'object.identifier': { name: exports.POINT_AWARD_IDENTIFIER_NAME } }
+                $pull: { 'object.identifier': { name: order_1.POINT_AWARD_IDENTIFIER_NAME } }
             }
         });
     });

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPointAward.js CHANGED Viewed

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReturnPointAwardActions = void 0;
 const factory = require("../../../../factory");
 const order_1 = require("../../../../factory/order");
-const placeOrderInProgress_1 = require("../../placeOrderInProgress");
 /**
  * ポイント特典返却アクションを作成する
  */
@@ -22,7 +21,7 @@ function createReturnPointAwardActions(params) {
         const returnPointAwardActions = [];
         // 入金識別子はorder.identifierに保管されている
         let pointAwardIdentifiers = [];
-        const pointAwardIdentifierStr = (_b = (_a = params.order.identifier) === null || _a === void 0 ? void 0 : _a.find((i) => i.name === placeOrderInProgress_1.POINT_AWARD_IDENTIFIER_NAME)) === null || _b === void 0 ? void 0 : _b.value;
+        const pointAwardIdentifierStr = (_b = (_a = params.order.identifier) === null || _a === void 0 ? void 0 : _a.find((i) => i.name === order_1.POINT_AWARD_IDENTIFIER_NAME)) === null || _b === void 0 ? void 0 : _b.value;
         if (typeof pointAwardIdentifierStr === 'string') {
             try {
                 pointAwardIdentifiers = JSON.parse(pointAwardIdentifierStr);

package/package.json CHANGED Viewed

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.351.0",
+    "@chevre/factory": "4.352.0-alpha.0",
     "@cinerino/sdk": "5.9.0-alpha.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.3.0-alpha.0",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.20.0-alpha.27"
+  "version": "21.20.0-alpha.28"
 }