@chevre/domain 22.2.0-alpha.1 → 22.2.0-alpha.2

package/lib/chevre/service/assetTransaction/reserve/start/createSubReservations.js

@@ -273,7 +273,7 @@ function validateAdvanceBookingRequirement(params) {
 function validateProgramMembershipUsed(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const now = new Date();
         let programMembershipUsed;
         const requestedProgramMembershipUsed = (_b = (_a = params.acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.programMembershipUsed;
@@ -284,15 +284,15 @@ function validateProgramMembershipUsed(params) {
             throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'must be permit');
         }
         const programMembershipUsedIdentifier = requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.identifier;
-        const issuedThroughId = (_c = requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.issuedThrough) === null || _c === void 0 ? void 0 : _c.id;
-        const issuedThroughTypeOf = (_d = requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.issuedThrough) === null || _d === void 0 ? void 0 : _d.typeOf;
+        const issuedThroughTypeOf = (_c = requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.issuedThrough) === null || _c === void 0 ? void 0 : _c.typeOf;
         if (typeof programMembershipUsedIdentifier === 'string') {
-            if (typeof issuedThroughId !== 'string' || issuedThroughId === '') {
-                throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
-            }
             let permitIssuedThrough;
             // まずメンバーシップを検索して、存在しなければCreditCardを検索(どちらが発行元サービスか不明なので)
             if (issuedThroughTypeOf === factory.product.ProductType.MembershipService) {
+                const issuedThroughId = (_d = requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.issuedThrough) === null || _d === void 0 ? void 0 : _d.id;
+                if (typeof issuedThroughId !== 'string' || issuedThroughId === '') {
+                    throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
+                }
                 permitIssuedThrough = (yield repos.product.searchProducts({
                     limit: 1,
                     page: 1,
@@ -304,6 +304,10 @@ function validateProgramMembershipUsed(params) {
                 }
             }
             else if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
+                const issuedThroughId = (_e = requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.issuedThrough) === null || _e === void 0 ? void 0 : _e.id;
+                if (typeof issuedThroughId !== 'string' || issuedThroughId === '') {
+                    throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
+                }
                 permitIssuedThrough = (yield repos.paymentService.searchPaymentServices({
                     limit: 1,
                     page: 1,
@@ -316,13 +320,13 @@ function validateProgramMembershipUsed(params) {
             }
             else if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
                 // プロダクトは存在しないので特に検証なし
+                permitIssuedThrough = {
+                    typeOf: factory.service.paymentService.PaymentServiceType.FaceToFace
+                };
             }
             else {
                 throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
             }
-            if (typeof (permitIssuedThrough === null || permitIssuedThrough === void 0 ? void 0 : permitIssuedThrough.typeOf) !== 'string') {
-                throw new factory.errors.NotFound(`Permit issuer service [${issuedThroughId}]`);
-            }
             switch (permitIssuedThrough.typeOf) {
                 case factory.service.paymentService.PaymentServiceType.FaceToFace:
                     // 問答無用に受け入れる
@@ -330,7 +334,6 @@ function validateProgramMembershipUsed(params) {
                         typeOf: factory.permit.PermitType.Permit,
                         identifier: programMembershipUsedIdentifier,
                         issuedThrough: {
-                            id: '',
                             typeOf: permitIssuedThrough.typeOf
                         }
                     };
@@ -362,7 +365,7 @@ function validateProgramMembershipUsed(params) {
                     break;
                 case factory.product.ProductType.MembershipService:
                     // requestedProgramMembershipUsedの発行サービスIDから外部連携設定を取得する
-                    const permitService = yield createPermitService({ issuedThrough: { id: issuedThroughId } })(repos);
+                    const permitService = yield createPermitService({ issuedThrough: { id: permitIssuedThrough.id } })(repos);
                     // メンバーシップの存在確認
                     const serviceOutput = yield permitService.findByIdentifier({
                         project: { id: params.project.id },
@@ -380,7 +383,7 @@ function validateProgramMembershipUsed(params) {
                             .isBefore(moment(now))) {
                         throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'unavailable programMembership');
                     }
-                    if (((_e = permitIssuedThrough.serviceType) === null || _e === void 0 ? void 0 : _e.typeOf) === 'CategoryCode') {
+                    if (((_f = permitIssuedThrough.serviceType) === null || _f === void 0 ? void 0 : _f.typeOf) === 'CategoryCode') {
                         programMembershipUsed = {
                             typeOf: serviceOutput.typeOf,
                             identifier: programMembershipUsedIdentifier,

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre/requestedProgramMembershipUsed2permit.d.ts

@@ -12,6 +12,9 @@ declare function requestedProgramMembershipUsed2permit(params: {
         id: string;
     };
     programMembershipUsed?: factory.assetTransaction.reserve.IAcceptedProgramMembershipUsed;
+    placeOrder: {
+        id: string;
+    };
 }): (repos: {
     action: ActionRepo;
     authorization: AuthorizationRepo;
@@ -19,5 +22,5 @@ declare function requestedProgramMembershipUsed2permit(params: {
     ticket: TicketRepo;
 }, credentials: {
     jwt: JWTCredentials;
-}) => Promise<factory.assetTransaction.reserve.IProgramMembershipUsedAsPermit | undefined>;
+}) => Promise<factory.assetTransaction.reserve.IPermitIssuedThroughFaceToFace | factory.assetTransaction.reserve.IPermitIssuedThroughMembershipService | undefined>;
 export { requestedProgramMembershipUsed2permit };

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre/requestedProgramMembershipUsed2permit.js

@@ -15,12 +15,13 @@ const CodeService = require("../../../../code");
 /**
  * チケット化された適用メンバーシップをPermitに変換する
  */
-// tslint:disable-next-line:max-func-body-length
 function requestedProgramMembershipUsed2permit(params) {
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         let programMembershipUsedAsPermit;
-        const { programMembershipUsed } = params;
+        const { programMembershipUsed, placeOrder } = params;
+        const now = new Date();
         // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
         if (typeof programMembershipUsed === 'string') {
             const { authorizedObject } = yield CodeService.verifyToken({
@@ -35,24 +36,27 @@ function requestedProgramMembershipUsed2permit(params) {
             if (permitOwnershipInfo.typeOf !== 'OwnershipInfo') {
                 throw new factory.errors.Argument('programMembershipUsed', 'must be OwnershipInfo');
             }
-            if (permitOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
+            const typeOfGood = permitOwnershipInfo.typeOfGood;
+            if (typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
                 throw new factory.errors.Argument('programMembershipUsed', 'must be Permit');
             }
-            const typeOfGood = permitOwnershipInfo.typeOfGood;
-            if (typeof ((_a = typeOfGood.issuedThrough) === null || _a === void 0 ? void 0 : _a.id) !== 'string') {
+            const issuedThroughTypeOf = (_a = typeOfGood.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf;
+            if (issuedThroughTypeOf !== factory.product.ProductType.MembershipService) {
+                throw new factory.errors.Argument('programMembershipUsed', 'must be issued through MembershipService');
+            }
+            if (typeof ((_b = typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.id) !== 'string') {
                 throw new factory.errors.NotFound('itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
             }
-            const issuedThroughTypeOf = typeOfGood.issuedThrough.typeOf;
-            if (issuedThroughTypeOf !== factory.product.ProductType.MembershipService
-                && issuedThroughTypeOf !== factory.service.paymentService.PaymentServiceType.CreditCard
-                && issuedThroughTypeOf !== factory.service.paymentService.PaymentServiceType.FaceToFace) {
+            if (issuedThroughTypeOf === factory.product.ProductType.MembershipService) {
+                programMembershipUsedAsPermit = {
+                    identifier: typeOfGood.identifier,
+                    issuedThrough: { id: typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
+                    typeOf: factory.permit.PermitType.Permit
+                };
+            }
+            else {
                 throw new factory.errors.Argument('programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
             }
-            programMembershipUsedAsPermit = {
-                identifier: String(typeOfGood.identifier),
-                issuedThrough: { id: typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
-                typeOf: factory.permit.PermitType.Permit
-            };
         }
         else if ((programMembershipUsed === null || programMembershipUsed === void 0 ? void 0 : programMembershipUsed.typeOf) === 'Ticket') {
             const { ticketToken } = programMembershipUsed;
@@ -79,28 +83,42 @@ function requestedProgramMembershipUsed2permit(params) {
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },
-                    ids: [ownershipInfoId]
+                    ids: [ownershipInfoId],
+                    ownedFrom: now,
+                    ownedThrough: now
                 })).shift();
                 if (permitOwnershipInfo === undefined) {
                     throw new factory.errors.NotFound('OwnershipInfo');
                 }
+                // ownedBy検証
+                if (!Array.isArray(permitOwnershipInfo.ownedBy) || ((_c = permitOwnershipInfo.ownedBy[0]) === null || _c === void 0 ? void 0 : _c.id) !== placeOrder.id) {
+                    throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo not matched with placeOrder');
+                }
                 if (permitOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
                     throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.typeOf must be Permit');
                 }
-                if (typeof ((_b = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.id) !== 'string') {
-                    throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.issuedThrough.id undefined');
+                const issuedThroughTypeOf = (_d = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _d === void 0 ? void 0 : _d.typeOf;
+                if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                    programMembershipUsedAsPermit = {
+                        identifier: permitOwnershipInfo.typeOfGood.identifier,
+                        issuedThrough: { typeOf: issuedThroughTypeOf },
+                        typeOf: factory.permit.PermitType.Permit
+                    };
+                }
+                else if (issuedThroughTypeOf === factory.product.ProductType.MembershipService
+                    || issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
+                    if (typeof ((_e = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _e === void 0 ? void 0 : _e.id) !== 'string') {
+                        throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.issuedThrough.id undefined');
+                    }
+                    programMembershipUsedAsPermit = {
+                        identifier: permitOwnershipInfo.typeOfGood.identifier,
+                        issuedThrough: { id: permitOwnershipInfo.typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
+                        typeOf: factory.permit.PermitType.Permit
+                    };
                 }
-                const issuedThroughTypeOf = permitOwnershipInfo.typeOfGood.issuedThrough.typeOf;
-                if (issuedThroughTypeOf !== factory.product.ProductType.MembershipService
-                    && issuedThroughTypeOf !== factory.service.paymentService.PaymentServiceType.CreditCard
-                    && issuedThroughTypeOf !== factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                else {
                     throw new factory.errors.Argument('programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
                 }
-                programMembershipUsedAsPermit = {
-                    identifier: permitOwnershipInfo.typeOfGood.identifier,
-                    issuedThrough: { id: permitOwnershipInfo.typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
-                    typeOf: factory.permit.PermitType.Permit
-                };
             }
         }
         return programMembershipUsedAsPermit;

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre.js

@@ -23,7 +23,7 @@ function processStartReserve4chevre(params, options) {
             // object: <IObjectWithDetail>action.object,
             acceptedOffers: params.acceptedOffers, event: { id: event.id }, transaction,
             transactionNumber }, (params.broker !== undefined) ? { broker: params.broker } : undefined));
-        const startParamObject = yield validateObjectWithoutDetail(startParams)(repos, credentials);
+        const startParamObject = yield validateObjectWithoutDetail(startParams, { id: params.transaction.id })(repos, credentials);
         const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, 
             // discontinue preSearchedEvent(2024-07-17~)
             // preSearchedEvent: event,
@@ -44,7 +44,7 @@ function processStartReserve4chevre(params, options) {
     });
 }
 exports.processStartReserve4chevre = processStartReserve4chevre;
-function validateObjectWithoutDetail(params) {
+function validateObjectWithoutDetail(params, placeOrder) {
     return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         const objectWithoutDetail = params.object;
@@ -53,7 +53,8 @@ function validateObjectWithoutDetail(params) {
             for (let acceptedOffer of objectWithoutDetail.acceptedOffer) {
                 const programMembershipUsedAsPermit = yield (0, requestedProgramMembershipUsed2permit_1.requestedProgramMembershipUsed2permit)({
                     project: { id: params.project.id },
-                    programMembershipUsed: (_b = (_a = acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.programMembershipUsed
+                    programMembershipUsed: (_b = (_a = acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.programMembershipUsed,
+                    placeOrder: { id: placeOrder.id }
                 })(repos, credentials);
                 // 適用メンバーシップがあればacceptedOfferを強制的に上書き
                 if (programMembershipUsedAsPermit !== undefined) {

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -368,6 +368,7 @@ function processMoneyTransferTransaction(params) {
         return pendingTransaction;
     });
 }
+// tslint:disable-next-line:max-func-body-length
 function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
     return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
@@ -389,10 +390,13 @@ function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
             if (paymentCardOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
                 throw new factory.errors.Argument('fromLocation', 'must be Permit');
             }
+            if (((_a = paymentCardOwnershipInfo.typeOfGood.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) !== factory.product.ProductType.PaymentCard) {
+                throw new factory.errors.Argument('fromLocation', 'must be issued through PaymentCard');
+            }
             fromLocation = {
                 typeOf: paymentCardOwnershipInfo.typeOfGood.typeOf,
                 identifier: paymentCardOwnershipInfo.typeOfGood.identifier,
-                issuedThrough: { id: String((_a = paymentCardOwnershipInfo.typeOfGood.issuedThrough) === null || _a === void 0 ? void 0 : _a.id) }
+                issuedThrough: { id: paymentCardOwnershipInfo.typeOfGood.issuedThrough.id }
             };
         }
         else {

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.381.0-alpha.2",
+    "@chevre/factory": "4.381.0-alpha.3",
     "@cinerino/sdk": "10.5.0-alpha.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.2.0-alpha.1"
+  "version": "22.2.0-alpha.2"
 }