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

package/lib/chevre/repo/action.js

@@ -22,7 +22,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48;
+        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;
         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
@@ -54,7 +54,18 @@ class MongoRepository {
                 }
             });
         }
-        const locationIdentifierEq = (_h = (_g = params.location) === null || _g === void 0 ? void 0 : _g.identifier) === null || _h === void 0 ? void 0 : _h.$eq;
+        const locationIdEq = (_h = (_g = params.location) === null || _g === void 0 ? void 0 : _g.id) === null || _h === void 0 ? void 0 : _h.$eq;
+        // tslint:disable-next-line:no-single-line-block-comment
+        /* istanbul ignore else */
+        if (typeof locationIdEq === 'string') {
+            andConditions.push({
+                'location.id': {
+                    $exists: true,
+                    $eq: locationIdEq
+                }
+            });
+        }
+        const locationIdentifierEq = (_k = (_j = params.location) === null || _j === void 0 ? void 0 : _j.identifier) === null || _k === void 0 ? void 0 : _k.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof locationIdentifierEq === 'string') {
@@ -67,7 +78,7 @@ class MongoRepository {
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
-        const objectPaymentMethodIdEq = (_k = (_j = params.object) === null || _j === void 0 ? void 0 : _j.paymentMethodId) === null || _k === void 0 ? void 0 : _k.$eq;
+        const objectPaymentMethodIdEq = (_m = (_l = params.object) === null || _l === void 0 ? void 0 : _l.paymentMethodId) === null || _m === void 0 ? void 0 : _m.$eq;
         if (typeof objectPaymentMethodIdEq === 'string') {
             andConditions.push({
                 'object.paymentMethodId': {
@@ -76,7 +87,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectObjectPaymentMethodIdEq = (_o = (_m = (_l = params.object) === null || _l === void 0 ? void 0 : _l.object) === null || _m === void 0 ? void 0 : _m.paymentMethodId) === null || _o === void 0 ? void 0 : _o.$eq;
+        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;
         if (typeof objectObjectPaymentMethodIdEq === 'string') {
             andConditions.push({
                 'object.object.paymentMethodId': {
@@ -85,7 +96,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectReservationForIdEq = (_r = (_q = (_p = params.object) === null || _p === void 0 ? void 0 : _p.reservationFor) === null || _q === void 0 ? void 0 : _q.id) === null || _r === void 0 ? void 0 : _r.$eq;
+        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;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof objectReservationForIdEq === 'string') {
@@ -96,7 +107,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPaymentMethodAccountIdEq = (_u = (_t = (_s = params.object) === null || _s === void 0 ? void 0 : _s.paymentMethod) === null || _t === void 0 ? void 0 : _t.accountId) === null || _u === void 0 ? void 0 : _u.$eq;
+        const objectPaymentMethodAccountIdEq = (_w = (_v = (_u = params.object) === null || _u === void 0 ? void 0 : _u.paymentMethod) === null || _v === void 0 ? void 0 : _v.accountId) === null || _w === void 0 ? void 0 : _w.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof objectPaymentMethodAccountIdEq === 'string') {
@@ -107,7 +118,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPaymentMethodPaymentMethodIdEq = (_x = (_w = (_v = params.object) === null || _v === void 0 ? void 0 : _v.paymentMethod) === null || _w === void 0 ? void 0 : _w.paymentMethodId) === null || _x === void 0 ? void 0 : _x.$eq;
+        const objectPaymentMethodPaymentMethodIdEq = (_z = (_y = (_x = params.object) === null || _x === void 0 ? void 0 : _x.paymentMethod) === null || _y === void 0 ? void 0 : _y.paymentMethodId) === null || _z === void 0 ? void 0 : _z.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof objectPaymentMethodPaymentMethodIdEq === 'string') {
@@ -118,7 +129,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPaymentMethodPaymentMethodIdIn = (_0 = (_z = (_y = params.object) === null || _y === void 0 ? void 0 : _y.paymentMethod) === null || _z === void 0 ? void 0 : _z.paymentMethodId) === null || _0 === void 0 ? void 0 : _0.$in;
+        const objectPaymentMethodPaymentMethodIdIn = (_2 = (_1 = (_0 = params.object) === null || _0 === void 0 ? void 0 : _0.paymentMethod) === null || _1 === void 0 ? void 0 : _1.paymentMethodId) === null || _2 === void 0 ? void 0 : _2.$in;
         if (Array.isArray(objectPaymentMethodPaymentMethodIdIn)) {
             andConditions.push({
                 'object.paymentMethod.paymentMethodId': {
@@ -127,7 +138,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPaymentMethodTypeOfEq = (_3 = (_2 = (_1 = params.object) === null || _1 === void 0 ? void 0 : _1.paymentMethod) === null || _2 === void 0 ? void 0 : _2.typeOf) === null || _3 === void 0 ? void 0 : _3.$eq;
+        const objectPaymentMethodTypeOfEq = (_5 = (_4 = (_3 = params.object) === null || _3 === void 0 ? void 0 : _3.paymentMethod) === null || _4 === void 0 ? void 0 : _4.typeOf) === null || _5 === void 0 ? void 0 : _5.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof objectPaymentMethodTypeOfEq === 'string') {
@@ -138,7 +149,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectTypeOfEq = (_5 = (_4 = params.object) === null || _4 === void 0 ? void 0 : _4.typeOf) === null || _5 === void 0 ? void 0 : _5.$eq;
+        const objectTypeOfEq = (_7 = (_6 = params.object) === null || _6 === void 0 ? void 0 : _6.typeOf) === null || _7 === void 0 ? void 0 : _7.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof objectTypeOfEq === 'string') {
@@ -149,7 +160,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectTypeOfIn = (_7 = (_6 = params.object) === null || _6 === void 0 ? void 0 : _6.typeOf) === null || _7 === void 0 ? void 0 : _7.$in;
+        const objectTypeOfIn = (_9 = (_8 = params.object) === null || _8 === void 0 ? void 0 : _8.typeOf) === null || _9 === void 0 ? void 0 : _9.$in;
         if (Array.isArray(objectTypeOfIn)) {
             andConditions.push({
                 'object.typeOf': {
@@ -158,7 +169,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectIdEq = (_9 = (_8 = params.object) === null || _8 === void 0 ? void 0 : _8.id) === null || _9 === void 0 ? void 0 : _9.$eq;
+        const objectIdEq = (_11 = (_10 = params.object) === null || _10 === void 0 ? void 0 : _10.id) === null || _11 === void 0 ? void 0 : _11.$eq;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (typeof objectIdEq === 'string') {
@@ -169,7 +180,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectIdIn = (_11 = (_10 = params.object) === null || _10 === void 0 ? void 0 : _10.id) === null || _11 === void 0 ? void 0 : _11.$in;
+        const objectIdIn = (_13 = (_12 = params.object) === null || _12 === void 0 ? void 0 : _12.id) === null || _13 === void 0 ? void 0 : _13.$in;
         if (Array.isArray(objectIdIn)) {
             andConditions.push({
                 'object.id': {
@@ -178,7 +189,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectOrderNumberIn = (_13 = (_12 = params.object) === null || _12 === void 0 ? void 0 : _12.orderNumber) === null || _13 === void 0 ? void 0 : _13.$in;
+        const objectOrderNumberIn = (_15 = (_14 = params.object) === null || _14 === void 0 ? void 0 : _14.orderNumber) === null || _15 === void 0 ? void 0 : _15.$in;
         if (Array.isArray(objectOrderNumberIn)) {
             andConditions.push({
                 'object.orderNumber': {
@@ -187,7 +198,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectEventIdIn = (_16 = (_15 = (_14 = params.object) === null || _14 === void 0 ? void 0 : _14.event) === null || _15 === void 0 ? void 0 : _15.id) === null || _16 === void 0 ? void 0 : _16.$in;
+        const objectEventIdIn = (_18 = (_17 = (_16 = params.object) === null || _16 === void 0 ? void 0 : _16.event) === null || _17 === void 0 ? void 0 : _17.id) === null || _18 === void 0 ? void 0 : _18.$in;
         if (Array.isArray(objectEventIdIn)) {
             andConditions.push({
                 'object.event.id': {
@@ -196,7 +207,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectAcceptedOfferSeatNumberIn = (_20 = (_19 = (_18 = (_17 = params.object) === null || _17 === void 0 ? void 0 : _17.acceptedOffer) === null || _18 === void 0 ? void 0 : _18.ticketedSeat) === null || _19 === void 0 ? void 0 : _19.seatNumber) === null || _20 === void 0 ? void 0 : _20.$in;
+        const objectAcceptedOfferSeatNumberIn = (_22 = (_21 = (_20 = (_19 = params.object) === null || _19 === void 0 ? void 0 : _19.acceptedOffer) === null || _20 === void 0 ? void 0 : _20.ticketedSeat) === null || _21 === void 0 ? void 0 : _21.seatNumber) === null || _22 === void 0 ? void 0 : _22.$in;
         if (Array.isArray(objectAcceptedOfferSeatNumberIn)) {
             andConditions.push({
                 'object.acceptedOffer.ticketedSeat.seatNumber': {
@@ -213,7 +224,7 @@ class MongoRepository {
             });
         }
         else {
-            const typeOfEq = (_21 = params.typeOf) === null || _21 === void 0 ? void 0 : _21.$eq;
+            const typeOfEq = (_23 = params.typeOf) === null || _23 === void 0 ? void 0 : _23.$eq;
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
             if (typeof typeOfEq === 'string') {
@@ -222,7 +233,7 @@ class MongoRepository {
                 });
             }
         }
-        const actionStatusIn = (_22 = params.actionStatus) === null || _22 === void 0 ? void 0 : _22.$in;
+        const actionStatusIn = (_24 = params.actionStatus) === null || _24 === void 0 ? void 0 : _24.$in;
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (Array.isArray(actionStatusIn)) {
@@ -253,7 +264,7 @@ class MongoRepository {
                 startDate: { $lte: startDateLte }
             });
         }
-        const fromLocationTypeOfIn = (_24 = (_23 = params.fromLocation) === null || _23 === void 0 ? void 0 : _23.typeOf) === null || _24 === void 0 ? void 0 : _24.$in;
+        const fromLocationTypeOfIn = (_26 = (_25 = params.fromLocation) === null || _25 === void 0 ? void 0 : _25.typeOf) === null || _26 === void 0 ? void 0 : _26.$in;
         if (Array.isArray(fromLocationTypeOfIn)) {
             andConditions.push({
                 'fromLocation.typeOf': {
@@ -262,7 +273,7 @@ class MongoRepository {
                 }
             });
         }
-        const fromLocationAccountNumberIn = (_26 = (_25 = params.fromLocation) === null || _25 === void 0 ? void 0 : _25.accountNumber) === null || _26 === void 0 ? void 0 : _26.$in;
+        const fromLocationAccountNumberIn = (_28 = (_27 = params.fromLocation) === null || _27 === void 0 ? void 0 : _27.accountNumber) === null || _28 === void 0 ? void 0 : _28.$in;
         if (Array.isArray(fromLocationAccountNumberIn)) {
             andConditions.push({
                 'fromLocation.accountNumber': {
@@ -271,7 +282,7 @@ class MongoRepository {
                 }
             });
         }
-        const fromLocationAccountTypeIn = (_28 = (_27 = params.fromLocation) === null || _27 === void 0 ? void 0 : _27.accountType) === null || _28 === void 0 ? void 0 : _28.$in;
+        const fromLocationAccountTypeIn = (_30 = (_29 = params.fromLocation) === null || _29 === void 0 ? void 0 : _29.accountType) === null || _30 === void 0 ? void 0 : _30.$in;
         if (Array.isArray(fromLocationAccountTypeIn)) {
             andConditions.push({
                 'fromLocation.accountType': {
@@ -280,7 +291,7 @@ class MongoRepository {
                 }
             });
         }
-        const toLocationTypeOfIn = (_30 = (_29 = params.toLocation) === null || _29 === void 0 ? void 0 : _29.typeOf) === null || _30 === void 0 ? void 0 : _30.$in;
+        const toLocationTypeOfIn = (_32 = (_31 = params.toLocation) === null || _31 === void 0 ? void 0 : _31.typeOf) === null || _32 === void 0 ? void 0 : _32.$in;
         if (Array.isArray(toLocationTypeOfIn)) {
             andConditions.push({
                 'toLocation.typeOf': {
@@ -289,7 +300,7 @@ class MongoRepository {
                 }
             });
         }
-        const toLocationAccountNumberIn = (_32 = (_31 = params.toLocation) === null || _31 === void 0 ? void 0 : _31.accountNumber) === null || _32 === void 0 ? void 0 : _32.$in;
+        const toLocationAccountNumberIn = (_34 = (_33 = params.toLocation) === null || _33 === void 0 ? void 0 : _33.accountNumber) === null || _34 === void 0 ? void 0 : _34.$in;
         if (Array.isArray(toLocationAccountNumberIn)) {
             andConditions.push({
                 'toLocation.accountNumber': {
@@ -298,7 +309,7 @@ class MongoRepository {
                 }
             });
         }
-        const toLocationAccountTypeIn = (_34 = (_33 = params.toLocation) === null || _33 === void 0 ? void 0 : _33.accountType) === null || _34 === void 0 ? void 0 : _34.$in;
+        const toLocationAccountTypeIn = (_36 = (_35 = params.toLocation) === null || _35 === void 0 ? void 0 : _35.accountType) === null || _36 === void 0 ? void 0 : _36.$in;
         if (Array.isArray(toLocationAccountTypeIn)) {
             andConditions.push({
                 'toLocation.accountType': {
@@ -307,7 +318,7 @@ class MongoRepository {
                 }
             });
         }
-        const purposeTypeOfIn = (_36 = (_35 = params.purpose) === null || _35 === void 0 ? void 0 : _35.typeOf) === null || _36 === void 0 ? void 0 : _36.$in;
+        const purposeTypeOfIn = (_38 = (_37 = params.purpose) === null || _37 === void 0 ? void 0 : _37.typeOf) === null || _38 === void 0 ? void 0 : _38.$in;
         if (Array.isArray(purposeTypeOfIn)) {
             andConditions.push({
                 'purpose.typeOf': {
@@ -316,7 +327,7 @@ class MongoRepository {
                 }
             });
         }
-        const purposeIdIn = (_38 = (_37 = params.purpose) === null || _37 === void 0 ? void 0 : _37.id) === null || _38 === void 0 ? void 0 : _38.$in;
+        const purposeIdIn = (_40 = (_39 = params.purpose) === null || _39 === void 0 ? void 0 : _39.id) === null || _40 === void 0 ? void 0 : _40.$in;
         if (Array.isArray(purposeIdIn)) {
             andConditions.push({
                 'purpose.id': {
@@ -325,7 +336,7 @@ class MongoRepository {
                 }
             });
         }
-        const purposeOrderNumberIn = (_40 = (_39 = params.purpose) === null || _39 === void 0 ? void 0 : _39.orderNumber) === null || _40 === void 0 ? void 0 : _40.$in;
+        const purposeOrderNumberIn = (_42 = (_41 = params.purpose) === null || _41 === void 0 ? void 0 : _41.orderNumber) === null || _42 === void 0 ? void 0 : _42.$in;
         if (Array.isArray(purposeOrderNumberIn)) {
             andConditions.push({
                 'purpose.orderNumber': {
@@ -334,7 +345,7 @@ class MongoRepository {
                 }
             });
         }
-        const resultTypeOfIn = (_42 = (_41 = params.result) === null || _41 === void 0 ? void 0 : _41.typeOf) === null || _42 === void 0 ? void 0 : _42.$in;
+        const resultTypeOfIn = (_44 = (_43 = params.result) === null || _43 === void 0 ? void 0 : _43.typeOf) === null || _44 === void 0 ? void 0 : _44.$in;
         if (Array.isArray(resultTypeOfIn)) {
             andConditions.push({
                 'result.typeOf': {
@@ -343,7 +354,7 @@ class MongoRepository {
                 }
             });
         }
-        const resultIdIn = (_44 = (_43 = params.result) === null || _43 === void 0 ? void 0 : _43.id) === null || _44 === void 0 ? void 0 : _44.$in;
+        const resultIdIn = (_46 = (_45 = params.result) === null || _45 === void 0 ? void 0 : _45.id) === null || _46 === void 0 ? void 0 : _46.$in;
         if (Array.isArray(resultIdIn)) {
             andConditions.push({
                 'result.id': {
@@ -352,7 +363,7 @@ class MongoRepository {
                 }
             });
         }
-        const resultOrderNumberIn = (_46 = (_45 = params.result) === null || _45 === void 0 ? void 0 : _45.orderNumber) === null || _46 === void 0 ? void 0 : _46.$in;
+        const resultOrderNumberIn = (_48 = (_47 = params.result) === null || _47 === void 0 ? void 0 : _47.orderNumber) === null || _48 === void 0 ? void 0 : _48.$in;
         if (Array.isArray(resultOrderNumberIn)) {
             andConditions.push({
                 'result.orderNumber': {
@@ -361,7 +372,7 @@ class MongoRepository {
                 }
             });
         }
-        const resultCodeIn = (_48 = (_47 = params.result) === null || _47 === void 0 ? void 0 : _47.code) === null || _48 === void 0 ? void 0 : _48.$in;
+        const resultCodeIn = (_50 = (_49 = params.result) === null || _49 === void 0 ? void 0 : _49.code) === null || _50 === void 0 ? void 0 : _50.$in;
         if (Array.isArray(resultCodeIn)) {
             andConditions.push({
                 'result.code': {

package/lib/chevre/repo/mongoose/model/action.js

@@ -12,6 +12,7 @@ const schema = new mongoose.Schema({
     project: mongoose.SchemaTypes.Mixed,
     actionStatus: String,
     typeOf: String,
+    description: String,
     agent: mongoose.SchemaTypes.Mixed,
     recipient: mongoose.SchemaTypes.Mixed,
     result: mongoose.SchemaTypes.Mixed,
@@ -32,7 +33,8 @@ const schema = new mongoose.Schema({
     id: true,
     read: 'primaryPreferred',
     writeConcern: writeConcern,
-    strict: false,
+    // true化(2022-11-12~)
+    strict: true,
     useNestedStrict: true,
     timestamps: {
         createdAt: 'createdAt',
@@ -66,6 +68,12 @@ schema.index({ endDate: -1, startDate: -1 }, {
         endDate: { $exists: true }
     }
 });
+schema.index({ 'location.id': 1, startDate: -1 }, {
+    name: 'searchByLocationId',
+    partialFilterExpression: {
+        'location.id': { $exists: true }
+    }
+});
 schema.index({ 'location.identifier': 1, startDate: -1 }, {
     name: 'searchByLocationIdentifier',
     partialFilterExpression: {

package/lib/chevre/service/assetTransaction/pay/potentialActions.js

@@ -10,12 +10,13 @@ function createPayActions(params) {
     const payObject = createPayObject(params);
     const informPaymentActions = createInformPaymentActions(params);
     if (payObject !== undefined) {
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
         const simpleOrder = {
             // project: params.order.project,
             typeOf: params.order.typeOf,
             seller: params.order.seller,
             // mask
-            customer: (0, order_1.createMaskedCustomer)(params.order),
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
             confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
             price: params.order.price,

package/lib/chevre/service/order/onOrderStatusChanged/factory.js

@@ -33,7 +33,7 @@ function getOrderWithToken(params) {
             ? {
                 id: params.order.customer.id,
                 name: '****',
-                project: params.order.customer.project,
+                // project: params.order.customer.project,
                 typeOf: params.order.customer.typeOf
             }
             : {

package/lib/chevre/service/order/onOrderStatusChanged.js

@@ -24,11 +24,11 @@ const TOKEN_EXPIRES_IN = 604800;
 function onOrderStatusChanged(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let tasks = [];
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
         const simpleOrder = {
-            // project: params.order.project,
             typeOf: params.order.typeOf,
             seller: params.order.seller,
-            customer: (0, order_1.createMaskedCustomer)(params.order),
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
             confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
             price: params.order.price,

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

@@ -89,11 +89,12 @@ function placeOrderWithoutTransaction(params) {
         //     orderNumber: params.object.orderNumber
         // })({ transaction: repos.transaction });
         // アクションを作成する(2022-04-11~)
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
         const simpleOrder = {
             // project: order.project,
             typeOf: order.typeOf,
             seller: order.seller,
-            customer: (0, order_1.createMaskedCustomer)(order),
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
             confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
@@ -148,11 +149,12 @@ function placeOrder(params) {
             orderNumber: params.object.orderNumber
         })({ transaction: repos.transaction });
         // アクションを作成する(2022-04-11~)
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
         const simpleOrder = {
             // project: order.project,
             typeOf: order.typeOf,
             seller: order.seller,
-            customer: (0, order_1.createMaskedCustomer)(order),
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
             confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,

package/lib/chevre/service/order/sendOrder.js

@@ -42,11 +42,12 @@ function sendOrder(params) {
             }
             // SendOrderアクションを作成する
             // minimizeする(2022-04-18~)
+            const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
             const simpleOrder = {
                 // project: order.project,
                 typeOf: order.typeOf,
                 seller: order.seller,
-                customer: (0, order_1.createMaskedCustomer)(order),
+                customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
                 confirmationNumber: order.confirmationNumber,
                 orderNumber: order.orderNumber,
                 price: order.price,

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

@@ -34,12 +34,13 @@ function createPotentialActions(params) {
         const givePointAwardActions = yield (0, givePointAward_1.createGivePointAwardActions)(params);
         // 注文配送メール送信設定
         const sendEmailMessageActions = yield (0, sendEmailMessage_1.createSendEmailMessageActions)(params);
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
         const simpleOrder = {
             // project: params.order.project,
             typeOf: params.order.typeOf,
             seller: params.order.seller,
             // mask
-            customer: (0, order_1.createMaskedCustomer)(params.order),
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
             confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
             price: params.order.price,

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.276.0-alpha.2",
-    "@cinerino/sdk": "3.132.0-alpha.0",
+    "@chevre/factory": "4.277.0-alpha.0",
+    "@cinerino/sdk": "3.132.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.1.0-alpha.2"
+  "version": "20.1.0-alpha.4"
 }

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/confirmReservation.d.ts

@@ -1,11 +0,0 @@
-import * as factory from '../../../../factory';
-export declare type IAuthorizeSeatReservationOffer = factory.action.authorize.offer.seatReservation.IAction<factory.service.webAPI.Identifier>;
-/**
- * 予約確定アクションを作成する
- */
-/**
- * 予約確定オブジェクトを作成する
- */
-/**
- * 予約確定オブジェクトを作成する
- */

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

@@ -1,187 +0,0 @@
-"use strict";
-// import { PhoneNumberFormat, PhoneNumberUtil } from 'google-libphonenumber';
-// import { format } from 'util';
-Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * 予約確定アクションを作成する
- */
-// export async function createConfirmReservationActions(params: {
-//     order: factory.order.IOrder;
-//     transaction: factory.transaction.placeOrder.ITransaction;
-//     createConfirmReserveActions: boolean;
-// }): Promise<factory.action.interact.confirm.reservation.IAttributes<factory.service.webAPI.Identifier>[]> {
-//     const confirmReservationActions: factory.action.interact.confirm.reservation.IAttributes<factory.service.webAPI.Identifier>[] = [];
-//     const seatReservationAuthorizeActions = <IAuthorizeSeatReservationOffer[]>
-//         params.transaction.object.authorizeActions
-//             .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
-//             .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
-//     const purpose: factory.order.ISimpleOrder = createPurpose({ order: params.order });
-//     seatReservationAuthorizeActions.forEach((a) => {
-//         const actionResult = a.result;
-//         if (a.instrument === undefined) {
-//             a.instrument = {
-//                 typeOf: 'WebAPI',
-//                 identifier: factory.service.webAPI.Identifier.Chevre
-//             };
-//         }
-//         if (actionResult !== undefined) {
-//             const responseBody = actionResult.responseBody;
-//             let confirmReservationObject: factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.Chevre>
-//                 | factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.COA>;
-//             switch (a.instrument.identifier) {
-//                 case factory.service.webAPI.Identifier.COA:
-//                     confirmReservationObject = createConfirmReservationActionObject4COA({
-//                         order: params.order,
-//                         // tslint:disable-next-line:max-line-length
-// tslint:disable-next-line:max-line-length
-//                         reserveTransaction: <factory.action.authorize.offer.seatReservation.IResponseBody<factory.service.webAPI.Identifier.COA>>responseBody,
-//                         requestBody: actionResult.requestBody,
-//                         price: Number(actionResult.price),
-//                         acceptedOffers: <factory.action.authorize.offer.seatReservation.IAcceptedOffer4COA[]>a.object.acceptedOffer
-//                     });
-//                     break;
-//                 default:
-//                     const reserveTransactionNumber = a.object.pendingTransaction?.transactionNumber;
-//                     if (typeof reserveTransactionNumber !== 'string') {
-//                         throw new factory.errors.NotFound('AuthorizaAction.object.pendingTransaction.transactionNumber');
-//                     }
-//                     confirmReservationObject = createConfirmReservationActionObject({
-//                         order: params.order,
-//                         // transaction: params.transaction,
-//                         // tslint:disable-next-line:max-line-length
-// tslint:disable-next-line:max-line-length
-//                         // reserveTransaction: <factory.action.authorize.offer.seatReservation.IResponseBody<factory.service.webAPI.Identifier.Chevre>>responseBody,
-//                         reserveTransactionNumber
-//                     });
-//             }
-//             if (params.createConfirmReserveActions) {
-//                 confirmReservationActions.push({
-//                     project: params.transaction.project,
-//                     typeOf: <factory.actionType.ConfirmAction>factory.actionType.ConfirmAction,
-//                     object: confirmReservationObject,
-//                     // agent: Projectに統一(2022-05-16~)
-//                     agent: params.transaction.project,
-//                     // agent: params.transaction.agent,
-//                     purpose: purpose,
-//                     instrument: a.instrument
-//                 });
-//             }
-//         }
-//     });
-//     return confirmReservationActions;
-// }
-// function createPurpose(params: {
-//     order: factory.order.IOrder;
-// }): factory.order.ISimpleOrder {
-//     return {
-//         project: params.order.project,
-//         typeOf: params.order.typeOf,
-//         seller: params.order.seller,
-//         // mask
-//         customer: createMaskedCustomer(params.order),
-//         confirmationNumber: params.order.confirmationNumber,
-//         orderNumber: params.order.orderNumber,
-//         price: params.order.price,
-//         priceCurrency: params.order.priceCurrency,
-//         orderDate: params.order.orderDate
-//     };
-// }
-/**
- * 予約確定オブジェクトを作成する
- */
-// function createConfirmReservationActionObject4COA(params: {
-//     order: factory.order.IOrder;
-//     reserveTransaction: factory.action.authorize.offer.seatReservation.IResponseBody<factory.service.webAPI.Identifier.COA>;
-//     requestBody: any;
-//     price: number;
-//     acceptedOffers: factory.action.authorize.offer.seatReservation.IAcceptedOffer4COA[];
-// }): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.COA> {
-//     const price = params.price;
-//     const customer = params.order.customer;
-//     const updTmpReserveSeatArgs = params.requestBody;
-//     const updTmpReserveSeatResult = params.reserveTransaction;
-//     // 電話番号のフォーマットを日本人にリーダブルに調整(COAではこのフォーマットで扱うので)
-//     const phoneUtil = PhoneNumberUtil.getInstance();
-//     const phoneNumber = phoneUtil.parse(customer.telephone, 'JP');
-//     let telNum = phoneUtil.format(phoneNumber, PhoneNumberFormat.NATIONAL);
-//     // COAでは数字のみ受け付けるので数字以外を除去
-//     telNum = telNum.replace(/[^\d]/g, '');
-//     const mailAddr = customer.email;
-//     if (mailAddr === undefined) {
-//         throw new factory.errors.Argument('order', 'order.customer.email undefined');
-//     }
-//     return {
-//         theaterCode: updTmpReserveSeatArgs.theaterCode,
-//         dateJouei: updTmpReserveSeatArgs.dateJouei,
-//         titleCode: updTmpReserveSeatArgs.titleCode,
-//         titleBranchNum: updTmpReserveSeatArgs.titleBranchNum,
-//         timeBegin: updTmpReserveSeatArgs.timeBegin,
-//         tmpReserveNum: updTmpReserveSeatResult.tmpReserveNum,
-// tslint:disable-next-line:no-irregular-whitespace
-//         reserveName: format('%s　%s', customer.familyName, customer.givenName),
-// tslint:disable-next-line:no-irregular-whitespace
-//         reserveNameJkana: format('%s　%s', customer.familyName, customer.givenName),
-//         telNum: telNum,
-//         mailAddr: mailAddr,
-//         reserveAmount: price, // デフォルトのpriceCurrencyがJPYなのでこれでよし
-//         listTicket: params.acceptedOffers.map((o) => o.ticketInfo),
-//         transactionNumber: String(updTmpReserveSeatResult.tmpReserveNum),
-//         typeOf: 'COAReserveTransaction'
-//     };
-// }
-/**
- * 予約確定オブジェクトを作成する
- */
-// function createConfirmReservationActionObject(params: {
-//     order: factory.order.IOrder;
-//     reserveTransactionNumber: string;
-// }): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.Chevre> {
-//     return {
-//         typeOf: factory.assetTransactionType.Reserve,
-//         transactionNumber: params.reserveTransactionNumber,
-//         potentialActions: {
-//             reserve: {
-//                 purpose: {
-//                     confirmationNumber: params.order.confirmationNumber,
-//                     orderNumber: params.order.orderNumber,
-//                     typeOf: params.order.typeOf
-//                 }
-//             }
-//         }
-//     };
-// }
-// function createReservationUnderNameIdentifier(params: {
-//     order: factory.order.IOrder;
-//     transaction: factory.transaction.placeOrder.ITransaction;
-// }): factory.propertyValue.IPropertyValue<string>[] {
-//     const order = params.order;
-//     const customer = order.customer;
-//     // 予約のunderName.identifierを決定する
-//     return [
-//         { name: 'orderNumber', value: order.orderNumber },
-//         // 不要なので廃止(2022-05-24~)
-//         // { name: 'transaction', value: params.transaction.id },
-//         // ↓legacy-reservationの印刷アウトプットで使用(2022-02-09廃止)
-//         // { name: 'paymentMethod', value: paymentMethodNames },
-//         ...(Array.isArray(customer.identifier)) ? customer.identifier : []
-//     ];
-// }
-// function createReservationUnderName(params: {
-//     order: factory.order.IOrder;
-//     identifier: factory.propertyValue.IPropertyValue<string>[];
-// }): factory.reservation.IUnderName<factory.reservationType.EventReservation> {
-//     return {
-//         identifier: params.identifier,
-//         name: String(params.order.customer.name),
-//         typeOf: params.order.customer.typeOf,
-//         ...(typeof params.order.customer.address === 'string') ? { address: params.order.customer.address } : undefined,
-//         ...(typeof params.order.customer.age === 'string') ? { age: params.order.customer.age } : undefined,
-//         ...(typeof params.order.customer.email === 'string') ? { email: params.order.customer.email } : undefined,
-//         ...(typeof params.order.customer.familyName === 'string') ? { familyName: params.order.customer.familyName } : undefined,
-//         ...(typeof params.order.customer.gender === 'string') ? { gender: params.order.customer.gender } : undefined,
-//         ...(typeof params.order.customer.givenName === 'string') ? { givenName: params.order.customer.givenName } : undefined,
-//         ...(typeof params.order.customer.id === 'string') ? { id: params.order.customer.id } : undefined,
-//         ...(typeof params.order.customer.telephone === 'string') ? { telephone: params.order.customer.telephone } : undefined,
-//         ...(typeof params.order.customer.url === 'string') ? { url: params.order.customer.url } : undefined
-//     };
-// }