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

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

@@ -130,7 +130,7 @@ 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 | factory.offerType.Offer;
+                $eq?: factory.action.authorize.offer.eventService.ObjectType.SeatReservation | factory.action.authorize.paymentMethod.any.ResultType.Payment | factory.offerType.AggregateOffer;
             };
             paymentMethodId?: {
                 $eq?: string;

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

@@ -45,7 +45,7 @@ class AuthorizeOfferActionRepo extends actionProcess_1.ActionProcessRepo {
                 typeOf: {
                     $in: [
                         factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
-                        factory.offerType.Offer
+                        factory.offerType.AggregateOffer
                     ]
                 }
             },

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

@@ -40,13 +40,16 @@ class AuthorizeProductOfferActionRepo extends actionProcess_1.ActionProcessRepo
             ...params,
             typeOf: factory.actionType.AuthorizeAction,
             object: {
-                typeOf: { $eq: factory.offerType.Offer }
+                typeOf: { $eq: factory.offerType.AggregateOffer }
             }
         });
-        return authorizeActions.filter((a) => Array.isArray(a.object)
-            && a.object.length > 0
-            // && a.object[0].typeOf === factory.offerType.Offer
-            && availableProductTypes_1.availableProductTypes.indexOf(a.object[0].itemOffered.typeOf) >= 0);
+        return authorizeActions.filter((a) => 
+        // Array.isArray(a.object)
+        // && 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
+            && availableProductTypes_1.availableProductTypes.indexOf(a.object.itemOffered.typeOf) >= 0);
     }
 }
 exports.AuthorizeProductOfferActionRepo = AuthorizeProductOfferActionRepo;

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

@@ -215,6 +215,7 @@ const indexes = [
             }
         }
     ]
+    // eslint-disable-next-line no-warning-comments
     // TODO add unique index(2025-03-28~)
     // [
     //     { identifier: 1 },

package/lib/chevre/repo/order.js

