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

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

@@ -271,43 +271,70 @@ function validateAdvanceBookingRequirement(params) {
     }
 }
 function validateProgramMembershipUsed(params) {
-    // tslint:disable-next-line:max-func-body-length
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         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;
         if (typeof requestedProgramMembershipUsed === 'string') {
-            throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'must be object');
+            throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'must be permit');
+        }
+        if ((requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.typeOf) === 'Ticket') {
+            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;
-        if (typeof programMembershipUsedIdentifier === 'string' && programMembershipUsedIdentifier.length > 0) {
-            if (typeof issuedThroughId !== 'string' || issuedThroughId.length === 0) {
+        const issuedThroughTypeOf = (_d = requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.issuedThrough) === null || _d === void 0 ? void 0 : _d.typeOf;
+        if (typeof programMembershipUsedIdentifier === 'string') {
+            if (typeof issuedThroughId !== 'string' || issuedThroughId === '') {
                 throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
             }
             let permitIssuedThrough;
             // まずメンバーシップを検索して、存在しなければCreditCardを検索(どちらが発行元サービスか不明なので)
-            permitIssuedThrough = (yield repos.product.searchProducts({
-                limit: 1,
-                page: 1,
-                id: { $eq: issuedThroughId },
-                typeOf: { $eq: factory.product.ProductType.MembershipService }
-            }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], [])).shift();
-            if (permitIssuedThrough === undefined) {
+            if (issuedThroughTypeOf === factory.product.ProductType.MembershipService) {
+                permitIssuedThrough = (yield repos.product.searchProducts({
+                    limit: 1,
+                    page: 1,
+                    id: { $eq: issuedThroughId },
+                    typeOf: { $eq: factory.product.ProductType.MembershipService }
+                }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], [])).shift();
+                if (permitIssuedThrough === undefined) {
+                    throw new factory.errors.NotFound(factory.product.ProductType.MembershipService);
+                }
+            }
+            else if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
                 permitIssuedThrough = (yield repos.paymentService.searchPaymentServices({
                     limit: 1,
                     page: 1,
                     id: { $eq: issuedThroughId },
                     typeOf: { $eq: factory.service.paymentService.PaymentServiceType.CreditCard }
                 }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], [])).shift();
+                if (permitIssuedThrough === undefined) {
+                    throw new factory.errors.NotFound(factory.service.paymentService.PaymentServiceType.CreditCard);
+                }
+            }
+            else if (issuedThroughTypeOf === 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}]`);
             }
-            // permitIssuedThrough =
-            //     await repos.product.findById({ id: issuedThroughId }, ['_id', 'typeOf', 'project', 'serviceType', 'serviceOutput'], []);
             switch (permitIssuedThrough.typeOf) {
+                case factory.service.paymentService.PaymentServiceType.FaceToFace:
+                    // 問答無用に受け入れる
+                    programMembershipUsed = {
+                        typeOf: factory.permit.PermitType.Permit,
+                        identifier: programMembershipUsedIdentifier,
+                        issuedThrough: {
+                            id: '',
+                            typeOf: permitIssuedThrough.typeOf
+                        }
+                    };
+                    break;
                 // 発行サービスがCreditCardのケースに対応(2023-09-01~)
                 case factory.service.paymentService.PaymentServiceType.CreditCard:
                     // 決済サービスのserviceOutputにPermitが存在すれば、設定されたメンバーシップ区分のPermitをprogramMembershipUsedとして適用する
@@ -320,7 +347,6 @@ function validateProgramMembershipUsed(params) {
                     }
                     if ((issuedThroughServiceType === null || issuedThroughServiceType === void 0 ? void 0 : issuedThroughServiceType.typeOf) === 'CategoryCode') {
                         programMembershipUsed = {
-                            project: permitIssuedThrough.project,
                             typeOf: factory.permit.PermitType.Permit,
                             identifier: programMembershipUsedIdentifier,
                             issuedThrough: {
@@ -354,12 +380,17 @@ function validateProgramMembershipUsed(params) {
                             .isBefore(moment(now))) {
                         throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'unavailable programMembership');
                     }
-                    programMembershipUsed = {
-                        project: serviceOutput.project,
-                        typeOf: serviceOutput.typeOf,
-                        identifier: serviceOutput.identifier,
-                        issuedThrough: serviceOutput.issuedThrough
-                    };
+                    if (((_e = permitIssuedThrough.serviceType) === null || _e === void 0 ? void 0 : _e.typeOf) === 'CategoryCode') {
+                        programMembershipUsed = {
+                            typeOf: serviceOutput.typeOf,
+                            identifier: programMembershipUsedIdentifier,
+                            issuedThrough: {
+                                id: permitIssuedThrough.id,
+                                serviceType: permitIssuedThrough.serviceType,
+                                typeOf: permitIssuedThrough.typeOf
+                            }
+                        };
+                    }
                     break;
                 default:
                     throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', `${permitIssuedThrough.typeOf} not implemented`);

package/lib/chevre/service/assetTransaction/reserve/start/factory/createReservation.js

@@ -197,11 +197,18 @@ function validateEligibleMembershipType(params) {
     // 使用メンバーシップがeligibleMembershipに含まれればよい
     const eligibleMembershipType = params.availableOffer.eligibleMembershipType;
     if (Array.isArray(eligibleMembershipType)) {
-        if (typeof (programMembershipUsed === null || programMembershipUsed === void 0 ? void 0 : programMembershipUsed.typeOf) !== 'string' || programMembershipUsed.typeOf.length === 0) {
+        if ((programMembershipUsed === null || programMembershipUsed === void 0 ? void 0 : programMembershipUsed.typeOf) !== factory.permit.PermitType.Permit) {
             throw new factory.errors.Argument('programMembershipUsed', 'programMembership required');
         }
+        const { identifier, issuedThrough } = programMembershipUsed;
+        if (typeof identifier !== 'string' || identifier === '') {
+            throw new factory.errors.Argument('programMembershipUsed', 'programMembership.identifier required');
+        }
         // programMembershipUsed.issuedThrough.serviceTypeで検証する
-        const isEligible = eligibleMembershipType.some((membershipType) => { var _a, _b; return membershipType.codeValue === ((_b = (_a = programMembershipUsed.issuedThrough) === null || _a === void 0 ? void 0 : _a.serviceType) === null || _b === void 0 ? void 0 : _b.codeValue); });
+        const isEligible = eligibleMembershipType.some((membershipType) => 
+        // FaceToFaceについては問答無用に受け入れる(2024-08-14~)
+        issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace
+            || membershipType.codeValue === issuedThrough.serviceType.codeValue);
         if (!isEligible) {
             throw new factory.errors.Argument('programMembershipUsed', `${programMembershipUsed.identifier} is not eligible for the offer ${params.availableOffer.id}`);
         }

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

@@ -0,0 +1,23 @@
+import * as factory from '../../../../../factory';
+import type { JWTCredentials } from '../../../../../credentials/jwt';
+import type { ActionRepo } from '../../../../../repo/action';
+import type { AuthorizationRepo } from '../../../../../repo/authorization';
+import type { OwnershipInfoRepo } from '../../../../../repo/ownershipInfo';
+import type { TicketRepo } from '../../../../../repo/ticket';
+/**
+ * チケット化された適用メンバーシップをPermitに変換する
+ */
+declare function requestedProgramMembershipUsed2permit(params: {
+    project: {
+        id: string;
+    };
+    programMembershipUsed?: factory.assetTransaction.reserve.IAcceptedProgramMembershipUsed;
+}): (repos: {
+    action: ActionRepo;
+    authorization: AuthorizationRepo;
+    ownershipInfo: OwnershipInfoRepo;
+    ticket: TicketRepo;
+}, credentials: {
+    jwt: JWTCredentials;
+}) => Promise<factory.assetTransaction.reserve.IProgramMembershipUsedAsPermit | undefined>;
+export { requestedProgramMembershipUsed2permit };

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

@@ -0,0 +1,109 @@
+"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.requestedProgramMembershipUsed2permit = void 0;
+const factory = require("../../../../../factory");
+const CodeService = require("../../../../code");
+/**
+ * チケット化された適用メンバーシップをPermitに変換する
+ */
+// tslint:disable-next-line:max-func-body-length
+function requestedProgramMembershipUsed2permit(params) {
+    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        let programMembershipUsedAsPermit;
+        const { programMembershipUsed } = params;
+        // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
+        if (typeof programMembershipUsed === 'string') {
+            const { authorizedObject } = yield CodeService.verifyToken({
+                project: { id: params.project.id },
+                agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+                token: String(programMembershipUsed)
+            })(repos, credentials);
+            const permitOwnershipInfo = authorizedObject;
+            if (Array.isArray(permitOwnershipInfo)) {
+                throw new factory.errors.NotImplemented('programMembershipUsed as an array not implemented');
+            }
+            if (permitOwnershipInfo.typeOf !== 'OwnershipInfo') {
+                throw new factory.errors.Argument('programMembershipUsed', 'must be OwnershipInfo');
+            }
+            if (permitOwnershipInfo.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') {
+                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) {
+                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;
+            if (typeof ticketToken === 'string') {
+                const ticket = (yield repos.ticket.search({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: params.project.id } },
+                    ticketToken: { $eq: ticketToken }
+                })).shift();
+                if (ticket === undefined) {
+                    throw new factory.errors.NotFound('Ticket');
+                }
+                // 承認を参照
+                const { object } = yield repos.authorization.findValidOneByCode({
+                    project: { id: params.project.id },
+                    code: ticket.ticketToken
+                });
+                if (object.typeOf !== 'OwnershipInfo') {
+                    throw new factory.errors.Argument('programMembershipUsed', 'invalid authorization');
+                }
+                const ownershipInfoId = object.id;
+                const permitOwnershipInfo = (yield repos.ownershipInfo.search({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: params.project.id } },
+                    ids: [ownershipInfoId]
+                })).shift();
+                if (permitOwnershipInfo === undefined) {
+                    throw new factory.errors.NotFound('OwnershipInfo');
+                }
+                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 = permitOwnershipInfo.typeOfGood.issuedThrough.typeOf;
+                if (issuedThroughTypeOf !== factory.product.ProductType.MembershipService
+                    && issuedThroughTypeOf !== factory.service.paymentService.PaymentServiceType.CreditCard
+                    && issuedThroughTypeOf !== factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                    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;
+    });
+}
+exports.requestedProgramMembershipUsed2permit = requestedProgramMembershipUsed2permit;

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

@@ -7,6 +7,7 @@ import type { EventRepo, IMinimizedIndividualEvent } from '../../../../repo/even
 import type { OfferRepo } from '../../../../repo/offer';
 import type { OfferCatalogRepo } from '../../../../repo/offerCatalog';
 import type { OfferCatalogItemRepo } from '../../../../repo/offerCatalogItem';
+import type { OwnershipInfoRepo } from '../../../../repo/ownershipInfo';
 import type { PaymentServiceRepo } from '../../../../repo/paymentService';
 import type { SeatRepo } from '../../../../repo/place/seat';
 import type { PriceSpecificationRepo } from '../../../../repo/priceSpecification';
@@ -45,6 +46,7 @@ declare function processStartReserve4chevre(params: {
     offerCatalog: OfferCatalogRepo;
     offerCatalogItem: OfferCatalogItemRepo;
     offerRateLimit: OfferRateLimitRepo;
+    ownershipInfo: OwnershipInfoRepo;
     paymentService: PaymentServiceRepo;
     product: ProductRepo;
     productOffer: ProductOfferRepo;

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

@@ -12,8 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processStartReserve4chevre = void 0;
 const factory = require("../../../../factory");
 const ReserveTransactionService = require("../../../assetTransaction/reserve");
-const CodeService = require("../../../code");
 const factory_1 = require("./factory");
+const requestedProgramMembershipUsed2permit_1 = require("./processStartReserve4chevre/requestedProgramMembershipUsed2permit");
 function processStartReserve4chevre(params, options) {
     return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
         const { event, transaction, transactionNumber } = params;
@@ -46,39 +46,18 @@ function processStartReserve4chevre(params, options) {
 exports.processStartReserve4chevre = processStartReserve4chevre;
 function validateObjectWithoutDetail(params) {
     return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const objectWithoutDetail = params.object;
         if (Array.isArray(objectWithoutDetail.acceptedOffer)) {
             const validatedAcceptedOffersWithoutDetail = [];
             for (let acceptedOffer of objectWithoutDetail.acceptedOffer) {
-                let programMembershipUsed = (_b = (_a = acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.programMembershipUsed;
-                // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
-                if (typeof programMembershipUsed === 'string' && programMembershipUsed.length > 0) {
-                    const { authorizedObject } = yield CodeService.verifyToken({
-                        project: params.project,
-                        agent: params.project,
-                        token: String(programMembershipUsed)
-                    })(repos, credentials);
-                    const permitOwnershipInfo = authorizedObject;
-                    if (Array.isArray(permitOwnershipInfo)) {
-                        throw new factory.errors.NotImplemented('programMembershipUsed as an array not implemented');
-                    }
-                    if (permitOwnershipInfo.typeOf !== 'OwnershipInfo') {
-                        throw new factory.errors.Argument('programMembershipUsed', 'must be OwnershipInfo');
-                    }
-                    if (permitOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
-                        throw new factory.errors.Argument('programMembershipUsed', 'must be Permit');
-                    }
-                    const typeOfGood = permitOwnershipInfo.typeOfGood;
-                    const issuedThroughId = (_c = typeOfGood.issuedThrough) === null || _c === void 0 ? void 0 : _c.id;
-                    if (typeof issuedThroughId !== 'string' || issuedThroughId.length === 0) {
-                        throw new factory.errors.NotFound('itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
-                    }
-                    programMembershipUsed = {
-                        identifier: String(typeOfGood.identifier),
-                        issuedThrough: { id: issuedThroughId }
-                    };
-                    acceptedOffer = Object.assign(Object.assign({}, acceptedOffer), { itemOffered: Object.assign(Object.assign({}, acceptedOffer.itemOffered), { serviceOutput: Object.assign(Object.assign({}, (_d = acceptedOffer.itemOffered) === null || _d === void 0 ? void 0 : _d.serviceOutput), { typeOf: factory.reservationType.EventReservation, programMembershipUsed }) }) });
+                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
+                })(repos, credentials);
+                // 適用メンバーシップがあればacceptedOfferを強制的に上書き
+                if (programMembershipUsedAsPermit !== undefined) {
+                    acceptedOffer = Object.assign(Object.assign({}, acceptedOffer), { itemOffered: Object.assign(Object.assign({}, acceptedOffer.itemOffered), { serviceOutput: Object.assign(Object.assign({}, (_c = acceptedOffer.itemOffered) === null || _c === void 0 ? void 0 : _c.serviceOutput), { typeOf: factory.reservationType.EventReservation, programMembershipUsed: programMembershipUsedAsPermit }) }) });
                 }
                 validatedAcceptedOffersWithoutDetail.push(acceptedOffer);
             }

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

@@ -9,6 +9,7 @@ import type { OfferCatalogRepo } from '../../../repo/offerCatalog';
 import type { OfferCatalogItemRepo } from '../../../repo/offerCatalogItem';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
+import type { OwnershipInfoRepo } from '../../../repo/ownershipInfo';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { SeatRepo } from '../../../repo/place/seat';
 import type { PriceSpecificationRepo } from '../../../repo/priceSpecification';
@@ -33,6 +34,7 @@ interface IAuthorizeRepos {
     offerRateLimit: OfferRateLimitRepo;
     orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
+    ownershipInfo: OwnershipInfoRepo;
     paymentService: PaymentServiceRepo;
     priceSpecification: PriceSpecificationRepo;
     product: ProductRepo;

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.381.0-alpha.1",
+    "@chevre/factory": "4.381.0-alpha.2",
     "@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.0"
+  "version": "22.2.0-alpha.1"
 }