@chevre/domain 24.0.0-alpha.37 → 24.0.0-alpha.39

package/lib/chevre/repo/action/actionProcess.d.ts

@@ -130,7 +130,8 @@ export declare class ActionProcessRepo<TAction extends IAction<factory.actionTyp
         };
         object?: {
             typeOf?: {
-                $eq?: factory.action.authorize.offer.eventService.ObjectType.SeatReservation | factory.action.authorize.paymentMethod.any.ResultType.Payment | factory.offerType.AggregateOffer;
+                $eq?: factory.action.authorize.offer.eventService.ObjectType.SeatReservation | factory.action.authorize.paymentMethod.any.ResultType.Payment | factory.action.authorize.offer.eventService.ObjectType.AggregateOffer | factory.offerType.AggregateOffer;
+                $in?: (factory.action.authorize.offer.eventService.ObjectType.SeatReservation | factory.action.authorize.offer.eventService.ObjectType.AggregateOffer)[];
             };
             paymentMethodId?: {
                 $eq?: string;

package/lib/chevre/repo/action/actionProcess.js

@@ -723,6 +723,10 @@ class ActionProcessRepo {
         if (typeof objectTypeOfEq === 'string') {
             andConditions.push({ 'object.typeOf': { $exists: true, $eq: objectTypeOfEq } });
         }
+        const objectTypeOfIn = params.object?.typeOf?.$in;
+        if (Array.isArray(objectTypeOfIn)) {
+            andConditions.push({ 'object.typeOf': { $exists: true, $in: objectTypeOfIn } });
+        }
         if (typeof params.typeOf === 'string') {
             andConditions.push({ typeOf: { $eq: params.typeOf } });
         }

package/lib/chevre/repo/action/authorizeOffer.d.ts

@@ -20,6 +20,9 @@ export declare class AuthorizeOfferActionRepo extends ActionProcessRepo<IAuthori
          */
         ids: string[];
     }): Promise<IAuthorizeOfferActionWithInstrument[]>;
+    /**
+     * 注文取引から興行オファー承認アクションを参照する
+     */
     findAuthorizeOfferActionsByPurpose(params: {
         /**
          * 注文取引でフィルター
@@ -35,6 +38,24 @@ export declare class AuthorizeOfferActionRepo extends ActionProcessRepo<IAuthori
             $eq?: factory.actionStatusType.CompletedActionStatus;
         };
     }): Promise<IAuthorizeEventServiceOfferAction[]>;
+    /**
+     * 注文取引から汎用オファー承認アクションを参照する
+     */
+    findAuthorizeAnyOfferActionsByPurpose(params: {
+        /**
+         * 注文取引でフィルター
+         */
+        purpose: {
+            typeOf: factory.transactionType;
+            id: string;
+        };
+        /**
+         * アクションステータスでフィルター
+         */
+        actionStatus?: {
+            $eq?: factory.actionStatusType.CompletedActionStatus;
+        };
+    }): Promise<IAuthorizeOfferAction[]>;
     /**
      * アクション再開
      */

package/lib/chevre/repo/action/authorizeOffer.js

@@ -45,13 +45,16 @@ class AuthorizeOfferActionRepo extends actionProcess_1.ActionProcessRepo {
                 typeOf: {
                     $in: [
                         factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
-                        factory.offerType.AggregateOffer
+                        factory.action.authorize.offer.eventService.ObjectType.AggregateOffer
                     ]
                 }
             },
             id: { $in: params.ids }
         }, ['instrument']);
     }
+    /**
+     * 注文取引から興行オファー承認アクションを参照する
+     */
     async findAuthorizeOfferActionsByPurpose(params) {
         return this.findAnyActionsByPurpose({
             ...params,
@@ -63,6 +66,27 @@ class AuthorizeOfferActionRepo extends actionProcess_1.ActionProcessRepo {
             object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } }
         });
     }