@@ -853,6 +853,7 @@ class OrderRepo {
         }, {
             $set: {
                 'paymentMethods.$[invoice].paymentMethod.identifier': params.invoice.paymentMethod.identifier,
+                // eslint-disable-next-line no-warning-comments
                 // TODO 互換性維持対応としてtypeOfも変更しているが、そのうち廃止(2023-08-30)
                 'paymentMethods.$[invoice].typeOf': params.invoice.paymentMethod.identifier
             }

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

@@ -121,8 +121,6 @@ function createAuthorizeSeatReservationActionAttributes(params) {
         event: authorizeObjectEvent
         // pendingTransaction: params.pendingTransaction, // discontinue(2024-06-22~)
         // ...(params.broker !== undefined) ? { broker: params.broker } : undefined // discontinue(2024-06-24~)
-        // useResultAcceptedOffers: false // discontinue(2024-06-24~)
-        // acceptedOffer: acceptedOffers // discontinue(2024-06-19~)
     };
     const instrument = {
         // typeOf: 'WebAPI',

package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.js

@@ -49,10 +49,8 @@ function createAuthorizeSeatReservationActionAttributes(params) {
     const authorizeObject = {
         typeOf: factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
         id: params.acceptAction.id,
-        // acceptedOffer: params.acceptedOffers, // discontinue acceptedOffers(2024-06-21~)
         event: authorizeObjectEvent,
         pendingTransaction: params.pendingTransaction
-        // useResultAcceptedOffers: false // discontinue(2024-06-24~)
     };
     const instrument = {
         // typeOf: 'WebAPI',

package/lib/chevre/service/offer/product/factory.d.ts

@@ -4,26 +4,26 @@ export declare function createRegisterServiceStartParams(params: {
         id: string;
         typeOf: factory.organizationType.Project;
     };
-    object: factory.action.authorize.offer.product.IObject;
+    object: factory.action.authorize.offer.product.IAcceptedOffer[];
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType>, 'seller' | 'expires'>;
     transactionNumber: string;
 }): factory.assetTransaction.registerService.IStartParamsWithoutDetail;
 export declare function createActionAttributes(params: {
-    acceptedOffer: factory.action.authorize.offer.product.IObject;
+    acceptedOffer: factory.action.authorize.offer.product.IAcceptedOffer[];
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
     transactionNumber: string;
 }): factory.action.authorize.offer.product.IAttributes;
 export declare function acceptedOffers2amount(params: {
     acceptedOffers: IResultAcceptedOffer;
 }): number;
-type IResultAcceptedOffer = factory.action.authorize.offer.product.IResultAcceptedOffer;
+type IResultAcceptedOffer = factory.order.IAcceptedOffer<factory.order.IPermit>[];
 export declare function responseBody2resultAcceptedOffer(params: {
     project: {
         id: string;
         typeOf: factory.organizationType.Project;
     };
     responseBody: factory.assetTransaction.registerService.ITransaction;
-    acceptedOffer: factory.action.authorize.offer.product.IObject;
+    acceptedOffer: factory.action.authorize.offer.product.IAcceptedOffer[];
 }): IResultAcceptedOffer;
 export declare function createResult(params: {
     project: {
@@ -32,6 +32,6 @@ export declare function createResult(params: {
     };
     requestBody: factory.assetTransaction.registerService.IStartParamsWithoutDetail;
     responseBody: factory.assetTransaction.registerService.ITransaction;
-    acceptedOffer: factory.action.authorize.offer.product.IObject;
+    acceptedOffer: factory.action.authorize.offer.product.IAcceptedOffer[];
 }): factory.action.authorize.offer.product.IResult;
 export {};

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

@@ -79,6 +79,13 @@ function createRegisterServiceStartParams(params) {
 }
 function createActionAttributes(params) {
     const transaction = params.transaction;
+    const actionObject = {
+        typeOf: factory.offerType.AggregateOffer,
+        itemOffered: {
+            id: params.acceptedOffer[0].itemOffered.id,
+            typeOf: params.acceptedOffer[0].itemOffered.typeOf
+        }
+    };
     return {
         project: transaction.project,
         typeOf: factory.actionType.AuthorizeAction,
@@ -86,7 +93,8 @@ function createActionAttributes(params) {
             typeOf: factory.assetTransactionType.RegisterService,
             transactionNumber: params.transactionNumber
         },
-        object: params.acceptedOffer,
+        // object: params.acceptedOffer,
+        object: actionObject, // optimize(2026-03-13~)
         agent: {
             id: transaction.seller.id,
             typeOf: transaction.seller.typeOf,
@@ -199,7 +207,7 @@ function responseBody2resultAcceptedOffer(params) {
             const permitAcceptedOffer = {
                 typeOf: responseBodyObject.typeOf,
                 id: offer.id,
-                name: offer.name,
+                // name: offer.name,
                 itemOffered,
                 priceSpecification,
                 serialNumber: params.responseBody.transactionNumber
@@ -214,10 +222,10 @@ function createResult(params) {
     // 金額計算
     const amount = acceptedOffers2amount({ acceptedOffers: acceptedOffers4result });
     return {
+        typeOf: factory.offerType.AggregateOffer,
         price: amount,
         priceCurrency: factory.priceCurrency.JPY,
-        // acceptedOffers: acceptedOffers4result, // discontinue(2024-06-17~)
-        requestBody: params.requestBody,
-        responseBody: params.responseBody
+        // requestBody: params.requestBody, // discontinue(2026-03-13~)
+        // responseBody: params.responseBody // discontinue(2026-03-13~)
     };
 }

package/lib/chevre/service/offer/product.d.ts

@@ -77,7 +77,7 @@ export declare function authorize(params: {
         id: string;
         typeOf: factory.organizationType.Project;
     };
-    object: factory.action.authorize.offer.product.IObject;
+    object: factory.action.authorize.offer.product.IAcceptedOffer[];
     agent: {
         id: string;
         typeOf: factory.personType.Person | factory.creativeWorkType.WebApplication;

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

@@ -245,13 +245,17 @@ function voidTransaction(params) {
                 }
             })
                 .then((actions) => actions
-                .filter((a) => Array.isArray(a.object)
-                && a.object.length > 0
-                && a.object[0].typeOf === factory.offerType.Offer
-                && availableProductTypes_1.availableProductTypes.indexOf(a.object[0].itemOffered.typeOf) >= 0));
+                .filter((a) => 
+            // Array.isArray(a.object)
+            // && 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
+                && availableProductTypes_1.availableProductTypes.indexOf(a.object.itemOffered.typeOf) >= 0));
         }
         await Promise.all(authorizeActions.map(async (action) => {
-            const productId = action.object[0]?.itemOffered?.id;
+            // const productId = action.object[0]?.itemOffered?.id;
+            const productId = action.object?.itemOffered?.id;
             if (typeof productId === 'string') {
                 // 廃止(2023-12-07~)
                 // await processUnlockRegisterMembershipService({

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

@@ -276,6 +276,7 @@ function createAuthorizeResult(params) {
         typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment,
         referencesOrder // add(2025-11-23~)
     };
+    // eslint-disable-next-line no-warning-comments
     // TODO 保留 resultにメンバーシップを追加(2024-08-13~)
     // let resultAsPermit: factory.action.authorize.paymentMethod.any.IResultAsPermit | undefined;
     // if (typeof params.permit?.identifier === 'string') {

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

@@ -144,6 +144,7 @@ function syncEventSeries(params) {
             project: { typeOf: factory.organizationType.Project, id: params.project.id },
             typeOf: factory.actionType.ReplaceAction,
             agent: params.agent,
+            // eslint-disable-next-line no-warning-comments
             // TODO define object
             object: {
                 ...params.object,
@@ -212,6 +213,7 @@ function syncEvents(params) {
             project: { typeOf: factory.organizationType.Project, id: params.project.id },
             typeOf: factory.actionType.ReplaceAction,
             agent: params.agent,
+            // eslint-disable-next-line no-warning-comments
             // TODO define object
             object: {
                 ...params.object,

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

@@ -221,6 +221,7 @@ function deleteTransactionById(params) {
                         default:
                             throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
                     }
+                    // eslint-disable-next-line no-warning-comments
                     // TODO サービス登録取引を削除
                     // 決済取引を削除
                     const deletePayTransactionsByPlaceOrderResult = await deletePayTransactionsByPlaceOrder({ authorizeActions, transaction })(repos);

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

@@ -4,5 +4,6 @@ export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventSe
 export type IAuthorizeProductOffer = factory.action.authorize.offer.product.IAction;
 export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'result' | 'endDate'> & {
     object: Pick<factory.action.authorize.paymentMethod.any.IObject, 'typeOf' | 'paymentMethodId'>;
+    instrument?: never;
 };
 export type IPayTransaction = Pick<factory.assetTransaction.pay.ITransaction, 'object'>;

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

@@ -31,7 +31,6 @@ const debug_1 = __importDefault(require("debug"));
 const moment_1 = __importDefault(require("moment"));
 const errorHandler_1 = require("../../../errorHandler");
 const factory = __importStar(require("../../../factory"));
-const availableProductTypes_1 = require("../../../factory/availableProductTypes");
 // import { Settings } from '../../../settings';
 const factory_1 = require("../../order/placeOrder/factory");
 const orderedItem_1 = require("../../order/placeOrder/factory/orderedItem");
@@ -245,27 +244,29 @@ function dissolveAuthorizeActions(completedAuthorizeActions) {
     completedAuthorizeActions.forEach((a) => {
         let serialNumber;
         if (Array.isArray(a.object)) {
-            if (a.object.length > 0
-                && a.object.every(({ typeOf }) => typeOf === factory.offerType.Offer)
-                && a.object.every(({ itemOffered }) => availableProductTypes_1.availableProductTypes.indexOf(itemOffered.typeOf) >= 0)) {
-                authorizeProductOfferActions.push(a);
-                serialNumber = a.instrument.transactionNumber;
-            }
+            throw new factory.errors.NotImplemented('authorizeAction object as an array discontinued.'); // discontinue(2026-03-13~)
+            // if (
+            //     a.object.length > 0
+            //     && a.object.every(({ typeOf }) => typeOf === factory.offerType.Offer)
+            //     && a.object.every(({ itemOffered }) => availableProductTypes.indexOf(itemOffered.typeOf) >= 0)
+            // ) {
+            //     authorizeProductOfferActions.push(<IAuthorizeProductOffer>a);
+            //     serialNumber = (<IAuthorizeProductOffer>a).instrument.transactionNumber;
+            // }
         }
         else {
             if (a.object.typeOf === factory.action.authorize.offer.eventService.ObjectType.SeatReservation) {
                 authorizeEventServiceOfferActions.push(a);
-                const assetTransactionNumber = a.instrument.transactionNumber;
+                const assetTransactionNumber = a.instrument?.transactionNumber;
                 if (typeof assetTransactionNumber !== 'string') {
                     throw new factory.errors.NotFound('instrument.transactionNumber', `action.instrument.transactionNumber not found. [${a.id}]`);
                 }
                 serialNumber = assetTransactionNumber;
-                // } else if (
-                //     a.object.typeOf === factory.offerType.Offer
-                //     && a.object.itemOffered?.typeOf === factory.actionType.MoneyTransfer
-                // ) {
-                //     authorizeMoneyTansferActions.push(<IAuthorizeMoneyTransferOffer>a);
-                //     serialNumber = (<IAuthorizeMoneyTransferOffer>a).instrument.transactionNumber;
+            }
+            else if (a.object.typeOf === factory.offerType.AggregateOffer
+                && a.instrument?.typeOf === factory.assetTransactionType.RegisterService) {
+                authorizeProductOfferActions.push(a);
+                serialNumber = a.instrument.transactionNumber;
             }
             else if (a.object.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment) {
                 authorizePaymentActions.push(a);

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -214,6 +214,7 @@ function createTasks(params, setting
             else {
                 taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
             }
+            // eslint-disable-next-line no-warning-comments
             // TODO reimplement
             // temporarily discontinue VoidRegisterServiceTransaction VoidMoneyTransferTransaction(2025-02-25~)
             // const voidRegisterServiceTaskAttributes: factory.task.IAttributes<factory.taskName.VoidRegisterServiceTransaction> = {

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.0",
+    "@chevre/factory": "6.0.0-alpha.1",
     "@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.35"
+  "version": "24.0.0-alpha.37"
 }