@chevre/domain 22.2.0-alpha.4 → 22.2.0-alpha.6

package/example/src/chevre/{projectReservationFieldsById.ts → projectOwnershipInfoFieldsById.ts}

@@ -8,12 +8,12 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const reservationRepo = await chevre.repository.Reservation.createInstance(mongoose.connection);
-    const result = await reservationRepo.projectFieldsById(
+    const ownershipInfoRepo = await chevre.repository.OwnershipInfo.createInstance(mongoose.connection);
+    const result = await ownershipInfoRepo.projectFieldsById(
         {
-            id: '948926445022844-0',
-            inclusion: ['reservationStatus', 'reservationFor.id']
+            id: 'd9080760-1bdb-49cf-86eb-50f98fab0010'
         }
+        // ['id', 'typeOfGood']
     );
     // tslint:disable-next-line:no-null-keyword
     console.dir(result, { depth: null });

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

@@ -35,10 +35,12 @@ export declare class OwnershipInfoRepo {
     /**
      * なければ作成する
      */
-    createIfNotExistByIdentifier(ownershipInfo: IOwnershipInfo): Promise<IOwnershipInfo>;
-    findById(params: {
+    createIfNotExistByIdentifier(ownershipInfo: Omit<IOwnershipInfo, 'id'>): Promise<{
         id: string;
-    }, projection?: any): Promise<IOwnershipInfo>;
+    }>;
+    projectFieldsById(params: {
+        id: string;
+    }, inclusion?: (keyof IOwnershipInfo)[]): Promise<IOwnershipInfo>;
     /**
      * 所有権を検索する
      */

package/lib/chevre/repo/ownershipInfo.js

@@ -233,11 +233,14 @@ class OwnershipInfoRepo {
                     new: true,
                     upsert: true,
                     projection: {
-                        __v: 0,
-                        createdAt: 0,
-                        updatedAt: 0
+                        _id: 0,
+                        id: { $toString: '$_id' }
+                        // __v: 0,
+                        // createdAt: 0,
+                        // updatedAt: 0
                     }
                 })
+                    .lean()
                     .exec();
             }
             catch (error) {
@@ -254,26 +257,50 @@ class OwnershipInfoRepo {
             if (duplicate) {
                 // 重複の場合、再度取得
                 doc = yield this.ownershipInfoModel.findOne({ identifier: { $eq: ownershipInfo.identifier } }, {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
+                    _id: 0,
+                    id: { $toString: '$_id' }
+                    // __v: 0,
+                    // createdAt: 0,
+                    // updatedAt: 0
                 })
+                    .lean()
                     .exec();
             }
             if (doc === undefined || doc === null) {
                 throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
             }
-            return doc.toObject();
+            return { id: doc.id };
+            // return <IOwnershipInfo>doc.toObject();
         });
     }