+    /**
+     * 注文取引から汎用オファー承認アクションを参照する
+     */
+    async findAuthorizeAnyOfferActionsByPurpose(params) {
+        return this.findAnyActionsByPurpose({
+            ...params,
+            typeOf: factory.actionType.AuthorizeAction,
+            purpose: {
+                typeOf: params.purpose.typeOf,
+                id: params.purpose.id
+            },
+            object: {
+                typeOf: {
+                    $in: [
+                        factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
+                        factory.action.authorize.offer.eventService.ObjectType.AggregateOffer
+                    ]
+                }
+            }
+        });
+    }
     /**
      * アクション再開
      */

package/lib/chevre/repo/action/authorizeProductOffer.js

@@ -40,7 +40,7 @@ class AuthorizeProductOfferActionRepo extends actionProcess_1.ActionProcessRepo
             ...params,
             typeOf: factory.actionType.AuthorizeAction,
             object: {
-                typeOf: { $eq: factory.offerType.AggregateOffer }
+                typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.AggregateOffer }
             }
         });
         return authorizeActions.filter((a) => 
@@ -48,7 +48,7 @@ class AuthorizeProductOfferActionRepo extends actionProcess_1.ActionProcessRepo
         // && a.object.length > 0
         // // && a.object[0].typeOf === factory.offerType.Offer
         // && availableProductTypes.indexOf(a.object[0].itemOffered.typeOf) >= 0
-        a.object.typeOf === factory.offerType.AggregateOffer
+        a.object.typeOf === factory.action.authorize.offer.product.ObjectType.AggregateOffer
             && availableProductTypes_1.availableProductTypes.indexOf(a.object.itemOffered.typeOf) >= 0);
     }
 }

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

