@chevre/domain 22.1.0 → 22.2.0-alpha.1

package/lib/chevre/repo/paymentService.d.ts

@@ -37,7 +37,9 @@ export declare class PaymentServiceRepo {
     /**
      * 決済サービスを検索する
      */
-    searchPaymentServices(conditions: ISearchConditions4paymentService, inclusion: IKeyOfProjection4paymentService[], exclusion: IKeyOfProjection4paymentService[]): Promise<factory.service.paymentService.IService[]>;
+    searchPaymentServices(conditions: ISearchConditions4paymentService, inclusion: IKeyOfProjection4paymentService[], exclusion: IKeyOfProjection4paymentService[]): Promise<(factory.service.paymentService.IService & {
+        id: string;
+    })[]>;
     deletePaymentServiceById(params: {
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/product.d.ts

@@ -41,7 +41,9 @@ export declare class ProductRepo {
     /**
      * プロダクトを検索する
      */
-    searchProducts(conditions: ISearchConditions4product, inclusion: IKeyOfProjection4product[], exclusion: IKeyOfProjection4product[]): Promise<factory.product.IProduct[]>;
+    searchProducts(conditions: ISearchConditions4product, inclusion: IKeyOfProjection4product[], exclusion: IKeyOfProjection4product[]): Promise<(factory.product.IProduct & {
+        id: string;
+    })[]>;
     deleteProductById(params: {
         id: string;
     }): Promise<void>;

package/lib/chevre/service/assetTransaction/registerService/factory.d.ts

@@ -12,7 +12,9 @@ export declare function createPointAward(params: {
  */
 export declare function createServiceOutput(params: {
     dateIssued: Date;
-    product: factory.product.IProduct;
+    product: factory.product.IProduct & {
+        id: string;
+    };
     acceptedOffer: factory.assetTransaction.registerService.IAcceptedOfferWithoutDetail;
     offer: factory.product.ITicketOffer;
     transactionNumber: string;

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/lib/chevre/service/offer/product/factory.js

@@ -26,10 +26,15 @@ function createRegisterServiceStartParams(params) {
             // ]
         },
         object: params.object.map((o) => {
+            // 許可証コードは自動発行されているはず
+            const permitIdentifier = o.itemOffered.serviceOutput.identifier;
+            if (typeof permitIdentifier !== 'string' || permitIdentifier === '') {
+                throw new factory.errors.ArgumentNull('itemOffered.serviceOutput.identifier');
+            }
             return {
                 typeOf: o.typeOf,
                 id: String(o.id),
-                itemOffered: o.itemOffered
+                itemOffered: Object.assign(Object.assign({}, o.itemOffered), { serviceOutput: Object.assign(Object.assign({}, o.itemOffered.serviceOutput), { identifier: permitIdentifier }) })
             };
         }),
         expires: moment(params.transaction.expires)

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

@@ -9,16 +9,17 @@ function createPaymentMethods(params) {
     let price = 0;
     // 決済方法をセット
     params.authorizePaymentActions.forEach((a) => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const resultAsInvoice = (Array.isArray(a.result))
-            ? (_a = a.result) === null || _a === void 0 ? void 0 : _a.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
-            : a.result;
+            // ? a.result?.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            ? a.result[0]
+            : undefined;
         if (resultAsInvoice === undefined) {
             throw new factory.errors.NotFound('authorizePaymentAction.resultAsInvoice'); // resultは必ず存在するはず
         }
-        const paymentMethodAmountCurrencyByAuthorizeAction = (_c = (_b = resultAsInvoice.paymentMethodAsObject) === null || _b === void 0 ? void 0 : _b.amount) === null || _c === void 0 ? void 0 : _c.currency;
+        const paymentMethodAmountCurrencyByAuthorizeAction = (_b = (_a = resultAsInvoice.paymentMethodAsObject) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency;
         // 決済方法区分は必ず存在するはず(2023-08-15~)
-        const paymentMethodType = (_d = resultAsInvoice.paymentMethodAsObject) === null || _d === void 0 ? void 0 : _d.typeOf;
+        const paymentMethodType = (_c = resultAsInvoice.paymentMethodAsObject) === null || _c === void 0 ? void 0 : _c.typeOf;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.NotFound('authorizePaymentAction.result.paymentMethodAsObject.typeOf');
         }
@@ -34,11 +35,12 @@ function createPaymentMethods(params) {
     // 決済方法から注文金額の計算
     price += params.authorizePaymentActions
         .reduce((a, b) => {
-        var _a, _b;
+        var _a;
         const resultAsInvoice = (Array.isArray(b.result))
-            ? (_a = b.result) === null || _a === void 0 ? void 0 : _a.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
-            : b.result;
-        const jpyAmount = (((_b = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency) === factory.priceCurrency.JPY)
+            // ? b.result?.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            ? b.result[0]
+            : undefined;
+        const jpyAmount = (((_a = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _a === void 0 ? void 0 : _a.currency) === factory.priceCurrency.JPY)
             ? resultAsInvoice.totalPaymentDue.value
             : 0;
         return a + jpyAmount;

package/lib/chevre/service/payment/any/factory.d.ts

@@ -28,7 +28,8 @@ export declare function createMovieTicket(params: factory.action.trade.pay.IMovi
 export declare function createAuthorizeResult(params: {
     object: factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails;
     payTransaction: factory.assetTransaction.pay.ITransaction;
-}): factory.action.authorize.paymentMethod.any.IResultAsInvoice[];
+    permit?: Pick<factory.ownershipInfo.IPermitAsGood, 'identifier'>;
+}): factory.action.authorize.paymentMethod.any.IResult;
 /**
  * 通知対象としてのアクションを最適化
  */

package/lib/chevre/service/payment/any/factory.js

@@ -129,8 +129,6 @@ function createAuthorizeResult(params) {
         accountId: (typeof ((_e = payTransactionObject.paymentMethod) === null || _e === void 0 ? void 0 : _e.accountId) === 'string')
             ? payTransactionObject.paymentMethod.accountId
             : '',
-        // 廃止(2023-08-07~)
-        // amount: params.object.amount,
         issuedThrough,
         // 完全廃止(paymentMethodAsObjectへ完全移行)(2023-08-16~)
         // paymentMethod: params.object.paymentMethod,
@@ -146,7 +144,23 @@ function createAuthorizeResult(params) {
         additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [],
         typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment
     };
-    return [resultAsInvoice]; // Arrayに統一(2023-09-04~)
+    // tslint:disable-next-line:no-suspicious-comment
+    // TODO 保留 resultにメンバーシップを追加(2024-08-13~)
+    // let resultAsPermit: factory.action.authorize.paymentMethod.any.IResultAsPermit | undefined;
+    // if (typeof params.permit?.identifier === 'string') {
+    //     resultAsPermit = {
+    //         typeOf: factory.permit.PermitType.Permit,
+    //         identifier: params.permit.identifier,
+    //         issuedThrough: { serviceType: params.permit.issuedThrough?.serviceType }
+    //     };
+    // }
+    // Arrayに統一(2023-09-04~)
+    // if (resultAsPermit !== undefined) {
+    //     return [resultAsInvoice, resultAsPermit];
+    // } else {
+    //     return [resultAsInvoice];
+    // }
+    return [resultAsInvoice];
 }
 exports.createAuthorizeResult = createAuthorizeResult;
 function payActionObject2invoice(params) {

package/lib/chevre/service/payment/any/fixConfirmationNumberAsNeeded.d.ts

@@ -0,0 +1,11 @@
+import * as factory from '../../../factory';
+import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
+import type { TransactionRepo } from '../../../repo/transaction';
+declare function fixConfirmationNumberAsNeeded(params: {
+    purpose: factory.action.authorize.paymentMethod.any.IPurpose;
+    paymentServiceType: factory.service.paymentService.PaymentServiceType;
+}): (repos: {
+    transaction: TransactionRepo;
+    confirmationNumber: ConfirmationNumberRepo;
+}) => Promise<string | undefined>;
+export { fixConfirmationNumberAsNeeded };

package/lib/chevre/service/payment/any/fixConfirmationNumberAsNeeded.js

@@ -0,0 +1,32 @@
+"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.fixConfirmationNumberAsNeeded = void 0;
+const factory = require("../../../factory");
+const publishConfirmationNumberIfNotExist_1 = require("../../transaction/placeOrder/publishConfirmationNumberIfNotExist");
+function fixConfirmationNumberAsNeeded(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // MovieTicketの場合、確認番号を発行(着券に連携するため)(2024-05-27~)
+        let confirmationNumber;
+        if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket) {
+            confirmationNumber = yield (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
+                id: params.purpose.id,
+                status: { $in: [factory.transactionStatusType.InProgress] },
+                object: { orderDate: new Date() }
+            })({
+                confirmationNumber: repos.confirmationNumber,
+                transaction: repos.transaction
+            });
+        }
+        return confirmationNumber;
+    });
+}
+exports.fixConfirmationNumberAsNeeded = fixConfirmationNumberAsNeeded;

package/lib/chevre/service/payment/any/verifyTicketTokenAsNeeded.d.ts

@@ -0,0 +1,22 @@
+import * as factory from '../../../factory';
+import type { AuthorizationRepo } from '../../../repo/authorization';
+import type { OwnershipInfoRepo } from '../../../repo/ownershipInfo';
+import type { TicketRepo } from '../../../repo/ticket';
+type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail & {
+    ticketToken?: string;
+};
+declare function verifyTicketTokenAsNeeded(params: {
+    project: {
+        id: string;
+    };
+    object: IObjectWithoutDetail;
+    paymentServiceType: factory.service.paymentService.PaymentServiceType;
+    purpose: factory.action.authorize.paymentMethod.any.IPurpose;
+}): (repos: {
+    authorization: AuthorizationRepo;
+    ownershipInfo: OwnershipInfoRepo;
+    ticket: TicketRepo;
+}) => Promise<{
+    permit: Pick<factory.ownershipInfo.IPermitAsGood, 'identifier'> | undefined;
+}>;
+export { verifyTicketTokenAsNeeded };

package/lib/chevre/service/payment/any/verifyTicketTokenAsNeeded.js

@@ -0,0 +1,79 @@
+"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.verifyTicketTokenAsNeeded = void 0;
+const factory = require("../../../factory");
+function verifyTicketTokenAsNeeded(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const { paymentServiceType, object, project } = params;
+        const { ticketToken } = object;
+        let permit;
+        switch (paymentServiceType) {
+            case factory.service.paymentService.PaymentServiceType.CreditCard:
+            case factory.service.paymentService.PaymentServiceType.FaceToFace:
+                // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
+                if (typeof ticketToken === 'string' && ticketToken !== '') {
+                    let authorizedObject;
+                    const ticket = (yield repos.ticket.search({
+                        limit: 1,
+                        page: 1,
+                        project: { id: { $eq: project.id } },
+                        ticketToken: { $eq: ticketToken }
+                    })).shift();
+                    if (ticket === undefined) {
+                        throw new factory.errors.NotFound('Ticket');
+                    }
+                    // 承認を参照
+                    const validAuthorization = yield repos.authorization.findValidOneByCode({
+                        project: { id: params.project.id },
+                        code: ticket.ticketToken
+                    });
+                    authorizedObject = validAuthorization.object;
+                    if (authorizedObject.typeOf !== 'OwnershipInfo') {
+                        throw new factory.errors.Argument('ticketToken', 'must be OwnershipInfo');
+                    }
+                    const ownershipInfoId = authorizedObject.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');
+                    }
+                    const { ownedBy, typeOfGood } = permitOwnershipInfo;
+                    if (typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
+                        throw new factory.errors.Argument('ticketToken', 'must be Permit');
+                    }
+                    if (((_a = typeOfGood.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) !== paymentServiceType) {
+                        throw new factory.errors.Argument('ticketToken', 'paymentServiceType not matched');
+                    }
+                    if (!Array.isArray(ownedBy)) {
+                        throw new factory.errors.Argument('ticketToken', 'ownershipInfo.ownedBy must be Array');
+                    }
+                    if (ownedBy[0].typeOf !== factory.transactionType.PlaceOrder) {
+                        throw new factory.errors.Argument('ticketToken', 'ownershipInfo.ownedBy.typeOf must be PlaceOrder');
+                    }
+                    if (ownedBy[0].id !== params.purpose.id) {
+                        throw new factory.errors.Argument('ticketToken', 'ownershipInfo.ownedBy.id not matched');
+                    }
+                    permit = { identifier: typeOfGood.identifier };
+                }
+                break;
+            default:
+            // no op
+        }
+        return { permit };
+    });
+}
+exports.verifyTicketTokenAsNeeded = verifyTicketTokenAsNeeded;

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

@@ -10,6 +10,7 @@ import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { ConfirmationNumberRepo } from '../../repo/confirmationNumber';
 import type { EventRepo } from '../../repo/event';
+import type { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import type { PaymentServiceRepo } from '../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
 import type { ProductRepo } from '../../repo/product';
@@ -79,6 +80,7 @@ interface IAuthorizeRepos {
     authorization: AuthorizationRepo;
     confirmationNumber: ConfirmationNumberRepo;
     event: EventRepo;
+    ownershipInfo: OwnershipInfoRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
@@ -102,6 +104,9 @@ interface IPublishPaymentUrlRepos {
     transactionNumber: TransactionNumberRepo;
 }
 type IPublishPaymentUrlOperation<T> = (repos: IPublishPaymentUrlRepos, settings: Settings) => Promise<T>;
+type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail & {
+    ticketToken?: string;
+};
 /**
  * 外部決済ロケーションを発行する
  */
@@ -123,7 +128,6 @@ declare function publishPaymentUrl(params: {
         id: string;
     };
 }): IPublishPaymentUrlOperation<Pick<PayTransactionService.IPublishPaymentUrlResult, 'paymentMethodId' | 'paymentUrl'>>;
-type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail;
 /**
  * 決済承認
  */

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

@@ -16,13 +16,14 @@ exports.publishPaymentUrl = exports.processVoidPayTransaction = exports.person2u
 const factory = require("../../factory");
 const PayTransactionService = require("../assetTransaction/pay");
 const code_1 = require("../code");
-const publishConfirmationNumberIfNotExist_1 = require("../transaction/placeOrder/publishConfirmationNumberIfNotExist");
 const factory_1 = require("./any/factory");
+const fixConfirmationNumberAsNeeded_1 = require("./any/fixConfirmationNumberAsNeeded");
 const handlePrePublishedPaymentMethodIdOnAuthorizing_1 = require("./any/handlePrePublishedPaymentMethodIdOnAuthorizing");
 const onPaymentStatusChanged_1 = require("./any/onPaymentStatusChanged");
 Object.defineProperty(exports, "onPaymentStatusChanged", { enumerable: true, get: function () { return onPaymentStatusChanged_1.onPaymentStatusChanged; } });
 const person2username_1 = require("./any/person2username");
 Object.defineProperty(exports, "person2username", { enumerable: true, get: function () { return person2username_1.person2username; } });
+const verifyTicketTokenAsNeeded_1 = require("./any/verifyTicketTokenAsNeeded");
 /**
  * 決済承認中止
  * タスクから決済承認を取り消す
@@ -304,29 +305,29 @@ function authorize(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        if (params.purpose.typeOf !== factory.transactionType.PlaceOrder) {
-            throw new factory.errors.NotImplemented(`purpose.typeOf '${params.purpose.typeOf} not implemented'`);
-        }
-        // MovieTicketの場合、確認番号を発行(着券に連携するため)(2024-05-27~)
-        let confirmationNumber;
-        if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket) {
-            confirmationNumber = yield (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
-                id: params.purpose.id,
-                status: { $in: [factory.transactionStatusType.InProgress] },
-                object: { orderDate: new Date() }
-            })({
-                confirmationNumber: repos.confirmationNumber,
-                transaction: repos.transaction
-            });
+        const { paymentServiceType, purpose, project } = params;
+        if (purpose.typeOf !== factory.transactionType.PlaceOrder) {
+            throw new factory.errors.NotImplemented(`purpose.typeOf '${purpose.typeOf} not implemented'`);
         }
-        const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['agent', 'expires', 'typeOf', 'project', 'seller']);
-        const paymentServiceType = params.paymentServiceType;
+        const confirmationNumber = yield (0, fixConfirmationNumberAsNeeded_1.fixConfirmationNumberAsNeeded)({ purpose, paymentServiceType })(repos);
+        const transaction = yield repos.transaction.findInProgressById({ typeOf: purpose.typeOf, id: purpose.id }, ['agent', 'expires', 'typeOf', 'project', 'seller']);
         // 取引番号生成
         let transactionNumber;
         let pendingPaymentAgencyTransaction;
         let creditCard = params.object.creditCard;
+        // ticketTokenを解釈(2024-08-13~)
+        const { permit } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({ project, object: params.object, paymentServiceType, purpose })(repos);
+        const paymentMethodIdByPermit = permit === null || permit === void 0 ? void 0 : permit.identifier;
+        if (typeof paymentMethodIdByPermit === 'string') {
+            transactionNumber = paymentMethodIdByPermit; // メンバーシップ指定の場合、取引番号に適用(2024-08-13~)
+        }
         // リクエストでpaymentMethodIdを指定された場合、取引に保管されたpaymentMethodIdに一致すればそちらを適用(外部サイト決済対応)
         if (typeof params.object.paymentMethodId === 'string' && params.object.paymentMethodId.length > 0) {
+            if (typeof paymentMethodIdByPermit === 'string') {
+                if (paymentMethodIdByPermit !== params.object.paymentMethodId) {
+                    throw new factory.errors.Argument('ticketToken', 'not matched with paymentMethodId');
+                }
+            }
             const { authorizeParams, existingCompletedAuthorizeAction } = yield (0, handlePrePublishedPaymentMethodIdOnAuthorizing_1.handlePrePublishedPaymentMethodIdOnAuthorizing)({
                 object: params.object,
                 prePublishedPaymentMethodId: params.object.paymentMethodId,
@@ -420,7 +421,7 @@ function authorize(params) {
                 throw error;
             }
         }
-        const result = (0, factory_1.createAuthorizeResult)({ payTransaction, object: authorizeObjectIncludingPaymentMethodDetails });
+        const result = (0, factory_1.createAuthorizeResult)(Object.assign({ payTransaction, object: authorizeObjectIncludingPaymentMethodDetails }, (permit !== undefined) ? { permit } : undefined));
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id };
     });

package/lib/chevre/service/payment/paymentCard.js

@@ -65,7 +65,7 @@ function authorize(params, paymentServiceId) {
 exports.authorize = authorize;
 function validatePaymentMethod(params, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const serviceOutputIdentifier = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.accountId;
         const amount = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.amount;
         const paymentMethodType = (_c = params.object.paymentMethod) === null || _c === void 0 ? void 0 : _c.identifier;
@@ -114,7 +114,10 @@ function validatePaymentMethod(params, paymentServiceId) {
             issuedThrough: { typeOf: factory.product.ProductType.PaymentCard }
         });
         // サービスタイプを確認
-        if (((_k = (_j = serviceOutput.issuedThrough) === null || _j === void 0 ? void 0 : _j.serviceType) === null || _k === void 0 ? void 0 : _k.codeValue) !== paymentMethodType) {
+        if (((_j = serviceOutput.issuedThrough) === null || _j === void 0 ? void 0 : _j.typeOf) !== factory.product.ProductType.PaymentCard) {
+            throw new factory.errors.Argument('object.paymentMethod.accountId', 'serviceOutput.issuedThrough?.typeOf must be PaymentCard');
+        }
+        if (((_l = (_k = serviceOutput.issuedThrough) === null || _k === void 0 ? void 0 : _k.serviceType) === null || _l === void 0 ? void 0 : _l.codeValue) !== paymentMethodType) {
             throw new factory.errors.Argument('object.paymentMethod.accountId', 'paymentMethodType not matched');
         }
         // 出金金額設定を確認

package/lib/chevre/service/task/authorizePayment.js

@@ -17,6 +17,7 @@ const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
 const confirmationNumber_1 = require("../../repo/confirmationNumber");
 const event_1 = require("../../repo/event");
+const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
@@ -54,6 +55,7 @@ function call(params) {
                 authorization: new authorization_1.AuthorizationRepo(connection),
                 confirmationNumber: new confirmationNumber_1.ConfirmationNumberRepo(redisClient),
                 event: new event_1.EventRepo(connection),
+                ownershipInfo: new ownershipInfo_1.OwnershipInfoRepo(connection),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),

package/lib/chevre/service/transaction/placeOrder/confirm/validation.js

@@ -27,7 +27,8 @@ function validateTransaction(transaction, authorizePaymentActions, authorizeEven
                 const authorizeMovieTicketActions = authorizePaymentActions.filter((a) => {
                     var _a;
                     const resultAsInvoice = (Array.isArray(a.result))
-                        ? a.result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+                        // ? a.result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+                        ? a.result[0]
                         : undefined;
                     return (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.issuedThrough.typeOf) === factory.service.paymentService.PaymentServiceType.MovieTicket
                         // 決済方法区分は必ず存在するはず(2023-08-15~)
@@ -65,7 +66,8 @@ function findMovieTicketPaymentMethodTypesFromTransaction(authorizePaymentAction
     const paymentMethodTypes = [];
     authorizePaymentActions.forEach(({ result }) => {
         const resultAsInvoice = (Array.isArray(result))
-            ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            // ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            ? result[0]
             : undefined;
         if ((resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.issuedThrough.typeOf) === factory.service.paymentService.PaymentServiceType.MovieTicket) {
             // 決済方法区分は必ず存在するはず(2023-08-15~)
@@ -123,7 +125,8 @@ function validatePrice(authorizePaymentActions, authorizeEventServiceOfferAction
     authorizePaymentActions.forEach(({ result }) => {
         var _a;
         const resultAsInvoice = (Array.isArray(result))
-            ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            // ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            ? result[0]
             : undefined;
         const jpyAmount = (((_a = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _a === void 0 ? void 0 : _a.currency) === factory.priceCurrency.JPY)
             ? resultAsInvoice.totalPaymentDue.value
@@ -160,7 +163,8 @@ function validatePaymentUrl(transaction, authorizePaymentActions) {
         // 発行された決済URLに対する決済承認を確認する
         const authorizePaymentAction4paymentUrlExists = authorizePaymentActions.some(({ result }) => {
             const resultAsInvoice = (Array.isArray(result))
-                ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+                // ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+                ? result[0]
                 : undefined;
             return (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.paymentMethodId) === paymentMethodId;
         });
@@ -176,7 +180,8 @@ function validateMonetaryAmount(authorizePaymentActions, authorizeEventServiceOf
     const authorizeMonetaryAmountActions = authorizePaymentActions.filter(({ result }) => {
         var _a;
         const resultAsInvoice = (Array.isArray(result))
-            ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            // ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+            ? result[0]
             : undefined;
         // JPY以外の通貨に対して承認可能なのはPaymentServiceType.PaymentCardのみ
         return (resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.issuedThrough.typeOf) === factory.service.paymentService.PaymentServiceType.PaymentCard
@@ -198,7 +203,8 @@ function validateMonetaryAmount(authorizePaymentActions, authorizeEventServiceOf
     const authorizedCurrencyTypes = [...new Set(authorizeMonetaryAmountActions.map(({ result }) => {
             var _a;
             const resultAsInvoice = (Array.isArray(result))
-                ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+                // ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+                ? result[0]
                 : undefined;
             return (_a = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _a === void 0 ? void 0 : _a.currency;
         }))];
@@ -213,7 +219,8 @@ function validateMonetaryAmount(authorizePaymentActions, authorizeEventServiceOf
         authorizeMonetaryAmountActions.forEach(({ result }) => {
             var _a;
             const resultAsInvoice = (Array.isArray(result))
-                ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+                // ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
+                ? result[0]
                 : undefined;
             if (((_a = resultAsInvoice === null || resultAsInvoice === void 0 ? void 0 : resultAsInvoice.totalPaymentDue) === null || _a === void 0 ? void 0 : _a.currency) === currencyType) {
                 authorizedMonetaryAmount += resultAsInvoice.totalPaymentDue.value;

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.380.0",
-    "@cinerino/sdk": "10.4.0",
+    "@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",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.1.0"
+  "version": "22.2.0-alpha.1"
 }

package/example/src/chevre/investigateMovieTicketIdentifier.ts

@@ -1,78 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-const MOVIE_TICKET_IDENTIFIER_REGEX = '^[0-9a-zA-Z*]+$';
-// const MOVIE_TICKET_IDENTIFIER_REGEX = '^.+$';
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
-
-    const cursor = actionRepo.getCursor(
-        {
-            typeOf: { $eq: chevre.factory.actionType.AuthorizeAction },
-            'object.typeOf': { $eq: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment },
-            startDate: {
-                $gte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-30, 'days')
-                    .toDate()
-            }
-        },
-        {
-            project: 1,
-            typeOf: 1,
-            startDate: 1,
-            object: 1,
-            result: 1
-        }
-    );
-    console.log('actions found');
-
-    let i = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const action: Pick<
-            chevre.factory.action.authorize.paymentMethod.any.IAction,
-            'project' | 'typeOf' | 'startDate' | 'object' | 'result'
-        > = doc.toObject();
-
-        const accountId = (Array.isArray(action.result)) ? action.result[0].accountId : action.result?.accountId;
-        const issuedThroughTypeOf = (Array.isArray(action.result))
-            ? action.result[0].issuedThrough.typeOf
-            : action.result?.issuedThrough.typeOf;
-        if (issuedThroughTypeOf === chevre.factory.service.paymentService.PaymentServiceType.MovieTicket) {
-            const regExp = new RegExp(MOVIE_TICKET_IDENTIFIER_REGEX);
-            console.log(
-                'checking...',
-                accountId,
-                action.project.id, action.startDate, i
-            );
-            if (typeof accountId !== 'string') {
-                throw new Error(`${accountId} must be string`);
-            }
-            if (!accountId.match(regExp)) {
-                throw new Error(`${accountId} invalid`);
-            }
-        } else {
-            // console.log(
-            //     'no check',
-            //     issuedThroughTypeOf,
-            //     action.project.id, action.startDate, i
-            // );
-        }
-    });
-
-    console.log(i, 'actions checked');
-}
-
-main()
-    .then()
-    .catch(console.error);