-    findById(params, projection) {
+    projectFieldsById(params, inclusion) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.ownershipInfoModel.findById(params.id, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+            let projection = {
+                _id: 0,
+                id: { $toString: '$_id' },
+                project: 1,
+                typeOf: 1,
+                identifier: 1,
+                ownedBy: 1,
+                acquiredFrom: 1,
+                ownedFrom: 1,
+                ownedThrough: 1,
+                typeOfGood: 1
+            };
+            const positiveProjectionFields = (Array.isArray(inclusion))
+                ? inclusion.filter((key) => key !== 'id' && String(key) !== '_id')
+                : undefined;
+            if (Array.isArray(positiveProjectionFields)) {
+                projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            }
+            const doc = yield this.ownershipInfoModel.findOne({ _id: { $eq: params.id } }, projection)
+                .lean() // lean(2024-08-15~)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
             }
-            return doc.toObject();
+            return doc;
+            // return doc.toObject();
         });
     }
     /**

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

@@ -2,7 +2,6 @@ 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に変換する
@@ -18,7 +17,6 @@ declare function requestedProgramMembershipUsed2permit(params: {
 }): (repos: {
     action: ActionRepo;
     authorization: AuthorizationRepo;
-    ownershipInfo: OwnershipInfoRepo;
     ticket: TicketRepo;
 }, credentials: {
     jwt: JWTCredentials;

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

@@ -18,10 +18,9 @@ const CodeService = require("../../../../code");
 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, _c, _d, _e;
+        var _a, _b, _c, _d;
         let programMembershipUsedAsPermit;
         const { programMembershipUsed, placeOrder } = params;
-        const now = new Date();
         // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
         if (typeof programMembershipUsed === 'string') {
             const { authorizedObject } = yield CodeService.verifyToken({
@@ -71,33 +70,34 @@ function requestedProgramMembershipUsed2permit(params) {
                     throw new factory.errors.NotFound('Ticket');
                 }
                 // 承認を参照
-                const { object } = yield repos.authorization.findValidOneByCode({
+                const { audience, 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],
-                    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');
+                // const ownershipInfoId = object.id;
+                // const permitOwnershipInfo = (await repos.ownershipInfo.search({
+                //     limit: 1,
+                //     page: 1,
+                //     project: { id: { $eq: params.project.id } },
+                //     ids: [ownershipInfoId],
+                //     ownedFrom: now,
+                //     ownedThrough: now
+                // })).shift();
+                // if (permitOwnershipInfo === undefined) {
+                //     throw new factory.errors.NotFound('OwnershipInfo');
+                // }
+                // audience検証
+                if ((audience === null || audience === void 0 ? void 0 : audience.typeOf) !== factory.transactionType.PlaceOrder || audience.id !== placeOrder.id) {
+                    throw new factory.errors.Argument('programMembershipUsed', 'audience not matched with placeOrder');
                 }
+                const permitOwnershipInfo = object;
                 if (permitOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
                     throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.typeOf must be Permit');
                 }
-                const issuedThroughTypeOf = (_d = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _d === void 0 ? void 0 : _d.typeOf;
+                const issuedThroughTypeOf = (_c = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _c === void 0 ? void 0 : _c.typeOf;
                 if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
                     programMembershipUsedAsPermit = {
                         identifier: permitOwnershipInfo.typeOfGood.identifier,
@@ -107,7 +107,7 @@ function requestedProgramMembershipUsed2permit(params) {
                 }
                 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') {
+                    if (typeof ((_d = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _d === void 0 ? void 0 : _d.id) !== 'string') {
                         throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.issuedThrough.id undefined');
                     }
                     programMembershipUsedAsPermit = {

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

@@ -7,7 +7,6 @@ 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';
@@ -46,7 +45,6 @@ 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.d.ts

@@ -9,7 +9,6 @@ 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';
@@ -34,7 +33,6 @@ interface IAuthorizeRepos {
     offerRateLimit: OfferRateLimitRepo;
     orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
-    ownershipInfo: OwnershipInfoRepo;
     paymentService: PaymentServiceRepo;
     priceSpecification: PriceSpecificationRepo;
     product: ProductRepo;

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

@@ -86,7 +86,8 @@ function sendOrder(params) {
                 typeOf: factory.actionType.SendAction
             };
             const action = yield repos.action.start(sendOrderActionAttributes);
-            let ownershipInfos = [];
+            let creatingOwnershipInfos = [];
+            let createdOwnershipInfos = [];
             let allOffersDelivered = false;
             let acceptedOffers;
             // 所有権生成を最小化(2024-03-01~)
@@ -111,12 +112,15 @@ function sendOrder(params) {
                 debug('delivering...', order.orderNumber, acceptedOffers.map((offer) => `${offer.itemOffered.id}`), params.object.acceptedOffers, 'offerIndexBase:', offerIndexBase);
                 // 所有権作成
                 if (createOwnerships) {
-                    ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
+                    creatingOwnershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
                         order: Object.assign(Object.assign({}, order), { acceptedOffers }),
                         offerIndexBase
                     });
-                    ownershipInfos = yield Promise.all(ownershipInfos.map((ownershipInfo) => __awaiter(this, void 0, void 0, function* () {
-                        return repos.ownershipInfo.createIfNotExistByIdentifier(ownershipInfo);
+                    createdOwnershipInfos = yield Promise.all(creatingOwnershipInfos.map((creatingOwnershipInfo) => __awaiter(this, void 0, void 0, function* () {
+                        const { id } = yield repos.ownershipInfo.createIfNotExistByIdentifier(creatingOwnershipInfo);
+                        return Object.assign({ id }, (typeof creatingOwnershipInfo.identifier === 'string')
+                            ? { identifier: creatingOwnershipInfo.identifier }
+                            : undefined);
                     })));
                 }
                 // const deliveredCount = limit * page;
@@ -140,7 +144,7 @@ function sendOrder(params) {
                 }
                 throw error;
             }
-            const result = ownershipInfos;
+            const result = createdOwnershipInfos;
             yield repos.action.completeWithVoid({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
             debug('allOffersDelivered?:', allOffersDelivered, order.orderNumber);
             if (params.useOnOrderStatusChanged) {

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

@@ -1,6 +1,5 @@
 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;
@@ -14,7 +13,6 @@ declare function verifyTicketTokenAsNeeded(params: {
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
 }): (repos: {
     authorization: AuthorizationRepo;
-    ownershipInfo: OwnershipInfoRepo;
     ticket: TicketRepo;
 }) => Promise<{
     permit: Pick<factory.ownershipInfo.IPermitAsGood, 'identifier'> | undefined;

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

@@ -13,7 +13,7 @@ exports.verifyTicketTokenAsNeeded = void 0;
 const factory = require("../../../factory");
 function verifyTicketTokenAsNeeded(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const { paymentServiceType, object, project } = params;
         const { ticketToken } = object;
         let permit;
@@ -41,32 +41,29 @@ function verifyTicketTokenAsNeeded(params) {
                     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');
+                    // audience検証
+                    if (((_a = validAuthorization.audience) === null || _a === void 0 ? void 0 : _a.typeOf) !== factory.transactionType.PlaceOrder
+                        || validAuthorization.audience.id !== params.purpose.id) {
+                        throw new factory.errors.Argument('ticketToken', 'audience not matched with placeOrder');
                     }
-                    const { ownedBy, typeOfGood } = permitOwnershipInfo;
+                    const permitOwnershipInfo = authorizedObject;
+                    // const ownershipInfoId = authorizedObject.id;
+                    // const permitOwnershipInfo = (await 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 { 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) {
+                    if (((_b = typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.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;

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

@@ -10,7 +10,6 @@ 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';
@@ -80,7 +79,6 @@ interface IAuthorizeRepos {
     authorization: AuthorizationRepo;
     confirmationNumber: ConfirmationNumberRepo;
     event: EventRepo;
-    ownershipInfo: OwnershipInfoRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;

package/lib/chevre/service/report/ownershipInfo.d.ts

@@ -21,5 +21,7 @@ export interface IOwnershipInfoReport {
     };
 }
 export declare function ownershipInfo2report(params: {
-    ownershipInfo: factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood>;
+    ownershipInfo: factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
+        id: string;
+    };
 }): IOwnershipInfoReport;

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

@@ -17,7 +17,6 @@ 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");
@@ -55,7 +54,6 @@ 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/task/onAuthorizationCreated.js

@@ -70,7 +70,7 @@ function onAuthorizationCreated(params) {
                 // 所有権検索
                 const ownershipInfoId = authorization.object.id;
                 if (typeof ownershipInfoId === 'string' && ownershipInfoId.length > 0) {
-                    const ownershipInfo = yield repos.ownershipInfo.findById({ id: ownershipInfoId });
+                    const ownershipInfo = yield repos.ownershipInfo.projectFieldsById({ id: ownershipInfoId }, ['typeOfGood']);
                     // 座席予約に対する所有権であれば発券
                     if (ownershipInfo.typeOfGood.typeOf === factory.reservationType.EventReservation
                         || ownershipInfo.typeOfGood.typeOf === factory.reservationType.BusReservation) {

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.381.0-alpha.4",
+    "@chevre/factory": "4.381.0-alpha.6",
     "@cinerino/sdk": "10.5.0-alpha.1",
     "@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.4"
+  "version": "22.2.0-alpha.6"
 }