@@ -37,7 +37,7 @@ export declare class ActionRepo extends ActionProcessRepo<IAction<StartableActio
         };
         object?: {
             typeOf?: {
-                $eq?: factory.action.authorize.offer.eventService.ObjectType.SeatReservation | factory.action.authorize.paymentMethod.any.ResultType.Payment | factory.offerType.AggregateOffer;
+                $eq?: factory.action.authorize.offer.eventService.ObjectType.SeatReservation | factory.action.authorize.paymentMethod.any.ResultType.Payment | factory.action.authorize.offer.product.ObjectType.AggregateOffer;
             };
             paymentMethodId?: {
                 $eq?: string;

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

@@ -8,6 +8,6 @@ type IModel = Model<IDocType, {}, {}, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, IVirtuals, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "OwnershipInfo";
-declare function createSchema(): ISchema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): ISchema;
 export { createSchema, IDocType, IModel, indexes, modelName };

package/lib/chevre/repo/mongoose/schemas/ownershipInfo.js

@@ -8,20 +8,14 @@ const settings_1 = require("../../../settings");
 const modelName = 'OwnershipInfo';
 exports.modelName = modelName;
 const schemaDefinition = {
-    project: mongoose_1.SchemaTypes.Mixed,
+    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     _id: String,
-    typeOf: {
-        type: String,
-        required: true
-    },
-    identifier: {
-        type: String,
-        required: true
-    },
+    typeOf: { type: String, required: true },
+    identifier: { type: String, required: true },
     ownedBy: mongoose_1.SchemaTypes.Mixed,
     acquiredFrom: mongoose_1.SchemaTypes.Mixed,
-    ownedFrom: Date,
-    ownedThrough: Date,
+    ownedFrom: { type: Date, required: true },
+    ownedThrough: { type: Date, required: true },
     typeOfGood: mongoose_1.SchemaTypes.Mixed
 };
 const schemaOptions = {
@@ -48,16 +42,6 @@ const schemaOptions = {
         versionKey: false
     }
 };
-/**
- * 所有権スキーマ
- */
-let schema;
-function createSchema() {
-    if (schema === undefined) {
-        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
-    }
-    return schema;
-}
 const indexes = [
     [
         // 識別子はユニークな前提
@@ -81,14 +65,18 @@ const indexes = [
         { typeOf: 1, ownedFrom: -1 },
         { name: 'searchByTypeOf-v2' }
     ],
+    // [
+    //     { identifier: 1, ownedFrom: -1 },
+    //     {
+    //         name: 'searchByIdentifier-v2',
+    //         partialFilterExpression: {
+    //             identifier: { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { identifier: 1, ownedFrom: -1 },
-        {
-            name: 'searchByIdentifier-v2',
-            partialFilterExpression: {
-                identifier: { $exists: true }
-            }
-        }
+        { name: 'identifier' }
     ],
     [
         { 'acquiredFrom.id': 1, ownedFrom: -1 },
@@ -117,23 +105,27 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'ownedBy.memberOf.membershipNumber': 1, ownedFrom: -1 },
-        {
-            name: 'searchByOwnedByMemberOfMembershipNumber',
-            partialFilterExpression: {
-                'ownedBy.memberOf.membershipNumber': { $exists: true }
-            }
-        }
-    ],
-    [
-        { ownedThrough: -1, ownedFrom: -1 },
-        {
-            name: 'searchByOwnedThrough-v2',
-            partialFilterExpression: {
-                ownedThrough: { $exists: true }
-            }
-        }
+    // [
+    //     { 'ownedBy.memberOf.membershipNumber': 1, ownedFrom: -1 },
+    //     {
+    //         name: 'searchByOwnedByMemberOfMembershipNumber',
+    //         partialFilterExpression: {
+    //             'ownedBy.memberOf.membershipNumber': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { ownedThrough: -1, ownedFrom: -1 },
+    //     {
+    //         name: 'searchByOwnedThrough-v2',
+    //         partialFilterExpression: {
+    //             ownedThrough: { $exists: true }
+    //         }
+    //     }
+    // ],
+    [
+        { ownedThrough: 1, ownedFrom: -1 },
+        { name: 'ownedThrough' }
     ],
     [
         { 'typeOfGood.typeOf': 1, ownedFrom: -1 },
@@ -144,15 +136,15 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'typeOfGood.reservedTicket.ticketToken': 1, ownedFrom: -1 },
-        {
-            name: 'searchByTypeOfGoofReservedTicketToken',
-            partialFilterExpression: {
-                'typeOfGood.reservedTicket.ticketToken': { $exists: true }
-            }
-        }
-    ],
+    // [
+    //     { 'typeOfGood.reservedTicket.ticketToken': 1, ownedFrom: -1 },
+    //     {
+    //         name: 'searchByTypeOfGoofReservedTicketToken',
+    //         partialFilterExpression: {
+    //             'typeOfGood.reservedTicket.ticketToken': { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'typeOfGood.id': 1, ownedFrom: -1 },
         {
@@ -171,15 +163,15 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'typeOfGood.membershipFor.id': 1, ownedFrom: -1 },
-        {
-            name: 'searchByTypeOfGoodMembershipForId',
-            partialFilterExpression: {
-                'typeOfGood.membershipFor.id': { $exists: true }
-            }
-        }
-    ],
+    // [
+    //     { 'typeOfGood.membershipFor.id': 1, ownedFrom: -1 },
+    //     {
+    //         name: 'searchByTypeOfGoodMembershipForId',
+    //         partialFilterExpression: {
+    //             'typeOfGood.membershipFor.id': { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'typeOfGood.issuedThrough.id': 1, ownedFrom: -1 },
         {
@@ -198,15 +190,15 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'typeOfGood.accountNumber': 1, ownedFrom: -1 },
-        {
-            name: 'searchByTypeOfGoodAccountNumber',
-            partialFilterExpression: {
-                'typeOfGood.accountNumber': { $exists: true }
-            }
-        }
-    ],
+    // [
+    //     { 'typeOfGood.accountNumber': 1, ownedFrom: -1 },
+    //     {
+    //         name: 'searchByTypeOfGoodAccountNumber',
+    //         partialFilterExpression: {
+    //             'typeOfGood.accountNumber': { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'typeOfGood.reservationNumber': 1, ownedFrom: -1 },
         {
@@ -218,3 +210,18 @@ const indexes = [
     ]
 ];
 exports.indexes = indexes;
+/**
+ * 所有権スキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema?.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}

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

@@ -71,9 +71,15 @@ export declare class OwnershipInfoRepo {
         };
         identifiers: string[];
         ownedThrough: {
-            $lt: Date;
+            $lte: Date;
         };
     }): Promise<void>;
+    /**
+     * 所有期限切れの所有権を削除する
+     */
+    deleteExpiredOwnershipInfos(params: {
+        ownedThroughLte: Date;
+    }): Promise<void>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<Omit<factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood>, "id"> & {
         _id: string;
     } & Required<{

package/lib/chevre/repo/ownershipInfo.js

@@ -422,8 +422,18 @@ class OwnershipInfoRepo {
         await this.ownershipInfoModel.deleteMany({
             'project.id': { $eq: params.project.id },
             identifier: { $in: params.identifiers },
-            // 所有期限切れのもの(ownedThroughの存在しないものは削除してはいけない)
-            ownedThrough: { $exists: true, $lt: params.ownedThrough.$lt }
+            // 所有期限切れのもの(ownedThroughは必ず存在する)
+            ownedThrough: { $lte: params.ownedThrough.$lte }
+        })
+            .exec();
+    }
+    /**
+     * 所有期限切れの所有権を削除する
+     */
+    async deleteExpiredOwnershipInfos(params) {
+        await this.ownershipInfoModel.deleteMany({
+            // 所有期限切れのもの(ownedThroughは必ず存在する)
+            ownedThrough: { $lte: params.ownedThroughLte }
         })
             .exec();
     }
@@ -440,14 +450,7 @@ class OwnershipInfoRepo {
             throw new factory.errors.ArgumentNull('ownedBy.id');
         }
         let newOwner;
-        if (params.ownedBy.typeOf === factory.organizationType.Organization) {
-            newOwner = {
-                id: params.ownedBy.id,
-                typeOf: params.ownedBy.typeOf
-            };
-        }
-        else if (params.ownedBy.typeOf === factory.personType.Person
-            || params.ownedBy.typeOf === factory.creativeWorkType.WebApplication) {
+        if (params.ownedBy.typeOf === factory.personType.Person) {
             newOwner = {
                 id: params.ownedBy.id,
                 typeOf: params.ownedBy.typeOf

package/lib/chevre/service/delivery/factory.js

@@ -53,15 +53,28 @@ function createOwnershipInfosFromOrder(params) {
         });
         const acquiredFrom = createAcquiredFrom(params);
         const ownedBy = createOwnedby(params);
-        const itemOfferedType = itemOffered.typeOf;
-        switch (itemOfferedType) {
-            case factory.reservationType.EventReservation:
-                const excludeCOAReservation = acceptedOffer.offeredThrough?.identifier === factory.service.webAPI.Identifier.COA;
-                if (excludeCOAReservation) {
-                    // bookingService:COAでは作成しない(2024-12-31~)
-                }
-                else {
-                    ownershipInfo = (0, factory_2.createReservationOwnershipInfo)({
+        // 所有者があれば所有権を作成する
+        if (ownedBy.length > 0) {
+            const itemOfferedType = itemOffered.typeOf;
+            switch (itemOfferedType) {
+                case factory.reservationType.EventReservation:
+                    const excludeCOAReservation = acceptedOffer.offeredThrough?.identifier === factory.service.webAPI.Identifier.COA;
+                    if (excludeCOAReservation) {
+                        // bookingService:COAでは作成しない(2024-12-31~)
+                    }
+                    else {
+                        ownershipInfo = (0, factory_2.createReservationOwnershipInfo)({
+                            project: params.order.project,
+                            ownedBy: ownedBy,
+                            acceptedOffer: { ...acceptedOffer, itemOffered },
+                            ownedFrom: ownedFrom,
+                            identifier: identifier,
+                            acquiredFrom: acquiredFrom
+                        });
+                    }
+                    break;
+                case factory.permit.PermitType.Permit:
+                    ownershipInfo = (0, factory_1.createProductOwnershipInfo)({
                         project: params.order.project,
                         ownedBy: ownedBy,
                         acceptedOffer: { ...acceptedOffer, itemOffered },
@@ -69,24 +82,14 @@ function createOwnershipInfosFromOrder(params) {
                         identifier: identifier,
                         acquiredFrom: acquiredFrom
                     });
-                }
-                break;
-            case factory.permit.PermitType.Permit:
-                ownershipInfo = (0, factory_1.createProductOwnershipInfo)({
-                    project: params.order.project,
-                    ownedBy: ownedBy,
-                    acceptedOffer: { ...acceptedOffer, itemOffered },
-                    ownedFrom: ownedFrom,
-                    identifier: identifier,
-                    acquiredFrom: acquiredFrom
-                });
-                break;
-            // case factory.actionType.MoneyTransfer:
-            //     // no op
-            //     // 所有権は発生しない
-            //     break;
-            default:
-                throw new factory.errors.NotImplemented(`Offered item type ${itemOfferedType} not implemented`);
+                    break;
+                // case factory.actionType.MoneyTransfer:
+                //     // no op
+                //     // 所有権は発生しない
+                //     break;
+                default:
+                    throw new factory.errors.NotImplemented(`Offered item type ${itemOfferedType} not implemented`);
+            }
         }
         if (ownershipInfo !== undefined) {
             ownershipInfos.push(ownershipInfo);
@@ -111,17 +114,17 @@ function createAcquiredFrom(params) {
     };
 }
 function createOwnedby(params) {
-    // 最低限の情報に絞る
     const customer = params.order.customer;
     let owner;
     // 顧客組織の場合
     if (customer.typeOf === factory.organizationType.Organization) {
-        const ownerAsOrganization = {
-            // 個人情報排除するように
-            typeOf: customer.typeOf,
-            id: customer.id
-        };
-        owner = ownerAsOrganization;
+        // discontinue(2026-03-15~)
+        // const ownerAsOrganization: factory.ownershipInfo.IOwnerAsOrganization = {
+        //     // 個人情報排除するように
+        //     typeOf: customer.typeOf,
+        //     id: customer.id
+        // };
+        // owner = ownerAsOrganization;
     }
     else if (customer.typeOf === factory.personType.Person) {
         const ownerAsPerson = {
@@ -132,11 +135,12 @@ function createOwnedby(params) {
         owner = ownerAsPerson;
     }
     else {
-        owner = {
-            // 個人情報排除するように
-            typeOf: customer.typeOf,
-            id: customer.id
-        };
+        // discontinue(2026-03-15~)
+        // owner = {
+        //     // 個人情報排除するように
+        //     typeOf: customer.typeOf,
+        //     id: customer.id
+        // };
     }
-    return [owner];
+    return (owner !== undefined) ? [owner] : [];
 }

package/lib/chevre/service/delivery/product/factory.js

@@ -73,7 +73,6 @@ function createProductOwnershipInfo(params) {
         throw new factory.errors.NotFound('Order.acceptedOffers.priceSpecification.referenceQuantity.value');
     }
     const itemOffered = params.acceptedOffer.itemOffered;
-    // 最適化(2023-02-01~)
     const issuedThrough = (typeof itemOffered.issuedThrough?.typeOf === 'string')
         ? {
             id: itemOffered.issuedThrough.id,
@@ -84,12 +83,11 @@ function createProductOwnershipInfo(params) {
         }
         : undefined;
     const typeOfGood = {
-        // project: itemOffered.project, // 最適化(2023-02-01~)
         identifier: itemOffered.identifier,
         typeOf: itemOffered.typeOf,
         ...(typeof issuedThrough?.typeOf === 'string') ? { issuedThrough } : undefined,
-        ...(itemOffered.validFor !== undefined) ? { validFor: itemOffered.validFor } : undefined,
-        ...(itemOffered.name !== undefined) ? { name: itemOffered.name } : undefined
+        // ...(itemOffered.validFor !== undefined) ? { validFor: itemOffered.validFor } : undefined,
+        // ...(itemOffered.name !== undefined) ? { name: itemOffered.name } : undefined
     };
     const ownershipInfo = {
         project: params.project,

package/lib/chevre/service/delivery/reservation/factory.js

@@ -42,21 +42,21 @@ function createReservationOwnershipInfo(params) {
     else {
         throw new factory.errors.NotImplemented(`itemOffered.typeOf '${itemOffered.typeOf}' not implemented`);
     }
-    let bookingService = params.acceptedOffer.offeredThrough;
-    if (bookingService === undefined) {
-        // デフォルトブッキングサービスはChevre
-        bookingService = {
-            typeOf: 'WebAPI',
-            identifier: factory.service.webAPI.Identifier.Chevre
-        };
-    }
+    // let bookingService = params.acceptedOffer.offeredThrough;
+    // if (bookingService === undefined) {
+    //     // デフォルトブッキングサービスはChevre
+    //     bookingService = {
+    //         typeOf: 'WebAPI',
+    //         identifier: factory.service.webAPI.Identifier.Chevre
+    //     };
+    // }
     let typeOfGood;
     if (itemOffered.typeOf === factory.reservationType.EventReservation) {
         typeOfGood = {
             typeOf: itemOffered.typeOf,
             id: itemOffered.id,
             reservationNumber: itemOffered.reservationNumber,
-            bookingService: bookingService,
+            // bookingService: bookingService,
             ...(typeof itemOffered.issuedThrough?.typeOf === 'string') ? { issuedThrough: itemOffered.issuedThrough } : undefined
         };
         // } else if (itemOffered.typeOf === factory.reservationType.BusReservation) {

package/lib/chevre/service/offer/product/factory.js

@@ -80,7 +80,7 @@ function createRegisterServiceStartParams(params) {
 function createActionAttributes(params) {
     const transaction = params.transaction;
     const actionObject = {
-        typeOf: factory.offerType.AggregateOffer,
+        typeOf: factory.action.authorize.offer.product.ObjectType.AggregateOffer,
         itemOffered: {
             id: params.acceptedOffer[0].itemOffered.id,
             typeOf: params.acceptedOffer[0].itemOffered.typeOf

package/lib/chevre/service/offer/product.js

@@ -250,7 +250,7 @@ function voidTransaction(params) {
             // && a.object.length > 0
             // && a.object[0].typeOf === factory.offerType.Offer
             // && availableProductTypes.indexOf(a.object[0].itemOffered.typeOf) >= 0
-            a.object.typeOf === factory.offerType.AggregateOffer
+            a.object.typeOf === factory.action.authorize.offer.product.ObjectType.AggregateOffer
                 && availableProductTypes_1.availableProductTypes.indexOf(a.object.itemOffered.typeOf) >= 0));
         }
         await Promise.all(authorizeActions.map(async (action) => {

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

@@ -147,7 +147,7 @@ function deleteOwnershipInfosByOrder(order) {
                 project: { id: order.project.id },
                 identifiers: ownershipIdentifiers,
                 // 所有期限切れのもの(ownedThroughの存在しないものは削除してはいけない)
-                ownedThrough: { $lt: now }
+                ownedThrough: { $lte: now }
             });
         }
     };

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

@@ -114,10 +114,13 @@ function sendOrder(params) {
             // 所有権生成を最小化(2024-03-01~)
             let createOwnerships = false;
             switch (order.customer.typeOf) {
-                case factory.creativeWorkType.WebApplication:
+                case factory.personType.Person:
+                    createOwnerships = true; // Personのみに限定(2026-03-15~)
                     break;
+                // case factory.creativeWorkType.WebApplication:
+                //     break;
                 default:
-                    createOwnerships = true;
+                // createOwnerships = true;
             }
             try {
                 const offerIndexBase = (limit * (page - 1));

package/lib/chevre/service/transaction/placeOrder/confirm.d.ts

@@ -1,4 +1,6 @@
 import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizePaymentMethodActionRepo } from '../../../repo/action/authorizePaymentMethod';
+import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
@@ -13,6 +15,8 @@ import * as factory from '../../../factory';
 import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 interface IConfirmOperationRepos {
     action: ActionRepo;
+    authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
+    authorizeOfferAction: AuthorizeOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
     emailMessage?: EmailMessageRepo;
@@ -57,4 +61,4 @@ interface IConfirmResult {
  * 注文取引を確定する
  */
 declare function confirm(params: IConfirmParams, options: IConfirmOptions): IConfirmOperation<IConfirmResult>;
-export { confirm };
+export { IConfirmOperationRepos, confirm };

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

@@ -263,7 +263,7 @@ function dissolveAuthorizeActions(completedAuthorizeActions) {
                 }
                 serialNumber = assetTransactionNumber;
             }
-            else if (a.object.typeOf === factory.offerType.AggregateOffer
+            else if (a.object.typeOf === factory.action.authorize.offer.product.ObjectType.AggregateOffer
                 && a.instrument?.typeOf === factory.assetTransactionType.RegisterService) {
                 authorizeProductOfferActions.push(a);
                 serialNumber = a.instrument.transactionNumber;
@@ -420,15 +420,33 @@ function searchAcceptPayActions(params) {
 function searchAuthorizeActions(params) {
     return async (repos) => {
         // 取引に対する全ての承認アクションをマージ
-        let authorizeActions = await repos.action.searchByPurpose({
-            typeOf: factory.actionType.AuthorizeAction,
-            purpose: {
-                typeOf: factory.transactionType.PlaceOrder,
-                id: params.id
-            },
-            // Completedに絞る(2023-05-16~)
-            actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
-        });
+        // let authorizeActions = <IAuthorizeOfferOrPaymentAction[]>await repos.action.searchByPurpose({
+        //     typeOf: factory.actionType.AuthorizeAction,
+        //     purpose: {
+        //         typeOf: factory.transactionType.PlaceOrder,
+        //         id: params.id
+        //     },
+        //     // Completedに絞る(2023-05-16~)
+        //     actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
+        // });
+        let authorizeActions = [
+            ...await repos.authorizePaymentMethodAction.findAuthorizePaymentMethodActionsByPurpose({
+                purpose: {
+                    typeOf: factory.transactionType.PlaceOrder,
+                    id: params.id
+                },
+                // Completedに絞る(2023-05-16~)
+                actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
+            }),
+            ...await repos.authorizeOfferAction.findAuthorizeAnyOfferActionsByPurpose({
+                purpose: {
+                    typeOf: factory.transactionType.PlaceOrder,
+                    id: params.id
+                },
+                // Completedに絞る(2023-05-16~)
+                actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
+            }),
+        ];
         // 万が一このプロセス中に他処理が発生してもそれらを無視するように、endDateでフィルタリング
         authorizeActions = authorizeActions.filter((a) => {
             return (a.endDate instanceof Date) && (0, moment_1.default)(a.endDate)

package/lib/chevre/service.d.ts

@@ -20,7 +20,6 @@ import type * as OrderService from './service/order';
 import type * as AnyPaymentService from './service/payment/any';
 import type * as PermitService from './service/permit';
 import type * as ProjectService from './service/project';
-import type * as ReportService from './service/report';
 import type * as ReserveService from './service/reserve';
 import type * as TaskService from './service/task';
 import type * as TransactionService from './service/transaction';
@@ -65,9 +64,6 @@ export declare namespace permit {
 export declare namespace project {
     function createService(): Promise<typeof ProjectService>;
 }
-export declare namespace report {
-    function createService(): Promise<typeof ReportService>;
-}
 export declare namespace reserve {
     function createService(): Promise<typeof ReserveService>;
 }

package/lib/chevre/service.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.factory = exports.transaction = exports.task = exports.reserve = exports.report = exports.project = exports.permit = exports.payment = exports.order = exports.offer = exports.notification = exports.iam = exports.event = exports.delivery = exports.assetTransaction = exports.aggregation = exports.accountTransaction = exports.account = void 0;
+exports.factory = exports.transaction = exports.task = exports.reserve = exports.project = exports.permit = exports.payment = exports.order = exports.offer = exports.notification = exports.iam = exports.event = exports.delivery = exports.assetTransaction = exports.aggregation = exports.accountTransaction = exports.account = void 0;
 /**
  * service module
  */
@@ -189,17 +189,6 @@ var project;
     }
     project.createService = createService;
 })(project || (exports.project = project = {}));
-var report;
-(function (report) {
-    let service;
-    async function createService() {
-        if (service === undefined) {
-            service = await Promise.resolve().then(() => __importStar(require('./service/report')));
-        }
-        return service;
-    }
-    report.createService = createService;
-})(report || (exports.report = report = {}));
 var reserve;
 (function (reserve) {
     let service;

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "6.0.0-alpha.1",
+    "@chevre/factory": "6.0.0-alpha.3",
     "@cinerino/sdk": "13.2.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -99,5 +99,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.37"
+  "version": "24.0.0-alpha.39"
 }

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

@@ -1,27 +0,0 @@
-import * as factory from '../../factory';
-/**
- * 所有権レポートインターフェース
- */
-export interface IOwnershipInfoReport {
-    id: string;
-    identifier: string;
-    ownedBy: {
-        typeOf: string;
-        id: string;
-    };
-    typeOfGood: {
-        typeOf: string;
-        id?: string;
-        identifier?: string;
-    };
-    ownedFrom: string;
-    ownedThrough: string;
-    seller: {
-        id?: string;
-    };
-}
-export declare function ownershipInfo2report(params: {
-    ownershipInfo: factory.ownershipInfo.IOwnershipInfo<factory.ownershipInfo.IGood> & {
-        id: string;
-    };
-}): IOwnershipInfoReport;

package/lib/chevre/service/report/ownershipInfo.js

@@ -1,39 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ownershipInfo2report = ownershipInfo2report;
-/**
- * 所有権レポートサービス
- */
-// import * as json2csv from 'json2csv';
-const moment_1 = __importDefault(require("moment"));
-function ownershipInfo2report(params) {
-    const ownershipInfo = params.ownershipInfo;
-    return {
-        id: ownershipInfo.id,
-        identifier: String(ownershipInfo.identifier),
-        ownedBy: (Array.isArray(ownershipInfo.ownedBy))
-            ? {
-                typeOf: ownershipInfo.ownedBy[0]?.typeOf,
-                id: String(ownershipInfo.ownedBy[0]?.id)
-            }
-            : {
-                typeOf: ownershipInfo.ownedBy.typeOf,
-                id: String(ownershipInfo.ownedBy.id)
-            },
-        typeOfGood: {
-            typeOf: ownershipInfo.typeOfGood.typeOf,
-            id: ownershipInfo.typeOfGood.id,
-            identifier: ownershipInfo.typeOfGood.identifier
-        },
-        ownedFrom: (0, moment_1.default)(ownershipInfo.ownedFrom)
-            .toISOString(),
-        ownedThrough: (0, moment_1.default)(ownershipInfo.ownedThrough)
-            .toISOString(),
-        seller: {
-            id: ownershipInfo.acquiredFrom?.id
-        }
-    };
-}

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

@@ -1,5 +0,0 @@
-/**
- * レポートサービス
- */
-import * as OwnershipInfoService from './report/ownershipInfo';
-export { OwnershipInfoService as ownershipInfo };

package/lib/chevre/service/report.js

@@ -1,31 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ownershipInfo = void 0;
-/**
- * レポートサービス
- */
-const OwnershipInfoService = __importStar(require("./report/ownershipInfo"));
-exports.ownershipInfo = OwnershipInfoService;